adata-ui 0.1.37 → 0.1.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.37",
+  "version": "0.1.40",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/_text_field.scss

@@ -64,7 +64,7 @@
 
   &__input {
     background: #ffffff;
-    border: 1px solid #c4c4c4;
+    border: 0.5px solid #c4c4c4;
     box-sizing: border-box;
     border-radius: 2px;
     width: 100%;
@@ -90,19 +90,12 @@
         font-size: 8px;
       }
     }
-
-    &:focus ~ #{$self}__label-red,
-    &:not(:focus):valid ~ #{$self}__label-red {
-      top: 12px;
-      font-size: 10px;
-      color: #ff2e43;
-      @media(max-width: 1025px) {
-        font-size: 8px;
-      }
+    &:hover {
+      border: 0.5px solid #2C3E50;
     }
 
     &:focus {
-      border: 1px solid #2c3e50;
+      border: 0.5px solid #2C3E50;
     }
 
     &::placeholder {
@@ -135,28 +128,6 @@
     }
   }
 
-  &__label-red {
-    position: absolute;
-    pointer-events: none;
-    left: 16px;
-    top: 50%;
-    transform: translateY(-50%);
-    white-space: nowrap;
-    overflow: hidden;
-    line-height: 40px;
-    transition: 0.3s;
-    color: #ff2e43;
-    font-size: 12px;
-
-    @media(max-width: 1025px) {
-      left: 12px;
-      font-size: 10px;
-      line-height: 16px;
-      color: #ff2e43;
-    }
-  }
-
-
   &__icon {
     position: absolute;
     right: 16px;
@@ -209,85 +180,4 @@
       }
     }
   }
-
-  .mobile-magnifier {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 40px;
-    width: 40px;
-    min-width: 40px;
-    border-radius: 0 2px 2px 0;
-    border-left: none;
-    background: #FFCD33;
-  }
-
-  &__input-mob-filter {
-    background: #ffffff;
-    border-bottom: none;
-    box-sizing: border-box;
-    border-radius: 2px;
-    width: 100%;
-    height: 48px;
-    font-size: 16px;
-    line-height: 19px;
-    display: flex;
-    align-items: center;
-    color: #1A2030;
-    padding: 19px 40px 5px 16px;
-    transition: 0.3s all;
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-
-    &:focus ~ #{$self}__label-mob-filter,
-    &:not(:focus):valid ~ #{$self}__label-mob-filter {
-      top: 11px;
-      font-size: 10px;
-      color: #71757A;
-      @media(max-width: 1025px) {
-        font-size: 7px;
-      }
-    }
-
-    &:focus {
-      border: 1px solid #2c3e50;
-    }
-
-    &::placeholder {
-      font-size: 12px;
-    }
-
-    &.error {
-      border: 1px solid #FF2E43;
-      background: #ff2e431f;
-    }
-  }
-
-  &__label-mob-filter {
-    position: absolute;
-    pointer-events: none;
-    left: 16px;
-    top: 50%;
-    transform: translateY(-50%);
-    white-space: nowrap;
-    overflow: hidden;
-    line-height: 40px;
-    transition: 0.3s;
-    color: #71757A;
-    @media(max-width: 1025px) {
-      left: 16px;
-      font-size: 14px;
-      line-height: 16px;
-      color: #71757A;
-    }
-
-    &__red {
-      color: rgba(255, 0, 0, 0.53);
-    }
-  }
-  &__magnifier {
-    left: 8px;
-    width: fit-content;
-  }
 }

package/src/components/Header/Header.vue

@@ -2,7 +2,7 @@
   <header class="a-header" :class="[{'bordered': isBordered}, {'fixed': isFixed}]">
     <div class="container">
       <div class="a-header__left">
-        <a class="logo" :href="toAdtdev('https://adata.kz')">
+        <a class="logo" :href="main[mode]">
           <svg class="adata-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 166 48">
             <path d="M62.926 38.22v-28h10.316c10.342 0 15.511 4.55 15.508 13.652 0 4.36-1.41 7.843-4.232 10.448-2.822 2.605-6.58 3.907-11.276 3.904l-10.316-.004zm6.56-22.868v17.752h3.248c2.839 0 5.069-.82 6.69-2.46 1.622-1.64 2.43-3.873 2.424-6.7 0-2.667-.8-4.767-2.403-6.3-1.602-1.533-3.853-2.297-6.752-2.292h-3.206zM118.5 38.22h-7.131l-2.079-6.228H98.958l-2.079 6.228h-7.093l10.598-28h7.775l10.341 28zm-10.723-11.072l-3.127-9.416a11.94 11.94 0 01-.486-2.516h-.162c-.07.83-.24 1.649-.508 2.44l-3.168 9.492h7.451zm31.833-11.796h-8.316V38.22h-6.557V15.352h-8.274v-5.136h23.147v5.136zM166 38.22h-7.143l-2.079-6.228h-10.349l-2.05 6.228h-7.106l10.598-28h7.776l10.353 28zm-10.719-11.072l-3.127-9.416a11.94 11.94 0 01-.486-2.516h-.163c-.069.83-.239 1.649-.507 2.44l-3.168 9.492h7.451zM24.553 15.252h-.163c-.069.83-.24 1.649-.507 2.44L20.715 27.2h7.45l-3.126-9.412a12.02 12.02 0 01-.486-2.536z"></path>
             <path d="M44.905 0H4.99a5.091 5.091 0 00-3.528 1.406A4.71 4.71 0 000 4.8v38.4a4.71 4.71 0 001.461 3.394A5.091 5.091 0 004.99 48h39.916a5.091 5.091 0 003.528-1.406 4.71 4.71 0 001.462-3.394V4.8a4.71 4.71 0 00-1.462-3.394A5.091 5.091 0 0044.905 0zM31.737 38.26l-2.079-6.232H19.305l-2.05 6.232h-7.097l10.598-28h7.776l10.353 28h-7.148z"></path>
@@ -13,7 +13,7 @@
                :key="index"
                class="menu__wrapper menu__items"
                :class="{active: item.key === activeTabKey}"
-               :href="toAdtdev(item.url)"
+               :href="item[mode]"
           >
             {{ item.name }}
           </a>
@@ -23,7 +23,7 @@
         <slot name="chooseCountry"></slot>
         <Profile
             v-bind:profileDropDown="profileDropDown"
-            :isDev="isDev"
+            :mode="mode"
             :isAuthenticated="isAuthenticated"
             :requestCount="requestCount"
             :daysRemaining="daysRemaining"
@@ -64,7 +64,7 @@
             :key="index"
             class="menu_mobile-wrapper"
             :class="{'active-burger-tab': item.key === activeTabKey}"
-            :href="toAdtdev(item.url)"
+            :href="item[mode]"
         >
           {{ item.name }}
         </a>
@@ -75,7 +75,7 @@
 
 <script>
 import Profile from "./Profile";
-import { profileDropDown } from "../../configs/profileDropDown"
+import { profileDropDown } from "@/configs/profileDropDown"
 import MobileToggle from "../transitions/VerticalMobileToggle";
 
 export default {
@@ -84,9 +84,12 @@ export default {
     MobileToggle,
   },
   props: {
-    isDev: {
-      type: Boolean,
-      default: false
+    mode: {
+      type: String,
+      required: true,
+      validator: function (value) {
+        return ['prod', 'dev', 'staging'].indexOf(value) !== -1
+      }
     },
     isAuthenticated: {
       type: Boolean,
@@ -130,35 +133,50 @@ export default {
   data() {
     return {
       profileDropDown,
+      main: {
+        dev: 'https://adtdev.kz',
+        prod: 'https://adata.kz',
+        staging: 'https://adada.kz'
+      },
       subheaderItems: [
         {
           id: 1,
           name: "Контрагенты",
-          url: 'https://pk.adata.kz',
+          dev: 'https://pk.adtdev.kz',
+          prod: 'https://pk.adata.kz',
+          staging: 'https://pk.adada.kz',
           key: 'counterparty'
         },
         {
           id: 2,
           name: "Тендеры",
-          url: 'https://tender.adata.kz',
+          dev: 'https://tender.adtdev.kz',
+          prod: 'https://tender.adata.kz',
+          staging: 'https://tender.adada.kz',
           key: 'tenders'
         },
         {
           id: 3,
           name: "Работа",
-          url: 'https://work.adata.kz',
+          dev: 'https://work.adtdev.kz',
+          prod: 'https://work.adata.kz',
+          staging: 'https://work.adada.kz',
           key: 'work'
         },
         {
           id: 4,
           name: "Штрафы",
-          url: 'https://avto.adata.kz',
+          dev: 'https://avto.adtdev.kz',
+          prod: 'https://avto.adata.kz',
+          staging: 'https://avto.adada.kz',
           key: 'fines'
         },
         {
           id: 5,
           name: "Маркетинг",
-          url: 'https://marketing.adata.kz',
+          dev: 'https://marketing.adtdev.kz',
+          prod: 'https://marketing.adata.kz',
+          staging: 'https://marketing.adada.kz',
           key: 'marketing'
         }
       ],
@@ -173,9 +191,6 @@ export default {
       this.isOpen = !this.isOpen
       this.$emit('menuOpen', this.isOpen)
     },
-    toAdtdev(url) {
-      return this.isDev ? url.replace("adata", "adtdev") : url;
-    },
     setBalance(balance) {
       if (balance !== 0) {
         this.profileDropDown[2].name = 'Текущий баланс: ' + this.thousandSeparator(balance) + ' ₸';

package/src/components/Header/Profile.vue

@@ -241,9 +241,12 @@ export default {
     clickOutside: vClickOutside.directive,
   },
   props: {
-    isDev: {
-      type: Boolean,
-      default: false
+    mode: {
+      type: String,
+      required: true,
+      validator: function (value) {
+        return ['prod', 'dev', 'staging'].indexOf(value) !== -1
+      }
     },
     profileDropDown: {
       type: Array,
@@ -316,17 +319,17 @@ export default {
     },
     async showModal(url, name) {
       if (name.includes('Текущий')) {
-        if(window.location.href.includes(this.toAdtdev(url))) {
+        if(window.location.href.includes(url)) {
           this.$emit("setIsReplenishModal", true);
           this.setShowModal(true);
         } else {
-          await window.open(this.toAdtdev(url) + "&modal=show", "_self")
+          await window.open(url + "&modal=show", "_self")
         }
       }
     },
     handleClick(url, name) {
       if (!name.includes('Текущий')) {
-        window.open(this.toAdtdev(url), "_self");
+        window.open(url, "_self");
         this.active = false;
         if (this.chosenElem) this.chosenElem.opened = false;
       }
@@ -335,9 +338,6 @@ export default {
       this.chosenElem = this.listDropDown[index];
       this.$set(this.listDropDown[index], 'opened', !this.listDropDown[index].opened)
     },
-    toAdtdev(url) {
-      return this.isDev ? url.replace("adata", "adtdev") : url;
-    }
   }
 };
 </script>