adata-ui 2.1.0 → 2.1.2

package/components/forms/request-demo/ARequestDemo.vue

@@ -49,12 +49,16 @@ function onSend() {
   <div class="rounded-[20px] bg-blue-700 dark:bg-[#1B98E2] p-4 dark:bg-blue-500 lg:p-8">
     <div class="flex w-full flex-col gap-4 lg:flex-row lg:justify-between">
       <div class="flex flex-col gap-4 text-white dark:text-gray-900 lg:max-w-[50%] lg:gap-6">
-        <p class="md:text-[32px] text-[24px]  font-bold">
-          {{ title || t('forms.request_demo.title') }}
-        </p>
-        <p class="text-base">
-          {{ description || t('forms.request_demo.info') }}
-        </p>
+        <slot name="title">
+          <p class="md:text-[32px] text-[24px]  font-bold">
+            {{ title || t('forms.request_demo.title') }}
+          </p>
+        </slot>
+        <slot name="description">
+          <p class="text-base whitespace-pre-line">
+            {{ description || t('forms.request_demo.info') }}
+          </p>
+        </slot>
       </div>
       <div class="rounded-[20px] bg-white p-6 dark:bg-gray-900 lg:w-[456px]">
         <div class="flex flex-col gap-4">
@@ -62,17 +66,22 @@ function onSend() {
             <div class="flex flex-col gap-4">
               <a-input-standard
                 v-model="form.sender_name"
+                required
                 :label="t('forms.demo.n')"
                 :error="getError('sender_name')"
               />
               <a-input-standard
                 v-model="form.email"
+                required
                 :label="t('forms.demo.e')"
                 :error="getError('email')"
                 type="email"
               />
               <a-input-standard
                 v-model="form.phone_number"
+                v-maska
+                required
+                data-maska="8 (###) ###-##-##"
                 :label="t('forms.demo.p')"
                 :error="getError('phone_number')"
                 type="tel"
@@ -80,7 +89,12 @@ function onSend() {
             </div>
           </slot>
           <div>
-            <a-button @click="onSend">{{ t('forms.request_demo.send') }}</a-button>
+            <a-button
+              block
+              @click="onSend"
+            >
+              {{ t('forms.request_demo.send') }}
+            </a-button>
           </div>
         </div>
       </div>

package/components/modals/AConfirmationEmail.vue

@@ -0,0 +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>

package/components/modals/AnotherDeviceModal.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
 import { useAnotherDeviceModal } from '#adata-ui/composables/modalsState'
+import { useUrls } from '#adata-ui/composables/useUrls'
 const { t, locale } = useI18n()
 const localePath = useLocalePath()
 
 const isOpen = useAnotherDeviceModal()
-const { myLayer }: any = useAppConfig()
+const { landing } = useUrls()
 
 function onClose() {
   isOpen.value = false
@@ -47,7 +48,7 @@ function onClose() {
         </a-button>
         <a-button
           class="w-full"
-          :to="buildLocalizedUrl(locale, myLayer.landingUrl)"
+          :to="buildLocalizedUrl(locale, landing)"
         >
           {{ t('modals.buttons.toMain') }}
         </a-button>

package/components/modals/ConnectingTariffModal.vue

@@ -34,7 +34,6 @@ if (props.deleteFromDom) {
   <a-modal
     v-model="isOpen"
     name="connecting-tariff"
-    :prevent-close="true"
   >
     <div class="flex flex-col gap-5">
       <p class="heading-02 text-center">

package/components/modals/ContentNavigationModal.vue

@@ -25,87 +25,117 @@ import Connections from "#adata-ui/icons/sviazi.vue";
 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 {
+  AIconAkimat,
+  AIconCurrencyTenge,
+  AIconExcelIcon,
+  AIconFiles, AIconSearch,
+  AIconUsers,
+  AIconWarningTriangle
+} from '#components'
+import MapPinRect from '#adata-ui/icons/map/map-pin-rect.vue'
+import ChartBar from '#adata-ui/icons/chart-bar.vue'
+import Bank from '#adata-ui/icons/bank.vue'
+import { useUrls } from '#adata-ui/composables/useUrls'
+import MapPaper from '#adata-ui/icons/map-paper.vue'
+import AiAssistant from '#adata-ui/icons/ai-assistant.vue'
+import Tasks from '#adata-ui/icons/tasks.vue'
+import HotLine from '#adata-ui/icons/hot-line.vue'
+import Sanctions from '#adata-ui/icons/sanctions.vue'
+import CheckSb from '#adata-ui/icons/check-sb.vue'
 type Emits = {
   (e: 'pushMain'): void
 }
 const isOpen = ref(false)
 const tab = ref(useCurrentModule().value)
 const { myLayer }: any = useAppConfig()
-const { t } = useI18n()
-const emits = defineEmits<Emits>()
+const urls = useUrls()
 
+const { t, locale } = useI18n()
+const emits = defineEmits<Emits>()
+const mode = myLayer.mode
 
 const tabOptions = [
   {
     name: 'header.products.counterparties.label',
     key: 'pk',
   },
-  {
-    name: 'header.products.jobs.label',
-    key: 'work',
-  },
-  {
-    name: 'header.products.tenders.label',
-    key: 'tenders',
-  },
   {
     name: 'header.products.fines.label',
     key: 'fines',
   },
   {
-    name: 'header.products.analytics.label',
-    key: 'analytics',
+    name: 'header.products.jobs.label',
+    key: 'work',
   },
   {
     name: 'header.products.fea.label',
     key: 'fea',
   },
   {
-    name: 'header.products.compliance.label',
-    key: 'compliance',
+    name: 'header.products.tenders.label',
+    key: 'tenders',
   },
   {
     name: 'header.products.edo.label',
     key: 'edo',
-  }
+  },
+  {
+    name: 'header.products.compliance.label',
+    key: 'compliance',
+  },
+
+  {
+    name: 'header.products.analytics.label',
+    key: 'analytics',
+  },
+
+
+
 ]
 const sideLinks = <any>{
+  edo: [
+    {
+      label: 'header.products.edo.label',
+      icon: AIconFiles,
+      link: urls.edo + PAGES.edo.l
+    }
+  ],
   pk: [
     {
       icon: IconSearch,
       label: 'header.products.counterparties.items.counterparty.title',
-      link: myLayer.pkUrl + PAGES.pk.main
+      link: urls.pk + PAGES.pk.main
     },
     {
       icon: IconScales,
       label: 'header.products.counterparties.items.compare.title',
-      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: 'header.products.counterparties.items.networks.title',
-      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: 'header.products.counterparties.items.wholesale.title',
-      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: 'header.products.counterparties.items.foreign.title',
-      link: myLayer.pkUrl + PAGES.pk.foreign
+      link: urls.pk + PAGES.pk.foreign
     },
     {
       icon: IconBlock,
       label: 'header.products.counterparties.items.sanction.title',
-      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: 'header.products.counterparties.items.offshore.title',
-      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,
@@ -115,53 +145,51 @@ const sideLinks = <any>{
     {
       icon: IconArrowCircle,
       label: 'header.products.counterparties.items.unloading.title',
-      link: myLayer.pkUrl + PAGES.pk.unload
+      link: urls.pk + PAGES.pk.unload
     }
   ],
   work: [
     {
       icon: IconWork,
       label: 'header.products.jobs.items.vacancies.title',
-      link: myLayer.workUrl + PAGES.work.vacancy
+      link: urls.work + PAGES.work.vacancy
     },
     {
       icon: IconDocument,
       label: 'header.products.jobs.items.resume.title',
-      link: myLayer.workUrl + PAGES.work.summary
+      link: urls.work + PAGES.work.summary
     },
   ],
   tenders: [
     {
-      icon: IconSearch,
-      label: 'header.products.tenders.items.tenders.title',
-      link: myLayer.tenderUrl + PAGES.tender.main
+      icon: AIconUsers,
+      label: t('header.products.tenders.items.customers.title'),
+      link: urls.zakupki + PAGES.tender.customers,
     },
     {
-      icon: IconFile,
-      label: 'header.products.tenders.items.contracts.title',
-      link: myLayer.tenderUrl + PAGES.tender.contracts
+      icon: AIconAkimat,
+      label: t('header.products.tenders.items.akimat.title'),
+      link: urls.zakupki + PAGES.tender.akimat,
     },
     {
-      icon: IconCheck,
-      label: 'header.products.tenders.items.procurement.title',
-      link: myLayer.tenderUrl + PAGES.tender.plans
-    }
-  ],
-  fines: [
+      icon: AIconWarningTriangle,
+      label: 'header.products.tenders.items.tru.title',
+      link: urls.zakupki + PAGES.tender.tru
+    },
     {
-      icon: IconCheckCircle,
-      label: 'header.products.fines.items.fines.title',
-      link: myLayer.avtoUrl + PAGES.fines.main
+      icon: AIconCurrencyTenge,
+      label: 'header.products.tenders.items.price.title',
+      link: urls.zakupki + PAGES.tender.price
     },
     {
-      icon: IconCar,
-      label: 'header.products.fines.items.auto.title',
-      link: myLayer.avtoUrl + PAGES.fines.avto
+      icon: AIconExcelIcon,
+      label: 'header.products.tenders.items.constructor.title',
+      link: urls.zakupki + PAGES.tender.constructor
     },
     {
-      icon: IconTruck,
-      label: 'header.products.fines.items.wholesaleAuto.title',
-      link: myLayer.avtoUrl + PAGES.fines.bulk
+      icon: AIconSearch,
+      label: 'header.products.tenders.items.monitoring.title',
+      link: urls.tender
     }
   ],
   analytics: [
@@ -170,66 +198,111 @@ const sideLinks = <any>{
     //   label: 'header.products.analytics.items.clients.title',
     //   link: myLayer.analyticsUrl + PAGES.analytics.clients
     // },
-    {
-      icon: IconCheck,
-      label: 'header.products.analytics.items.procurement.title',
-      link: myLayer.analyticsNewUrl + PAGES.analytics.main
-    },
+    // {
+    //   icon: IconCheck,
+    //   label: 'header.products.analytics.items.procurement.title',
+    //   link: urls.analyticsNew + PAGES.analytics.main
+    // },
     {
       icon: IconArrowGraph,
       label: 'header.products.analytics.items.activity.title',
-      link: myLayer.analyticsNewUrl + PAGES.analytics.index
+      link: urls.analyticsNew + PAGES.analytics.index
     },
     {
       icon: IconCompany,
       label: 'header.products.analytics.items.subjects.title',
-      link: myLayer.analyticsNewUrl + PAGES.analytics.business
+      link: urls.analyticsNew + PAGES.analytics.business
     },
     {
       icon: IconMedal,
       label: 'header.products.analytics.items.rate.title',
-      link: myLayer.analyticsNewUrl + PAGES.analytics.rating
+      link: urls.analyticsNew + PAGES.analytics.rating
     }
   ],
+  fines: [
+    {
+      icon: IconCheckCircle,
+      label: 'header.products.fines.items.fines.title',
+      link: urls.avto + PAGES.fines.main
+    },
+    {
+      icon: IconCar,
+      label: 'header.products.fines.items.auto.title',
+      link: urls.avto + 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',
       icon: IconSearch,
-      link: `${myLayer.tnvedUrl}${PAGES.fea.t}`
+      link: `${urls.tnved}${PAGES.fea.t}`
     },
     {
       label: 'header.products.fea.items.o.t',
       icon: Connections,
-      link: `${myLayer.tnvedUrl}${PAGES.fea.o}`
+      link: `${urls.tnved}${PAGES.fea.o}`
     },
     {
       label: 'header.products.fea.items.cp.t',
       icon: IconFile,
-      link: `${myLayer.tnvedUrl}${PAGES.fea.cp}`
+      link: `${urls.tnved}${PAGES.fea.cp}`
     },
     {
       label: 'header.products.fea.items.ca.t',
       icon: IconCalc,
-      link: `${myLayer.tnvedUrl}${PAGES.fea.ca}`
+      link: `${urls.tnved}${PAGES.fea.ca}`
     },
     {
       label: 'header.products.fea.items.tr.t',
       icon: IconGlobe,
-      link: `${myLayer.tnvedUrl}${PAGES.fea.tr}`
+      link: `${urls.tnved}${PAGES.fea.tr}`
+    },
+    {
+      label: 'header.products.fea.items.importerMap.t',
+      icon: MapPinRect,
+      link: `${urls.tnved}${PAGES.fea.importerMap}`
+    },
+    {
+      label: 'header.products.fea.items.containers.t',
+      icon: MapPaper,
+      link: `${urls.tnved}${PAGES.fea.containers}`
     }
   ],
   compliance: [
     {
-      label: 'header.products.compliance.label',
+      label: 'header.products.compliance.items.assistant.t',
+      icon: AiAssistant,
+      link: urls.compliancemain + PAGES.compliance.assistant
+    },
+    {
+      label: 'header.products.compliance.items.inspection.t',
+      icon: Tasks,
+      link: urls.compliancemain + PAGES.compliance.inspection
+    },
+    {
+      label: 'header.products.compliance.items.hotline.t',
+      icon: HotLine,
+      link: urls.compliancemain + PAGES.compliance.hotline
+    },
+    {
+      label: 'header.products.compliance.items.sanctions.t',
+      icon: Sanctions,
+      link: urls.compliancemain + PAGES.compliance.sanctions
+    },
+    {
+      label: 'header.products.compliance.items.suppliers.t',
       icon: IconProfile,
-      link: myLayer.complianceUrl + PAGES.compliance.l
-    }
-  ],
-  edo: [
+      link: urls.compliancemain + PAGES.compliance.suppliers
+    },
     {
-      label: 'header.products.edo.label',
-      icon: AIconFiles,
-      link: 'https://edo.adata.kz' + PAGES.edo.l
+      label: 'header.products.compliance.items.sb.t',
+      icon: CheckSb,
+      link: urls.compliancemain + PAGES.compliance.sb
     }
   ]
 }
@@ -247,15 +320,15 @@ watch(tab, (e) => {
   <a-modal v-model="isOpen" :title="t('modals.mobile_navigation.type_main')">
     <div class="flex flex-col gap-5">
       <div class="h-[1px] w-full bg-deepblue-900/5"/>
-     <div>
-       <a-pill-tabs v-model="tab" :options="tabOptions" view="gray"/>
-     </div>
+      <div>
+        <a-pill-tabs v-model="tab" :options="tabOptions" view="gray"/>
+      </div>
       <div class="h-[40vh] sm:h-[300px] overflow-auto no-scrollbar">
         <nuxt-link
-            v-for="item in currentLinks"
-            :key="item.label"
-            :to="item.link"
-            class="flex items-center gap-4 px-4 py-3 bg-gray-50 dark:bg-gray-800 mb-2 rounded"
+          v-for="item in currentLinks"
+          :key="item.label"
+          :to="item.link"
+          class="flex items-center gap-4 px-4 py-3 bg-gray-50 dark:bg-gray-800 mb-2 rounded"
         >
           <div class="bg-gradient-blue p-1 rounded-lg">
             <component

package/components/modals/Insufficient-funds-modal.vue

@@ -15,10 +15,14 @@ const { t } = useI18n()
 interface Props {
   deleteFromDom?: boolean
 }
+const { topUpSidePanel } = usePayment()
+
 const isOpen = defineModel<boolean>({ default: false })
 const userInfo = useState<UserInfo>('user-info', () => ({}))
+
 function confirm() {
-  emit('next')
+  isOpen.value = false
+  topUpSidePanel.value = true
 }
 function cancel() {
   isOpen.value = false
@@ -33,7 +37,6 @@ if (props.deleteFromDom) {
   <a-modal
     v-model="isOpen"
     name="insufficient-funds"
-    :prevent-close="true"
   >
     <div class="flex flex-col gap-5">
       <p class="heading-02 text-center">

package/components/modals/LimitReachedModal.vue

@@ -1,13 +1,14 @@
 <script setup lang="ts">
 
+import { useUrls } from '#adata-ui/composables/useUrls'
+
 const { t } = useI18n()
 const isOpen = useLimitReachedModal()
-const appConfig = useAppConfig()
-const loginUrl = appConfig.myLayer.landingUrl
+const { login } = useUrls()
 
 function goTariffs() {
   if (window) {
-    window.location.href = `${loginUrl}/tariffs`
+    window.location.href = `${login}/tariffs`
   }
 }
 </script>

package/components/modals/ReportBugModal.vue

@@ -4,8 +4,8 @@ import * as z from 'zod'
 import { useUIValidation } from '#adata-ui/composables/useUIValidation'
 
 const props = defineProps<{
-  name: string
-  email: string
+  name?: string
+  email?: string
 }>()
 
 const emit = defineEmits<{
@@ -16,7 +16,7 @@ const { t } = useI18n()
 
 const mask = new Mask({ mask: '# (###) ### ## ##' })
 
-const isOpen = defineModel<boolean>('isOpen', { required: true })
+const isOpen = defineModel<boolean>()
 const form: any = reactive({
   name: '',
   email: '',

package/components/modals/Resend.vue

@@ -0,0 +1,82 @@
+<script setup lang="ts">
+
+import { useUrls } from '#adata-ui/composables/useUrls'
+
+const emit = defineEmits<{
+  (e: 'resend'): void
+  (e: 'close'): void
+}>()
+
+const timer = ref(60)
+const isResend = ref(false)
+const route = useRoute()
+const { landing } = useUrls()
+
+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(landing)
+  }
+  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/SubmitApplicationModal.vue

@@ -64,11 +64,13 @@ defineExpose({
           v-model="form.name"
           :label="t('modals.submit_application_modal.labels.name')"
           :error="getError('name')"
+          required
         />
         <a-input-standard
           v-model="form.email"
           :label="t('modals.submit_application_modal.labels.email')"
           :error="getError('email')"
+          required
         />
         <a-input-standard
           v-model="form.phone"
@@ -83,6 +85,8 @@ defineExpose({
           v-model="form.comment"
           :label="t('modals.submit_application_modal.labels.comment')"
           :error="getError('comment')"
+          resizeable="none"
+          required
         />
       </div>
     </div>