adata-ui 0.1.24 → 0.1.28

package/package.json

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

package/src/components/Footer/Footer.vue

@@ -1,7 +1,7 @@
 <template>
   <footer class="a-footer" :class="[{'paddinged': hasBottomMenu}]">
     <div class="a-footer__top">
-      <ul class="nav">
+      <div class="nav">
         <a class="logo adata-logo" href="https://adata.kz">
           <svg fill="#2C3E50" 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>
@@ -9,45 +9,45 @@
           </svg>
         </a>
         <div class="social">
-          <a target="_blank" href="https://www.facebook.com/adata.kz">
+          <a target="_blank" rel="nofollow" href="https://www.facebook.com/adata.kz">
             <svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="social__icon">
               <path d="M13.6562 0H2.34375C1.05151 0 0 1.05151 0 2.34375V13.6562C0 14.9485 1.05151 16 2.34375 16H7.0625V10.3438H5.1875V7.53125H7.0625V5.625C7.0625 4.0741 8.3241 2.8125 9.875 2.8125H12.7188V5.625H9.875V7.53125H12.7188L12.25 10.3438H9.875V16H13.6562C14.9485 16 16 14.9485 16 13.6562V2.34375C16 1.05151 14.9485 0 13.6562 0Z" fill="#2C3E50"></path>
             </svg>
           </a>
-          <a target="_blank" href="https://www.instagram.com/adata.kz/?igshid=253i4qxg3els">
+          <a target="_blank" rel="nofollow" href="https://www.instagram.com/adata.kz/?igshid=253i4qxg3els">
             <svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="social__icon">
               <path fill-rule="evenodd" clip-rule="evenodd" d="M3.01562 0.0166016C1.35877 0.0166016 0.015625 1.35975 0.015625 3.0166V13.001C0.015625 14.6578 1.35877 16.001 3.01562 16.001H13C14.6569 16.001 16 14.6578 16 13.001V3.0166C16 1.35975 14.6569 0.0166016 13 0.0166016H3.01562ZM14.3891 3.20021C14.3891 3.6416 14.0313 3.99943 13.5899 3.99943C13.1485 3.99943 12.7906 3.6416 12.7906 3.20021C12.7906 2.75881 13.1485 2.40099 13.5899 2.40099C14.0313 2.40099 14.3891 2.75881 14.3891 3.20021ZM8.01132 11.5982C9.99761 11.5982 11.6078 9.98805 11.6078 8.00176C11.6078 6.01548 9.99761 4.40528 8.01132 4.40528C6.02504 4.40528 4.41484 6.01548 4.41484 8.00176C4.41484 9.98805 6.02504 11.5982 8.01132 11.5982ZM8.01132 12.7971C10.6597 12.7971 12.8066 10.6501 12.8066 8.00176C12.8066 5.35339 10.6597 3.20645 8.01132 3.20645C5.36295 3.20645 3.21601 5.35339 3.21601 8.00176C3.21601 10.6501 5.36295 12.7971 8.01132 12.7971Z" fill="#2C3E50"></path>
             </svg>
           </a>
-          <a target="_blank" href="https://www.youtube.com/channel/UCPkbtgwgTZbMJXjmTi3R8Uw/about">
+          <a target="_blank" rel="nofollow" href="https://www.youtube.com/channel/UCPkbtgwgTZbMJXjmTi3R8Uw/about">
             <svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="social__icon">
               <path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.895431 0 2V14C0 15.1046 0.895431 16 2 16H14C15.1046 16 16 15.1046 16 14V2C16 0.895431 15.1046 0 14 0H2ZM13.7528 4.98132C13.6144 4.46732 13.2092 4.06205 12.6952 3.92367C11.7561 3.66667 7.99997 3.66667 7.99997 3.66667C7.99997 3.66667 4.24381 3.66667 3.30477 3.91378C2.80066 4.05217 2.3855 4.46732 2.24712 4.98132C2 5.92036 2 7.86764 2 7.86764C2 7.86764 2 9.82479 2.24712 10.7539C2.3855 11.268 2.79077 11.6732 3.30477 11.8116C4.2537 12.0686 7.99997 12.0686 7.99997 12.0686C7.99997 12.0686 11.7561 12.0686 12.6952 11.8215C13.2092 11.6831 13.6144 11.2778 13.7528 10.7638C13.9999 9.82479 13.9999 7.87752 13.9999 7.87752C13.9999 7.87752 14.0098 5.92036 13.7528 4.98132ZM6.80392 9.59801L9.92747 7.799L6.80392 6V9.59801Z" fill="#2C3E50"></path>
             </svg>          </a>
-          <a target="_blank" href="https://www.tiktok.com/@adata.kz?lang=ru-RU" >
+          <a target="_blank" rel="nofollow" href="https://www.tiktok.com/@adata.kz?lang=ru-RU" >
             <svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="social__icon">
               <path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.895431 0 2V14C0 15.1046 0.895431 16 2 16H14C15.1046 16 16 15.1046 16 14V2C16 0.895431 15.1046 0 14 0H2ZM8.27136 9.89447C8.27136 10.8688 7.54987 11.506 6.65988 11.506C5.76988 11.506 5.04839 10.7845 5.04839 9.89447C5.04839 9.0988 5.7895 8.37096 6.68689 8.40404C6.86305 8.40404 7.06987 8.44599 7.15006 8.47436V6.62331C5.55588 6.30091 3.14893 7.62001 3.14893 9.89447C3.14893 11.506 4.38899 13.3333 6.65988 13.3333C8.93076 13.3333 10.1985 11.506 10.1985 9.89447V6.23373C10.5643 6.52374 11.6152 7.04631 12.8511 7.04631V5.229C11.406 5.25812 10.0956 3.98482 10.204 2.66667H8.27136V9.89447Z" fill="#2C3E50"></path>
             </svg>
           </a>
         </div>
-        <li class="nav__item">
-          <a href="https://adata.kz/tariffs" class="nav__link">Тарифы</a>
-        </li>
-        <li class="nav__item">
-          <a href="https://adata.kz/about" class="nav__link">О сервисе</a>
-        </li>
-        <li class="nav__item">
-          <a href="https://adata.kz/apiInfo" class="nav__link">Описание API</a>
-        </li>
-        <li class="nav__item">
-          <a href="https://adata.kz/user-agreements" class="nav__link">Пользовательское соглашение</a>
-        </li>
-        <li class="nav__item">
-          <a href="https://adata.kz/vacancy" class="nav__link">Вакансии</a>
-        </li>
-        <li class="nav__item">
-          <a href="https://adata.kz/contacts" class="nav__link">Контакты</a>
-        </li>
-      </ul>
+        <a href="https://adata.kz/tariffs" class="nav__item nav__link">
+            Тарифы
+        </a>
+        <a href="https://adata.kz/about" class="nav__item nav__link">
+            О сервисе
+        </a>
+        <a href="https://adata.kz/apiInfo" class="nav__item nav__link">
+            Описание API
+        </a>
+        <a href="https://adata.kz/user-agreements" class="nav__item nav__link">
+            Пользовательское соглашение
+        </a>
+        <a href="https://adata.kz/vacancy" class="nav__item nav__link">
+            Вакансии
+        </a>
+        <a href="https://adata.kz/contacts" class="nav__item nav__link">
+            Контакты
+        </a>
+      </div>
     </div>
     <div class="a-footer__bottom"><span>2022 © ТОО "Alldata"</span></div>
   </footer>

package/src/components/Header/Header.stories.js

@@ -51,6 +51,6 @@ headerAuthenticated.args = {
     daysRemaining: "остаток дней: 29",
     email: "sboranbayeva@gmail.com",
     loginUrl: "https://id.adtdev.kz/auth/signin?url=https://pk.adata.kz/auth",
-    activeTabKey: 'tender',
+    activeTabKey: 'counterparty',
     balance: 1954900
 }

package/src/components/Header/Header.vue

@@ -1,5 +1,5 @@
 <template>
-  <header v-if="windowOpen" class="a-header" :class="[{'bordered': isBordered}, {'fixed': isFixed}]">
+  <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')">
@@ -12,7 +12,7 @@
           <a v-for="(item, index) in subheaderItems"
                :key="index"
                class="menu__wrapper menu__items"
-               :class="{active: locationUrl.includes(toAdtdev(item.url))}"
+               :class="{active: item.key === activeTabKey}"
                :href="toAdtdev(item.url)"
           >
             {{ item.name }}
@@ -63,7 +63,7 @@
             v-for="(item, index) in subheaderItems"
             :key="index"
             class="menu_mobile-wrapper"
-            :class="{'active-burger-tab': locationUrl.includes(toAdtdev(item.url))}"
+            :class="{'active-burger-tab': item.key === activeTabKey}"
             :href="toAdtdev(item.url)"
         >
           {{ item.name }}
@@ -130,44 +130,44 @@ export default {
   data() {
     return {
       profileDropDown,
-      windowOpen: false,
       subheaderItems: [
         {
           id: 1,
           name: "Контрагенты",
           url: 'https://pk.adata.kz',
+          key: 'counterparty'
         },
         {
           id: 2,
           name: "Тендеры",
           url: 'https://tender.adata.kz',
+          key: 'tenders'
         },
         {
           id: 3,
           name: "Работа",
           url: 'https://work.adata.kz',
+          key: 'work'
         },
         {
           id: 4,
           name: "Штрафы",
           url: 'https://avto.adata.kz',
+          key: 'fines'
+        },
+        {
+          id: 5,
+          name: "Маркетинг",
+          url: 'https://marketing.adata.kz',
+          key: 'fines'
         }
       ],
       isOpen: false
     };
   },
   mounted() {
-    this.windowOpen = true;
     this.setBalance(this.balance);
   },
-  computed: {
-    locationUrl() {
-      if (window)
-        return window.location.href;
-      else
-        return ''
-    }
-  },
   methods: {
     changeValue() {
       this.isOpen = !this.isOpen
@@ -329,6 +329,7 @@ export default {
         font-size: 16px;
         line-height: 22px;
         color: #2c3e50;
+        display: block;
 
         &:last-child {
           border-bottom: 1px solid #9DA3AC4C;

package/src/components/Header/Profile.vue

@@ -293,9 +293,9 @@ export default {
     if (this.profileDropDown && this.profileDropDown.length > 0) {
       this.listDropDown = [...this.profileDropDown]
     }
-    if(this.activeTabKey === 'counterparty') {
+    if(this.activeTabKey === 'counterparty' && window && window.innerWidth > 850) {
       this.chosenElem = this.listDropDown.find(el => el.name === 'Контрагенты');
-    } else if (this.activeTabKey === 'tender') {
+    } else if (this.activeTabKey === 'tenders') {
       this.chosenElem = this.listDropDown.find(el => el.name === 'Тендеры');
     } else if (this.activeTabKey === 'work') {
       this.chosenElem = this.listDropDown.find(el => el.name === 'Работа');

package/src/components/SearchTextField/SearchTextField.stories.js

@@ -11,7 +11,12 @@ export default {
 const Template = (args, { argTypes }) => ({
     components: { ASearchTextField },
     props: Object.keys(argTypes),
-    template: '<a-search-text-field  v-bind="$props"></a-search-text-field>'
+    template: '<a-search-text-field  v-bind="$props" @enterPressed="enterPressed"></a-search-text-field>',
+    methods: {
+        enterPressed(){
+            console.log('hihi')
+        }
+    }
 })
 
 export const WithIcon = Template.bind({});

package/src/components/SearchTextField/SearchTextField.vue

@@ -6,12 +6,14 @@
   >
     <div class="adt-text-block__field">
       <input
+          v-if="!mask"
           ref="input"
           :type="type"
           :value="value"
+          :placeholder="placeholder"
           required
           @input="$emit('input', $event.target.value)"
-          @keypress.enter="$emit('enterPressed')"
+          @keyup.enter="enterPressed"
           @focus="showAutocomplete = true"
           @click="$emit('showVTour')"
           :class="[
@@ -20,6 +22,22 @@
           {'adt-text-block__input': !forMobileFilter}
           ]"
       />
+      <TheMask
+          v-else
+          ref="maskInput"
+          :value="value"
+          :mask="mask"
+          :type="type"
+          :masked="false"
+          :placeholder="inputPlaceholder"
+          required
+          @input.native="$emit('input', $event.target.value)"
+          @focus.native="showPlaceholder = true"
+          @blur.native="showPlaceholder = false"
+          class="adt-text-block__input"
+          :class="{ error: !!errorText }"
+
+      />
       <label
           :class="{
           'adt-text-block__label-red' : !forMobileFilter && getIsError,
@@ -70,6 +88,7 @@
 
 <script>
 import '../../assets/style.scss';
+import {TheMask} from 'vue-the-mask';
 import { PerfectScrollbar } from "vue2-perfect-scrollbar";
 import vClickOutside from "v-click-outside";
 
@@ -79,6 +98,18 @@ export default {
     clickOutside: vClickOutside.directive
   },
   props: {
+    errorText: {
+      type: String,
+      default: ""
+    },
+    placeholder: {
+      type: String,
+      default: ""
+    },
+    mask: {
+      type: String,
+      default: ""
+    },
     label: {
       type: String,
       required: true,
@@ -130,14 +161,24 @@ export default {
     }
   },
   components: {
-    PerfectScrollbar
+    PerfectScrollbar,
+    TheMask
   },
   data() {
     return {
-      showAutocomplete: false
+      showAutocomplete: false,
+      showPlaceholder: false
+    }
+  },
+  computed: {
+    inputPlaceholder() {
+      return this.showPlaceholder ? this.placeholder : ""
     }
   },
   methods: {
+    enterPressed() {
+      this.$emit('enterPressed', this.showAutocomplete)
+    },
     onOutsideClick() {
       if (!this.isMobile) this.showAutocomplete = false
     },

package/src/components/TextField/TextField.stories.js

@@ -10,7 +10,12 @@ export default {
 const Template = (args, { argTypes }) => ({
     components: { ATextField },
     props: Object.keys(argTypes),
-    template: '<a-text-field v-bind="$props"></a-text-field>'
+    template: '<a-text-field v-bind="$props" @enterPressed="enterPressed"></a-text-field>',
+    methods: {
+        enterPressed(){
+            console.log('hihi')
+        }
+    }
 })
 
 export const Clearable = Template.bind({});

package/src/components/TextField/TextField.vue

@@ -9,7 +9,7 @@
           :placeholder="placeholder"
           required
           @input="$emit('input', $event.target.value)"
-          @keypress.enter="$emit('enterPressed')"
+          @keyup.enter="enterPressed"
           class="adt-text-block__input"
           :class="{ error: !!errorText }"
       />
@@ -99,6 +99,12 @@ export default {
     inputPlaceholder() {
       return this.showPlaceholder ? this.placeholder : ""
     }
+  },
+  methods: {
+    enterPressed() {
+      this.$emit('enterPressed')
+    },
+
   }
 }
 </script>

package/src/configs/profileDropDown.js

@@ -52,11 +52,11 @@ export const profileDropDown = [
                 name: "Профиль",
                 url: "https://work.adata.kz/profile/account"
             },
-            {
-                id: 11,
-                name: "Создать резюме",
-                url: "https://work.adata.kz/user/create"
-            },
+            // {
+            //     id: 11,
+            //     name: "Создать резюме",
+            //     url: "https://work.adata.kz/user/create"
+            // },
             {
                 id: 12,
                 name: "Отклики",