adata-ui 0.1.41 → 0.1.44

package/package.json

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

package/src/App.vue

@@ -1,49 +1,10 @@
 <template>
-  <div id="app">
-    <!--    <text-field label="Пример" v-model="value" @input="inputHandle" @enterPressed="inputHandle" />-->
-    <search-text-field
-      label="Пример2"
-      v-model="value"
-      @input="inputHandle"
-      @enterPressed="inputHandle"
-      :options="options"
-      :optionFields="['id', 'name']"
-      v-mask="'####-##'"
-      clearable
-    />
-  </div>
+  <div id="app"></div>
 </template>
 
 <script>
-import { VueMaskDirective } from "v-mask";
-// import TextField from "./components/TextField/TextField";
-import SearchTextField from "./components/SearchTextField/SearchTextField";
-
 export default {
   name: "App",
-  directives: {
-    mask: VueMaskDirective,
-  },
-  components: {
-    // TextField,
-    SearchTextField,
-  },
-  data() {
-    return {
-      value: "",
-      options: [
-        {
-          id: 1,
-          name: "reg",
-        },
-      ],
-    };
-  },
-  methods: {
-    inputHandle(val) {
-      console.log(val);
-    },
-  },
 };
 </script>
 

package/src/components/Button/AButton.vue

@@ -72,6 +72,7 @@ export default {
   border: none;
   border-radius: 2px;
   font-size: 14px;
+  font-weight: 500;
 
   @media screen and (max-width: 560px) {
     width: 100%;
@@ -183,6 +184,7 @@ export default {
       background: #0055BB;
       color: #fff;
     }
+
   }
 
   &_blue {

package/src/components/Header/Profile.vue

@@ -50,15 +50,15 @@
               <div v-for="(elem, index) in listDropDown" :key="index">
                 <div :class="elem.link ? 'profile-menu__balance-link': 'profile-menu__links'"
                      class="gray-text"
-                     v-if="elem.url"
-                     @click="handleClick(elem.url, elem.name)"
+                     v-if="elem[mode]"
+                     @click="handleClick(elem[mode], elem.name)"
                      >
                   <div>
                     {{ elem.name }}
                   </div>
                   <span
                       v-if="elem.link"
-                      @click="showModal(elem.url, elem.name)"
+                      @click="showModal(elem[mode], elem.name)"
                       class="profile-menu__balance"
                   >
                       {{ elem.link }}
@@ -79,8 +79,8 @@
                         <div
                             class="profile-menu__item__child"
                             :key="idx + 'link'"
-                            v-if="child.url"
-                            @click="handleClick(child.url, child.name)"
+                            v-if="child[mode]"
+                            @click="handleClick(child[mode], child.name)"
                         >
                           <span>
                             <svg width="4" height="4" viewBox="0 0 4 4" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -122,8 +122,8 @@
               <div class="profile-menu-mobile__items" v-if="listDropDown.length > 0">
                 <div v-for="(elem, index) in listDropDown" :key="index" class="bb">
                   <div
-                      @click="handleClick(elem.url, elem.name)"
-                      v-if="elem.url"
+                      @click="handleClick(elem[mode], elem.name)"
+                      v-if="elem[mode]"
                       :class="elem.link ? 'profile-menu-mobile__balance-link': 'profile-menu-mobile__links'"
                   >
                     <div v-if="!elem.link" class="button-inner">
@@ -201,8 +201,8 @@
             <div class="profile-menu-mobile__inner">
               <div class="profile-menu-mobile__items" v-if="chosenElem.children.length > 0">
                 <div v-for="(elem, index) in chosenElem.children" :key="index" class="bb">
-                  <div @click="handleClick(elem.url, elem.name)"
-                       v-if="elem.url"
+                  <div @click="handleClick(elem[mode], elem.name)"
+                       v-if="elem[mode]"
                        :class="elem.link ? 'profile-menu-mobile__balance-link': 'profile-menu-mobile__links'">
                     <div class="button-inner">
                       <div>{{ elem.name }}</div>
@@ -330,8 +330,8 @@ export default {
     handleClick(url, name) {
       if (!name.includes('Текущий')) {
         window.open(url, "_self");
-        this.active = false;
-        if (this.chosenElem) this.chosenElem.opened = false;
+        // this.active = false;
+        // if (this.chosenElem) this.chosenElem.opened = false;
       }
     },
     rotateItem(index) {

package/src/components/MailTo/MailTo.stories.js

@@ -0,0 +1,14 @@
+import MailTo from "./MailTo.vue";
+
+export default {
+  title: "MailTo",
+  component: MailTo,
+  template: "<mail-to></mail-to>",
+};
+
+const Template = () => ({
+  components: { MailTo },
+  template: "<mail-to></mail-to>",
+});
+
+export const AMailTo = Template.bind({});

package/src/components/MailTo/MailTo.vue

@@ -0,0 +1,66 @@
+<template>
+  <div class="mail">
+    <h2 class="mail__title">Интересует больше данных?</h2>
+    <p class="mail__subtitle">
+      Отправьте ваш запрос на
+      <a class="mail__link" href="mailto:info@adata.kz">info@adata.kz</a>
+    </p>
+    <div class="mail__img-wrapper">
+      <img
+        class="mail__img"
+        :src="require('/src/assets/images/mail.png')"
+        alt="mail"
+      />
+    </div>
+    <p class="mail__text">
+      Мы обязательно ответим вам <br />
+      в кратчайшие сроки.
+    </p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "MailTo",
+};
+</script>
+
+<style lang="scss" scoped>
+.mail {
+  padding: 25px 0px 50px;
+  &__title {
+    font-size: 20px;
+    line-height: 27px;
+    color: #2c3e50;
+    font-weight: 700;
+    text-align: center;
+    margin-bottom: 16px;
+  }
+  &__subtitle {
+    font-size: 14px;
+    line-height: 22px;
+    text-align: center;
+    color: #2c3e50;
+  }
+  &__link {
+    color: #007aff;
+    text-decoration: underline;
+  }
+  &__img-wrapper {
+    padding: 24px;
+    display: flex;
+    justify-content: center;
+  }
+  &__img {
+    width: 120px;
+    height: 120px;
+    object-fit: contain;
+  }
+  &__text {
+    font-size: 14px;
+    line-height: 22px;
+    text-align: center;
+    color: #2c3e50;
+  }
+}
+</style>

package/src/components/TextField/TextField.vue

@@ -2,51 +2,74 @@
   <div class="adt-text-block">
     <div :class="['adt-text-block__field', { error: !!errorText }]">
       <input
-          ref="input"
-          v-mask="mask"
-          :type="type"
-          v-model="value"
-          :placeholder="placeholder"
-          required
-          @keyup.enter="pressedEnter"
-          class="adt-text-block__input"
-          :class="{ error: !!errorText }"
-          @input="() => {$emit('input', value)}"
+        ref="input"
+        :type="type"
+        :value="value"
+        :placeholder="placeholder"
+        required
+        @input="$emit('input', $event.target.value)"
+        @keyup.enter="enterPressed"
+        class="adt-text-block__input"
+        :class="{ error: !!errorText }"
       />
       <label class="adt-text-block__label">
         {{ label }}
         <span v-if="required" class="adt-text-block__required">*</span>
       </label>
-      <div class="adt-text-block__icon desktop" v-if="clearable && value && value.length > 0"
-           @click="$emit('input', '')">
-        <svg width="12" height="12" fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="clearIcon">
-          <path d="M2 2l12 12m0-12L2 14" stroke="#2C3E50" stroke-linecap="round" stroke-linejoin="round"></path>
+      <div
+        class="adt-text-block__icon desktop"
+        v-if="clearable && value && value.length > 0"
+        @click="$emit('input', '')"
+      >
+        <svg
+          width="12"
+          height="12"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 16 16"
+          id="clearIcon"
+        >
+          <path
+            d="M2 2l12 12m0-12L2 14"
+            stroke="#2C3E50"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          ></path>
         </svg>
       </div>
     </div>
     <div class="adt-text-block__error" v-if="!!errorText">
-      <svg width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon__attention">
-        <path d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z" fill="#FF2E43"/>
-        <path d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z" fill="#FF2E43"/>
-        <circle cx="8" cy="8" r="7" stroke="#FF2E43"/>
+      <svg
+        width="14"
+        height="14"
+        viewBox="0 0 16 16"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        id="icon__attention"
+      >
+        <path
+          d="M8.5 4C8.5 3.72386 8.27614 3.5 8 3.5C7.72386 3.5 7.5 3.72386 7.5 4H8.5ZM7.5 9C7.5 9.27614 7.72386 9.5 8 9.5C8.27614 9.5 8.5 9.27614 8.5 9H7.5ZM7.5 4V9H8.5V4H7.5Z"
+          fill="#FF2E43"
+        />
+        <path
+          d="M8.5 11C8.5 10.7239 8.27614 10.5 8 10.5C7.72386 10.5 7.5 10.7239 7.5 11H8.5ZM7.5 11.5C7.5 11.7761 7.72386 12 8 12C8.27614 12 8.5 11.7761 8.5 11.5H7.5ZM7.5 11V11.5H8.5V11H7.5Z"
+          fill="#FF2E43"
+        />
+        <circle cx="8" cy="8" r="7" stroke="#FF2E43" />
       </svg>
       {{ errorText }}
     </div>
   </div>
 </template>
 <script>
-import '../../assets/style.scss';
-import { VueMaskDirective } from "v-mask";
+import "../../assets/style.scss";
 
 export default {
   name: "TextField",
-  directives: {
-    mask: VueMaskDirective
-  },
   props: {
     errorText: {
       type: String,
-      default: ""
+      default: "",
     },
     label: {
       type: String,
@@ -56,38 +79,41 @@ export default {
       type: String,
       default: "text",
     },
-    mask: {
+    value: {
       type: String,
-      default: ""
+      default: "",
     },
     placeholder: {
       type: String,
-      default: ""
+      default: "",
     },
     clearable: {
       type: Boolean,
-      default: false
+      default: false,
     },
     required: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
       showPlaceholder: false,
-      value: ""
-    }
+    };
   },
   computed: {
     inputPlaceholder() {
-      return this.showPlaceholder ? this.placeholder : ""
-    }
+      return this.showPlaceholder ? this.placeholder : "";
+    },
   },
   methods: {
-    pressedEnter() {
-      this.$emit('enterPressed', this.value);
-    }
-  }
-}
+    enterPressed() {
+      this.$emit("enterPressed", this.showAutocomplete);
+    },
+    inputHandler(e) {
+      this.$emit("input", e.target.value);
+      this.showAutocomplete = true;
+    },
+  },
+};
 </script>

package/src/components/index.js

@@ -1,24 +1,26 @@
-import Vue from 'vue'
-import AButton from './Button/AButton'
-import ATextField from './TextField/TextField'
-import APasswordField from './PasswordField/PasswordField'
-import AAlert from './Alert/Alert'
-import AHeader from './Header/Header'
-import AFooter from './Footer/Footer'
-import ASearchTextField from './SearchTextField/SearchTextField'
+import Vue from "vue";
+import AButton from "./Button/AButton";
+import ATextField from "./TextField/TextField";
+import APasswordField from "./PasswordField/PasswordField";
+import AAlert from "./Alert/Alert";
+import AHeader from "./Header/Header";
+import AFooter from "./Footer/Footer";
+import ASearchTextField from "./SearchTextField/SearchTextField";
+import AMailTo from "./MailTo/MailTo";
 
 const Components = {
-    AButton,
-    ATextField,
-    APasswordField,
-    AAlert,
-    AHeader,
-    AFooter,
-    ASearchTextField
+  AButton,
+  ATextField,
+  APasswordField,
+  AAlert,
+  AHeader,
+  AFooter,
+  ASearchTextField,
+  AMailTo,
 };
 
-Object.keys(Components).forEach(name => {
-    Vue.component(name, Components[name]);
+Object.keys(Components).forEach((name) => {
+  Vue.component(name, Components[name]);
 });
 
 export default Components;

package/src/configs/profileDropDown.js

@@ -2,21 +2,27 @@ export const profileDropDown = [
     {
         id: 1,
         name: "Общие настройки",
-        url: "https://adata.kz/profile?tab=general",
+        dev: "https://adtdev.kz/profile?tab=general",
+        staging: "https://adada.kz/profile?tab=general",
+        prod: "https://adata.kz/profile?tab=general",
         disabled: false,
         withoutArray: true
     },
     {
         id: 2,
         name: "Увеличить лимит запросов",
-        url: "https://adata.kz/profile?tab=tariffs",
+        dev: "https://adtdev.kz/profile?tab=tariffs",
+        staging: "https://adada.kz/profile?tab=tariffs",
+        prod: "https://adata.kz/profile?tab=tariffs",
         disabled: false,
         withoutArray: true
     },
     {
         id: 3,
         name: "Текущий баланс: 0 ₸",
-        url: "https://adata.kz/profile?tab=tariffs",
+        dev: "https://adtdev.kz/profile?tab=tariffs",
+        staging: "https://adada.kz/profile?tab=tariffs",
+        prod: "https://adata.kz/profile?tab=tariffs",
         link: "Пополнить",
         disabled: true,
         withoutArray: true
@@ -24,7 +30,9 @@ export const profileDropDown = [
     {
         id: 4,
         name: "Историй платежей",
-        url: "https://adata.kz/profile?tab=payments",
+        dev: "https://adtdev.kz/profile?tab=payments",
+        staging: "https://adada.kz/profile?tab=payments",
+        prod: "https://adata.kz/profile?tab=payments",
         disabled: false,
         withoutArray: true
     },
@@ -36,12 +44,16 @@ export const profileDropDown = [
             {
                 id: 8,
                 name: "Избранные",
-                url: "https://pk.adata.kz/profile/favorites"
+                dev: "https://pk.adtdev.kz/profile/favorites",
+                staging: "https://pk.adada.kz/profile/favorites",
+                prod: "https://pk.adata.kz/profile/favorites"
             },
             {
                 id: 9,
                 name: "История просмотров",
-                url: "https://pk.adata.kz/profile/browsing-history"
+                dev: "https://pk.adtdev.kz/profile/browsing-history",
+                staging: "https://pk.adada.kz/profile/browsing-history",
+                prod: "https://pk.adata.kz/profile/browsing-history"
             }
         ],
         disabled: false
@@ -54,7 +66,9 @@ export const profileDropDown = [
             {
                 id: 10,
                 name: "Профиль",
-                url: "https://work.adata.kz/profile/account"
+                dev: "https://work.adtdev.kz/profile/account",
+                staging: "https://work.adada.kz/profile/account",
+                prod: "https://work.adata.kz/profile/account"
             },
             // {
             //     id: 11,
@@ -64,12 +78,16 @@ export const profileDropDown = [
             {
                 id: 12,
                 name: "Отклики",
-                url: "https://work.adata.kz/profile/application"
+                dev: "https://work.adtdev.kz/profile/application",
+                staging: "https://work.adada.kz/profile/application",
+                prod: "https://work.adata.kz/profile/application",
             },
             {
                 id: 13,
                 name: "Предложения",
-                url: "https://work.adata.kz/profile/offer"
+                dev: "https://work.adtdev.kz/profile/offer",
+                staging: "https://work.adada.kz/profile/offer",
+                prod: "https://work.adata.kz/profile/offer"
             }
         ],
         disabled: false
@@ -82,12 +100,16 @@ export const profileDropDown = [
             {
                 id: 17,
                 name: "Шаблоны поиска",
-                url: "https://tender.adata.kz/profile/search-profile"
+                dev: "https://tender.adtdev.kz/profile/search-profile",
+                staging: "https://tender.adada.kz/profile/search-profile",
+                prod: "https://tender.adata.kz/profile/search-profile",
             },
             {
                 id: 17,
                 name: "Избранные",
-                url: "https://tender.adata.kz/profile/favourites"
+                dev: "https://tender.adtdev.kz/profile/favourites",
+                staging: "https://tender.adada.kz/profile/favourites",
+                prod: "https://tender.adata.kz/profile/favourites"
             }
         ],
         disabled: false