adata-ui 2.1.25 → 2.1.27

package/components/modals/ContentNavigationModal.vue

@@ -206,17 +206,17 @@ const sideLinks = <any>{
     {
       icon: IconArrowGraph,
       label: 'header.products.analytics.items.activity.title',
-      link: urls.analyticsNew + PAGES.analytics.index
+      link: urls.analytics + PAGES.analytics.index
     },
     {
       icon: IconCompany,
       label: 'header.products.analytics.items.subjects.title',
-      link: urls.analyticsNew + PAGES.analytics.business
+      link: urls.analytics + PAGES.analytics.business
     },
     {
       icon: IconMedal,
       label: 'header.products.analytics.items.rate.title',
-      link: urls.analyticsNew + PAGES.analytics.rating
+      link: urls.analytics + PAGES.analytics.rating
     }
   ],
   fines: [

package/components/navigation/footer/AFooter.vue

@@ -69,7 +69,7 @@ const mainLinks = computed(() => ({
         },
         {
           title: t('footer.analytics.title'),
-          link: buildLocalizedUrl(locale.value, urls.analyticsNew, PAGES.analytics.main),
+          link: buildLocalizedUrl(locale.value, urls.analytics, PAGES.analytics.main),
         },
         {
           title: t('footer.zakupki.title'),

package/components/navigation/header/HeaderLink.vue

@@ -8,7 +8,7 @@ import ContactMenu from '#adata-ui/components/navigation/header/ContactMenu.vue'
 import { buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
 import { useUrls } from '#adata-ui/composables/useUrls'
 
-const { landing } = useUrls()
+const { landing, pk } = useUrls()
 const { t, locale } = useI18n()
 
 const navs: any = [
@@ -28,12 +28,18 @@ const navs: any = [
     label: 'header.navs.api',
     to: landing + PAGES.api
   },
-  {
-    label: 'header.navs.services',
-    to: landing + PAGES.services
-  }
 ]
 
+const pageUrl = useRequestURL()
+if (pageUrl.hostname.startsWith('pk')) {
+  navs.push(
+    {
+      label: 'header.navs.services',
+      to: pk + PAGES.services + '/kgd'
+    }
+  )
+}
+
 const menu = ref<HTMLElement | null>(null)
 const isBodyAlreadyLocked = ref<boolean>(false)
 const currentIndex = ref(0)
@@ -63,7 +69,7 @@ const toggleMenu = (index: number) => {
     if (pageUrl.hostname.includes('pk')) code = '?code=pk'
     if (pageUrl.hostname.includes('avto')) code = '?code=auto'
     if (pageUrl.hostname.includes('tnved')) code = '?code=ved'
-    if (pageUrl.hostname.includes('analytics-new')) code = '?code=analytics'
+    if (pageUrl.hostname.includes('analytics')) code = '?code=analytics'
     if (pageUrl.hostname.includes('ac')) code = '?code=compliance'
     if (pageUrl.hostname.includes('zakupki')) code = '?code=procurement'
     if (pageUrl.hostname.includes('edo')) code = '?code=edo'
@@ -73,7 +79,7 @@ const toggleMenu = (index: number) => {
     navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.api, target: '_blank' })
   }
   else if (index === 4) {
-    navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.services, target: '_blank' })
+    navigateToLocalizedPage({ locale, projectUrl: pk, path: PAGES.services + '/kgd', target: '_blank' })
   }
   else {
     currentMenu.value = currentMenuToShow(index)

package/components/navigation/header/ProductMenu.vue

@@ -23,7 +23,7 @@ const filteredItems = useHeaderNavigationLinks()
 
 function isCurrentModule(currentModule: string) {
   if (currentModule === 'fines') return 'avto'
-  if (currentModule === 'analytics') return 'analytics-new'
+  if (currentModule === 'analytics') return 'analytics'
   if (currentModule === 'compliance') return 'ac'
   if (currentModule === 'fea') return 'tnved'
   if (currentModule === 'tenders') return 'zakupki'

package/composables/useHeaderNavigationLinks.ts

@@ -317,7 +317,7 @@ export const useHeaderNavigationLinks = () => {
       {
         key: 'analytics',
         name: t('header.products.analytics.label'),
-        link: buildLocalizedUrl(locale, urls.analyticsNew, ''),
+        link: buildLocalizedUrl(locale, urls.analytics, ''),
         icon: AIconArrowGraphUp,
         items: [
           // {
@@ -330,20 +330,20 @@ export const useHeaderNavigationLinks = () => {
             title: t('header.products.analytics.items.activity.title'),
             subtitle: t('header.products.analytics.items.activity.subtitle'),
             icon: IconArrowGraph,
-            to: buildLocalizedUrl(locale, urls.analyticsNew, PAGES.analytics.index)
+            to: buildLocalizedUrl(locale, urls.analytics, PAGES.analytics.index)
 
           },
           {
             title: t('header.products.analytics.items.rate.title'),
             subtitle: t('header.products.analytics.items.rate.subtitle'),
             icon: IconMedal,
-            to: buildLocalizedUrl(locale, urls.analyticsNew, PAGES.analytics.rating)
+            to: buildLocalizedUrl(locale, urls.analytics, PAGES.analytics.rating)
           },
           {
             title: t('header.products.analytics.items.subjects.title'),
             subtitle: t('header.products.analytics.items.subjects.subtitle'),
             icon: IconCompany,
-            to: buildLocalizedUrl(locale, urls.analyticsNew, PAGES.analytics.business)
+            to: buildLocalizedUrl(locale, urls.analytics, PAGES.analytics.business)
           }
         ]
       },

package/composables/useUrls.ts

@@ -10,8 +10,9 @@ export function useUrls() {
     tender: `https://tender.${mode}.kz`,
     zakupki: `https://zakupki.${mode}.kz`,
     avto: `https://avto.${mode}.kz`,
+    analyticsOld: `https://analytics-old.${mode}.kz`,
     analytics: `https://analytics.${mode}.kz`,
-    analyticsNew: `https://analytics-new.${mode}.kz`,
+    analyticsNew: `https://analytics.${mode}.kz`,
     tnved: `https://tnved.${mode}.kz`,
     edo: `https://edo.${mode}.kz`,
     compliance: `https://ac.${mode}.kz/compliance`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.25",
+  "version": "2.1.27",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/shared/constans/pages.ts

@@ -10,7 +10,7 @@ export const PAGES = {
   favourites: '/favourites',
   totalServices: '/total-services',
   allServices: '/all-services',
-  services: '/counterparty-service',
+  services: '/services',
   profile: {
     index: '/profile',
     security: '/profile/change-password',