@eturnity/eturnity_reusable_components 1.2.19-dev03.2 → 1.2.19-v.5.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.19-dev03.2",
+  "version": "1.2.19-v.5.45.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -14,7 +14,8 @@
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
     "vue-styled-components": "^1.6.0",
-    "html-loader": "^0.5.5"
+    "html-loader": "^0.5.5",
+    "v-click-outside": "^2.1.4"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.2.8",

package/src/App.vue

@@ -2,10 +2,7 @@
   <ThemeProvider :theme="getTheme()" :style="{ height: '100%' }">
     <page-container>
       <br />
-<<<<<<< HEAD
-=======
-      <iconWrapper name="bell"/>
-      <modal backdrop="dark" :isLoading="false" :isOpen="true">
+      <modal backdrop="dark" :isLoading="false" :isOpen="false">
         <main-table titleText="My Table">
           <thead>
             <tr>
@@ -34,6 +31,23 @@
           </tbody>
         </main-table>
       </modal>
+      <row-container>
+        <div v-for='(item, index) in markersArray' :key="item.index">
+          <project-marker
+            :activeLanguage="'en-us'"
+            :markerData="item"
+            :isLimitedPartner="false"
+            :isGroupSupport="false"
+            :isEditable="true"
+            :gettext="gettext"
+            :date="'23.07.2022'"
+            @editHandler="consoleLog('edit index ' + index)"
+            @deleteHandler="consoleLog('delete id ' + item.id)"
+          />
+        </div>
+      </row-container>
+      <br />
+      <iconCollection />
       <br />
       <toggle
         @on-toggle-change="onInputChange($event)"
@@ -45,113 +59,73 @@
         :disabled="false"
       />
       <br />
->>>>>>> EPDM-5448
-      <input-number
-        :value="inputValue"
-        @input-change="inputValue = $event"
-        inputWidth="250px"
-        slotSize="50%"
-        ><InputAnnexContainer>
-          <span>123m2</span>
-          <info-text size="10px" alignArrow="right" text="infoText ceci est le text"></info-text>
-        </InputAnnexContainer>
-      </input-number>
       <input-number
+        placeholder="Enter distance"
+        :numberPrecision="2"
         :value="inputValue"
-        @input-change="inputValue = $event"
-        inputWidth="250px"
-        slotSize="50%"
-        :isError="true"
-        ><InputAnnexContainer>
-          <span>123m2</span>
-          <info-text :style="{'justify-self': 'end'}" size="12px" alignArrow="center" text="infoText ceci est le text">This is the tooltip text</info-text>
-        </InputAnnexContainer>
-      </input-number>
+        @input-change="onInputChange($event)"
+      />
       <br />
-      
-  <p>InputText</p>
-   <input-text
-     placeholder="Company name"
-     :value="inputValue"
-     :isError="true"
-     errorMessage="This is my error message"
-     infoTextAlign="right" 
-     infoTextMessage="My info message"
-     label="Question 5"
-     alignItems="vertical"
-     inputWidth="250px"
-     minWidth="100px"
-   />
-   <br/>
-      <input-number
-        :value="num"
-        @input-change="num = $event"
-        unitName="t"
-        id="biebie"
-        test="koko"
-        @keydown="keydownHandler"
+      <page-subtitle text="My Subtitle" infoText="My info Text" />
+      <spinner size="30px" />
+      <checkbox
+        label="Do you accept the Terms?"
+        :isChecked="true"
+        size="small"
+        :isDisabled="false"
       />
+      <external-button text="Click me!" minWidth="500px" />
     </page-container>
   </ThemeProvider>
 </template>
 
 <script>
-<<<<<<< HEAD
-import { ThemeProvider } from "vue-styled-components"
-import theme from "./assets/theme"
-import styled from "vue-styled-components"
-import MainTable from "@/components/tables/mainTable"
-import ThreeDots from "@/components/threeDots"
-import Toggle from "@/components/inputs/toggle"
-import InputNumber from "@/components/inputs/inputNumber"
-import Checkbox from "@/components/inputs/checkbox"
-import PageSubtitle from "@/components/pageSubtitle"
-import Spinner from "@/components/spinner"
-import ExternalButton from "@/components/buttons/externalButton"
-import InputText from "@/components/inputs/inputText"
-=======
 import { ThemeProvider } from 'vue-styled-components'
 import theme from './assets/theme'
 import styled from 'vue-styled-components'
 import MainTable from '@/components/tables/mainTable'
 import ThreeDots from '@/components/threeDots'
-import iconWrapper from '@/components/iconWrapper'
 import Toggle from '@/components/inputs/toggle'
 import InputNumber from '@/components/inputs/inputNumber'
 import Checkbox from '@/components/inputs/checkbox'
 import PageSubtitle from '@/components/pageSubtitle'
 import Spinner from '@/components/spinner'
 import ExternalButton from '@/components/buttons/externalButton'
+import ProjectMarker from '@/components/projectMarker'
+import iconCollection from '@/components/icon/iconCollection'
 import Modal from '@/components/modals/modal'
->>>>>>> EPDM-5448
 // import TableDropdown from "@/components/tableDropdown"
-const InputAnnexContainer = styled.div`
-  display: grid;
-  grid-template-columns: auto auto;
-  grid-gap: 10px;
-`
 
 const PageContainer = styled.div`
   padding: 40px;
 `
 
+const RowContainer = styled.div`
+  display: inline-flex;
+  gap: 10px;
+  flex-wrap: wrap;
+`
+
 export default {
   name: 'App',
   components: {
     ThemeProvider,
     PageContainer,
+    MainTable,
+    ThreeDots,
+    Toggle,
     InputNumber,
     PageSubtitle,
     Spinner,
     Checkbox,
-    InputText,
     ExternalButton,
-    iconWrapper,
     Modal,
+    ProjectMarker,
+    iconCollection,
+    RowContainer
   },
   data() {
     return {
-      num: 42,
       inputValue: null,
       checkedOption: 'button_1',
       question: {
@@ -207,11 +181,15 @@ export default {
           id: 4,
         },
       ],
+      markersArray: [{"id":1180,"choice":"project-on-hold","translations":{"fr":{"name":"fr - Project on hold"},"en-us":{"name":"Project on hold"},"it-ch":{"name":"it-ch - Project on hold"},"de-ch":{"name":"de-ch - Project on hold"},"fr-be":{"name":"fr-be - Project on hold"}},"color":"#D27CCA","can_be_deleted":true}, {"id":266,"choice":"transferred","translations":{"en-us":{"name":"Transferred"},"fr":{"name":"fr - Transferred"},"de-ch":{"name":"de-ch - Transferred"},"it-ch":{"name":"it-ch - Transferred"},"fr-be":{"name":"fr-be - Transferred"}},"color":"#20A4CA","can_be_deleted":false},{"id":267,"choice":"sold","translations":{"en-us":{"name":"Sold"},"fr":{"name":"Vendu"},"de-ch":{"name":"Verkauft"},"it-ch":{"name":"Venduto"},"fr-be":{"name":"Vendu"}},"color":"#008351","can_be_deleted":false},{"id":268,"choice":"lost","translations":{"en-us":{"name":"Lost"},"fr":{"name":"Perdu"},"de-ch":{"name":"Verloren"},"it-ch":{"name":"Perso"},"fr-be":{"name":"Perdu"}},"color":"#A52019","can_be_deleted":false},{"id":1181,"choice":"project-created","translations":{"fr":{"name":"Project created"},"en-us":{"name":"Project created"},"it-ch":{"name":"Project created"},"de-ch":{"name":"Project created"},"fr-be":{"name":"Project created"}},"color":"#FDB813","can_be_deleted":true}]
     }
   },
   methods: {
-    keydownHandler(e) {
-      console.log('test', e)
+    consoleLog(data) {
+      console.log(data)
+    },
+    gettext(string) {
+      return string.toUpperCase()
     },
     getTheme() {
       return theme
@@ -262,8 +240,8 @@ export default {
         item = '-'
       }
       return item
-    }
-  }
+    },
+  },
 }
 </script>
 
@@ -273,4 +251,4 @@ body {
   height: 100%;
   margin: 0;
 }
-</style>
+</style>

package/src/assets/svgIcons/cross.svg

@@ -0,0 +1,4 @@
+<svg fill="none" height="10" viewBox="0 0 10 10" width="10" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9.87865 8.47868L8.47865 9.87868L0.121287 1.52132L1.52129 0.121318L5.69997 4.3L9.87865 8.47868Z" fill="black"/>
+    <path d="M1.5213 9.87868L0.121302 8.47868L8.47866 0.12132L9.87866 1.52132L1.5213 9.87868Z" fill="black"/>
+</svg>

package/src/assets/svgIcons/obstacle_tool.svg

@@ -1,4 +1,4 @@
-<svg fill="none" height="16" viewbox="12 12 16 16" width="16" xmlns="http://www.w3.org/2000/svg">
+<svg fill="none" height="23" viewbox="6 12 34 23" width="34" xmlns="http://www.w3.org/2000/svg">
 <mask height="14" id="mask0_6458_86453" maskunits="userSpaceOnUse" style="mask-type:alpha" width="14" x="13" y="13">
 <rect fill="#FF5656" height="14" width="14" x="13" y="13"></rect>
 </mask>

package/src/assets/svgIcons/transfer.svg

@@ -0,0 +1,4 @@
+<svg fill="none" height="10" viewBox="0 0 10 10" width="10" xmlns="http://www.w3.org/2000/svg">
+    <path d="M3 9.98993L3.47934e-07 6.01003L10 6.01003V7.98993L3 7.98993L3 9.98993Z" fill="black"/>
+    <path d="M7 0.0100708L10 3.98997H0L1.19209e-07 2.01007L7 2.01007V0.0100708Z" fill="black"/>
+</svg>

package/src/assets/theme.js

@@ -19,8 +19,6 @@ const theme = {
     grey4: '#dee2eb',
     grey5: '#fafafa',
     green: '#99db0c',
-    transparentWhite1:'#ffffff32',
-    transparentBlack1:'#263238e6',
     disabled: '#dfe1e1'
   },
   screen: {

package/src/components/icon/index.vue

@@ -1,6 +1,6 @@
 <template>
+  <wrapper :isDisabled="isDisabled" :size="size" :cursor="cursor">
     <icon-image
-      :disabled="disabled"
       :size="size"
       :color="color"
       :hoveredColor="hoveredColor"
@@ -8,6 +8,7 @@
         require(`!html-loader!./../../assets/svgIcons/${name.toLowerCase()}.svg`)
       "
     ></icon-image>
+  </wrapper>
 </template>
 
 <script>
@@ -22,17 +23,19 @@
 
 import styled from 'vue-styled-components'
 
-const IconImageProps = { color: String, hoveredColor: String, size: String ,disabled:Boolean}
-const IconImage = styled('div', IconImageProps)`
-  display: inline-flex;
+const wrapperAttrs = { isDisabled: Boolean, size: String, cursor: String }
+const Wrapper = styled('div', wrapperAttrs)`
+  display: inline-block;
   width: ${(props) => props.size};
   height: ${(props) => props.size};
-  justify-content:center;
-  align-items:center;
-  cursor: ${(props) => (props.disabled ? 'not-allowed' : 'pointer')};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursor)};
+  line-height: 0;
+`
+const IconImageProps = { color: String, hoveredColor: String, size: String }
+const IconImage = styled('div', IconImageProps)`
   svg {
-    width: 100%;
-    height: 100%;
+    width: ${(props) => props.size};
+    height: ${(props) => props.size};
   }
   svg > path {
     ${(props) =>
@@ -46,10 +49,11 @@ const IconImage = styled('div', IconImageProps)`
 export default {
   name: 'icon',
   components: {
+    Wrapper,
     IconImage
   },
   props: {
-    disabled: {
+    isDisabled: {
       required: false,
       default: false
     },
@@ -65,10 +69,14 @@ export default {
     size: {
       required: false,
       default: '30px'
+    },
+    cursor: {
+      required: false,
+      default: 'pointer'
     }
   },
   data() {
     return {}
   }
 }
-</script>
+</script>

package/src/components/infoText/index.vue

@@ -1,25 +1,34 @@
 <template>
   <component-wrapper>
-    <icon-wrapper :size="size">
+    <icon-wrapper>
       <icon-img
         :isActive="showInfo"
         :size="size"
         :borderColor="borderColor"
         @click.prevent="toggleShowInfo()"
-        @mouseenter="openTrigger == 'onHover' ? toggleShowInfo() : ''"
-        @mouseleave="openTrigger == 'onHover' ? toggleShowInfo() : ''"
+        @mouseenter="toggleShowInfo()"
+        @mouseleave="toggleShowInfo()"
       >
-        <icon :size="size" name="info" :color="iconColor" />
+        <svg
+          class="img-icon"
+          :width="size"
+          :height="size"
+          viewBox="0 0 24 24"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            class="img-icon"
+            d="M20.4853 3.51469C18.2188 1.24823 15.2053 0 12 0C8.79469 0 5.78123 1.24823 3.51469 3.51469C1.24823 5.78123 0 8.79469 0 12C0 15.2053 1.24823 18.2188 3.51469 20.4853C5.78123 22.7518 8.79469 24 12 24C15.2053 24 18.2188 22.7518 20.4853 20.4853C22.7518 18.2188 24 15.2053 24 12C24 8.79469 22.7518 5.78123 20.4853 3.51469ZM12 3.28125C13.4216 3.28125 14.5781 4.4378 14.5781 5.85938C14.5781 7.28095 13.4216 8.4375 12 8.4375C10.5784 8.4375 9.42188 7.28095 9.42188 5.85938C9.42188 4.4378 10.5784 3.28125 12 3.28125ZM15.2812 19.6875H8.71875V18.2812H10.125V11.9167H8.71875V10.5104H13.875V18.2812H15.2812V19.6875Z"
+            fill="#D5D5D5"
+          />
+        </svg>
       </icon-img>
       <text-overlay
         v-if="showInfo"
         :borderColor="borderColor"
         :alignText="alignText"
-        :width="width"
-        :halfComputedTextInfoWidth="halfComputedTextInfoWidth"
-        :alignArrow="alignArrow"
-        :iconSize="size"
-      ><slot />
+      >
         {{ text }}
       </text-overlay>
     </icon-wrapper>
@@ -35,23 +44,22 @@
 //     size="20"
 //     alignText="right" // default is left
 // />
-import theme from '@/assets/theme.js'
-import styled from 'vue-styled-components'
-import icon from '../icon'
 
-const textAttrs = { iconSize:String, borderColor: String, alignArrow:String, alignText: String, width:String,halfComputedTextInfoWidth:Number }
-const TextOverlay = styled('div', textAttrs)`
+import styled from "vue-styled-components"
+
+const IconWrapper = styled.div`
+  position: relative;
+`
+
+const textAttrs = { borderColor: String, alignText: String }
+const TextOverlay = styled("div", textAttrs)`
   position: absolute;
-  top: ${(props) => 'calc('+props.iconSize+' + 15px)'};
-  ${(props) => (props.alignArrow === 'left' 
-    ? 'left: calc('+props.iconSize+' /2 - 18px)' 
-    : props.alignArrow === 'center' 
-    ? 'left: calc((-'+props.width+' + '+props.iconSize+') /2 + 2px)'
-    : 'right: calc('+props.iconSize+' /2 - 17px)')};
-  text-align: ${(props) => props.alignText};
+  top: 26px;
+  right: ${(props) => (props.alignText === "left" ? "-10px" : "inherit")};
+  left: ${(props) => (props.alignText === "left" ? "inherit" : "-10px")};
   background: ${(props) => props.theme.colors.black};
   padding: 10px;
-  width: ${(props) => props.width };
+  width: max-content;
   max-width: 400px;
   font-size: 13px;
   font-weight: 400;
@@ -60,13 +68,12 @@ const TextOverlay = styled('div', textAttrs)`
   color: ${(props) => props.theme.colors.white};
 
   :before {
-    content: '';
+    content: "";
     background-color: ${(props) => props.theme.colors.black};
     position: absolute;
     top: 2px;
-    ${(props) => (props.alignArrow === 'left' ? 'left:40px;' : 
-    props.alignArrow=='center' ? 'left: calc(50% + 19px);' : 
-    'right:-13px;')};
+    right: ${(props) => (props.alignText === "left" ? "-12px" : "inherit")};
+    left: ${(props) => (props.alignText === "left" ? "inherit" : "40px")};
     height: 8px;
     width: 8px;
     transform-origin: center center;
@@ -75,15 +82,18 @@ const TextOverlay = styled('div', textAttrs)`
 `
 
 const iconAttrs = { isActive: Boolean, size: String, borderColor: String }
-
-const IconWrapper = styled('div', iconAttrs)`
-  position: relative;
-  top: 1px;
-  height: ${(props) => props.size};
-`
-const IconImg = styled('div', iconAttrs)`
+const IconImg = styled("div", iconAttrs)`
   cursor: pointer;
-  height: ${(props) => props.size};
+  height: ${(props) => props.size + "px"};
+
+  .img-icon {
+    fill: ${(props) =>
+      props.isActive
+        ? props.borderColor
+          ? props.borderColor
+          : props.theme.colors.secondary
+        : props.theme.colors.mediumGray};
+  }
 `
 
 const ComponentWrapper = styled.div`
@@ -91,51 +101,38 @@ const ComponentWrapper = styled.div`
 `
 
 export default {
-  name: 'info-text',
+  name: "info-text",
   components: {
     IconWrapper,
     TextOverlay,
     ComponentWrapper,
     IconImg,
-    icon
   },
   props: {
     text: {
-      required: false,
+      required: true,
     },
     borderColor: {
       required: false,
-      default: null
+      default: null,
     },
     size: {
       required: false,
-      default: '14px'
+      default: "20",
     },
     alignText: {
       required: false,
-      default: 'left' // "left" or "right"
-    },
-    alignArrow:{
-      required:false,
-      default:'center'
-    },
-    openTrigger:{
-      required:false,
-      default: 'onClick'
+      default: "left", // "left" or "right"
     },
-    width:{
-      required:false,
-      default:'165px'
-    }
   },
   methods: {
     toggleShowInfo() {
       this.showInfo = !this.showInfo
 
       if (this.showInfo) {
-        document.addEventListener('click', this.clickOutside)
+        document.addEventListener("click", this.clickOutside)
       } else {
-        document.removeEventListener('click', this.clickOutside)
+        document.removeEventListener("click", this.clickOutside)
       }
     },
     clickOutside(event) {
@@ -143,24 +140,12 @@ export default {
         return
       }
       this.toggleShowInfo()
-    }
+    },
   },
   data() {
     return {
       showInfo: false,
     }
   },
-  computed: {
-    iconColor() {
-      return this.isActive
-        ? this.borderColor
-          ? this.borderColor
-          : theme.colors.secondary
-        : theme.colors.mediumGray
-    },
-    halfComputedTextInfoWidth() {
-      return parseInt(this.width)/2;
-    }
-  }
 }
-</script>
+</script>