@eturnity/eturnity_reusable_components 8.7.6 → 8.10.1-EPDM-13568.0

package/src/components/panelRangeInfo/index.vue

@@ -0,0 +1,196 @@
+<template>
+  <Container :width="width">
+    <MainLine />
+    <MainLineHighlight :max-percent="maxPercent" :min-percent="minPercent" />
+    <TopValueContainer :position="valuePercent + '%'">
+      <TextWrapper :background-color="arrowColor">{{ value }}</TextWrapper>
+      <Arrow :background-color="arrowColor" />
+      <VerticalMarkerArrow :color="colorVerticalMarkerArrow" />
+    </TopValueContainer>
+    <BottomValueContainer :position="minPercent + '%'">
+      <TextWrapper>{{ minValue }}</TextWrapper>
+      <VerticalMarker side="bottom" />
+    </BottomValueContainer>
+    <BottomValueContainer :position="maxPercent + '%'">
+      <TextWrapper>{{ maxValue }}</TextWrapper>
+      <VerticalMarker side="bottom" />
+    </BottomValueContainer>
+  </Container>
+</template>
+
+<script>
+  // import ProgressBar from "@eturnity/eturnity_reusable_components/src/components/progressBar"
+  //To Use:
+  // <progress-bar
+  //   fillColor="#000"
+  //   backgroundColor="#888"
+  //   minWidth="150px"
+  //   maxWidth="100%"
+  //   :fillProgress="50" //should be a number for percent
+  //   stepNumber="4"
+  //   :labelText="translate('step')"
+  // />
+  import styled from 'vue3-styled-components'
+  const Container = styled.div`
+    position: relative;
+    display: flex;
+    height: 47px;
+    width: ${(props) => props.width};
+  `
+  const TopValueContainer = styled('div', { position: String })`
+    font-size: 11px;
+    left: ${(props) => props.position};
+    position: absolute;
+    display: flex;
+    justify-content: center
+    width: 0px;
+    color:${(props) => props.theme.colors.black};
+    item-align: center;
+
+  `
+  const BottomValueContainer = styled('div', { position: String })`
+    font-size: 12px;
+    left: ${(props) => props.position};
+    width: 0px;
+    bottom: -2px;
+    position: absolute;
+    display: flex;
+    justify-content: center;
+    item-align: center;
+    border-radius: 4px;
+    color: white;
+  `
+  const TextWrapper = styled('div', { backgroundColor: String })`
+    padding: 2px 6px;
+    background-color: ${(props) =>
+      props.theme.colors[props.backgroundColor] || props.backgroundColor};
+    border-radius: 4px;
+  `
+  const Arrow = styled('div', { backgroundColor: String })`
+    position: absolute;
+    bottom: -10px;
+    left: calc(50% - 6px);
+    width: 0;
+    height: 0;
+    border: 6px solid transparent;
+    border-top-color: ${(props) =>
+      props.theme.colors[props.backgroundColor] || props.backgroundColor};
+    filter: drop-shadow(0 2px 2px rgba(0, 0, 0, 0.1));
+  `
+  const MainLine = styled.div`
+    display: block;
+    position: absolute;
+    bottom: 16px;
+    height: 4px;
+    width: 100%;
+    border-radius: 4px;
+    background-color: ${(props) => props.theme.colors.grey4};
+  `
+  const MainLineHighlight = styled('div', {
+    minPercent: Number,
+    maxPercent: Number,
+  })`
+    display: block;
+    position: absolute;
+    left: ${(props) => props.minPercent + '%'};
+    right: ${(props) => 100 - props.maxPercent + '%'};
+    bottom: 16px;
+    height: 4px;
+    background-color: white;
+  `
+  const VerticalMarker = styled('div')`
+    position: absolute;
+    width: 1px;
+    height: 8px;
+    background-color: white;
+    display: inline-block;
+    top: -6px;
+    left: 0px;
+  `
+  const VerticalMarkerArrow = styled('div', { color: String })`
+    position: absolute;
+    width: 1px;
+    height: 4px;
+    background-color: ${(props) => props.color};
+    display: inline-block;
+    bottom: -14px;
+    left: 0px;
+  `
+  export default {
+    name: 'ProgressBar',
+    components: {
+      Container,
+      MainLineHighlight,
+      Arrow,
+      TopValueContainer,
+      BottomValueContainer,
+      MainLine,
+      VerticalMarker,
+      VerticalMarkerArrow,
+      TextWrapper,
+    },
+    props: {
+      minValue: {
+        required: true,
+        type: Number,
+      },
+      maxValue: {
+        required: true,
+        type: Number,
+      },
+      value: {
+        required: true,
+        type: Number,
+      },
+      arrowColor: {
+        required: false,
+        type: String,
+        default: 'white',
+      },
+      width: {
+        required: false,
+        type: String,
+        default: null,
+      },
+    },
+    data() {
+      return {}
+    },
+    computed: {
+      minPercent() {
+        if (this.maxValue === this.minValue) {
+          return 50
+        } else {
+          return 30
+        }
+      },
+      maxPercent() {
+        if (this.maxValue === this.minValue) {
+          return 50
+        } else {
+          return 70
+        }
+      },
+      valuePercent() {
+        let percent
+        if (this.maxValue === this.minValue) {
+          percent = this.minPercent + 10 * (this.value - this.minValue)
+        } else {
+          percent =
+            this.minPercent +
+            ((this.maxPercent - this.minPercent) /
+              (this.maxValue - this.minValue)) *
+              (this.value - this.minValue)
+        }
+        return Math.max(0, Math.min(100, percent))
+      },
+      colorVerticalMarkerArrow() {
+        if (this.value < this.maxValue && this.value > this.minValue) {
+          return 'black'
+        } else {
+          return 'white'
+        }
+      },
+    },
+  }
+</script>

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

@@ -12,30 +12,50 @@
           :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.colors.white
+                  : theme.colors.primary
+              "
+              cursor="pointer"
+              :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.colors.white
+                    : theme.colors.primary
+                "
                 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"
+                :color="
+                  activeDropdown === item.key
+                    ? theme.colors.white
+                    : theme.colors.primary
+                "
                 :name="activeDropdown === item.key ? 'arrow_up' : 'arrow_down'"
                 size="10px"
               />
@@ -68,7 +88,7 @@
         @click="$emit('on-logout')"
       >
         <RotateIcon
-          color="#fff"
+          :color="theme.colors.primary"
           cursor="pointer"
           name="initial_situation"
           size="18px"
@@ -83,16 +103,17 @@
   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.colors.white};
     padding: 14px 12px;
     min-width: 220px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
+    border-right: 1px solid rgba(89, 0, 204, 0.2);
   `
 
   const ListContainer = styled.div`
@@ -111,17 +132,19 @@
     padding: 4px;
     border-radius: 6px;
     background-color: ${(props) =>
-      props.isActive ? 'rgba(255, 255, 255, 0.1)' : ''};
+      props.isActive ? props.theme.colors.primary : ''};
 
     :hover {
-      background-color: rgba(255, 255, 255, 0.1);
+      background-color: rgba(89, 0, 204, 0.2);
     }
   `
 
-  const ListText = styled.div`
+  const ListTextAttrs = { isActive: Boolean }
+  const ListText = styled('div', ListTextAttrs)`
     font-size: 16px;
     font-weight: 700;
-    color: ${(props) => props.theme.colors.white};
+    color: ${(props) =>
+      props.isActive ? props.theme.colors.white : props.theme.colors.primary};
   `
 
   const IconContainer = styled('div', IconAttrs)`
@@ -130,18 +153,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: rgba(89, 0, 204, 0.2);
+        }
+        `}
   `
 
   const SpinnerContainer = styled.div`
@@ -161,7 +182,7 @@
   const AppVersion = styled.p`
     font-size: 11px;
     line-height: 13px;
-    color: ${(props) => props.theme.colors.white};
+    color: ${(props) => props.theme.colors.primary};
     margin-right: 6px;
   `
 
@@ -175,20 +196,19 @@
     margin-left: 65px;
     padding: 8px;
     border-radius: 6px;
-    color: ${(props) => props.theme.colors.white};
+    color: ${(props) =>
+      props.isActive ? props.theme.colors.white : props.theme.colors.primary};
     font-weight: 700;
-    ${({ isActive }) =>
-      isActive &&
-      `
-    background: rgba(255, 255, 255, 0.1);
-  `}
+    background: ${(props) =>
+      props.isActive ? props.theme.colors.primary : ''};
 
     &:hover {
-      background: rgba(255, 255, 255, 0.1);
+      background: rgba(89, 0, 204, 0.2);
     }
   `
 
-  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 +216,16 @@
     border-radius: 6px;
     align-items: center;
     cursor: pointer;
+    background: ${(props) =>
+      props.isActive ? props.theme.colors.primary : ''};
+
     &:hover {
-      background: rgba(255, 255, 255, 0.1);
+      background: rgba(89, 0, 204, 0.2);
+    }
+
+    div {
+      color: ${(props) =>
+        props.isActive ? props.theme.colors.white : props.theme.colors.primary};
     }
   `
 
@@ -254,17 +282,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 +297,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,

package/src/components/tableDropdown/index.vue

@@ -25,18 +25,19 @@
                 item.type === 'template')
             "
           />
-          <TemplateButton
+          <MainButton
             v-if="
               item.type &&
               item.type === 'template' &&
               (item.value === '' || item.value === '-')
             "
             :key="index + '_button'"
-            :show-archived="showArchived"
+            button-size="small"
+            :text="$gettext('Use template...')"
+            :type="primary"
+            :variant="showArchived ? 'cancel' : 'main'"
             @click.stop="onTemplateClick(item.row)"
-          >
-            {{ $gettext('Use template...') }}
-          </TemplateButton>
+          />
           <TemplateLink
             v-else-if="
               item.type && item.type === 'template' && item.value !== ''
@@ -121,7 +122,7 @@
                 @on-change="onSearch($event)"
               />
             </SearchContainer>
-            <Spinner v-if="optionsLoading" />
+            <Spinner v-if="optionsLoading" size="small" />
             <EmptyText v-else-if="!optionsLoading && !optionItems.length">
               {{ emptyText ? emptyText : $gettext('No components found.') }}
             </EmptyText>
@@ -139,12 +140,13 @@
                 <span v-if="option !== 'template'">
                   {{ !!item[option] ? item[option] : '-' }}
                 </span>
-                <TemplateButton
+                <MainButton
                   v-else-if="option === 'template' && item.has_template"
+                  button-size="small"
+                  :text="$gettext('Use template...')"
+                  :type="primary"
                   @click.stop="onTemplateClick(item)"
-                >
-                  {{ $gettext('Use template...') }}
-                </TemplateButton>
+                />
                 <NoTemplate
                   v-else-if="option === 'template' && !item.has_template"
                 >
@@ -198,6 +200,7 @@
   import Icon from '../icon'
   import theme from '@/assets/theme.js'
   import InfoText from '../infoText'
+  import MainButton from '../buttons/mainButton'
 
   const rowAttrs = { disabled: Boolean, isOpen: Boolean }
   const DropdownRow = styled('div', rowAttrs)`
@@ -356,17 +359,6 @@
   `
 
   const templateAttrs = { showArchived: Boolean }
-  const TemplateButton = styled('div', templateAttrs)`
-    cursor: pointer;
-    background-color: #263238;
-    color: ${(props) =>
-      props.showArchived ? props.theme.colors.red : props.theme.colors.white};
-    padding: 4px 10px;
-    display: inline-block;
-    border-radius: 4px;
-    text-align: center;
-    margin-left: 15px;
-  `
 
   const NoTemplate = styled('div', templateAttrs)`
     color: ${(props) =>
@@ -466,7 +458,7 @@
       OptionsWrapper,
       OptionsItem,
       SearchContainer,
-      TemplateButton,
+      MainButton,
       NoTemplate,
       TemplateLink,
       InputText,

package/src/components/tables/mainTable/index.vue

@@ -91,7 +91,7 @@
     }
 
     ::-webkit-scrollbar-thumb {
-      border-bottom: 10px solid ${(props) => props.theme.colors.brightBlue}; // width of the actual scrollbar
+      border-bottom: 10px solid ${(props) => props.theme.colors.primary}; // width of the actual scrollbar
       border-radius: 4px;
     }
   `
@@ -154,7 +154,7 @@
 
     th {
       padding: 11px 15px;
-      background-color: ${(props) => props.theme.colors.blue1};
+      background-color: ${(props) => props.theme.colors.grey5};
       cursor: auto;
       height: 40px;