adata-ui 2.0.24 → 2.0.26

package/.nuxtrc

@@ -1 +1 @@
-typescript.includeWorkspace = true
+typescript.includeWorkspace = true

package/.playground/app.config.ts

@@ -1,5 +1,5 @@
-export default defineAppConfig({
-  myLayer: {
-    name: 'My amazing Nuxt layer (overwritten)'
-  }
-})
+export default defineAppConfig({
+  myLayer: {
+    name: 'My amazing Nuxt layer (overwritten)'
+  }
+})

package/README.md

@@ -1,75 +1,75 @@
-# Adata UI with Nuxt 3 using Layers
-
-Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
-
-## Setup
-
-Make sure to install the dependencies:
-
-```bash
-# npm
-npm install
-
-# pnpm
-pnpm install
-
-# yarn
-yarn install
-
-# bun
-bun install
-```
-
-## Development Server
-
-Start the development server on `https://localhost:3000`:
-
-```bash
-# npm
-npm run dev
-
-# pnpm
-pnpm run dev
-
-# yarn
-yarn dev
-
-# bun
-bun run dev
-```
-
-## Production
-
-Build the application for production:
-
-```bash
-# npm
-npm run build
-
-# pnpm
-pnpm run build
-
-# yarn
-yarn build
-
-# bun
-bun run build
-```
-
-Locally preview production build:
-
-```bash
-# npm
-npm run preview
-
-# pnpm
-pnpm run preview
-
-# yarn
-yarn preview
-
-# bun
-bun run preview
-```
-
-Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information.
+# Adata UI with Nuxt 3 using Layers
+
+Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
+
+## Setup
+
+Make sure to install the dependencies:
+
+```bash
+# npm
+npm install
+
+# pnpm
+pnpm install
+
+# yarn
+yarn install
+
+# bun
+bun install
+```
+
+## Development Server
+
+Start the development server on `https://localhost:3000`:
+
+```bash
+# npm
+npm run dev
+
+# pnpm
+pnpm run dev
+
+# yarn
+yarn dev
+
+# bun
+bun run dev
+```
+
+## Production
+
+Build the application for production:
+
+```bash
+# npm
+npm run build
+
+# pnpm
+pnpm run build
+
+# yarn
+yarn build
+
+# bun
+bun run build
+```
+
+Locally preview production build:
+
+```bash
+# npm
+npm run preview
+
+# pnpm
+pnpm run preview
+
+# yarn
+yarn preview
+
+# bun
+bun run preview
+```
+
+Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information.

package/components/elements/README.md

@@ -1 +1 @@
-# button, alerts, dropdown
+# button, alerts, dropdown

package/components/forms/README.md

@@ -1 +1 @@
-# inputs
+# inputs

package/components/modals/AConfirmationEmail.vue

@@ -1,40 +1,40 @@
-<script setup lang="ts">
-const emit = defineEmits<{
-  (e: 'resend'): void
-  (e: 'close'): void
-}>()
-</script>
-
-<template>
-  <div class="flex flex-col justify-center items-center gap-5">
-    <p class="heading-02">
-      {{ $t('login.modal.title') }}
-    </p>
-    <a-ill-mail />
-    <p class="body-400 text-center">
-      {{ $t('login.modal.subtitle1') }}
-    </p>
-    <p class="body-400 text-center">
-      {{ $t('login.modal.confirmationEmail') }}
-    </p>
-    <div class="flex flex-col gap-2 w-full">
-      <a-button
-        class="w-full"
-        view="outline"
-        @click="emit('close')"
-      >
-        {{ $t('login.modal.back') }}
-      </a-button>
-      <a-button
-        class="w-full"
-        @click="emit('resend')"
-      >
-        {{ $t('login.modal.resend') }}
-      </a-button>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+const emit = defineEmits<{
+  (e: 'resend'): void
+  (e: 'close'): void
+}>()
+</script>
+
+<template>
+  <div class="flex flex-col justify-center items-center gap-5">
+    <p class="heading-02">
+      {{ $t('login.modal.title') }}
+    </p>
+    <a-ill-mail />
+    <p class="body-400 text-center">
+      {{ $t('login.modal.subtitle1') }}
+    </p>
+    <p class="body-400 text-center">
+      {{ $t('login.modal.confirmationEmail') }}
+    </p>
+    <div class="flex flex-col gap-2 w-full">
+      <a-button
+        class="w-full"
+        view="outline"
+        @click="emit('close')"
+      >
+        {{ $t('login.modal.back') }}
+      </a-button>
+      <a-button
+        class="w-full"
+        @click="emit('resend')"
+      >
+        {{ $t('login.modal.resend') }}
+      </a-button>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/components/modals/ContentNavigationModal.vue

@@ -26,6 +26,7 @@ import {useCurrentModule} from "#adata-ui/composables/projectState";
 import IconCalc from '#adata-ui/icons/calculator.vue'
 import { buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
 import { AIconFiles } from '#components'
+import MapPinRect from '#adata-ui/icons/map/map-pin-rect.vue'
 type Emits = {
   (e: 'pushMain'): void
 }
@@ -37,6 +38,10 @@ const emits = defineEmits<Emits>()
 
 
 const tabOptions = [
+  {
+    name: 'header.products.edo.label',
+    key: 'edo',
+  },
   {
     name: 'header.products.counterparties.label',
     key: 'pk',
@@ -49,14 +54,14 @@ const tabOptions = [
     name: 'header.products.tenders.label',
     key: 'tenders',
   },
-  {
-    name: 'header.products.fines.label',
-    key: 'fines',
-  },
   {
     name: 'header.products.analytics.label',
     key: 'analytics',
   },
+  {
+    name: 'header.products.fines.label',
+    key: 'fines',
+  },
   {
     name: 'header.products.fea.label',
     key: 'fea',
@@ -65,12 +70,15 @@ const tabOptions = [
     name: 'header.products.compliance.label',
     key: 'compliance',
   },
-  {
-    name: 'header.products.edo.label',
-    key: 'edo',
-  }
 ]
 const sideLinks = <any>{
+  edo: [
+    {
+      label: 'header.products.edo.label',
+      icon: AIconFiles,
+      link: 'https://edo.adata.kz' + PAGES.edo.l
+    }
+  ],
   pk: [
     {
       icon: IconSearch,
@@ -147,23 +155,6 @@ const sideLinks = <any>{
       link: myLayer.tenderUrl + PAGES.tender.plans
     }
   ],
-  fines: [
-    {
-      icon: IconCheckCircle,
-      label: 'header.products.fines.items.fines.title',
-      link: myLayer.avtoUrl + PAGES.fines.main
-    },
-    {
-      icon: IconCar,
-      label: 'header.products.fines.items.auto.title',
-      link: myLayer.avtoUrl + PAGES.fines.avto
-    },
-    {
-      icon: IconTruck,
-      label: 'header.products.fines.items.wholesaleAuto.title',
-      link: myLayer.avtoUrl + PAGES.fines.bulk
-    }
-  ],
   analytics: [
     // {
     //   icon: IconSearch,
@@ -191,6 +182,23 @@ const sideLinks = <any>{
       link: myLayer.analyticsNewUrl + PAGES.analytics.rating
     }
   ],
+  fines: [
+    {
+      icon: IconCheckCircle,
+      label: 'header.products.fines.items.fines.title',
+      link: myLayer.avtoUrl + PAGES.fines.main
+    },
+    {
+      icon: IconCar,
+      label: 'header.products.fines.items.auto.title',
+      link: myLayer.avtoUrl + PAGES.fines.avto
+    },
+    {
+      icon: IconTruck,
+      label: 'header.products.fines.items.wholesaleAuto.title',
+      link: myLayer.avtoUrl + PAGES.fines.bulk
+    }
+  ],
   fea: [
     {
       label: 'header.products.fea.items.i.t',
@@ -216,6 +224,11 @@ const sideLinks = <any>{
       label: 'header.products.fea.items.tr.t',
       icon: IconGlobe,
       link: `${myLayer.tnvedUrl}${PAGES.fea.tr}`
+    },
+    {
+      label: 'header.products.fea.items.importerMap.t',
+      icon: MapPinRect,
+      link: `${myLayer.tnvedUrl}${PAGES.fea.importerMap}`
     }
   ],
   compliance: [
@@ -225,13 +238,6 @@ const sideLinks = <any>{
       link: myLayer.complianceUrl + PAGES.compliance.l
     }
   ],
-  edo: [
-    {
-      label: 'header.products.edo.label',
-      icon: AIconFiles,
-      link: 'https://edo.adata.kz' + PAGES.edo.l
-    }
-  ]
 }
 const currentLinks = ref(sideLinks[tab.value])
 

package/components/modals/Resend.vue

@@ -1,81 +1,81 @@
-<script setup lang="ts">
-
-const emit = defineEmits<{
-  (e: 'resend'): void
-  (e: 'close'): void
-}>()
-
-const timer = ref(60)
-const isResend = ref(false)
-const route = useRoute()
-const appConfig = useAppConfig()
-const landingUrl = appConfig.myLayer.landingUrl
-
-function runTimer() {
-  timer.value = 60
-  const intervalId = setInterval(() => {
-    if (timer.value <= 0) {
-      isResend.value = true
-      clearInterval(intervalId);
-      return;
-    }
-    timer.value--;
-  }, 1000);
-}
-
-onMounted(() => resend())
-
-const resend = () => {
-  isResend.value = false
-  runTimer()
-  emit('resend')
-}
-const goToMain = () => {
-  if (route.query.url) {
-    document.location.replace(route.query.url)
-  } else {
-    document.location.replace(landingUrl)
-  }
-  emit('close')
-
-}
-</script>
-
-<template>
-  <div class="flex flex-col justify-center items-center gap-5">
-    <p class="heading-02">
-      {{ $t('login.modal.title') }}
-    </p>
-    <a-ill-mail />
-    <p class="body-400 text-center">
-      {{ $t('login.modal.subtitle1') }}
-    </p>
-    <p class="body-400 text-center">
-      {{ $t('login.modal.subtitle2') }}
-    </p>
-    <p
-      v-if="!isResend"
-      class="heading-02"
-    >
-      {{ timer }} {{ $t('login.modal.seconds') }}
-    </p>
-    <a-button
-      v-else
-      class="w-full"
-      view="outline"
-      @click="resend"
-    >
-      {{ $t('login.modal.resend') }}
-    </a-button>
-    <a-button
-      class="w-full"
-      @click="goToMain"
-    >
-      {{ $t('login.modal.back') }}
-    </a-button>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+
+const emit = defineEmits<{
+  (e: 'resend'): void
+  (e: 'close'): void
+}>()
+
+const timer = ref(60)
+const isResend = ref(false)
+const route = useRoute()
+const appConfig = useAppConfig()
+const landingUrl = appConfig.myLayer.landingUrl
+
+function runTimer() {
+  timer.value = 60
+  const intervalId = setInterval(() => {
+    if (timer.value <= 0) {
+      isResend.value = true
+      clearInterval(intervalId);
+      return;
+    }
+    timer.value--;
+  }, 1000);
+}
+
+onMounted(() => resend())
+
+const resend = () => {
+  isResend.value = false
+  runTimer()
+  emit('resend')
+}
+const goToMain = () => {
+  if (route.query.url) {
+    document.location.replace(route.query.url)
+  } else {
+    document.location.replace(landingUrl)
+  }
+  emit('close')
+
+}
+</script>
+
+<template>
+  <div class="flex flex-col justify-center items-center gap-5">
+    <p class="heading-02">
+      {{ $t('login.modal.title') }}
+    </p>
+    <a-ill-mail />
+    <p class="body-400 text-center">
+      {{ $t('login.modal.subtitle1') }}
+    </p>
+    <p class="body-400 text-center">
+      {{ $t('login.modal.subtitle2') }}
+    </p>
+    <p
+      v-if="!isResend"
+      class="heading-02"
+    >
+      {{ timer }} {{ $t('login.modal.seconds') }}
+    </p>
+    <a-button
+      v-else
+      class="w-full"
+      view="outline"
+      @click="resend"
+    >
+      {{ $t('login.modal.resend') }}
+    </a-button>
+    <a-button
+      class="w-full"
+      @click="goToMain"
+    >
+      {{ $t('login.modal.back') }}
+    </a-button>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/components/modals/id/IdConfirmAccountOtpModal.vue

@@ -0,0 +1,147 @@
+<script setup lang="ts">
+import OtpInput from '#adata-ui/components/modals/two-factor/otp-input.vue'
+import { useAuthStore } from '#adata-ui/stores/auth.store'
+
+const { $toast } = useNuxtApp()
+const { t, locale } = useI18n()
+const { commonAuth } = useAppConfig()
+
+const authStore = useAuthStore()
+const { intermediateState } = storeToRefs(authStore)
+
+const { confirmAccountOtpModal, confirmSuccessfulModal } = useIdModals()
+
+const authApiURL = commonAuth.authApiURL
+
+const otp = ref(['', '', '', '', '', ''])
+const otpFormatted = computed(() => {
+  return otp.value.join('')
+})
+const showError = ref(false)
+const isLoading = ref(false)
+
+async function onResend() {
+  try {
+    await $fetch(`${authApiURL}/email/resend-otp`, {
+      method: 'GET',
+      credentials: 'include',
+      headers: {
+        lang: locale.value,
+      },
+      body: {
+        email: intermediateState.value.email,
+      },
+    })
+    runTimer()
+  }
+  catch (error) {
+    $toast.error(error.data)
+  }
+}
+
+async function onConfirm() {
+  try {
+    isLoading.value = true
+
+    await $fetch(`${authApiURL}/email/verify-otp`, {
+      method: 'GET',
+      credentials: 'include',
+      headers: {
+        lang: locale.value,
+      },
+      params: {
+        email: intermediateState.value.email,
+        otp_code: otpFormatted.value,
+      },
+    })
+
+    confirmAccountOtpModal.value = false
+    confirmSuccessfulModal.value = true
+  }
+  catch (error) {
+    showError.value = true
+    $toast.error(error.data.message)
+  }
+  finally {
+    isLoading.value = false
+  }
+}
+
+function onClose() {
+  otp.value = ['', '', '', '', '', '']
+  showError.value = false
+  confirmAccountOtpModal.value = false
+}
+
+const timer = ref(60)
+
+function runTimer() {
+  const intervalId = setInterval(() => {
+    if (!timer.value) clearInterval(intervalId)
+    return timer.value--
+  }, 1000)
+}
+
+function handleEnter(e: KeyboardEvent) {
+  if (e.key === 'Enter') {
+    onConfirm()
+  }
+}
+
+onMounted(() => {
+  runTimer()
+  document.addEventListener('keyup', handleEnter)
+})
+
+onBeforeUnmount(() => {
+  document.removeEventListener('keyup', handleEnter)
+})
+</script>
+
+<template>
+  <div class="flex flex-col items-center gap-4 text-center">
+    <h2 class="text-2xl font-bold">
+      {{ t('register.modal.title') }}
+    </h2>
+
+    <a-icon-hand-with-phone-light class="size-32 dark:hidden" />
+    <a-icon-hand-with-phone-dark class="hidden size-32 dark:block" />
+
+    <div class="text-sm">
+      <p class="mb-1">
+        {{ t('modals.id.resetPasswordOtp.content') }}
+      </p>
+
+      <div v-if="timer > 0" class="text-2xl font-bold">
+        {{ timer }} {{ t('register.modal.seconds') }}
+      </div>
+      <button
+        v-else
+        class="text-blue-700 dark:text-blue-500"
+        @click="onResend"
+      >
+        {{ t('actions.resend') }}
+      </button>
+    </div>
+
+    <otp-input v-model="otp" v-model:error="showError" />
+
+    <div class="flex w-full gap-2">
+      <a-button
+        block
+        view="outline"
+        @click="onClose"
+      >
+        {{ t('actions.close') }}
+      </a-button>
+      <a-button
+        block
+        :loading="isLoading"
+        :disabled="otpFormatted.length < 6"
+        @click="onConfirm"
+      >
+        {{ t('actions.confirm') }}
+      </a-button>
+    </div>
+  </div>
+</template>