adata-ui 0.1.91 → 0.1.94

package/package.json

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

package/src/components/Button/AButton.vue

@@ -9,6 +9,7 @@
     v-on="$listeners"
     :is="url ? 'a' : nuxtUrl ? 'nuxt-link' : 'button'"
     :href="url"
+    :to="nuxtUrl"
     :event="event ? 'click' : ''"
     :disabled="disabled"
   >
@@ -146,8 +147,8 @@ export default {
   }
 
   &_yellow {
-    background: linear-gradient(236.46deg, #FFE364 -2.39%, #FBC920 79.1%);
-    color: #333333;
+    background: linear-gradient(140.08deg, #FFE15A 13.59%, #FBC920 85.57%);
+    color: #2C3E50;
 
     &:hover {
       background: #FBC920;

package/src/components/Footer/Footer.vue

@@ -105,9 +105,8 @@ a {
 .a-footer {
   background: #BDC7CE4C;
   font-size: 14px;
-  margin-top: 20px;
+  margin-top: 0;
   @media(max-width: 1025px) {
-    background: #F6F6F7;
     &.paddinged {
       padding-bottom: 60px;
     }
@@ -119,11 +118,14 @@ a {
     max-width: 900px;
     width: 100%;
     margin: 0 auto;
-    padding: 20px 24px;
+    padding: 19px 21px;
     @media(max-width: 1025px) {
       flex-direction: column;
       padding: 16px 16px;
     }
+    @media(max-width: 560px) {
+      padding: 26px 17px;
+    }
 
     .adata-logo {
       display: none;
@@ -134,6 +136,9 @@ a {
           height: 24px;
         }
       }
+      @media(max-width: 560px) {
+        margin-bottom: 24px;
+      }
     }
 
     .nav {
@@ -147,6 +152,10 @@ a {
         column-gap: 15px;
         row-gap: 15px;
       }
+      @media(max-width: 560px) {
+        gap: 0;
+        grid-template-columns: 1fr;
+      }
 
       &__link {
         line-height: 19px;
@@ -154,6 +163,9 @@ a {
         @media(max-width: 1025px) {
           font-size: 12px;
         }
+        @media(max-width: 560px) {
+          margin-bottom: 21px;
+        }
 
         &:hover {
           color: #9da3ac;
@@ -175,6 +187,10 @@ a {
         margin-left: 0;
         order: 0;
       }
+      @media (max-width: 560px) {
+        order: 1;
+        margin-top: 5px;
+      }
 
       a {
         display: flex;
@@ -233,18 +249,21 @@ a {
 
   &__bottom {
     text-align: center;
-    padding: 11.5px 0 13px;
+    padding: 14px 0 13px;
     border: 1px solid #BDC7CE;
     @media(max-width: 1025px) {
-      background: #EFEFF0;
+      background: #BDC7CE4D;
       border: none;
       border-top: 1px solid #bdc7ce;
     }
+    @media(max-width: 560px) {
+      padding: 10px 0;
+    }
 
     span {
       font-size: 10px;
       line-height: 12px;
-      color: #71757a;
+      color: #2C3E50;
       @media(max-width: 1025px) {
         font-size: 10px;
         line-height: 16px;

package/src/components/Header/Header.vue

@@ -543,20 +543,20 @@ export default {
         },
         {
           id: 2,
-          name: "Тендеры",
-          dev: "https://tender.adtdev.kz",
-          prod: "https://tender.adata.kz",
-          staging: "https://tender.adada.kz",
-          key: "tenders",
-        },
-        {
-          id: 3,
           name: "Работа",
           dev: "https://work.adtdev.kz",
           prod: "https://work.adata.kz",
           staging: "https://work.adada.kz",
           key: "work",
         },
+        {
+          id: 3,
+          name: "Тендеры",
+          dev: "https://tender.adtdev.kz",
+          prod: "https://tender.adata.kz",
+          staging: "https://tender.adada.kz",
+          key: "tenders",
+        },
         {
           id: 4,
           name: "Штрафы",
@@ -597,7 +597,8 @@ export default {
     },
     async fetchNotification() {
       try {
-        const response = await fetch('https://users.adata.kz/api/v1/system-messages/active-list/?module_name=counterparty');
+        const link = `https://users.adata.kz/api/v1/system-messages/active-list/?module_name=${this.activeTabKey}`
+        const response = await fetch(link);
         const {data} = await response.json();
 
         if (data.details.length) {

package/src/components/Header/InfoHeader.vue

@@ -145,7 +145,7 @@
                 <span class="info-header__result info-header__result_circled">{{ requestCount }}</span>
               </div>
               <div class="info-header__inner-item" v-show="daysRemaining === 0 || daysRemaining">
-                <span class="info-header__title">остаток дней</span>
+                <span class="info-header__title">Остаток дней</span>
                 <span class="info-header__result info-header__result_circled">{{ daysRemaining }}</span>
               </div>
             </div>
@@ -275,7 +275,7 @@ export default {
       &-elem {
         display: flex;
         align-items: center;
-        gap: 8px;
+        gap: 20px;
       }
     }
     &__inner-item {

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

@@ -6,9 +6,10 @@ export default {
   template: "<a-mail-to></a-mail-to>",
 };
 
-const Template = () => ({
+const Template = (args, { argTypes }) => ({
   components: { MailTo },
-  template: "<a-mail-to></a-mail-to>",
+  props: Object.keys(argTypes),
+  template: '<mail-to v-bind="$props"></mail-to>',
 });
 
-export const AMailTo = Template.bind({});
+export const AMailTo = Template.bind({});

package/src/components/MailTo/MailTo.vue

@@ -65,8 +65,7 @@
     </div>
     <h2 class="mail__title">Интересует больше данных?</h2>
     <p class="mail__text">
-      Мы обязательно ответим Вам <br />
-      в кратчайшие сроки.
+      Оставьте комментарий мы обязательно ответим <br />Вам в кратчайшие сроки
     </p>
     <form class="mail__form" novalidate>
       <a-text-field
@@ -100,6 +99,7 @@
 
 <script>
 import Loader from "../Loader/Loader.vue";
+
 export default {
   name: "MailToTemplate",
   components: {
@@ -194,7 +194,7 @@ export default {
   }
   &__title {
     font-size: 24px;
-    line-height: 33px;
+    line-height: 32px;
     color: #2c3e50;
     font-weight: 700;
     text-align: center;
@@ -231,10 +231,11 @@ export default {
     z-index: 2;
   }
   &__text {
-    font-size: 16px;
-    line-height: 22px;
+    font-size: 14px;
+    color: #71757A;
+    font-weight: 400;
+    line-height: 20px;
     text-align: center;
-    color: #2c3e50;
     margin-bottom: 16px;
   }
   &__form {