adata-ui 0.3.69 → 0.3.71

package/package.json

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

package/src/components/BottomNavigationBar/ABottomNavigationBar.vue

@@ -28,7 +28,10 @@
         </div>
         <div class="bottom-navigation__title">Избранные</div>
       </component>
-      <a :href="loginUrl" v-else>
+      <a
+        @click="goAuth"
+        v-else
+      >
         <div class="bottom-navigation__icon">
           <a-nav-icon icon-name="sign" class="ic-24"/>
         </div>
@@ -99,12 +102,18 @@ export default {
             this.$emit("close")
           }
         })
-      })
+      }, {passive: true })
     })
   },
   methods: {
     handleClick() {
       this.$emit("click-menu")
+    },
+    goAuth() {
+      const fullPath = encodeURIComponent(window.location.toString());
+      if (window) {
+        window.location.href = `${this.loginUrl}?url=${fullPath}`;
+      }
     }
   }
 }

package/src/components/Header/Header.vue

@@ -648,10 +648,10 @@ export default {
         },
         {
           id: 5,
-          name: "Маркетинг",
-          dev: "https://marketing.adtdev.kz",
-          prod: "https://marketing.adata.kz",
-          staging: "https://marketing.adada.kz",
+          name: "Аналитика",
+          dev: "https://analytics.adtdev.kz",
+          prod: "https://analytics.adata.kz",
+          staging: "https://analytics.adada.kz",
           key: "marketing",
           children: [
             {

package/src/components/ServiceSlider/AServiceSlider.vue

@@ -467,12 +467,12 @@ export default {
               "</linearGradient>\n" +
               "</defs>\n" +
               "</svg>\n",
-          title: "Маркетинг",
+          title: "Аналитика",
           module: "marketing",
           url: {
-            dev: 'https://marketing.adtdev.kz',
-            staging: 'https://marketing.adada.kz',
-            prod: 'https://marketing.adata.kz',
+            dev: 'https://analytics.adtdev.kz',
+            staging: 'https://analytics.adada.kz',
+            prod: 'https://analytics.adata.kz',
           },
           links: [
             {
@@ -520,12 +520,12 @@ export default {
       if (e) {
         const currentModule = this.navigations.some((nav) => nav.module === this.module)
         if (currentModule) {
-          document.querySelector(`#services-navs #${this.module}`).click()
+          document.querySelector(`#services-navs #${this.module}`,{ passive: true }).click()
         }
-        document.html.style.overflowY = "hidden"
+        document.documentElement.style.overflowY = "hidden"
       } else {
         this.showPanelMenu = false
-        document.html.style.overflowY = "auto"
+        document.documentElement.style.overflowY = "auto"
       }
     },
     $route() {
@@ -537,9 +537,9 @@ export default {
     await this.fetchCurrencies()
   },
   mounted() {
-    this.$refs.arrow.addEventListener("touchstart", evt => this.touchstart(evt))
-    this.$refs.arrow.addEventListener("touchmove", evt => this.touchmove(evt))
-    this.$refs.arrow.addEventListener("touchend", () => this.touchend())
+    this.$refs.arrow.addEventListener("touchstart", evt => this.touchstart(evt), {passive: true})
+    this.$refs.arrow.addEventListener("touchmove", evt => this.touchmove(evt), {passive: true})
+    this.$refs.arrow.addEventListener("touchend", () => this.touchend(), {passive: true})
   },
   methods: {
     goTo(module) {

package/src/components/newComponents/FooterNew/FooterItem.vue

@@ -38,7 +38,7 @@ export default {
 
     window.addEventListener('resize', () => {
       this.checkWidth()
-    })
+    }, {passive: true})
   },
   methods: {
     checkWidth() {

package/src/components/newComponents/FooterNew/FooterTop.vue

@@ -50,7 +50,7 @@ export default {
       workTitle: 'Работа',
       tenderTitle: 'Тендеры',
       avtoTitle: 'Штрафы',
-      marketingTitle: 'Маркетинг',
+      marketingTitle: 'Аналитика',
       main: {
         dev: "adtdev.kz",
         prod: "adata.kz",
@@ -166,27 +166,27 @@ export default {
         {
           id: 1,
           text: 'Поиск клиентов',
-          link: `https://marketing.${this.environment}/unload-data`
+          link: `https://analytics.${this.environment}/unload-data`
         },
         {
           id: 2,
           text: 'Анализ закупок',
-          link: `https://marketing.${this.environment}/purchasing-analysis`
+          link: `https://analytics.${this.environment}/purchasing-analysis`
         },
         {
           id: 3,
           text: 'Индекс деловой активности',
-          link: `https://marketing.${this.environment}/business-activity`
+          link: `https://analytics.${this.environment}/business-activity`
         },
         {
           id: 4,
           text: 'Рейтинг налогоплательщиков',
-          link: `https://marketing.${this.environment}/tax-payment`
+          link: `https://analytics.${this.environment}/tax-payment`
         },
         {
           id: 5,
           text: 'Субъекты бизнеса',
-          link: `https://marketing.${this.environment}/business-entities`
+          link: `https://analytics.${this.environment}/business-entities`
         },
       ]
     }
@@ -246,10 +246,11 @@ export default {
     gap: 32px;
     justify-content: flex-end;
     max-width: 1140px;
-    margin: 0 auto;
-    padding: 0px 0 20px;
+    margin: 0 calc((100vw - 1180px) / 2);
+    padding: 0px 20px 20px 0;
     @media (max-width: 1140px) {
       justify-content: flex-start;
+      margin: 0 auto;
       gap: 16px;
       padding: 0 16px 20px
     }