adata-ui 2.0.30 → 2.0.32

package/components/elements/feature-description/AFeatureDescription.vue

@@ -68,12 +68,12 @@ onUnmounted(() => clearTimer())
         <component
           :is="item.icon"
           class="shrink-0 size-6 transition-colors duration-300 ease-in-out"
-          :class="selected === idx ? 'text-white dark:text-gray-900' : 'text-gray-600 dark:text-gray-200'"
+          :class="selected === idx ? 'text-white dark:text-gray-900' : 'text-gray-600 dark:text-[#9DA3AC]'"
         />
       </div>
       <p
         class="font-semibold text-base lg:text-xl transition-colors duration-300 ease-in-out"
-        :class="selected === idx ? 'dark:text-[#E3E5E8]' : 'text-gray-600 dark:text-gray-200'"
+        :class="selected === idx ? 'dark:text-[#E3E5E8]' : 'text-gray-600 dark:text-[#9DA3AC]'"
       >
         {{ item.title }}
       </p>

package/components/modals/id/IdConfirmAccountOtpModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import IdOtpInput from '#adata-ui/components/modals/id/IdOtpInput.vue'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 
@@ -21,7 +22,7 @@ const showError = ref(false)
 const isLoading = ref(false)
 
 async function loginUser() {
-  const login = await fetch(`${authApiURL}/login`, {
+  const login = await fetch(`${removeTrailingSlash(authApiURL)}/login`, {
     method: 'POST',
     credentials: 'include',
     headers: {
@@ -35,7 +36,7 @@ async function loginUser() {
   })
   await login.json().catch(() => ({}))
 
-  const response = await fetch(`${authApiURL}/access/cookie`, {
+  const response = await fetch(`${removeTrailingSlash(authApiURL)}/access/cookie`, {
     method: 'GET',
     credentials: 'include',
     headers: {
@@ -60,7 +61,7 @@ async function onConfirm() {
   try {
     isLoading.value = true
 
-    await $fetch(`${authApiURL}/email/verify-otp`, {
+    await $fetch(`${removeTrailingSlash(authApiURL)}/email/verify-otp`, {
       method: 'GET',
       credentials: 'include',
       headers: {
@@ -97,7 +98,7 @@ function onClose() {
 
 async function onResend() {
   try {
-    await $fetch(`${authApiURL}/email/resend-otp`, {
+    await $fetch(`${removeTrailingSlash(authApiURL)}/email/resend-otp`, {
       method: 'GET',
       credentials: 'include',
       headers: {

package/components/modals/id/IdLoginModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 import { navigateToLocalizedPage } from '#adata-ui/utils/localizedNavigation'
 import * as z from 'zod'
@@ -61,7 +62,7 @@ async function submit() {
   submitted.value = true
   if (!validation.value) {
     loading.value = true
-    const login = await fetch(`${authApiURL}/login`, {
+    const login = await fetch(`${removeTrailingSlash(authApiURL)}/login`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -86,7 +87,7 @@ async function submit() {
       if (login.status === 206) {
         confirmAccountOtpModal.value = true
 
-        $fetch(`${authApiURL}/email/resend-otp`, {
+        $fetch(`${removeTrailingSlash(authApiURL)}/email/resend-otp`, {
           method: 'GET',
           credentials: 'include',
           headers: {
@@ -108,7 +109,7 @@ async function submit() {
         twoFactorModal.value = true
       }
       else if (data.email_is_verified) {
-        const response = await fetch(`${authApiURL}/access/cookie`, {
+        const response = await fetch(`${removeTrailingSlash(authApiURL)}/access/cookie`, {
           method: 'GET',
           credentials: 'include',
           headers: {
@@ -128,14 +129,14 @@ async function submit() {
             secure: true,
           }).value = access_token
         }
-        $toast.success(t('login.successfully'))
+        $toast.success(t('reuse.successfully'))
         loginModal.value = false
         window.location.reload()
       }
       else {
         confirmAccountOtpModal.value = true
 
-        $fetch(`${authApiURL}/email/resend-otp`, {
+        $fetch(`${removeTrailingSlash(authApiURL)}/email/resend-otp`, {
           method: 'GET',
           credentials: 'include',
           headers: {

package/components/modals/id/IdModals.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import IdConfirmAccountOtpModal from '#adata-ui/components/modals/id/IdConfirmAccountOtpModal.vue'
 import IdConfirmSuccessfulModal from '#adata-ui/components/modals/id/IdConfirmSuccessfulModal.vue'
 import IdLoginModal from '#adata-ui/components/modals/id/IdLoginModal.vue'
@@ -20,6 +21,36 @@ const {
   confirmSuccessfulModal,
   twoFactorModal,
 } = useIdModals()
+
+const { locale } = useI18n()
+const { commonAuth } = useAppConfig()
+const authApiURL = commonAuth.authApiURL
+
+onMounted(async () => {
+  const accessToken = useCookie('accessToken')
+
+  const response = await fetch(`${removeTrailingSlash(authApiURL)}/access/cookie`, {
+    method: 'GET',
+    credentials: 'include',
+    headers: {
+      lang: locale.value,
+    },
+  })
+  const { data: cookiesData } = await response.json()
+  if (cookiesData?.access_token && !accessToken.value) {
+    const { access_token, expire_in } = cookiesData
+    const hostname = location.hostname.split('.').reverse()
+
+    useCookie('accessToken', {
+      maxAge: expire_in,
+      domain: `.${hostname[1]}.${hostname[0]}`,
+      path: '/',
+      secure: true,
+    }).value = access_token
+
+    window.location.reload()
+  }
+})
 </script>
 
 <template>

package/components/modals/id/IdNewPasswordModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 import * as z from 'zod'
 
@@ -55,7 +56,7 @@ async function onSubmit() {
     if (validation.value) return
     loading.value = true
 
-    const response = await $fetch(`${authApiURL}/password/reset-otp`, {
+    const response = await $fetch(`${removeTrailingSlash(authApiURL)}/password/reset-otp`, {
       method: 'POST',
       credentials: 'include',
       headers: {

package/components/modals/id/IdOtpInput.vue

@@ -125,8 +125,11 @@ function moveFocus(index: number, to: string) {
         v-model="otp[index]"
         type="text"
         maxlength="1"
-        class="size-10 rounded bg-deepblue-900/5 text-center text-lg caret-transparent focus:border focus:border-blue-500 focus:outline-none dark:bg-[#E3E5E80D]"
-        :class="{ 'border border-[#E74135] bg-[#E741351A] dark:border-[#F47E75] dark:bg-[#F47E751A]': showError }"
+        class="size-10 rounded bg-deepblue-900/5 text-center text-lg caret-transparent focus:outline-none dark:bg-[#E3E5E80D]"
+        :class="{
+          'border border-[#E74135] bg-[#E741351A] dark:border-[#F47E75] dark:bg-[#F47E751A]': showError,
+          'focus:border focus:border-blue-700  dark:focus:border-blue-500': !showError,
+        }"
         @input="onInput($event, index)"
         @keydown.backspace="onBackspace(index, $event)"
         @keydown.enter.prevent

package/components/modals/id/IdRecoveryModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 import * as z from 'zod'
 
@@ -35,7 +36,7 @@ async function onSubmit() {
     if (validation.value) return
     loading.value = true
 
-    await $fetch(`${authApiURL}/password/email-otp`, {
+    await $fetch(`${removeTrailingSlash(authApiURL)}/password/email-otp`, {
       method: 'POST',
       credentials: 'include',
       headers: {

package/components/modals/id/IdRegistrationModal.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import { PAGES } from '#adata-ui/shared/constans/pages'
-import { useAuthStore } from '#adata-ui/stores/auth.store'
 
+import { useAuthStore } from '#adata-ui/stores/auth.store'
 import { computed, reactive, ref } from 'vue'
 import * as z from 'zod'
 
@@ -74,7 +75,7 @@ async function onSubmit() {
 
   try {
     loading.value = true
-    const { success, message } = await $fetch(`${authApiURL}/register`, {
+    const { success, message } = await $fetch(`${removeTrailingSlash(authApiURL)}/v2/register`, {
       method: 'POST',
       credentials: 'include',
       headers: {

package/components/modals/id/IdResetPasswordOtpModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import IdOtpInput from '#adata-ui/components/modals/id/IdOtpInput.vue'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 
@@ -24,7 +25,7 @@ async function onConfirm() {
   try {
     isLoading.value = true
 
-    const response = await $fetch(`${authApiURL}/password/validate-otp`, {
+    const response = await $fetch(`${removeTrailingSlash(authApiURL)}/password/validate-otp`, {
       method: 'POST',
       credentials: 'include',
       headers: {
@@ -62,7 +63,7 @@ function onClose() {
 
 async function onResend() {
   try {
-    await $fetch(`${authApiURL}/password/email-otp`, {
+    await $fetch(`${removeTrailingSlash(authApiURL)}/password/email-otp`, {
       method: 'POST',
       credentials: 'include',
       headers: {

package/components/modals/id/IdTwoFactorModal.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { removeTrailingSlash } from '#adata-ui/components/modals/id/helpers/removeTrailingSlash'
 import IdOtpInput from '#adata-ui/components/modals/id/IdOtpInput.vue'
 import { useAuthStore } from '#adata-ui/stores/auth.store'
 
@@ -22,7 +23,7 @@ const isLoading = ref(false)
 
 async function onConfirm() {
   isLoading.value = true
-  const login = await fetch(`${authApiURL}/login`, {
+  const login = await fetch(`${removeTrailingSlash(authApiURL)}/login`, {
     method: 'POST',
     credentials: 'include',
     headers: {
@@ -44,7 +45,7 @@ async function onConfirm() {
     }
   }
   else {
-    const response = await fetch(`${authApiURL}/access/cookie`, {
+    const response = await fetch(`${removeTrailingSlash(authApiURL)}/access/cookie`, {
       method: 'GET',
       credentials: 'include',
       headers: {

package/components/modals/id/helpers/removeTrailingSlash.ts

@@ -0,0 +1,7 @@
+export function removeTrailingSlash(str: string): string {
+  if (str.endsWith('/')) {
+    return str.slice(0, -1)
+  }
+
+  return str
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.0.30",
+  "version": "2.0.32",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",