adata-ui 2.1.26 → 2.1.28

package/components/features/dropdown/ADropdown.vue

@@ -5,10 +5,12 @@ type Placement = 'left' | 'right'
 
 interface Props {
   placement: Placement
+  fullWidth?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  placement: "right"
+  placement: "right",
+  fullWidth: false,
 })
 
 const expanded = ref(false)
@@ -88,6 +90,7 @@ onMounted(() => {
         ref="card"
         v-if="expanded"
         class="absolute z-20 mt-5 lg:mt-4 shadow-md rounded-[0.5rem] top-[44px] lg:top-[initial]"
+        :class="{ 'w-full': fullWidth }"
       >
         <slot
           name="content"

package/components/navigation/footer/AFooter.vue

@@ -51,7 +51,7 @@ const socialMedia = [
 
 const mainLinks = computed(() => ({
   services: {
-    title: t('footer.services'),
+    title: t('footer.productsAndSolutions'),
     link: buildLocalizedUrl(locale.value, urls.landing, PAGES.allServices),
     items: [
       [
@@ -74,6 +74,7 @@ const mainLinks = computed(() => ({
         {
           title: t('footer.zakupki.title'),
           link: urls.zakupki + PAGES.tender.main,
+          isNew: true
         }
       ],
       [
@@ -120,6 +121,10 @@ const mainLinks = computed(() => ({
           title: t('footer.info.counterparty'),
           link: buildLocalizedUrl(locale.value, urls.pk, PAGES.pk.counterparty),
         },
+        {
+          title: t('footer.info.onlineServices'),
+          link: buildLocalizedUrl(locale.value, urls.pk, PAGES.services + '/taxpayer'),
+        },
       ]
     ]
   }

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 = [
@@ -24,16 +24,22 @@ const navs: any = [
     label: 'header.navs.tariffs',
     to: landing + PAGES.tariffs
   },
-  {
-    label: 'header.navs.api',
-    to: landing + PAGES.api
-  },
-  {
-    label: 'header.navs.services',
-    to: landing + PAGES.services
-  }
+  // {
+  //   label: 'header.navs.api',
+  //   to: landing + PAGES.api
+  // },
 ]
 
+// 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)
@@ -69,12 +75,13 @@ const toggleMenu = (index: number) => {
     if (pageUrl.hostname.includes('edo')) code = '?code=edo'
 
     navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.tariffs + code, target: '_blank' })
-  } else if (index === 3) {
-    navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.api, target: '_blank' })
-  }
-  else if (index === 4) {
-    navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.services, target: '_blank' })
   }
+  // else if (index === 3) {
+  //   navigateToLocalizedPage({ locale, projectUrl: landing, path: PAGES.api, target: '_blank' })
+  // }
+  // else if (index === 4) {
+  //   navigateToLocalizedPage({ locale, projectUrl: pk, path: PAGES.services + '/kgd', target: '_blank' })
+  // }
   else {
     currentMenu.value = currentMenuToShow(index)
     const prev = currentIndex.value

package/lang/en.ts

@@ -352,6 +352,7 @@ const EnLocale: RuLocale = {
     },
   },
   footer: {
+    productsAndSolutions: 'Products and Solutions',
     services: 'Services',
     useful: 'Useful',
     contacts: {
@@ -369,6 +370,7 @@ const EnLocale: RuLocale = {
       vacancy: 'Vacancies',
       counterparty: 'Enterprise Catalog',
       contacts: 'Contacts',
+      onlineServices: 'Online services',
     },
     counterparties: {
       title: 'Counterparties',

package/lang/kk.ts

@@ -353,6 +353,7 @@ const KkLocale: RuLocale = {
     },
   },
   footer: {
+    productsAndSolutions: 'Өнімдер мен шешімдер',
     services: 'Қызметтер',
     useful: 'Пайдалы',
     contacts: {
@@ -370,6 +371,7 @@ const KkLocale: RuLocale = {
       vacancy: 'Бос орындар',
       counterparty: 'Кәсіпорындар каталогы',
       contacts: 'Байланыс',
+      onlineServices: 'Онлайн қызметтер',
     },
     counterparties: {
       title: 'Контрагенттер',

package/lang/ru.ts

@@ -352,6 +352,7 @@ const RuLocale = {
     },
   },
   footer: {
+    productsAndSolutions: 'Продукты и решения',
     services: 'Сервисы',
     useful: 'Полезное',
     contacts: {
@@ -369,6 +370,7 @@ const RuLocale = {
       vacancy: 'Вакансии',
       counterparty: 'Каталог предприятий',
       contacts: 'Контакты',
+      onlineServices: 'Онлайн сервисы',
     },
     counterparties: {
       title: 'Контрагенты',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.26",
+  "version": "2.1.28",
   "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',