@eturnity/eturnity_reusable_components 7.12.7-EPDM-10335.0 → 7.12.7-EPDM-10528.0

package/.storybook/preview.js

@@ -1,4 +1,4 @@
-import { ThemeProvider } from "vue3-styled-components"
+import { ThemeProvider } from "vue-styled-components"
 
 const theme = {
   colors: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.12.7-EPDM-10335.0",
+  "version": "7.12.7-EPDM-10528.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -10,26 +10,30 @@
     "build-storybook": "build-storybook"
   },
   "dependencies": {
-    "@storybook/vue3": "7.0.18",
-    "@vue/compat": "3.3.4",
-    "@vueform/slider": "2.1.10",
-    "@vuepic/vue-datepicker": "6.1.0",
-    "click-outside-vue3": "4.0.1",
+    "@vueform/slider": "1.0.5",
     "html-loader": "0.5.5",
-    "postcss": "8.4.25",
-    "vue": "3.3.4",
-    "vue3-styled-components": "1.2.1",
-    "vuedraggable": "4.1.0"
+    "postcss": "^8.4.25",
+    "v-click-outside": "2.1.4",
+    "vue": "2.6.11",
+    "vue-styled-components": "1.6.0",
+    "vue2-datepicker": "3.11.1",
+    "vuedraggable": "2.24.3",
+    "core-js": "3.31.1"
   },
   "devDependencies": {
-    "@babel/core": "7.12.16",
-    "@babel/eslint-parser": "7.12.16",
-    "@vue/cli-plugin-babel": "5.0.8",
-    "@vue/cli-plugin-eslint": "5.0.8",
-    "@vue/cli-service": "5.0.8",
-    "@vue/compiler-sfc": "3.3.4",
-    "eslint": "7.32.0",
-    "eslint-plugin-vue": "8.0.3"
+    "@storybook/addon-actions": "6.2.8",
+    "@storybook/addon-docs": "6.4.19",
+    "@storybook/addon-essentials": "6.2.8",
+    "@storybook/addon-links": "6.2.8",
+    "@storybook/vue": "6.4.19",
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "@vue/composition-api": "1.0.0-rc.10",
+    "babel-eslint": "10.1.0",
+    "eslint": "6.7.2",
+    "eslint-plugin-vue": "6.2.2",
+    "vue-template-compiler": "2.6.11"
   },
   "eslintConfig": {
     "root": true,
@@ -41,7 +45,7 @@
       "eslint:recommended"
     ],
     "parserOptions": {
-      "parser": "@babel/eslint-parser"
+      "parser": "babel-eslint"
     },
     "rules": {}
   },

package/src/App.vue

@@ -55,9 +55,9 @@
 </template>
 
 <script>
-import { ThemeProvider } from 'vue3-styled-components'
+import { ThemeProvider } from 'vue-styled-components'
 import theme from './assets/theme'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import InputNumber from '@/components/inputs/inputNumber'
 
 const PageContainer = styled.div`

package/src/assets/svgIcons/house_3d-1.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
+  <mask id="path-1-inside-1_57915_53334" fill="white">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.0303 2.75757L0 5.30302V11.2424L3.41022 12.4091V8.96996L4.53143 9.41845V12.7926L8.0606 14V8.0606L4.0303 2.75757Z"/>
+  </mask>
+  <path d="M0 5.30302L-0.694191 4.20389L-1.3 4.5865V5.30302H0ZM4.0303 2.75757L5.06531 1.97096L4.344 1.02187L3.33611 1.65843L4.0303 2.75757ZM0 11.2424H-1.3V12.1716L-0.420794 12.4724L0 11.2424ZM3.41022 12.4091L2.98943 13.6391L4.71022 14.2278V12.4091H3.41022ZM3.41022 8.96996L3.89303 7.76294L2.11022 7.04982V8.96996H3.41022ZM4.53143 9.41845H5.83143V8.5383L5.01424 8.21143L4.53143 9.41845ZM4.53143 12.7926H3.23143V13.7219L4.11064 14.0227L4.53143 12.7926ZM8.0606 14L7.63981 15.23L9.3606 15.8187V14H8.0606ZM8.0606 8.0606H9.3606V7.62266L9.09561 7.27399L8.0606 8.0606ZM0.694191 6.40216L4.72449 3.8567L3.33611 1.65843L-0.694191 4.20389L0.694191 6.40216ZM1.3 11.2424V5.30302H-1.3V11.2424H1.3ZM3.83102 11.1791L0.420794 10.0124L-0.420794 12.4724L2.98943 13.6391L3.83102 11.1791ZM4.71022 12.4091V8.96996H2.11022V12.4091H4.71022ZM2.92741 10.177L4.04862 10.6255L5.01424 8.21143L3.89303 7.76294L2.92741 10.177ZM3.23143 9.41845V12.7926H5.83143V9.41845H3.23143ZM8.48139 12.77L4.95223 11.5626L4.11064 14.0227L7.63981 15.23L8.48139 12.77ZM6.7606 8.0606V14H9.3606V8.0606H6.7606ZM2.99529 3.54418L7.02559 8.8472L9.09561 7.27399L5.06531 1.97096L2.99529 3.54418Z" fill="#0068DE" mask="url(#path-1-inside-1_57915_53334)"/>
+  <path d="M8.55859 13.2165V8.37967L13.498 6.08638V10.9232L8.55859 13.2165Z" fill="#0068DE" stroke="#0068DE"/>
+  <path d="M8.21608 7.43759L4.80515 2.94953L9.81611 0.623007L13.227 5.11107L8.21608 7.43759Z" fill="#0068DE" stroke="#0068DE"/>
+</svg>

package/src/assets/svgIcons/house_3d.svg

@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16" fill="none">
+  <mask id="path-1-inside-1_57915_3657" fill="white">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.03081 3.71851L0 6.28736V12.2814L3.41065 13.4587V9.98801L4.532 10.4406V13.8458L8.06161 15.0643V9.07028L4.03081 3.71851Z"/>
+  </mask>
+  <path d="M0 6.28736L-0.698673 5.19107L-1.3 5.5743V6.28736H0ZM4.03081 3.71851L5.06922 2.9364L4.34595 1.9761L3.33213 2.62221L4.03081 3.71851ZM0 12.2814H-1.3V13.2079L-0.424205 13.5102L0 12.2814ZM3.41065 13.4587L2.98645 14.6876L4.71065 15.2828V13.4587H3.41065ZM3.41065 9.98801L3.89722 8.78251L2.11065 8.0614V9.98801H3.41065ZM4.532 10.4406H5.832V9.56343L5.01858 9.23511L4.532 10.4406ZM4.532 13.8458H3.232V14.7723L4.1078 15.0747L4.532 13.8458ZM8.06161 15.0643L7.63741 16.2931L9.36161 16.8883V15.0643H8.06161ZM8.06161 9.07028H9.36161V8.63549L9.10003 8.28818L8.06161 9.07028ZM0.698673 7.38365L4.72948 4.8148L3.33213 2.62221L-0.698673 5.19107L0.698673 7.38365ZM1.3 12.2814V6.28736H-1.3V12.2814H1.3ZM3.83485 12.2299L0.424205 11.0525L-0.424205 13.5102L2.98645 14.6876L3.83485 12.2299ZM4.71065 13.4587V9.98801H2.11065V13.4587H4.71065ZM2.92408 11.1935L4.04543 11.6461L5.01858 9.23511L3.89722 8.78251L2.92408 11.1935ZM3.232 10.4406V13.8458H5.832V10.4406H3.232ZM8.48582 13.8354L4.95621 12.617L4.1078 15.0747L7.63741 16.2931L8.48582 13.8354ZM6.76161 9.07028V15.0643H9.36161V9.07028H6.76161ZM2.99239 4.50061L7.0232 9.85239L9.10003 8.28818L5.06922 2.9364L2.99239 4.50061Z" fill="white" mask="url(#path-1-inside-1_57915_3657)"/>
+  <path d="M8.5625 14.2779V9.38818L13.5026 7.07375V11.9634L8.5625 14.2779Z" fill="white" stroke="white"/>
+  <path d="M8.21735 8.44534L4.80134 3.90984L9.81609 1.56045L13.2321 6.09596L8.21735 8.44534Z" fill="white" stroke="white"/>
+</svg>

package/src/components/addNewButton/index.vue

@@ -1,15 +1,14 @@
 <template>
   <page-container :shouldPosition="shouldPosition">
     <button-container :data-id="dataId">
-      <PlusButtonSvg />
+      <plus-button :src="require('../../assets/icons/plus_button.svg')" />
     </button-container>
   </page-container>
 </template>
 
 <script>
 // import AddNewButton from "@eturnity/eturnity_reusable_components/src/components/addNewButton"
-import styled from 'vue3-styled-components'
-import PlusButtonSvg from '../../assets/icons/plus_button.svg'
+import styled from 'vue-styled-components'
 
 const pageAttrs = { shouldPosition: Boolean }
 const PageContainer = styled('div', pageAttrs)`
@@ -47,8 +46,7 @@ export default {
   components: {
     PageContainer,
     ButtonContainer,
-    PlusButton,
-    PlusButtonSvg
+    PlusButton
   },
   props: {
     shouldPosition: {

package/src/components/buttons/buttonIcon/index.vue

@@ -32,7 +32,7 @@
 // />
 
 import Icon from "../../icon"
-import styled from "vue3-styled-components"
+import styled from "vue-styled-components"
 import Theme from "@/assets/theme";
 
 const PageContainer = styled.div``

package/src/components/buttons/closeButton/index.vue

@@ -13,7 +13,7 @@
 // <close-button
 //   color="#fff"
 // />
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 
 const Container = styled.div`
   position: relative;

package/src/components/buttons/mainButton/index.vue

@@ -1,13 +1,13 @@
 <template>
   <page-container>
     <button-container
-      :id="id"
       :type="type"
       :minWidth="minWidth"
       :isDisabled="isDisabled"
       :customColor="customColor"
       :noWrap="noWrap"
       :data-id="dataId"
+      :fontColor="fontColor"
     >
       {{ text }}
     </button-container>
@@ -26,7 +26,7 @@
 //   :data-id="test_data_id"
 // />
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 
 const PageContainer = styled.div``
 
@@ -35,12 +35,14 @@ const ButtonAttrs = {
   isDisabled: Boolean,
   minWidth: String,
   customColor: String,
+  fontColor: String,
   noWrap: Boolean
 }
 const ButtonContainer = styled('div', ButtonAttrs)`
   padding: 7px 15px;
   font-size: 13px;
-  color: ${(props) => props.theme.colors.white};
+  color: ${(props) =>
+    props.fontColor ? props.fontColor : props.theme.colors.white};
   background-color: ${(props) =>
     props.isDisabled
       ? props.theme.colors.disabled
@@ -91,6 +93,9 @@ export default {
       required: false,
       default: null
     },
+    fontColor: {
+      required: false
+    },
     noWrap: {
       required: false,
       default: false
@@ -99,10 +104,6 @@ export default {
       required: false,
       default: null
     },
-    id: {
-      required: false,
-      default: null
-    },
     dataId: {
       type: String,
       default: ''

package/src/components/deleteIcon/DeleteIcon.stories.js

@@ -1,8 +1,8 @@
-import DeleteIcon from './index.vue'
+import DeleteIcon from "./index.vue"
 
 export default {
-  title: 'DeleteIcon',
-  component: DeleteIcon
+  title: "DeleteIcon",
+  component: DeleteIcon,
   // argTypes: {},
 }
 
@@ -11,19 +11,19 @@ const Template = (args, { argTypes }) => ({
   components: { DeleteIcon },
   // The story's `args` need to be mapped into the template through the `setup()` method
   props: Object.keys(argTypes),
-  template: '<delete-icon v-bind="$props" />'
+  template: '<delete-icon v-bind="$props" />',
 
   // import DeleteIcon from "@eturnity/eturnity_reusable_components/src/components/deleteIcon"
   // To use:
-  // <delete-icon color="gray" @click="onDeleteItem(item)" :isDisabled="true" />
+  // <delete-icon color="gray" @click.native="onDeleteItem(item)" :isDisabled="true" />
 })
 
 export const Default = Template.bind({})
 Default.args = {
-  isDisabled: false
+  isDisabled: false,
 }
 
 export const Disabled = Template.bind({})
 Disabled.args = {
-  isDisabled: true
+  isDisabled: true,
 }

package/src/components/deleteIcon/index.vue

@@ -4,62 +4,58 @@
     @mouseleave="isHovered = false"
     :isDisabled="isDisabled"
   >
-    <delete-icon-red v-if="isHovered && !isDisabled" :hoverBg="hoverBg" />
-    <delete-icon-gray v-else />
+    <icon-image
+      v-if="isHovered && !isDisabled"
+      :hoverBg="hoverBg"
+      :src="require('../../assets/icons/delete_icon.svg')"
+    />
+    <icon-image
+      v-else
+      :src="require('../../assets/icons/delete_icon_gray.svg')"
+    />
   </wrapper>
 </template>
 
 <script>
 // To use:
-// <delete-icon @click="onDeleteItem(item)" :isDisabled="true" />
-import styled from 'vue3-styled-components'
-import SvgDelete from '../../assets/icons/delete_icon.svg'
-import SvgDeleteGray from '../../assets/icons/delete_icon_gray.svg'
+// <delete-icon @click.native="onDeleteItem(item)" :isDisabled="true" />
+import styled from "vue-styled-components"
 
 const wrapperAttrs = { isDisabled: Boolean }
-const Wrapper = styled('div', wrapperAttrs)`
+const Wrapper = styled("div", wrapperAttrs)`
   width: 30px;
   height: 30px;
-  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
+  cursor: ${(props) => (props.isDisabled ? "not-allowed" : "pointer")};
 `
 
 const IconImageAttrs = { hoverBg: String }
-const DeleteIconRed = styled(SvgDelete, IconImageAttrs)`
+const IconImage = styled('img', IconImageAttrs)`
   &:hover {
-    background-color: ${(props) =>
-      props.hoverBg ? props.hoverBg : props.theme.colors.grey5};
-    border-radius: 4px;
-  }
-`
-
-const DeleteIconGray = styled(SvgDeleteGray, IconImageAttrs)`
-  &:hover {
-    background-color: ${(props) => props.theme.colors.grey5};
+    background-color: ${(props) => props.hoverBg ? props.hoverBg : props.theme.colors.grey5};
     border-radius: 4px;
   }
 `
 
 export default {
-  name: 'delete-icon',
+  name: "delete-icon",
   components: {
     Wrapper,
-    DeleteIconRed,
-    DeleteIconGray
+    IconImage,
   },
   props: {
     isDisabled: {
       required: false,
-      default: false
+      default: false,
     },
     hoverBg: {
       required: false,
-      default: ''
+      default: '',
     }
   },
   data() {
     return {
-      isHovered: false
+      isHovered: false,
     }
-  }
+  },
 }
 </script>

package/src/components/draggableInputHandle/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Handle :height="height" class="handle">
+  <Handle :height = "height" class="handle">
     <Dot></Dot>
     <Dot></Dot>
     <Dot></Dot>
@@ -7,34 +7,35 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
 
-const Handle = styled('div', { height: String })`
-  position: absolute;
-  left: 0;
-  margin-right: 10px;
-  display: flex;
-  align-items: stretch;
-  flex-direction: column;
-  justify-content: center;
-  width: 14px;
-  height: ${(props) => props.height};
-  padding: 0 5px;
-  background-color: #f3f3f7;
-  cursor: pointer;
-  align-items: center;
-`
+import styled from 'vue-styled-components'
+
+const Handle = styled('div',{ height : String })`
+  position:absolute;
+  left:0;
+  margin-right:10px;
+    display: flex;
+    align-items: stretch;
+    flex-direction: column;
+    justify-content: center;
+    width: 14px;
+    height:${props=> props.height};
+    padding: 0 5px;
+    background-color: #f3f3f7;
+    cursor: pointer;
+    align-items: center;
+  `
 const Dot = styled.div`
-  display: inline-block;
-  width: 4px;
-  height: 4px;
-  margin: 2px;
-  background-color: #0068de;
-`
+    display: inline-block;
+    width: 4px;
+    height: 4px;
+    margin:2px;
+    background-color: #0068de;
+  `
 
 export default {
   name: 'draggableInputHandle',
-  props: ['height'],
+  props:['height'],
   components: {
     Handle,
     Dot

package/src/components/dropdown/index.vue

@@ -1,138 +1,119 @@
 <template>
-  <wrapper ref="dropdown" :openingMode="openingMode">
-    <WrapperButton @click="isOpenByClick = !isOpenByClick">
-      <slot name="trigger" />
-    </WrapperButton>
-    <WrapperDropdown
-      class="dropdown-content"
-      :class="{ openDropdown: isOpenByClick && openingMode == 'click' }"
-      :justify="justify"
-      :position="position"
-      :width="width"
-      :backgroundColor="backgroundColor"
-    >
-      <DropdownWindow
-        :gap="gap"
-        :backgroundColor="backgroundColor"
-        :width="width"
-      >
-        <slot name="dropdown" />
-      </DropdownWindow>
-    </WrapperDropdown>
-  </wrapper>
-</template>
+    <wrapper ref="dropdown" :openingMode="openingMode">
+        <WrapperButton @click="isOpenByClick=!isOpenByClick">
+            <slot name="trigger"/>
+        </WrapperButton>
+        <WrapperDropdown class="dropdown-content" :class="{openDropdown:isOpenByClick && openingMode=='click'}" :justify="justify" :position="position" :width="width" :backgroundColor="backgroundColor">
+          <DropdownWindow :gap="gap" :backgroundColor="backgroundColor" :width="width">
+            <slot name="dropdown"/>
+          </DropdownWindow>
+        </WrapperDropdown>
+    </wrapper>
+  </template>
+  
+  <script>
+  // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
+  //  How to use:
+  //<DropdownComponent
+  //    width="300px"
+  //    backgroundColor="red">
 
-<script>
-// import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
-//  How to use:
-//<DropdownComponent
-//    width="300px"
-//    backgroundColor="red">
+  // <DropdownComponent/>
+  
+  import styled from 'vue-styled-components'
+  
+  const wrapperAttrs = { width: String, backgroundColor:String,openingMode:String,gap:String,justify:String }
+  const Wrapper = styled('div', wrapperAttrs)`
+    display: inline-block;
+    position: relative;
 
-// <DropdownComponent/>
-
-import styled from 'vue3-styled-components'
-
-const wrapperAttrs = {
-  width: String,
-  backgroundColor: String,
-  openingMode: String,
-  gap: String,
-  justify: String
-}
-const Wrapper = styled('div', wrapperAttrs)`
-  display: inline-block;
-  position: relative;
-
-  &:hover .dropdown-content {
-    ${(props) => (props.openingMode == 'hover' ? 'display:block' : '')}
-  }
-  & .openDropdown {
-    ${(props) =>
-      props.openingMode == 'click' ? 'display:block !important' : ''}
-  }
-`
-const WrapperDropdown = styled('div', wrapperAttrs)`
-  margin-top: 0;
-  display: none;
-  position: absolute;
-  z-index: 1;
-  ${(props) => (props.justify == 'right' ? 'right:0;' : '')}
-`
-const DropdownWindow = styled('div', wrapperAttrs)`
-  width: ${(props) => props.width};
-  background-color: ${(props) =>
-    props.theme.colors[props.backgroundColor] || props.backgroundColor};
-  margin-top: ${(props) => props.gap};
-  border-radius: 4px;
-  position: relative;
-  min-width: 160px;
-  box-shadow: -1px 0px 5px rgba(0, 0, 0, 0.302);
-  z-index: 1;
-`
-
-const WrapperButton = styled('div', wrapperAttrs)`
-  display: inline-block;
-`
-
-export default {
-  name: 'DropdownComponent',
-  components: {
-    WrapperDropdown,
-    WrapperButton,
-    Wrapper,
-    DropdownWindow
-  },
-  props: {
-    width: {
-      required: false,
-      default: '300px'
+    &:hover .dropdown-content {
+        ${props=>props.openingMode=='hover'?"display:block":""}
+    }
+    & .openDropdown{
+        ${props=>props.openingMode=='click'?"display:block !important":""}
+    }
+  `
+  const WrapperDropdown = styled('div', wrapperAttrs)`
+    margin-top: 0;
+    display: none;
+    position: absolute;
+    z-index: 1;
+    ${(props) => props.justify=="right"?"right:0;":""}
+  `
+  const DropdownWindow = styled('div', wrapperAttrs)`
+    width: ${(props) => props.width};
+    background-color: ${(props) => props.theme.colors[props.backgroundColor] || props.backgroundColor};
+    margin-top: ${(props) => props.gap};
+    border-radius: 4px;
+    position: relative;
+    min-width: 160px;
+    box-shadow: -1px 0px 5px rgba(0, 0, 0, 0.302);
+    z-index: 1;
+  `
+  
+  const WrapperButton = styled('div', wrapperAttrs)`
+    display: inline-block;
+  `
+  
+  export default {
+    name: 'DropdownComponent',
+    components: {
+        WrapperDropdown,
+        WrapperButton,
+        Wrapper,
+        DropdownWindow
     },
-    gap: {
-      required: false,
-      default: '10px'
+    props: {
+      width: {
+        required: false,
+        default: '300px'
+      },
+      gap: {
+        required: false,
+        default: '10px'
+      },
+      position: {
+        required: false,
+        default: 'bottom'
+      },
+      justify: {
+        required: false,
+        default: 'left'
+      },
+      openingMode: {
+        required: false,
+        default: 'hover'
+      },
+      backgroundColor: {
+        required: false,
+        default: 'white'
+      }
     },
-    position: {
-      required: false,
-      default: 'bottom'
+    data() {
+      return {
+        isOpenByClick:false
+      }
     },
-    justify: {
-      required: false,
-      default: 'left'
+    methods:{
+        clickOutside(event) {
+            if (this.openingMode!="click") return
+            if (
+                this.$refs.dropdown.$el == event.target ||
+                this.$refs.dropdown.$el.contains(event.target)
+            ) {
+                return
+            } else {
+                this.isOpenByClick=false
+            }
+        },
     },
-    openingMode: {
-      required: false,
-      default: 'hover'
+    mounted() {
+        document.addEventListener('click', this.clickOutside)
+    },
+    beforeDestroy() {
+        document.removeEventListener('click', this.clickOutside)
     },
-    backgroundColor: {
-      required: false,
-      default: 'white'
-    }
-  },
-  data() {
-    return {
-      isOpenByClick: false
-    }
-  },
-  methods: {
-    clickOutside(event) {
-      if (this.openingMode != 'click') return
-      if (
-        this.$refs.dropdown &&
-        (this.$refs.dropdown.$el == event.target ||
-          this.$refs.dropdown.$el.contains(event.target))
-      ) {
-        return
-      } else {
-        this.isOpenByClick = false
-      }
-    }
-  },
-  mounted() {
-    document.addEventListener('click', this.clickOutside)
-  },
-  beforeDestroy() {
-    document.removeEventListener('click', this.clickOutside)
   }
-}
-</script>
+  </script>
+