adata-ui 2.0.21 → 2.0.23

package/components/{forms/registration/ARegistration.vue → modals/id/IdRegistrationModal.vue}

@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue'
-import { useToggle } from '@vueuse/shared'
+import Accept from '#adata-ui/components/modals/Accept.vue'
 import { PAGES } from '#adata-ui/shared/constans/pages'
+import { useToggle } from '@vueuse/shared'
 
-import Accept from '#adata-ui/components/modals/Accept.vue'
+import { computed, reactive, ref } from 'vue'
 
 import * as z from 'zod'
 
@@ -11,12 +11,11 @@ const { $toast } = useNuxtApp()
 const route = useRoute()
 
 const localePath = useLocalePath()
-const { t, locale} = useI18n()
+const { t, locale } = useI18n()
 const { myLayer, commonAuth }: any = useAppConfig()
 const authApiURL = commonAuth.authApiURL
 const redirectUrl = useCookie('redirect_url')
-const registrationModal = useRegistrationModal()
-const loginModal = useLoginModal()
+const { loginModal, registrationModal } = useIdModals()
 
 export interface RegistrationForm {
   email: string
@@ -76,12 +75,12 @@ async function onSubmit() {
   try {
     loading.value = true
     const { data, message } = await $fetch(`${authApiURL}/register`, {
-      method: "POST",
-      credentials: "include",
+      method: 'POST',
+      credentials: 'include',
       headers: {
         lang: locale.value,
       },
-      body: form
+      body: form,
     })
     if (data) {
       registrationModal.value = false
@@ -110,9 +109,8 @@ function goBack() {
 // });
 
 async function onResend() {
-
-  const emailResend = await fetch(`${authApiURL}/email/resend`,{
-    method: "GET",
+  const emailResend = await fetch(`${authApiURL}/email/resend`, {
+    method: 'GET',
     credentials: 'include',
     headers: {
       lang: locale.value,
@@ -132,7 +130,7 @@ function getUrl() {
     : myLayer.landingUrl + PAGES.userAgreement, {
     external: true,
     open: {
-      target: "_blank",
+      target: '_blank',
     },
   })
 }
@@ -144,8 +142,8 @@ function handleEnter(event: KeyboardEvent) {
 }
 
 function onLogin() {
-   registrationModal.value = false
-   loginModal.value = true
+  registrationModal.value = false
+  loginModal.value = true
 }
 
 watch(registrationModal, (value) => {
@@ -157,7 +155,6 @@ watch(registrationModal, (value) => {
   }
 })
 
-
 onMounted(() => {
   document.addEventListener('keyup', handleEnter)
 })
@@ -170,7 +167,7 @@ onBeforeUnmount(() => {
 <template>
   <a-modal v-model="registrationModal">
     <form
-      class="flex flex-col items-stretch gap-5 rounded-lg bg-white dark:bg-gray-900"
+      class="flex flex-col items-stretch gap-5"
       novalidate
       @submit.prevent="onSubmit"
     >

package/components/modals/two-factor/two-factor.vue

@@ -9,7 +9,8 @@ const emit = defineEmits<{
   (e: 'confirm', otp: string): void
   (e: 'close'): void
 }>()
-const isOpen = defineModel()
+const { t } = useI18n()
+const isOpen = defineModel({ default: false })
 const showError = defineModel('error')
 const otp = ref(['', '', '', '', '', ''])
 const otpFormatted = computed(() => {
@@ -41,16 +42,16 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
-  <a-modal @close="close" v-model="isOpen">
+  <a-modal v-model="isOpen" @close="close">
     <div class="flex flex-col items-center justify-center gap-5">
       <p class="heading-02 text-center">
-        {{ $t('twoFactor.title') }}
+        {{ t('modals.id.twoFactor.title') }}
       </p>
-      <a-icon-hand-with-phone-light class="dark:hidden size-32" />
-      <a-icon-hand-with-phone-dark class="hidden dark:block size-32" />
+      <a-icon-hand-with-phone-light class="size-32 dark:hidden" />
+      <a-icon-hand-with-phone-dark class="hidden size-32 dark:block" />
       <otp-input v-model="otp" v-model:error="showError" />
       <p class="body-400 text-center">
-        {{ $t('twoFactor.code') }}
+        {{ $t('modals.id.twoFactor.code') }}
       </p>
       <div class="flex w-full gap-2">
         <a-button
@@ -58,7 +59,7 @@ onBeforeUnmount(() => {
           view="outline"
           @click="close"
         >
-          {{ $t('twoFactor.close') }}
+          {{ t('modals.id.twoFactor.close') }}
         </a-button>
         <a-button
           :loading="loading"
@@ -66,7 +67,7 @@ onBeforeUnmount(() => {
           class="w-full"
           @click="confirm"
         >
-          {{ $t('twoFactor.confirm') }}
+          {{ t('modals.id.twoFactor.confirm') }}
         </a-button>
       </div>
     </div>

package/components/navigation/bottom-navigation/ABottomNavigation.vue

@@ -1,11 +1,18 @@
 <script setup lang="ts" generic="T extends NavigationItem">
+import Avatar from '#adata-ui/icons/avatar.vue'
+import IconLogout from '#adata-ui/icons/logout.vue'
 
-import Avatar from "#adata-ui/icons/avatar.vue";
-import IconLogout from "#adata-ui/icons/logout.vue";
-
-const {t} = useI18n()
-const appConfig = useAppConfig()
-const loginUrl = appConfig.myLayer.loginUrl
+const props = withDefaults(defineProps<Props>(), {
+  limitRemaining: 0,
+  daysRemaining: 0,
+  balance: 0,
+  rate: 'Базовый',
+  showLogIn: true,
+})
+const emit = defineEmits(['update:modelValue', 'logout'])
+const { t } = useI18n()
+const { myLayer } = useAppConfig()
+const loginUrl = myLayer.loginUrl
 
 interface Props {
   grow?: boolean
@@ -22,34 +29,31 @@ interface Props {
   showLogIn?: boolean
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  limitRemaining: 0,
-  daysRemaining: 0,
-  balance: 0,
-  rate: 'Базовый',
-  showLogIn: true
-})
-const emit = defineEmits(['update:modelValue', 'logout'])
+const { loginModal } = useIdModals()
 
-const goAuth = () => {
-  if (window) {
-    let fullPath = encodeURIComponent(window.location.toString())
-    if (fullPath.includes('basic-info')) {
-      fullPath = fullPath.replace('%2Fcounterparty/main', '').replace('%2Fbasic-info', '')
+function goAuth() {
+  if (myLayer.authMode !== 'local') {
+    if (window) {
+      let fullPath = encodeURIComponent(window.location.toString())
+      if (fullPath.includes('basic-info')) {
+        fullPath = fullPath.replace('%2Fcounterparty/main', '').replace('%2Fbasic-info', '')
+      }
+      window.location.href = `${loginUrl}?url=${fullPath}`
     }
-    window.location.href = `${loginUrl}?url=${fullPath}`
+  }
+  else {
+    loginModal.value = true
   }
 }
-const onClick = (value: string) => {
+function onClick(value: string) {
   if (value === props.modelValue) value = ''
   emit('update:modelValue', value)
 }
 
-const login: string = 'header.login';
-const profile: string = 'modals.mobile_navigation.type_profile';
-
-
+const login: string = 'header.login'
+const profile: string = 'modals.mobile_navigation.type_profile'
 </script>
+
 <template>
   <header class="w-full border-t border-[#9DA3AC80] bg-white dark:bg-gray-900">
     <div class="grid w-full grid-cols-3 justify-items-center">
@@ -65,7 +69,7 @@ const profile: string = 'modals.mobile_navigation.type_profile';
             <template v-if="Object.prototype.hasOwnProperty.call(item, 'icon')">
               <component
                 :is="item.icon"
-                class="h-6 w-6"
+                class="size-6"
               />
             </template>
             {{ t(item.label) }}
@@ -73,12 +77,12 @@ const profile: string = 'modals.mobile_navigation.type_profile';
         </button>
         <button
           v-show="isAuthenticated"
-          @click="onClick('profile')"
           class="h-16 w-auto min-w-16 max-w-[168px]"
+          @click="onClick('profile')"
         >
           <span class="flex flex-col items-center justify-center text-[10px] leading-5 lg:text-sm">
             <avatar
-              class="bg-gray outline-blue h-6 w-6 rounded-full"
+              class="bg-gray outline-blue size-6 rounded-full"
             />
             {{ t(profile) }}
           </span>
@@ -89,7 +93,7 @@ const profile: string = 'modals.mobile_navigation.type_profile';
           @click="goAuth"
         >
           <span class="flex flex-col items-center justify-center text-[10px] leading-5 lg:text-sm">
-            <icon-logout class="lg:h-6 lg:w-6" />
+            <icon-logout class="lg:size-6" />
             {{ t(login) }}
           </span>
         </button>

package/components/navigation/header/AHeader.vue

@@ -1,20 +1,31 @@
 <script lang="ts" setup>
-import AdataLogo from '#adata-ui/icons/adata-logo.vue'
+import type { ProjectKeys } from '#adata-ui/components/navigation/header/types'
 import AColorMode from '#adata-ui/components/features/color-mode/AColorMode.client.vue'
-import Arrow from '#adata-ui/icons/chevron/chevron-down.vue'
-import HeaderLink from './HeaderLink.vue'
-import ProfileMenu from '#adata-ui/components/navigation/header/ProfileMenu.vue'
-import IconLogout from '#adata-ui/icons/logout.vue'
-import TopHeader from '#adata-ui/components/navigation/header/TopHeader.vue'
 import LangSwitcher from '#adata-ui/components/features/lang-switcher/lang-switcher.vue'
 import AChangeVersion from '#adata-ui/components/features/сhange-version/AChangeVersion.vue'
-import Logo from '#adata-ui/icons/logo.vue'
-import type { ProjectKeys } from '#adata-ui/components/navigation/header/types'
+import ProfileMenu from '#adata-ui/components/navigation/header/ProfileMenu.vue'
+import TopHeader from '#adata-ui/components/navigation/header/TopHeader.vue'
 import { useContacts, useCurrentModule } from '#adata-ui/composables/projectState'
-import { navigateToLocalizedPage, buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
+import AdataLogo from '#adata-ui/icons/adata-logo.vue'
+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'
 
 defineOptions({ name: 'AHeader' })
 
+const props = withDefaults(defineProps<Props>(), {
+  limitRemaining: 0,
+  daysRemaining: 0,
+  balance: 0,
+  rate: 'Базовый',
+  showLogIn: true,
+  mobileHeaderType: 'default',
+  module: 'pk',
+})
+
+const emit = defineEmits(['logout', 'search', 'login'])
+
 interface Props {
   replenish?: string
   hasNotification?: boolean
@@ -28,22 +39,8 @@ interface Props {
   mobileHeaderType?: 'search' | 'default'
   module?: ProjectKeys
   oldVersion?: string
-  authMode?: 'local' | 'separate'
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  limitRemaining: 0,
-  daysRemaining: 0,
-  balance: 0,
-  rate: 'Базовый',
-  showLogIn: true,
-  mobileHeaderType: 'default',
-  module: 'pk',
-  authMode: 'separate',
-})
-
-const emit = defineEmits(['logout', 'search', 'login'])
-
 const { t } = useI18n()
 const { locale } = useI18n()
 
@@ -53,10 +50,10 @@ const { myLayer }: any = useAppConfig()
 
 const langIsOn = appConfig.myLayer.langIsOn
 const contacts = ref(useContacts())
-const loginModal = useLoginModal()
+const { loginModal } = useIdModals()
 
-const goAuth = () => {
-  if (props.authMode === 'separate') {
+function goAuth() {
+  if (myLayer.authMode !== 'local') {
     if (window) {
       emit('login')
       let fullPath = encodeURIComponent(window.location.toString())
@@ -68,7 +65,7 @@ const goAuth = () => {
         locale,
         projectUrl: myLayer.loginUrl.slice(0, -1),
         path: `/?url=${fullPath}`,
-        target: '_self'
+        target: '_self',
       })
     }
   }
@@ -77,18 +74,19 @@ const goAuth = () => {
   }
 }
 
-const goToAnotherModule = () => {
+function goToAnotherModule() {
   location.href = buildLocalizedUrl(locale.value, myLayer.landingUrl, '')
 }
 
-const fetchContacts = async () => {
+async function fetchContacts() {
   try {
     const response = await fetch(
-      'https://pk-api.adata.kz/api/v1/data/counterparty/contacts/sales-department'
+      'https://pk-api.adata.kz/api/v1/data/counterparty/contacts/sales-department',
     )
     const { data } = await response.json()
     contacts.value = data
-  } catch (e) {
+  }
+  catch (e) {
     console.error(e.message)
   }
 }
@@ -110,7 +108,7 @@ onBeforeMount(() => {
       class="relative h-16 border-b border-deepblue-900/10 bg-white dark:border-gray-200/10 dark:bg-gray-900"
     >
       <div class="a-container mobile-padding flex h-full items-center justify-between gap-2">
-        <!--        Desktop hidden-->
+        <!--        Desktop hidden -->
         <section
           id="mobile-header"
           class="grow lg:hidden"
@@ -154,7 +152,7 @@ onBeforeMount(() => {
             class="lg:hidden"
           />
         </div>
-        <!--Mobile hidden-->
+        <!-- Mobile hidden -->
         <nav class="hidden items-center gap-4 lg:flex">
           <nuxt-link-locale
             aria-label="Adata-logo"
@@ -170,7 +168,7 @@ onBeforeMount(() => {
           <header-link />
         </nav>
         <div class="text-deepblue hidden items-center gap-4 dark:text-[#E3E5E8] lg:flex">
-          <!--Mobile hidden-->
+          <!-- Mobile hidden -->
           <div class="hidden items-center gap-4 lg:flex">
             <a-change-version
               v-if="oldVersion"
@@ -212,11 +210,6 @@ onBeforeMount(() => {
       </div>
     </header>
   </div>
-
-  <template v-if="authMode === 'local'">
-    <a-login />
-    <a-registration />
-  </template>
 </template>
 
 <style scoped></style>

package/composables/modalsState.ts

@@ -6,6 +6,3 @@ export const usePaymentMethodModal = () => useState<boolean>('payment-method-mod
 export const useReplenishModal = () => useState<boolean>('replenish-modal', () => false)
 export const useLowBalanceModal = () => useState<boolean>('low-balance-modal', () => false)
 export const useNoAccessModal = () => useState<boolean>('no-access-modal', () => false)
-
-export const useLoginModal = () => useState<boolean>('login-modal', () => false)
-export const useRegistrationModal = () => useState<boolean>('registration-modal', () => false)

package/composables/useHeaderNavigationLinks.ts

@@ -117,21 +117,26 @@ export const useHeaderNavigationLinks = () => {
           }
         ]
       },
+
       {
-        key: 'compliance',
-        is_new: true,
-        name: t('header.products.compliance.label'),
-        icon: AIconId,
+        key: 'work',
+        name: t('header.products.jobs.label'),
+        icon: AIconWorkBag,
         items: [
           {
-            title: t('header.products.compliance.items.l.t'),
-            subtitle: t('header.products.compliance.items.l.st'),
-            icon: IconProfile,
-            to: buildLocalizedUrl(locale, `${myLayer.complianceUrl}/compliance`, '')
+            title: t('header.products.jobs.items.vacancies.title'),
+            icon: IconWork,
+            subtitle: t('header.products.jobs.items.vacancies.subtitle'),
+            to: myLayer.workUrl + PAGES.work.vacancy
+          },
+          {
+            title: t('header.products.jobs.items.resume.title'),
+            subtitle: t('header.products.jobs.items.resume.subtitle'),
+            icon: IconDocument,
+            to: myLayer.workUrl + PAGES.work.summary
           }
         ]
       },
-
       {
         key: 'tenders',
         name: t('header.products.tenders.label'),
@@ -267,21 +272,16 @@ export const useHeaderNavigationLinks = () => {
         ]
       },
       {
-        key: 'work',
-        name: t('header.products.jobs.label'),
-        icon: AIconWorkBag,
+        key: 'compliance',
+        is_new: true,
+        name: t('header.products.compliance.label'),
+        icon: AIconId,
         items: [
           {
-            title: t('header.products.jobs.items.vacancies.title'),
-            icon: IconWork,
-            subtitle: t('header.products.jobs.items.vacancies.subtitle'),
-            to: myLayer.workUrl + PAGES.work.vacancy
-          },
-          {
-            title: t('header.products.jobs.items.resume.title'),
-            subtitle: t('header.products.jobs.items.resume.subtitle'),
-            icon: IconDocument,
-            to: myLayer.workUrl + PAGES.work.summary
+            title: t('header.products.compliance.items.l.t'),
+            subtitle: t('header.products.compliance.items.l.st'),
+            icon: IconProfile,
+            to: buildLocalizedUrl(locale, `${myLayer.complianceUrl}/compliance`, '')
           }
         ]
       },

package/composables/useIdModals.ts

@@ -0,0 +1,17 @@
+export function useIdModals() {
+  const loginModal = useState('login-modal', () => false)
+  const registrationModal = useState('registration-modal', () => false)
+  const recoveryModal = useState('recovery-modal', () => false)
+  const emailModal = useState('email-modal', () => false)
+  const newPasswordModal = useState('new-password-modal', () => false)
+  const passwordSuccessfulModal = useState('password-successful-modal', () => false)
+
+  return {
+    loginModal,
+    registrationModal,
+    recoveryModal,
+    emailModal,
+    newPasswordModal,
+    passwordSuccessfulModal,
+  }
+}

package/eslint.config.mjs

@@ -0,0 +1,45 @@
+import antfu from '@antfu/eslint-config'
+import tailwind from 'eslint-plugin-tailwindcss'
+import withNuxt from './.nuxt/eslint.config.mjs'
+
+export default withNuxt(
+  ...tailwind.configs['flat/recommended'],
+  await antfu({
+    javascript: {
+      overrides: {
+        'no-console': ['off'],
+        'unused-imports/no-unused-vars': ['warn'],
+      },
+    },
+    typescript: {
+      overrides: {
+        'node/prefer-global/process': ['off'],
+      },
+    },
+    stylistic: {
+      overrides: {
+        'antfu/if-newline': ['off'],
+      },
+    },
+    vue: {
+      overrides: {
+        'vue/component-name-in-template-casing': ['error', 'kebab-case', {
+          registeredComponentsOnly: false,
+          ignores: ['Line', 'Bar', 'Doughnut'],
+        }],
+        'vue/max-attributes-per-line': ['warn', {
+          singleline: {
+            max: 2,
+          },
+          multiline: {
+            max: 1,
+          },
+        }],
+        'vue/no-dupe-keys': ['error'],
+        'vue/no-multiple-template-root': ['off'],
+        'tailwindcss/no-custom-classname': ['off'],
+        'tailwindcss/enforces-negative-arbitrary-values': ['warn'],
+      },
+    },
+  }),
+)