@eturnity/eturnity_reusable_components 8.10.3-EPDM-11600.1 → 8.10.3-EPDM-13568.3

package/src/components/icon/index.vue

@@ -10,6 +10,7 @@
       :background-color="backgroundColor"
       :color="color"
       data-test-id="icon_image"
+      :fill-type="fillType"
       :hovered-color="hoveredColor"
     >
       <i data-test-id="icon_svg" v-html="icon.html"></i>
@@ -80,6 +81,11 @@
       required: false,
       default: 'none',
     },
+    fillType: {
+      required: false,
+      default: 'fill',
+      type: String,
+    },
   })
 
   const Wrapper = styled('div', {
@@ -105,7 +111,7 @@
     right: -7px;
     background-color: ${({ theme }) => theme.colors.red};
     color: ${({ theme }) => theme.colors.white};
-    border-radius: 4px;
+    border-radius: 100%;
     width: 15px;
     height: 15px;
     display: flex;
@@ -129,12 +135,14 @@
     transform-origin: 0% 100%;
     transform: rotate(-45deg);
   `
-  const IconImage = styled('div', {
+  const IconImageAttrs = {
     color: String,
     backgroundColor: String,
     hoveredColor: String,
     animation: String,
-  })`
+    fillType: String,
+  }
+  const IconImage = styled('div', IconImageAttrs)`
     animation: ${(props) => props.animation};
     width: 100%;
     svg {
@@ -143,13 +151,14 @@
       background-color: ${(props) =>
         props.backgroundColor ? props.backgroundColor : 'transparent'};
       padding: ${(props) => (props.backgroundColor ? '3px' : '0')};
+      border-radius: ${(props) => (props.backgroundColor ? '8px' : '0')};
     }
     svg path:not(.fix) {
-      ${({ theme, color }) => color && `fill: ${theme.colors[color] || color};`}
+      ${({ theme, color, fillType }) =>
+        color && `${fillType}: ${theme.colors[color] || color};`}
     }
     &:hover svg path:not(.fix) {
-      ${({ theme, hoveredColor }) =>
-        hoveredColor && `fill: ${theme.colors[hoveredColor] || hoveredColor};`}
+      ${({ theme }) => `fill: ${theme.semanticColors.purple[500]};`}
     }
     &:hover + div {
       background-color: ${(props) => props.hoveredColor};

package/src/components/infoCard/index.vue

@@ -12,7 +12,7 @@
     <RCIcon
       :color="iconColor ? iconColor : presetStyles.iconColor"
       data-test-id="info_card_icon"
-      :name="isErrorMinor ? 'erase' : 'info'"
+      name="info"
       size="24px"
     />
     <TextContainer data-test-id="info_card_text_container">
@@ -138,8 +138,8 @@
           stylesCollection.iconColor = theme.colors.white
         } else if (this.isErrorMinor) {
           stylesCollection.borderStyle = 'dashed'
-          stylesCollection.borderColor = theme.colors.grey4
-          stylesCollection.iconColor = theme.colors.red
+          stylesCollection.borderColor = theme.colors.pureRed
+          stylesCollection.iconColor = theme.colors.pureRed
         } else {
           stylesCollection.borderStyle = 'dashed'
           stylesCollection.borderColor = theme.colors.grey4

package/src/components/infoText/index.vue

@@ -48,6 +48,7 @@
       <TextWrapper :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"
+          :app-theme="appTheme"
           :image="image"
           :style="boxStyle"
           :width="infoBoxWidth"
@@ -92,10 +93,8 @@
     width: Number,
   }
   const TextOverlay = styled('div', TextOverlayAttrs)`
-    background-color: ${(props) =>
-      props.image ? props.theme.colors.white : props.theme.colors.black};
     color: ${(props) =>
-      props.image ? props.theme.colors.grey1 : props.theme.colors.white};
+      props.image ? props.theme.colors.grey1 : props.theme.colors.black};
     font-size: ${(props) => (props.image ? '12px' : '13px')};
     border-radius: 4px;
     padding: 10px;
@@ -122,7 +121,11 @@
   //   height: 0;
   //   border: 8px solid transparent;
   //   border-top-color: ${(props) =>
-  //     props.image ? props.theme.colors.white : props.theme.colors.black};
+  //     props.image
+  //       ? props.theme.colors.white
+  //       : props.appTheme === 'dark'
+  //       ? props.theme.colors.grey5
+  //       : props.theme.colors.black};
   //   filter: ${(props) =>
   //     props.image ? 'drop-shadow(0 2px 2px rgba(0, 0, 0, 0.1))' : 'none'};
   // `

package/src/components/inputs/inputNumber/InputNumber.stories.js

@@ -3,15 +3,15 @@ import InputNumber from './index.vue'
 export default {
   title: 'InputNumber',
   component: InputNumber,
+  // argTypes: {},
 }
 
-const Template = (args) => ({
+const Template = (args, { argTypes }) => ({
   // Components used in your story `template` are defined in the `components` object
   components: { InputNumber },
-  setup() {
-    return { args: args }
-  },
-  template: `<InputNumber v-bind="args" />`,
+  // The story's `args` need to be mapped into the template through the `setup()` method
+  props: Object.keys(argTypes),
+  template: '<input-number v-bind="$props" />',
 
   // import InputNumber from "@eturnity/eturnity_reusable_components/src/components/inputs/inputNumber"
   // How to use:
@@ -73,20 +73,6 @@ Disabled.args = {
   showLinearUnitName: false,
 }
 
-export const DisabledAndPreDefined = Template.bind({})
-DisabledAndPreDefined.args = {
-  placeholder: 'Enter Value',
-  disabled: true,
-  isPreDefined: true,
-  value: '',
-  inputWidth: '200px',
-  isError: false,
-  numberPrecision: 0,
-  noBorder: false,
-  textAlign: 'left',
-  showLinearUnitName: false,
-}
-
 export const LinearUnit = Template.bind({})
 LinearUnit.args = {
   placeholder: 'Enter Value',

package/src/components/inputs/inputNumber/index.vue

@@ -25,6 +25,7 @@
       <InfoText
         v-if="labelInfoText"
         :align-arrow="labelInfoAlign"
+        :app-theme="appTheme"
         :text="labelInfoText"
       />
     </LabelWrapper>
@@ -42,6 +43,7 @@
         :color-mode="colorMode"
         :data-id="inputDataId"
         :data-qa-id="dataQaId"
+        :disabled="disabled"
         :font-color="colorMode === 'transparent' ? 'white' : fontColor"
         :font-size="fontSize"
         :has-label-slot="hasLabelSlot"
@@ -51,7 +53,6 @@
         :is-disabled="disabled"
         :is-error="isError"
         :is-interactive="isInteractive"
-        :is-pre-defined="isPreDefined"
         :min-width="minWidth"
         :no-border="noBorder"
         :placeholder="displayedPlaceholder"
@@ -194,7 +195,6 @@
     slotSize: String,
     inputHeight: String,
     isInteractive: Boolean,
-    isPreDefined: Boolean,
     alignItems: String,
     labelFontColor: String,
     labelFontWeight: String,
@@ -255,7 +255,7 @@
     color: ${(props) =>
       props.isError
         ? props.theme.colors.grey6
-        : props.isDisabled && !props.isPreDefined
+        : props.isDisabled
         ? props.colorMode === 'transparent'
           ? props.theme.colors.white
           : props.theme.colors.grey2
@@ -475,6 +475,10 @@
     },
     inheritAttrs: false,
     props: {
+      appTheme: {
+        type: String,
+        required: false,
+      },
       placeholder: {
         type: String,
         required: false,
@@ -525,11 +529,6 @@
         required: false,
         default: 0,
       },
-      isPreDefined: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
       minDecimals: {
         type: Number,
         required: false,

package/src/components/inputs/inputText/index.vue

@@ -21,6 +21,7 @@
         <InfoText
           v-if="infoTextMessage != ''"
           :align-arrow="infoTextAlign"
+          :app-theme="appTheme"
           data-test-id="info_text_message"
           :size="fontSize ? fontSize : '16px'"
           :text="infoTextMessage"
@@ -263,6 +264,11 @@
         default: '',
         type: String,
       },
+      appTheme: {
+        type: String,
+        required: false,
+        default: 'light',
+      },
       alignItems: {
         required: false,
         default: 'horizontal',

package/src/components/modals/modal/index.vue

@@ -8,11 +8,12 @@
   >
     <ModalContainer
       v-if="isOpen"
+      :is-loading="isLoading"
       :overflow="overflowRule"
       @click="onClickModalContainer"
     >
       <Spinner v-if="isLoading" :limited-to-modal="true" size="50px" />
-      <ContentContainer :visible="!isLoading">
+      <ContentContainer v-if="!isLoading">
         <slot></slot>
       </ContentContainer>
       <CloseButton v-if="!hideClose" class="close" @click="onCloseModal()" />
@@ -62,7 +63,7 @@
   }
 `
 
-  const modalContainerAttrs = { overflow: String }
+  const modalContainerAttrs = { overflow: String, isLoading: Boolean }
   const ModalContainer = styled('div', modalContainerAttrs)`
     align-self: center;
     justify-self: center;
@@ -74,8 +75,8 @@
     overflow: ${(props) => props.overflow};
     max-width: 95%;
     max-height: 95%;
-    min-width: 100px;
-    min-height: 100px;
+    min-width: ${(props) => (props.isLoading ? '400px' : '100px')};
+    min-height: ${(props) => (props.isLoading ? '500px' : '100px')};
 
     ::-webkit-scrollbar {
       width: 0.3em;

package/src/components/projectMarker/index.vue

@@ -59,7 +59,8 @@
           <MainButton :text="$gettext('Delete')" @click="onDelete" />
           <MainButton
             :text="$gettext('Cancel')"
-            type="cancel"
+            type="primary"
+            variant="cancel"
             @click="closeDeleteModal"
           />
         </CtaContainer>

package/src/components/sideMenu/index.vue

@@ -9,34 +9,54 @@
           v-if="!item.children"
           :key="idx"
           :data-id="`sub_menu_settings_${item.key}`"
+          :fill-type="item.icon === 'free_technology' ? 'stroke' : 'fill'"
           :is-active="activeTab === item.key || activeParentTab === item.key"
           @click="$emit('tab-click', { activeKey: item.key })"
         >
-          <IconContainer
-            :is-active="activeTab === item.key || activeParentTab === item.key"
-          >
-            <Icon color="#fff" cursor="pointer" :name="item.icon" size="18px" />
+          <IconContainer :is-active="activeTab === item.key">
+            <Icon
+              :color="
+                activeTab === item.key ? theme.semanticColors.purple[500] : ''
+              "
+              cursor="pointer"
+              :fill-type="item.fillType"
+              :name="item.icon"
+              size="18px"
+            />
           </IconContainer>
-          <ListText>{{ $gettext(item.label) }}</ListText>
+          <ListText :is-active="activeTab === item.key">{{
+            $gettext(item.label)
+          }}</ListText>
         </ListItem>
         <CollapseWrapper v-else :key="idx + item.key">
           <CollapseContainer
             :data-id="`sub_menu_settings_${item.key}`"
+            :is-active="activeParentTab === item.key"
             @click="toggleActiveDropdown(item.key)"
           >
             <IconContainer :is-active="activeParentTab === item.key">
               <Icon
-                color="#fff"
+                :color="
+                  activeParentTab === item.key
+                    ? theme.semanticColors.purple[500]
+                    : ''
+                "
                 cursor="pointer"
                 :name="item.icon"
                 size="18px"
               />
             </IconContainer>
-            <ListText>{{ $gettext(item.label) }}</ListText>
+            <ListText :is-active="activeTab === item.key">{{
+              $gettext(item.label)
+            }}</ListText>
             <ArrowContainer>
               <Icon
-                color="white"
-                :name="activeDropdown === item.key ? 'arrow_up' : 'arrow_down'"
+                :color="theme.semanticColors.grey[800]"
+                :name="
+                  activeDropdown === item.key
+                    ? 'arrow_up_unfilled'
+                    : 'arrow_down_unfilled'
+                "
                 size="10px"
               />
             </ArrowContainer>
@@ -68,7 +88,7 @@
         @click="$emit('on-logout')"
       >
         <RotateIcon
-          color="#fff"
+          :color="theme.semanticColors.teal[800]"
           cursor="pointer"
           name="initial_situation"
           size="18px"
@@ -83,11 +103,11 @@
   import styled from 'vue3-styled-components'
   import Icon from '../icon'
   import Spinner from '../spinner'
+  import theme from '@/assets/theme.js'
 
   const PageAttrs = { isLoading: Boolean }
   const PageContainer = styled('div', PageAttrs)`
-    background-color: ${(props) =>
-      props.isLoading ? props.theme.colors.white : props.theme.colors.grey6};
+    background-color: ${(props) => props.theme.semanticColors.grey[100]};
     padding: 14px 12px;
     min-width: 220px;
     display: flex;
@@ -100,7 +120,7 @@
     grid-gap: 6px;
   `
 
-  const IconAttrs = { isActive: Boolean, isButton: Boolean }
+  const IconAttrs = { isActive: Boolean, isButton: Boolean, fillType: String }
 
   const ListItem = styled('div', IconAttrs)`
     display: grid;
@@ -109,19 +129,28 @@
     grid-gap: 20px;
     cursor: pointer;
     padding: 4px;
-    border-radius: 6px;
+    border-radius: 4px;
     background-color: ${(props) =>
-      props.isActive ? 'rgba(255, 255, 255, 0.1)' : ''};
+      props.isActive ? props.theme.semanticColors.purple[50] : ''};
+    color: ${(props) =>
+      props.isActive
+        ? props.theme.semanticColors.purple[500]
+        : props.theme.semanticColors.teal[800]};
 
     :hover {
-      background-color: rgba(255, 255, 255, 0.1);
+      background-color: ${(props) => props.theme.semanticColors.purple[100]};
+      color: ${(props) => props.theme.semanticColors.purple[500]};
+      svg path:not(.fix) {
+        ${(props) => props.fillType}: ${(props) =>
+          props.theme.semanticColors.purple[500]};
+      }
     }
   `
 
-  const ListText = styled.div`
-    font-size: 16px;
-    font-weight: 700;
-    color: ${(props) => props.theme.colors.white};
+  const ListTextAttrs = { isActive: Boolean }
+  const ListText = styled('div', ListTextAttrs)`
+    font-size: 14px;
+    font-weight: 400;
   `
 
   const IconContainer = styled('div', IconAttrs)`
@@ -130,18 +159,16 @@
     justify-items: center;
     width: 32px;
     height: 32px;
-    background-color: ${(props) =>
-      props.isActive ? props.theme.colors.red : 'rgba(255, 255, 255, 0.2)'};
     border-radius: 6px;
 
     ${({ isButton = false }) =>
       isButton &&
       `
-  cursor: pointer;
-  &:hover {
-    background-color: rgba(255, 255, 255, 0.3);
-  }
-  `}
+        cursor: pointer;
+        &:hover {
+          background-color: ${(props) =>
+            props.theme.semanticColors.purple[100]};
+        `}
   `
 
   const SpinnerContainer = styled.div`
@@ -161,7 +188,7 @@
   const AppVersion = styled.p`
     font-size: 11px;
     line-height: 13px;
-    color: ${(props) => props.theme.colors.white};
+    color: ${(props) => props.theme.semanticColors.teal[800]};
     margin-right: 6px;
   `
 
@@ -174,21 +201,24 @@
     cursor: pointer;
     margin-left: 65px;
     padding: 8px;
-    border-radius: 6px;
-    color: ${(props) => props.theme.colors.white};
-    font-weight: 700;
-    ${({ isActive }) =>
-      isActive &&
-      `
-    background: rgba(255, 255, 255, 0.1);
-  `}
+    border-radius: 4px;
+    color: ${(props) =>
+      props.isActive
+        ? props.theme.semanticColors.purple[500]
+        : props.theme.semanticColors.teal[800]};
+    font-weight: 400;
+    font-size: 14px;
+    background: ${(props) =>
+      props.isActive ? props.theme.semanticColors.purple[50] : ''};
 
     &:hover {
-      background: rgba(255, 255, 255, 0.1);
+      background: ${(props) => props.theme.semanticColors.purple[100]};
+      color: ${(props) => props.theme.semanticColors.purple[500]} !important;
     }
   `
 
-  const CollapseContainer = styled.div`
+  const CollapseContainerAttrs = { isActive: Boolean }
+  const CollapseContainer = styled('div', CollapseContainerAttrs)`
     display: grid;
     grid-template-columns: auto 1fr auto;
     grid-gap: 20px;
@@ -196,8 +226,20 @@
     border-radius: 6px;
     align-items: center;
     cursor: pointer;
+    background: ${(props) =>
+      props.isActive ? props.theme.semanticColors.purple[50] : ''};
+
+    div {
+      color: ${(props) =>
+        props.isActive ? props.theme.semanticColors.purple[500] : ''};
+    }
+
     &:hover {
-      background: rgba(255, 255, 255, 0.1);
+      background: ${(props) => props.theme.semanticColors.purple[100]};
+      color: ${(props) => props.theme.semanticColors.purple[500]};
+      svg path:not(.fix) {
+        fill: ${(props) => props.theme.semanticColors.purple[500]};
+      }
     }
   `
 
@@ -254,17 +296,9 @@
     data() {
       return {
         activeDropdown: null,
+        theme,
       }
     },
-    methods: {
-      toggleActiveDropdown(value) {
-        if (this.activeDropdown === value) {
-          this.activeDropdown = null
-        } else {
-          this.activeDropdown = value
-        }
-      },
-    },
     watch: {
       activeTab: {
         // once active tab is received, check if any parent
@@ -277,5 +311,14 @@
         once: true,
       },
     },
+    methods: {
+      toggleActiveDropdown(value) {
+        if (this.activeDropdown === value) {
+          this.activeDropdown = null
+        } else {
+          this.activeDropdown = value
+        }
+      },
+    },
   }
 </script>

package/src/components/spinner/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <SpinnerContainer v-if="fullWidth" data-test-id="spinner_full_container">
+  <SpinnerContainer
+    v-if="fullWidth"
+    data-test-id="spinner_full_container"
+    :size="size"
+  >
     <Container>
-      <SpinnerWrapper data-test-id="spinner_full_wrapper">
-        <SpinnerSvg
-          :class="{ white: isWhite }"
-          data-test-id="spinner_full_icon"
-          :style="{ width: size, height: size }"
-        />
+      <SpinnerWrapper data-test-id="spinner_full_wrapper" :size="size">
+        <SpinnerCircle :is-white="isWhite" :size="size" />
       </SpinnerWrapper>
     </Container>
   </SpinnerContainer>
@@ -15,21 +15,14 @@
     data-test-id="spinner_container"
     :limited-to-modal="limitedToModal"
   >
-    <SpinnerWrapper data-test-id="spinner_wrapper">
-      <SpinnerSvg
-        :class="{ white: isWhite }"
-        data-test-id="spinner_icon"
-        :style="{ width: size, height: size }"
-      />
+    <SpinnerWrapper data-test-id="spinner_wrapper" :size="size">
+      <SpinnerCircle :is-white="isWhite" :size="size" />
     </SpinnerWrapper>
   </Container>
 </template>
 
 <script>
-  // import Spinner from "@eturnity/eturnity_reusable_components/src/components/spinner"
-  // <spinner size="30px" />
   import styled from 'vue3-styled-components'
-  import SpinnerSvg from '../../assets/icons/black_spinner.svg'
 
   const SpinnerContainer = styled.div`
     position: fixed;
@@ -43,35 +36,72 @@
     justify-items: center;
     z-index: 100;
   `
+
   const containerAttrs = { limitedToModal: Boolean }
   const Container = styled('div', containerAttrs)`
     display: grid;
     align-items: center;
     justify-items: center;
     position: ${(props) => (props.limitedToModal ? 'absolute' : 'inherit')};
-    height: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
-    width: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
+    height: ${(props) => (props.limitedToModal ? '100%' : 'auto')};
+    width: ${(props) => (props.limitedToModal ? '100%' : 'auto')};
   `
 
-  const SpinnerWrapper = styled.div`
-    width: ${(props) => (props.size ? props.size : '60px')};
-    height: auto;
+  const wrapperAttrs = { size: String }
+  const SpinnerWrapper = styled('div', wrapperAttrs)`
+    width: ${(props) =>
+      props.size === 'large'
+        ? '56px'
+        : props.size === 'medium'
+        ? '40px'
+        : '24px'};
+    height: ${(props) =>
+      props.size === 'large'
+        ? '56px'
+        : props.size === 'medium'
+        ? '40px'
+        : '24px'};
+  `
+
+  const circleAttrs = { size: String, isWhite: Boolean }
+  const SpinnerCircle = styled('div', circleAttrs)`
+    width: 100%;
+    height: 100%;
+    border-radius: 100%;
+    border: ${(props) => (props.size === 'large' ? '4px' : '2px')} solid
+      ${(props) =>
+        props.isWhite ? props.theme.colors.grey5 : props.theme.colors.white};
+    border-top-color: ${(props) =>
+      props.isWhite ? props.theme.colors.white : props.theme.colors.primary};
+    border-right-color: ${(props) =>
+      props.isWhite ? props.theme.colors.white : props.theme.colors.primary};
+    border-bottom-color: ${(props) =>
+      props.isWhite ? props.theme.colors.white : props.theme.colors.primary};
+    animation: spin 1s linear infinite;
+    transform: rotate(90deg);
 
-    .white {
-      filter: brightness(0) invert(1);
+    @keyframes spin {
+      to {
+        transform: rotate(450deg);
+      }
     }
   `
 
   export default {
-    name: 'SpinnerComponent',
+    name: 'NewSpinner',
     components: {
+      SpinnerContainer,
+      SpinnerCircle,
       Container,
       SpinnerWrapper,
-      SpinnerContainer,
-      SpinnerSvg,
     },
     props: {
-      fullWidth: {
+      size: {
+        type: String,
+        default: 'medium',
+        validator: (value) => ['small', 'medium', 'large'].includes(value),
+      },
+      isWhite: {
         required: false,
         default: false,
         type: Boolean,
@@ -81,12 +111,7 @@
         default: false,
         type: Boolean,
       },
-      size: {
-        required: false,
-        default: '60px',
-        type: String,
-      },
-      isWhite: {
+      fullWidth: {
         required: false,
         default: false,
         type: Boolean,