@eturnity/eturnity_reusable_components 8.7.5-EPDM-12618.3 → 8.7.5-EPIC-8593.0

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

@@ -1,19 +1,35 @@
 <template>
   <PageContainer>
     <ButtonWrapper
+      :app-theme="appTheme"
+      :button-size="buttonSize"
       :custom-color="customColor"
-      :height="height"
+      :is-active="isActive"
       :is-disabled="isDisabled"
       :min-width="minWidth"
+      :type="type"
+      :variant="variant"
     >
-      <IconContainer :width="height">
+      <IconContainer
+        :app-theme="appTheme"
+        :button-size="buttonSize"
+        :type="type"
+        :variant="variant"
+      >
         <Icon
-          :color="fontColor ? fontColor : theme.colors.white"
+          :color="
+            iconColor ||
+            theme.mainButton[appTheme][type][variant].default.textColor
+          "
+          :hovered-color="
+            iconColor ||
+            theme.mainButton[appTheme][type][variant].default.textColor
+          "
           :name="iconName"
           size="14px"
         />
       </IconContainer>
-      <ButtonContainer :font-color="fontColor" :font-size="fontSize">
+      <ButtonContainer :button-size="buttonSize">
         {{ text }}
       </ButtonContainer>
     </ButtonWrapper>
@@ -30,7 +46,6 @@
   //   iconName="external_icon"
   //   fontColor="white"
   //   fontSize="12px"
-  //   height="24px"
   // />
 
   import Icon from '../../icon'
@@ -40,61 +55,107 @@
   const PageContainer = styled.div``
 
   const ButtonAttrs = {
+    type: String,
     isDisabled: Boolean,
     minWidth: String,
     customColor: String,
-    height: String,
+    buttonSize: String,
+    variant: String,
+    appTheme: String,
+    isActive: Boolean,
   }
   const ButtonWrapper = styled('div', ButtonAttrs)`
     display: grid;
     grid-template-columns: auto 1fr;
+    font-size: ${(props) =>
+      props.theme?.mainButton?.size?.[props.buttonSize]?.fontSize};
+    color: ${(props) =>
+      props.isDisabled
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.textColor
+        : props.customColor
+        ? props.theme.colors.white
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.textColor};
     background-color: ${(props) =>
       props.isDisabled
-        ? props.theme.colors.disabled
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.backgroundColor
         : props.customColor
-        ? props.theme.colors[props.customColor]
-          ? props.theme.colors[props.customColor]
-          : props.customColor
-        : props.theme.colors.yellow};
+        ? props.customColor
+        : props.isActive
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .active.backgroundColor
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.backgroundColor};
+    border: ${(props) => {
+      const borderValue = props.isDisabled
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.borderColor
+        : props.customColor
+        ? props.customColor
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.borderColor
+      return borderValue ? '1px solid ' + borderValue : 'none'
+    }};
     cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
     user-select: none;
     border-radius: 4px;
     overflow: hidden;
-    min-width: ${(props) => (props.minWidth ? props.minWidth : 'initial')};
-    height: ${(props) => props.height};
+    min-width: ${(props) => props.minWidth || 'initial'};
 
     &:hover {
-      opacity: ${(props) => (props.isDisabled ? '1' : '0.8')};
+      background-color: ${(props) =>
+        props.isDisabled
+          ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .disabled.backgroundColor
+          : props.customColor
+          ? props.customColor
+          : props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .hover.backgroundColor};
     }
 
     &:active {
-      opacity: 1;
+      background-color: ${(props) =>
+        props.isDisabled
+          ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .disabled.backgroundColor
+          : props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .active.backgroundColor};
     }
   `
 
   const ButtonContainerAttrs = {
-    fontSize: String,
-    fontColor: String,
+    buttonSize: String,
   }
   const ButtonContainer = styled('div', ButtonContainerAttrs)`
-    font-size: ${(props) => props.fontSize};
-    color: ${(props) =>
-      props.fontColor ? props.fontColor : props.theme.colors.white};
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 0 14px;
+    padding: ${(props) =>
+      props.theme?.mainButton?.size?.[props.buttonSize]?.padding};
+    white-space: nowrap;
   `
 
   const IconContainerAttrs = {
-    width: String,
+    buttonSize: String,
+    appTheme: String,
+    type: String,
+    variant: String,
   }
   const IconContainer = styled('div', IconContainerAttrs)`
     display: grid;
     align-items: center;
     justify-items: center;
-    width: ${(props) => props.width};
-    background: ${(props) => props.theme.colors.white + '1a'};
+    width: ${(props) =>
+      props.theme?.mainButton?.size?.[props.buttonSize]?.iconWidth};
+    background: rgba(255, 255, 255, 0.1);
+    border-right: ${(props) => {
+      const borderColor =
+        props.theme.mainButton[props.appTheme][props.type][props.variant]
+          .default.borderColor
+      return borderColor ? `1px solid ${borderColor}` : 'none'
+    }};
   `
 
   export default {
@@ -107,35 +168,68 @@
       Icon,
     },
     props: {
+      type: {
+        required: false,
+        default: 'primary',
+        type: String,
+      },
+      variant: {
+        required: false,
+        default: 'main',
+        type: String,
+      },
+      themeType: {
+        type: String,
+        default: 'light',
+        required: false,
+      },
+      buttonSize: {
+        type: String,
+        default: 'medium',
+        required: false,
+      },
       isDisabled: {
         required: false,
         default: false,
+        type: Boolean,
       },
       text: {
         required: true,
+        type: String,
       },
       minWidth: {
         required: false,
         default: null,
+        type: String,
       },
       customColor: {
         required: false,
         default: null,
+        type: String,
       },
       iconName: {
         required: true,
+        type: String,
       },
-      fontColor: {
+      iconColor: {
         required: false,
         default: null,
+        type: String,
       },
       fontSize: {
         required: false,
-        default: '13px',
+        default: '14px',
+        type: String,
+      },
+      appTheme: {
+        required: false,
+        default: 'light',
+        type: String,
       },
-      height: {
+      isActive: {
         required: false,
-        default: '30px',
+        default: false,
+        type: Boolean,
       },
     },
     data() {
@@ -143,5 +237,14 @@
         theme: Theme,
       }
     },
+    // computed: {
+    //   getIconColor() {
+    //     console.log(this.theme[this.themeType][this.type][this.variant])
+    //     return (
+    //       this.iconColor ||
+    //       this.theme[this.themeType][this.type][this.variant].textColor
+    //     )
+    //   },
+    // },
   }
 </script>

package/src/components/buttons/mainButton/MainButton.stories.js

@@ -4,6 +4,9 @@ export default {
   title: 'MainButton',
   component: MainButton,
   tags: ['autodocs'],
+  parameters: {
+    layout: 'centered',
+  },
 }
 
 export const DefaultButton = {
@@ -49,3 +52,13 @@ export const IconButton = {
     customColor: '#fdb813',
   },
 }
+
+export const IconAltDesignButton = {
+  args: {
+    text: 'Click me',
+    icon: 'bell',
+    type: 'primary',
+    iconAltStyle: true,
+    iconAltStyleColor: '#f2f2f2',
+  },
+}

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

@@ -2,18 +2,25 @@
   <PageContainer>
     <ButtonContainer
       :id="id"
-      :custom-color="customColor"
+      :app-theme="appTheme"
+      :button-size="buttonSize"
       :data-id="dataId"
       :data-qa-id="dataQaId"
-      :font-color="fontColor"
       :height="height"
       :is-disabled="isDisabled"
       :min-width="minWidth"
       :no-wrap="noWrap"
       :type="type"
+      :variant="variant"
     >
       <LabelComponent :has-icon="Boolean(icon)">
-        <Icon v-if="icon" :name="icon" :color="iconColor" size="14px" />
+        <Icon
+          v-if="icon"
+          :color="getIconColor"
+          :hovered-color="getIconColor"
+          :name="icon"
+          size="14px"
+        />
         {{ text }}
       </LabelComponent>
     </ButtonContainer>
@@ -35,6 +42,7 @@
 
   import styled from 'vue3-styled-components'
   import Icon from '../../icon'
+  import theme from '../../../assets/theme'
 
   const PageContainer = styled.div``
 
@@ -42,34 +50,39 @@
     type: String,
     isDisabled: Boolean,
     minWidth: String,
-    customColor: String,
-    fontColor: String,
     noWrap: Boolean,
     height: String,
+    variant: String,
+    buttonSize: String,
+    appTheme: String,
   }
   const ButtonContainer = styled('div', ButtonAttrs)`
     display: flex;
     justify-content: center;
-    padding: 7px 15px;
-    font-size: 14px;
+    padding: ${(props) =>
+      props.theme?.mainButton?.size?.[props.buttonSize]?.padding};
+    font-size: ${(props) =>
+      props.theme?.mainButton?.size?.[props.buttonSize]?.fontSize};
     color: ${(props) =>
       props.isDisabled
-        ? props.theme.colors.white
-        : props.fontColor
-        ? props.fontColor
-        : props.theme.colors.white};
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.textColor
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.textColor};
     background-color: ${(props) =>
       props.isDisabled
-        ? props.theme.colors.disabled
-        : props.customColor
-        ? props.customColor
-        : props.type === 'primary'
-        ? props.theme.colors.black
-        : props.type === 'secondary'
-        ? props.theme.colors.grey3
-        : props.type === 'cancel'
-        ? props.theme.colors.red
-        : props.theme.colors.black};
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.backgroundColor
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.backgroundColor};
+    border: ${(props) => {
+      const borderValue = props.isDisabled
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .disabled.borderColor
+        : props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .default.borderColor
+      return borderValue ? '1px solid ' + borderValue : 'none'
+    }};
     border-radius: 4px;
     text-align: center;
     cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
@@ -77,16 +90,51 @@
     ${(props) => (props.minWidth ? `min-width: ${props.minWidth};` : '')};
     ${(props) => (props.noWrap ? `white-space: nowrap;` : '')};
     height: ${(props) => props.height};
+    line-height: 1;
 
     &:hover {
-      opacity: ${(props) => (props.isDisabled ? '1' : '0.8')};
+      background-color: ${(props) =>
+        props.isDisabled
+          ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .disabled.backgroundColor
+          : props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .hover.backgroundColor};
     }
 
     &:active {
-      opacity: 1;
+      background-color: ${(props) =>
+        props.isDisabled
+          ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .disabled.backgroundColor
+          : props.theme.mainButton[props.appTheme][props.type][props.variant]
+              .active.backgroundColor};
     }
   `
 
+  const AltAttrs = {
+    altStyle: Boolean,
+    color: String,
+  }
+
+  const IconContainer = styled('div', AltAttrs)`
+    background-color: ${(props) =>
+      props.color ? props.color : props.theme.colors.transparentWhite1};
+    padding: 7px;
+    height: 100%;
+    width: 30%;
+    justify-content: center;
+    display: flex;
+    align-items: center;
+    border-radius: 4px 0 0 4px;
+    color: ${(props) => props.theme.colors.white};
+    all: ${(props) => (props.altStyle ? '' : 'unset')};
+  `
+
+  const TextContainer = styled('span', AltAttrs)`
+    padding: ${(props) => (props.altStyle ? '7px' : '0')};
+    all: ${(props) => (props.altStyle ? '' : 'unset')};
+  `
+
   const LabelAttrs = {
     hasIcon: Boolean,
   }
@@ -109,7 +157,12 @@
     props: {
       type: {
         required: false,
-        default: 'primary',
+        default: 'primary', // primary, secondary, tertiary, ghost
+        type: String,
+      },
+      variant: {
+        required: false,
+        default: 'main', // main, cancel
         type: String,
       },
       isDisabled: {
@@ -127,18 +180,18 @@
         default: '',
         type: String,
       },
-      text: {
-        required: true,
-        type: String,
+      iconAltStyle: {
+        required: false,
+        default: false,
+        type: Boolean,
       },
-      customColor: {
+      iconAltStyleColor: {
         required: false,
         default: null,
         type: String,
       },
-      fontColor: {
-        required: false,
-        default: '',
+      text: {
+        required: true,
         type: String,
       },
       noWrap: {
@@ -169,6 +222,27 @@
         type: String,
         default: '',
       },
+      appTheme: {
+        type: String,
+        default: 'light',
+      },
+      buttonSize: {
+        type: String,
+        default: 'medium',
+        required: false,
+      },
+    },
+    computed: {
+      theme() {
+        return theme
+      },
+      getIconColor() {
+        return this.isDisabled
+          ? this.theme.mainButton[this.appTheme][this.type][this.variant]
+              .disabled.textColor
+          : this.theme.mainButton[this.appTheme][this.type][this.variant]
+              .default.textColor
+      },
     },
   }
 </script>

package/src/components/filter/filterSettings.vue

@@ -297,12 +297,13 @@
       <MainButton
         v-if="buttonText.cancel"
         :text="buttonText.cancel"
-        type="cancel"
+        type="primary"
+        variant="cancel"
         @click="$emit('on-cancel-view')"
       />
       <ResetContainer v-if="!filterViews || !filterViews.length">
         <ResetButton @click="$emit('on-reset-filters')">
-          <Icon :color="theme.colors.blue" :name="'update'" size="14px" />
+          <Icon :color="theme.colors.primary" :name="'update'" size="14px" />
           <div>{{ $gettext('reset_filters') }}</div>
         </ResetButton>
       </ResetContainer>
@@ -475,7 +476,7 @@
     margin-top: 20px;
     align-self: center;
     font-size: 13px;
-    color: ${(props) => props.theme.colors.blue};
+    color: ${(props) => props.theme.colors.primary};
     cursor: pointer;
   `
 

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>
@@ -45,6 +46,7 @@
     disabled: {
       required: false,
       default: false,
+      type: Boolean,
     },
     name: {
       required: true,
@@ -52,33 +54,48 @@
     },
     color: {
       required: false,
+      default: null,
+      type: String,
     },
     hoveredColor: {
       required: false,
+      default: null,
+      type: String,
     },
     size: {
       required: false,
       default: '30px',
+      type: String,
     },
     cursor: {
       required: false,
       default: null,
+      type: String,
     },
     isStriked: {
       required: false,
       default: false,
+      type: Boolean,
     },
     backgroundColor: {
       required: false,
       default: null,
+      type: String,
     },
     count: {
       required: false,
       default: 0,
+      type: Number,
     },
     animation: {
       required: false,
       default: 'none',
+      type: String,
+    },
+    fillType: {
+      required: false,
+      default: 'fill',
+      type: String,
     },
   })
 
@@ -105,7 +122,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 +146,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 +162,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};`}
+      ${(props) => `${props.fillType}: ${props.hoveredColor || props.color};`}
     }
     &:hover + div {
       background-color: ${(props) => props.hoveredColor};

package/src/components/infoCard/index.vue

@@ -12,8 +12,9 @@
     <RCIcon
       :color="iconColor ? iconColor : presetStyles.iconColor"
       data-test-id="info_card_icon"
-      name="info"
-      size="24px"
+      :hovered-color="iconColor ? iconColor : presetStyles.iconColor"
+      :name="iconName"
+      size="18px"
     />
     <TextContainer data-test-id="info_card_text_container">
       <slot></slot>
@@ -39,7 +40,7 @@
     display: flex;
     align-items: ${(props) =>
       props.alignItems ? props.alignItems : props.presetStyles.alignItems};
-    gap: 15px;
+    gap: 16px;
     min-width: ${(props) => props.minWidth};
     padding: ${(props) =>
       props.padding ? props.padding : props.presetStyles.padding};
@@ -57,7 +58,7 @@
   `
 
   const TextContainer = styled.div`
-    font-size: 13px;
+    font-size: 14px;
     width: 100%;
   `
 
@@ -121,21 +122,24 @@
       isErrorMinor() {
         return this.type === 'error_minor'
       },
+      iconName() {
+        return this.type === 'warning' ? 'warning_triangle' : 'info'
+      },
       presetStyles() {
         // the types that doesn't have explicit border anyway have it transparent
         // to avoid flickering in case the same info card would switch the types
         let stylesCollection = {
           alignItems: 'flex-start',
-          padding: '20px',
+          padding: '8px 6px 8px 16px',
           borderWidth: '1px',
           borderStyle: 'solid',
           borderColor: 'transparent',
         }
 
         if (this.isWarning) {
-          stylesCollection.color = theme.colors.white
-          stylesCollection.backgroundColor = theme.colors.yellow
-          stylesCollection.iconColor = theme.colors.white
+          stylesCollection.color = theme.semanticColors.teal[800]
+          stylesCollection.backgroundColor = theme.semanticColors.yellow[300]
+          stylesCollection.iconColor = theme.semanticColors.teal[800]
         } else if (this.isErrorMinor) {
           stylesCollection.borderStyle = 'dashed'
           stylesCollection.borderColor = theme.colors.pureRed