adata-ui 2.1.27 → 2.1.29

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/modals/Resend.vue

@@ -7,13 +7,13 @@ const emit = defineEmits<{
   (e: 'close'): void
 }>()
 
-const timer = ref(60)
+const timer = ref(120)
 const isResend = ref(false)
 const route = useRoute()
 const { landing } = useUrls()
 
 function runTimer() {
-  timer.value = 60
+  timer.value = 120
   const intervalId = setInterval(() => {
     if (timer.value <= 0) {
       isResend.value = true

package/components/modals/id/IdConfirmAccountOtpModal.vue

@@ -116,10 +116,10 @@ async function onResend() {
   }
 }
 
-const timer = ref(60)
+const timer = ref(120)
 
 function runTimer() {
-  timer.value = 60
+  timer.value = 120
   const intervalId = setInterval(() => {
     if (!timer.value) clearInterval(intervalId)
     return timer.value--

package/components/modals/id/IdResetPasswordOtpModal.vue

@@ -86,10 +86,10 @@ function handleEnter(e: KeyboardEvent) {
   }
 }
 
-const timer = ref(60)
+const timer = ref(120)
 
 function runTimer() {
-  timer.value = 60
+  timer.value = 120
   const intervalId = setInterval(() => {
     if (!timer.value) clearInterval(intervalId)
     return timer.value--

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/AHeader.vue

@@ -93,7 +93,7 @@ async function fetchContacts() {
   }
 }
 
-onBeforeMount(() => {
+onMounted(() => {
   fetchContacts()
 })
 </script>

package/components/navigation/header/HeaderLink.vue

@@ -24,21 +24,21 @@ const navs: any = [
     label: 'header.navs.tariffs',
     to: landing + PAGES.tariffs
   },
-  {
-    label: 'header.navs.api',
-    to: landing + PAGES.api
-  },
+  // {
+  //   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 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)
@@ -75,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: pk, path: PAGES.services + '/kgd', 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/components/navigation/header/TopHeader.vue

@@ -104,7 +104,7 @@ const fetchNotification = async () => {
   }
 }
 
-onBeforeMount(() => {
+onMounted(() => {
   fetchNotification()
   fetchCurrencies()
 })
@@ -117,66 +117,68 @@ const closeMessage = () => {
 
 <template>
   <div class="min-h-[40px]" :class="[isOpenNotification && systemMessage ? '' : 'hidden lg:block']">
-    <transition name="fade">
-      <div
-        v-if="isOpenNotification && systemMessage"
-        class="bg-[#FFF5E6] px-2 py-3 text-[#FCA204] dark:bg-[#161617] md:px-0"
-      >
-        <div class="a-container flex items-center justify-between">
-          <div class="flex items-center gap-2">
-            <a-icon-info-circle
-              class="max-h-[16px] w-full max-w-[16px] stroke-orange-500 dark:stroke-orange-500"
+    <client-only>
+      <transition name="fade">
+        <div
+          v-if="isOpenNotification && systemMessage"
+          class="bg-[#FFF5E6] px-2 py-3 text-[#FCA204] dark:bg-[#161617] md:px-0"
+        >
+          <div class="a-container flex items-center justify-between">
+            <div class="flex items-center gap-2">
+              <a-icon-info-circle
+                class="max-h-[16px] w-full max-w-[16px] stroke-orange-500 dark:stroke-orange-500"
+              />
+              <span class="text-sm font-semibold text-orange-500">{{ systemMessage }}</span>
+            </div>
+            <a-icon-x-mark
+              class="max-h-[16px] w-full max-w-[16px] cursor-pointer stroke-orange-500"
+              @click="closeMessage"
             />
-            <span class="text-sm font-semibold text-orange-500">{{ systemMessage }}</span>
           </div>
-          <a-icon-x-mark
-            class="max-h-[16px] w-full max-w-[16px] cursor-pointer stroke-orange-500"
-            @click="closeMessage"
-          />
         </div>
-      </div>
-    </transition>
-    <div
-      v-if="!isOpenNotification || !systemMessage"
-      class="hidden min-h-10 bg-gray-50 dark:bg-gray-950 lg:block"
-    >
-      <div class="a-container flex justify-between py-2 items-center text-sm">
-        <div class="flex items-center leading-[24px]">
-          <div v-for="currency in currencies" :key="currency.currency" class="mr-4 flex gap-2">
-            <div class="flex items-center">
-              <component
-                :is="Symbols[currency.currency]"
-                class="mr-2 size-4 rounded-sm border border-solid border-[#E0E3E6] dark:border-[#2B2B2C]"
-              />
-              {{ currency.buy }}
-              <div :class="computedClass(currency.sell_state)">
-                <arrow-currency />
+      </transition>
+      <div
+        v-if="!isOpenNotification || !systemMessage"
+        class="hidden min-h-10 bg-gray-50 dark:bg-gray-950 lg:block"
+      >
+        <div class="a-container flex justify-between py-2 items-center text-sm">
+          <div class="flex items-center leading-[24px]">
+            <div v-for="currency in currencies" :key="currency.currency" class="mr-4 flex gap-2">
+              <div class="flex items-center">
+                <component
+                  :is="Symbols[currency.currency]"
+                  class="mr-2 size-4 rounded-sm border border-solid border-[#E0E3E6] dark:border-[#2B2B2C]"
+                />
+                {{ currency.buy }}
+                <div :class="computedClass(currency.sell_state)">
+                  <arrow-currency />
+                </div>
               </div>
-            </div>
-            <div class="flex items-center">
-              {{ currency.sell }}
-              <div :class="computedClass(currency.sell_state)">
-                <arrow-currency />
+              <div class="flex items-center">
+                {{ currency.sell }}
+                <div :class="computedClass(currency.sell_state)">
+                  <arrow-currency />
+                </div>
               </div>
             </div>
           </div>
-        </div>
-        <div v-if="isAuthenticated" class="flex items-center gap-5">
-          <div v-if="limitRemaining != null || limitRemaining != undefined">
-            <span class="mr-2 text-xs">{{ t('header.top.requestLimit') }}</span>
-            <a-status-badge size="sm">
-              {{ limitRemaining }}
-            </a-status-badge>
-          </div>
-          <div v-if="daysRemaining">
-            <span class="mr-2 text-xs">{{ t('header.top.daysLeft') }}</span>
-            <a-status-badge size="sm">
-              {{ daysRemaining }}
-            </a-status-badge>
+          <div v-if="isAuthenticated" class="flex items-center gap-5">
+            <div v-if="limitRemaining != null || limitRemaining != undefined">
+              <span class="mr-2 text-xs">{{ t('header.top.requestLimit') }}</span>
+              <a-status-badge size="sm">
+                {{ limitRemaining }}
+              </a-status-badge>
+            </div>
+            <div v-if="daysRemaining">
+              <span class="mr-2 text-xs">{{ t('header.top.daysLeft') }}</span>
+              <a-status-badge size="sm">
+                {{ daysRemaining }}
+              </a-status-badge>
+            </div>
           </div>
         </div>
       </div>
-    </div>
+    </client-only>
   </div>
 </template>
 

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.27",
+  "version": "2.1.29",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",