adata-ui 2.0.70 → 2.0.72

package/components/navigation/header/AHeader.vue

@@ -11,6 +11,7 @@ import Arrow from '#adata-ui/icons/chevron/chevron-down.vue'
 import Logo from '#adata-ui/icons/logo.vue'
 import { buildLocalizedUrl, navigateToLocalizedPage } from '#adata-ui/utils/localizedNavigation'
 import HeaderLink from './HeaderLink.vue'
+import { useUrls } from '#adata-ui/composables/useUrls'
 
 defineOptions({ name: 'AHeader' })
 
@@ -47,6 +48,7 @@ const { locale } = useI18n()
 useCurrentModule().value = props.module
 const appConfig = useAppConfig()
 const { myLayer }: any = useAppConfig()
+const urls = useUrls()
 
 const langIsOn = appConfig.myLayer.langIsOn
 const contacts = ref(useContacts())
@@ -63,7 +65,7 @@ function goAuth() {
 
       navigateToLocalizedPage({
         locale,
-        projectUrl: myLayer.loginUrl.slice(0, -1),
+        projectUrl: urls.login,
         path: `/?url=${fullPath}`,
         target: '_self',
       })
@@ -75,7 +77,7 @@ function goAuth() {
 }
 
 function goToAnotherModule() {
-  location.href = buildLocalizedUrl(locale.value, myLayer.landingUrl, '')
+  location.href = buildLocalizedUrl(locale.value, urls.landing, '')
 }
 
 async function fetchContacts() {

package/components/navigation/header/CardGallery.vue

@@ -2,8 +2,9 @@
 import { AIconArrowCircleDown, AIconGlobe, AIconId, AIconArrowSideUp } from '#components'
 import { PAGES } from '#adata-ui/shared/constans/pages'
 import { buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
+import { useUrls } from '#adata-ui/composables/useUrls'
 
-const { myLayer } = useAppConfig()
+const urls = useUrls()
 const { t, locale } = useI18n()
 const colorMode = useColorMode()
 const computedColorMode = computed(() => colorMode.value)
@@ -13,21 +14,21 @@ const items = computed(()=>{
     {
       title: 'header.products.galleryCards.unload.title',
       subtitle: 'header.products.galleryCards.unload.subtitle',
-      to: buildLocalizedUrl(locale, myLayer.pkUrl, PAGES.pk.unload),
+      to: buildLocalizedUrl(locale, urls.pk, PAGES.pk.unload),
       image: '/header/unload.webp',
       icon: AIconArrowCircleDown,
     },
     {
       title: 'header.products.galleryCards.compliance.title',
       subtitle: 'header.products.galleryCards.compliance.subtitle',
-      to: buildLocalizedUrl(locale, myLayer.complianceUrl, PAGES.compliance.l),
+      to: buildLocalizedUrl(locale, urls.compliance, PAGES.compliance.l),
       image: '/header/compliance.webp',
       icon: AIconId,
     },
     {
       title: 'header.products.galleryCards.ved.title',
       subtitle: 'header.products.galleryCards.ved.subtitle',
-      to: buildLocalizedUrl(locale, myLayer.tnvedUrl),
+      to: buildLocalizedUrl(locale, urls.tnved),
       image: '/header/ved.webp',
       icon: AIconGlobe,
     },

package/components/navigation/header/HeaderLink.vue

@@ -6,22 +6,27 @@ import ProductMenu from '#adata-ui/components/navigation/header/ProductMenu.vue'
 
 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 { myLayer }: any = useAppConfig()
+const { landing } = useUrls()
 const { t, locale } = useI18n()
 
 const navs: any = [
   {
     label: 'header.navs.products',
-    to: myLayer.landingUrl + PAGES.totalServices
+    to: landing + PAGES.totalServices
   },
   {
     label: 'header.navs.contacts',
-    to: myLayer.landingUrl + PAGES.contacts
+    to: landing + PAGES.contacts
   },
   {
     label: 'header.navs.tariffs',
-    to: myLayer.landingUrl + PAGES.tariffs
+    to: landing + PAGES.tariffs
+  },
+  {
+    label: 'header.navs.api',
+    to: landing + PAGES.api
   }
 ]
 
@@ -47,7 +52,9 @@ const currentMenuToShow = (index) => {
 }
 const toggleMenu = (index: number) => {
   if (index === 2) {
-    window.open(buildLocalizedUrl(locale, myLayer.landingUrl, PAGES.tariffs), '_blank')
+    window.open(buildLocalizedUrl(locale, landing, PAGES.tariffs), '_blank')
+  } else if (index === 3) {
+    window.open(buildLocalizedUrl(locale, landing, PAGES.api), '_blank')
   } else {
     currentMenu.value = currentMenuToShow(index)
     const prev = currentIndex.value
@@ -76,7 +83,7 @@ const closeMenu = (forceClose = false) => {
   }
 }
 const onMenuMouseEnter = (index: number) => {
-  if (index !== 2) {
+  if (![2, 3].includes(index)) {
     if (show.value === false) {
       delayTimer.value = setTimeout(() => {
         toggleMenu(index)
@@ -168,7 +175,7 @@ watch(
               v-show="show"
               :animation="forward ? 'next' : 'prev'"
               :index="currentIndex"
-              :url="buildLocalizedUrl(locale, myLayer.landingUrl, PAGES.contacts)"
+              :url="buildLocalizedUrl(locale, landing, PAGES.contacts)"
               @outer-click="closeMenu(true)"
               @mouse-over="closeMenu"
             />

package/components/navigation/mobile-navigation/AMobileNavigation.vue

@@ -7,6 +7,7 @@ import ProfileMenu from '#adata-ui/components/navigation/header/ProfileMenu.vue'
 import type { ProjectKeys } from '#adata-ui/components/navigation/header/types'
 import { useCurrentModule } from '#adata-ui/composables/projectState'
 import AModal from "#adata-ui/components/overlays/modal/AModal.vue";
+import { useUrls } from '#adata-ui/composables/useUrls'
 
 interface Props {
   replenish?: string
@@ -31,8 +32,7 @@ const props = withDefaults(defineProps<Props>(), {
 })
 const emit = defineEmits(['logout'])
 useCurrentModule().value = props.module
-const appConfig = useAppConfig()
-const landingUrl = appConfig.myLayer.landingUrl
+const { landing } = useUrls()
 const activeModule = ref<string | null>(null)
 const isMain = ref(false)
 const isContacts = ref(false)
@@ -62,7 +62,7 @@ watch(activeModule, (e) => {
   } else if (e === 'profile') {
     isProfile.value = true
   } else if (e === 'tariff') {
-    navigateTo(`${landingUrl}/tariffs`, { external: true })
+    navigateTo(`${landing}/tariffs`, { external: true })
   }
   activeModule.value = ''
 })

package/components/navigation/side-navigation/ASideNavigation.vue

@@ -24,6 +24,7 @@ import IconMedal from "#adata-ui/icons/medal.vue";
 
 import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'
 import {PAGES} from "#adata-ui/shared/constans/pages";
+import { useUrls } from '#adata-ui/composables/useUrls'
 
 type Modules = 'counterparty' | 'work' | 'tender' | 'fines' | 'analytics'
 
@@ -43,6 +44,7 @@ const props = withDefaults(defineProps<Props>(), {
   zIndex: 'auto'
 })
 const { myLayer }: any = useAppConfig()
+const urls = useUrls()
 
 const activeModule = ref<Modules | null>(null)
 const bottom = ref<HTMLElement | null>(null)
@@ -98,37 +100,37 @@ const sideLinks = {
     {
       icon: IconSearch,
       label: "Проверка контрагентов",
-      link: myLayer.pkUrl + PAGES.pk.main
+      link: urls.pk + PAGES.pk.main
     },
     {
       icon: IconScales,
       label: "Сравнение контрагентов",
-      link: myLayer.counterParty ?  myLayer.pkUrl + myLayer.counterParty + PAGES.pk.compare : myLayer.pkUrl + PAGES.pk.compare
+      link: myLayer.counterParty ?  urls.pk + myLayer.counterParty + PAGES.pk.compare : urls.pk + PAGES.pk.compare
     },
     {
       icon: IconLink,
       label: "Косвенные связи",
-      link: myLayer.counterParty ?  myLayer.pkUrl + myLayer.counterParty + '/search-connections/check' : myLayer.pkUrl + PAGES.pk.connections
+      link: myLayer.counterParty ?  urls.pk + myLayer.counterParty + '/search-connections/check' : urls.pk + PAGES.pk.connections
     },
     {
       icon: IconUsers,
       label: "Массовая проверка",
-      link: myLayer.counterParty ?  myLayer.pkUrl + myLayer.counterParty + PAGES.pk.employees : myLayer.pkUrl + PAGES.pk.employees
+      link: myLayer.counterParty ?  urls.pk + myLayer.counterParty + PAGES.pk.employees : urls.pk + PAGES.pk.employees
     },
     {
       icon: IconGlobe,
       label: "Зарубежные контрагенты",
-      link: myLayer.pkUrl + PAGES.pk.foreign
+      link: urls.pk + PAGES.pk.foreign
     },
     {
       icon: IconBlock,
       label: "Санкции",
-      link: myLayer.counterParty ?  myLayer.pkUrl + myLayer.counterParty + PAGES.pk.sanctions : myLayer.pkUrl + PAGES.pk.sanctions
+      link: myLayer.counterParty ?  urls.pk + myLayer.counterParty + PAGES.pk.sanctions : urls.pk + PAGES.pk.sanctions
     },
     {
       icon: IconDollar,
       label: "Офшоры",
-      link: myLayer.counterParty ?  myLayer.pkUrl + myLayer.counterParty + PAGES.pk.offshore : myLayer.pkUrl + PAGES.pk.offshore
+      link: myLayer.counterParty ?  urls.pk + myLayer.counterParty + PAGES.pk.offshore : urls.pk + PAGES.pk.offshore
     },
     {
       icon: IconDocument,
@@ -138,80 +140,80 @@ const sideLinks = {
     {
       icon: IconArrowCircle,
       label: "Выгрузка данных",
-      link: myLayer.pkUrl + PAGES.pk.unload
+      link: urls.pk + PAGES.pk.unload
     }
   ],
   work: [
     {
       icon: IconWork,
       label: "Вакансии",
-      link: myLayer.workUrl + PAGES.work.vacancy
+      link: urls.work + PAGES.work.vacancy
     },
     {
       icon: IconDocument,
       label: "Резюме",
-      link: myLayer.workUrl + PAGES.work.summary
+      link: urls.work + PAGES.work.summary
     },
   ],
   tender: [
     {
       icon: IconSearch,
       label: "Поиск тендеров",
-      link: myLayer.tenderUrl + PAGES.tender.main
+      link: urls.tender + PAGES.tender.main
     },
     {
       icon: IconFile,
       label: "Поиск договоров",
-      link: myLayer.tenderUrl + PAGES.tender.contracts
+      link: urls.tender + PAGES.tender.contracts
     },
     {
       icon: IconCheck,
       label: "Планы закупок",
-      link: myLayer.tenderUrl + PAGES.tender.plans
+      link: urls.tender + PAGES.tender.plans
     }
   ],
   fines: [
     {
       icon: IconCheckCircle,
       label: "Проверка штрафов",
-      link: myLayer.avtoUrl + PAGES.fines.main
+      link: urls.avto + PAGES.fines.main
     },
     {
       icon: IconCar,
       label: "Проверка авто",
-      link: myLayer.avtoUrl + PAGES.fines.avto
+      link: urls.avto + PAGES.fines.avto
     },
     {
       icon: IconTruck,
       label: "Массовая проверка авто",
-      link: myLayer.avtoUrl + PAGES.fines.bulk
+      link: urls.avto + PAGES.fines.bulk
     }
   ],
   analytics: [
     {
       icon: IconSearch,
       label: "Поиск клиентов",
-      link: myLayer.analyticsUrl + PAGES.analytics.clients
+      link: urls.analytics + PAGES.analytics.clients
     },
     {
       icon: IconCheck,
       label: "Анализ закупок",
-      link: myLayer.analyticsUrl + PAGES.analytics.analysis
+      link: urls.analytics + PAGES.analytics.analysis
     },
     {
       icon: IconArrowGraph,
       label: "Индекс деловой активности",
-      link: myLayer.analyticsUrl + PAGES.analytics.index
+      link: urls.analytics + PAGES.analytics.index
     },
     {
       icon: IconCompany,
       label: "Субьекты бизнеса",
-      link: myLayer.analyticsUrl + PAGES.analytics.business
+      link: urls.analytics + PAGES.analytics.business
     },
     {
       icon: IconMedal,
       label: "Рейтинг налогоплательщиков",
-      link: myLayer.analyticsUrl + PAGES.analytics.rating
+      link: urls.analytics + PAGES.analytics.rating
     }
   ],
 }