adata-ui 0.1.36 → 0.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.36",
+  "version": "0.1.39",
   "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/Button/AButton.vue

@@ -75,6 +75,7 @@ export default {
 
   @media screen and (max-width: 560px) {
     width: 100%;
+    text-align: center;
   }
 
   svg {

package/src/components/Header/Header.vue

@@ -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,
@@ -134,31 +137,41 @@ export default {
         {
           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 +186,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) + ' ₸';