adata-ui 2.1.41-beta.7 → 2.1.41-beta.8

package/composables/useActiveNavigation.ts

@@ -1,84 +1,84 @@
-// Active-state detection for the products mega-menu.
-//
-// Two levels of "active":
-//   1. activeModule  — the current host matches one of the module's hosts
-//      (host ≠ module key: e.g. the `fines` module lives on avto.*.kz,
-//       and `tenders` spans both zakupki.*.kz and tender.*.kz).
-//   2. activeService — within the active module, the current page matches a
-//      concrete item link (`/`, `/unload`, `/foreign`, …).
-
-const LOCALE_SEGMENTS = new Set(['kk', 'en'])
-
-interface NavTarget { to: string }
-interface NavModule { link: string, items: NavTarget[] }
-interface NormalizedUrl { host: string, key: string }
-
-function safeUrl(href: string): URL | null {
-  try {
-    return new URL(href)
-  }
-  catch {
-    return null
-  }
-}
-
-// Reduce a URL to a comparable identity: host + locale-stripped path + query.
-// The query is kept because it can be significant (fines main is `/?check_fines=true`).
-function normalize(href: string): NormalizedUrl | null {
-  const url = safeUrl(href)
-  if (!url) return null
-
-  const segments = url.pathname
-    .split('/')
-    .filter(segment => segment && !LOCALE_SEGMENTS.has(segment))
-
-  const path = `/${segments.join('/')}`
-  return { host: url.host, key: path + url.search }
-}
-
-// A "root" target has no path segments (e.g. `/` or `/?check_fines=true`).
-// Roots must match exactly, otherwise their prefix would light up every sub-page.
-function isRoot(key: string): boolean {
-  return key === '/' || key.startsWith('/?')
-}
-
-export function useActiveNavigation() {
-  const route = useRoute()
-
-  // Recompute on every SPA navigation. Host stays constant within an app, so we
-  // read it from the request URL (SSR-safe); the path/query come from the route.
-  const current = computed<NormalizedUrl | null>(() => {
-    const host = useRequestURL().host
-    return normalize(`https://${host}${route.fullPath}`)
-  })
-
-  function isActiveModule(module: NavModule): boolean {
-    if (!current.value) return false
-
-    const hosts = new Set<string>()
-    const link = normalize(module.link)
-    if (link) hosts.add(link.host)
-    for (const item of module.items) {
-      const item_url = normalize(item.to)
-      if (item_url) hosts.add(item_url.host)
-    }
-
-    return hosts.has(current.value.host)
-  }
-
-  function isActiveService(itemTo: string): boolean {
-    const cur = current.value
-    const item = normalize(itemTo)
-    if (!cur || !item || cur.host !== item.host) return false
-
-    // The car-check page redirects to a `car-result` URL; keep its item lit.
-    if (item.key.includes('check-car') && cur.key.includes('car-result')) return true
-
-    if (cur.key === item.key) return true
-    if (isRoot(item.key)) return false
-
-    return cur.key.startsWith(item.key)
-  }
-
-  return { isActiveModule, isActiveService }
-}
+// Active-state detection for the products mega-menu.
+//
+// Two levels of "active":
+//   1. activeModule  — the current host matches one of the module's hosts
+//      (host ≠ module key: e.g. the `fines` module lives on avto.*.kz,
+//       and `tenders` spans both zakupki.*.kz and tender.*.kz).
+//   2. activeService — within the active module, the current page matches a
+//      concrete item link (`/`, `/unload`, `/foreign`, …).
+
+const LOCALE_SEGMENTS = new Set(['kk', 'en'])
+
+interface NavTarget { to: string }
+interface NavModule { link: string, items: NavTarget[] }
+interface NormalizedUrl { host: string, key: string }
+
+function safeUrl(href: string): URL | null {
+  try {
+    return new URL(href)
+  }
+  catch {
+    return null
+  }
+}
+
+// Reduce a URL to a comparable identity: host + locale-stripped path + query.
+// The query is kept because it can be significant (fines main is `/?check_fines=true`).
+function normalize(href: string): NormalizedUrl | null {
+  const url = safeUrl(href)
+  if (!url) return null
+
+  const segments = url.pathname
+    .split('/')
+    .filter(segment => segment && !LOCALE_SEGMENTS.has(segment))
+
+  const path = `/${segments.join('/')}`
+  return { host: url.host, key: path + url.search }
+}
+
+// A "root" target has no path segments (e.g. `/` or `/?check_fines=true`).
+// Roots must match exactly, otherwise their prefix would light up every sub-page.
+function isRoot(key: string): boolean {
+  return key === '/' || key.startsWith('/?')
+}
+
+export function useActiveNavigation() {
+  const route = useRoute()
+
+  // Recompute on every SPA navigation. Host stays constant within an app, so we
+  // read it from the request URL (SSR-safe); the path/query come from the route.
+  const current = computed<NormalizedUrl | null>(() => {
+    const host = useRequestURL().host
+    return normalize(`https://${host}${route.fullPath}`)
+  })
+
+  function isActiveModule(module: NavModule): boolean {
+    if (!current.value) return false
+
+    const hosts = new Set<string>()
+    const link = normalize(module.link)
+    if (link) hosts.add(link.host)
+    for (const item of module.items) {
+      const item_url = normalize(item.to)
+      if (item_url) hosts.add(item_url.host)
+    }
+
+    return hosts.has(current.value.host)
+  }
+
+  function isActiveService(itemTo: string): boolean {
+    const cur = current.value
+    const item = normalize(itemTo)
+    if (!cur || !item || cur.host !== item.host) return false
+
+    // The car-check page redirects to a `car-result` URL; keep its item lit.
+    if (item.key.includes('check-car') && cur.key.includes('car-result')) return true
+
+    if (cur.key === item.key) return true
+    if (isRoot(item.key)) return false
+
+    return cur.key.startsWith(item.key)
+  }
+
+  return { isActiveModule, isActiveService }
+}

package/composables/useAdaptive.ts

@@ -1,46 +1,46 @@
-import {ref, useSSRContext} from "vue";
-import type {Ref, UnwrapRef} from "vue"
-
-export type AdaptiveContext = {
-    isMobile: boolean
-    isTablet: boolean
-    isSmallTablet: boolean
-    isDesktop: boolean
-}
-
-const isBrowser = typeof window !== undefined && process.client
-const computeIsMobile = (): boolean =>
-    isBrowser ? window.matchMedia('(max-width: 560px)').matches : false
-
-const computeIsSmallTablet = (): boolean =>
-    isBrowser ? window.matchMedia('(max-width: 767px)').matches : false
-const computeIsTablet = (): boolean =>
-    isBrowser ? window.innerWidth >= 768 && window.innerWidth < 1024 : false
-const computeIsDesktop = (): boolean =>
-    isBrowser ? window.innerWidth >= 1024 : false
-
-export const useAdaptive = (): Ref<AdaptiveContext> => {
-    const ctx = ref<UnwrapRef<AdaptiveContext>>({
-        isDesktop: computeIsDesktop(),
-        isMobile: computeIsMobile(),
-        isTablet: computeIsTablet(),
-        isSmallTablet: computeIsSmallTablet()
-    })
-
-    const setValues = () =>
-        (ctx.value = {
-            isDesktop: computeIsDesktop(),
-            isMobile: computeIsMobile(),
-            isTablet: computeIsTablet(),
-            isSmallTablet: computeIsSmallTablet()
-        })
-
-
-    onMounted(() => {
-            window.addEventListener('resize', setValues, { passive: true })
-        }
-    )
-    onUnmounted(() => window.removeEventListener('resize', setValues))
-
-    return ctx
-}
+import {ref, useSSRContext} from "vue";
+import type {Ref, UnwrapRef} from "vue"
+
+export type AdaptiveContext = {
+    isMobile: boolean
+    isTablet: boolean
+    isSmallTablet: boolean
+    isDesktop: boolean
+}
+
+const isBrowser = typeof window !== undefined && process.client
+const computeIsMobile = (): boolean =>
+    isBrowser ? window.matchMedia('(max-width: 560px)').matches : false
+
+const computeIsSmallTablet = (): boolean =>
+    isBrowser ? window.matchMedia('(max-width: 767px)').matches : false
+const computeIsTablet = (): boolean =>
+    isBrowser ? window.innerWidth >= 768 && window.innerWidth < 1024 : false
+const computeIsDesktop = (): boolean =>
+    isBrowser ? window.innerWidth >= 1024 : false
+
+export const useAdaptive = (): Ref<AdaptiveContext> => {
+    const ctx = ref<UnwrapRef<AdaptiveContext>>({
+        isDesktop: computeIsDesktop(),
+        isMobile: computeIsMobile(),
+        isTablet: computeIsTablet(),
+        isSmallTablet: computeIsSmallTablet()
+    })
+
+    const setValues = () =>
+        (ctx.value = {
+            isDesktop: computeIsDesktop(),
+            isMobile: computeIsMobile(),
+            isTablet: computeIsTablet(),
+            isSmallTablet: computeIsSmallTablet()
+        })
+
+
+    onMounted(() => {
+            window.addEventListener('resize', setValues, { passive: true })
+        }
+    )
+    onUnmounted(() => window.removeEventListener('resize', setValues))
+
+    return ctx
+}

package/composables/useBuyTariffs.ts

@@ -1,91 +1,91 @@
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
-
-export function useBuyTariffs() {
-  const { commonAuth } = useAppConfig()
-
-  const userApiURL = commonAuth.userApiURL
-  const { locale } = useI18n()
-  const localePath = useLocalePath()
-  const checkNumber = ref(0)
-  const messageRate = ref(null)
-
-
-  const isAuthenticated = computed(() => {
-    const accessToken = useCookie('accessToken')
-    return accessToken.value
-  })
-
-  async function buyTariff(tariffs: any) {
-    await fetch(`${removeTrailingSlash(userApiURL)}/user/rate`, {
-      method: 'PUT',
-      credentials: 'include',
-      headers: {
-        'Content-Type': 'application/json',
-        'lang': locale.value,
-        Authorization: `Bearer ${isAuthenticated.value}`
-      },
-      body: JSON.stringify({
-        rate_code: tariffs
-      })
-    })
-    location.reload()
-  }
-
-  async function viaKaspiBank(tariffId: any, sum: any) {
-    try {
-      const info = await fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/request/`, {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-          'lang': locale.value,
-          Authorization: `Bearer ${isAuthenticated.value}`
-        },
-        body: JSON.stringify({
-          amount: sum,
-          rate_id: tariffId
-        })
-      })
-      const { data } = await info.json().catch(() => ({}))
-
-      checkNumber.value = data.request_id
-    } catch (error) {
-      console.error(error)
-    } finally {
-      window.open(localePath(`https://kaspi.kz/pay/adata?service_id=5964&9507=${checkNumber.value}`), '_blank')
-    }
-  }
-
-  async function leaveRequest(name: any, email: any, phone: any, comment: any, rateCode: any = 'adata_pro') {
-    try {
-      const info = await fetch(`${removeTrailingSlash(userApiURL)}/message/rate`, {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          'Content-Type': 'application/json',
-          'lang': locale.value,
-          Authorization: `Bearer ${isAuthenticated.value}`
-        },
-        body: JSON.stringify({
-          sender_name: name,
-          email: email,
-          phone_number: phone,
-          message: comment,
-          rate_code: rateCode,
-        })
-      })
-      const { data } = await info.json().catch(() => ({}))
-      messageRate.value = data
-    } catch (error) {
-      console.error(error)
-    }
-  }
-
-  return {
-    buyTariff,
-    viaKaspiBank,
-    checkNumber,
-    leaveRequest,
-    messageRate
-  }
-}
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+
+export function useBuyTariffs() {
+  const { commonAuth } = useAppConfig()
+
+  const userApiURL = commonAuth.userApiURL
+  const { locale } = useI18n()
+  const localePath = useLocalePath()
+  const checkNumber = ref(0)
+  const messageRate = ref(null)
+
+
+  const isAuthenticated = computed(() => {
+    const accessToken = useCookie('accessToken')
+    return accessToken.value
+  })
+
+  async function buyTariff(tariffs: any) {
+    await fetch(`${removeTrailingSlash(userApiURL)}/user/rate`, {
+      method: 'PUT',
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json',
+        'lang': locale.value,
+        Authorization: `Bearer ${isAuthenticated.value}`
+      },
+      body: JSON.stringify({
+        rate_code: tariffs
+      })
+    })
+    location.reload()
+  }
+
+  async function viaKaspiBank(tariffId: any, sum: any) {
+    try {
+      const info = await fetch(`${removeTrailingSlash(userApiURL)}/user/kaspi-balance/request/`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+          'lang': locale.value,
+          Authorization: `Bearer ${isAuthenticated.value}`
+        },
+        body: JSON.stringify({
+          amount: sum,
+          rate_id: tariffId
+        })
+      })
+      const { data } = await info.json().catch(() => ({}))
+
+      checkNumber.value = data.request_id
+    } catch (error) {
+      console.error(error)
+    } finally {
+      window.open(localePath(`https://kaspi.kz/pay/adata?service_id=5964&9507=${checkNumber.value}`), '_blank')
+    }
+  }
+
+  async function leaveRequest(name: any, email: any, phone: any, comment: any, rateCode: any = 'adata_pro') {
+    try {
+      const info = await fetch(`${removeTrailingSlash(userApiURL)}/message/rate`, {
+        method: 'POST',
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/json',
+          'lang': locale.value,
+          Authorization: `Bearer ${isAuthenticated.value}`
+        },
+        body: JSON.stringify({
+          sender_name: name,
+          email: email,
+          phone_number: phone,
+          message: comment,
+          rate_code: rateCode,
+        })
+      })
+      const { data } = await info.json().catch(() => ({}))
+      messageRate.value = data
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
+  return {
+    buyTariff,
+    viaKaspiBank,
+    checkNumber,
+    leaveRequest,
+    messageRate
+  }
+}

package/composables/useCarouselScroll.ts

@@ -1,49 +1,49 @@
-import { ref, type Ref, onMounted, onUnmounted } from 'vue'
-
-export const useCarouselScroll = (el: Ref<HTMLElement>) => {
-  const x = ref<number>(0)
-
-  function onMouseDown (e) {
-    el.value.style.scrollSnapType = 'none'
-    el.value.style.scrollBehavior = 'auto'
-
-    x.value = e.pageX
-
-    window.addEventListener('mousemove', onMouseMove)
-    window.addEventListener('mouseup', onMouseUp)
-  }
-
-  function onMouseUp () {
-    el.value.style.removeProperty('scroll-behavior')
-    el.value.style.removeProperty('scroll-snap-type')
-
-    window.removeEventListener('mousemove', onMouseMove)
-    window.removeEventListener('mouseup', onMouseUp)
-  }
-
-  function onMouseMove (e) {
-    e.preventDefault()
-
-    const delta = e.pageX - x.value
-
-    x.value = e.pageX
-
-    el.value.scrollBy(-delta, 0)
-  }
-
-  onMounted(() => {
-    if (!el.value) {
-      return
-    }
-
-    el.value.addEventListener('mousedown', onMouseDown)
-  })
-
-  onUnmounted(() => {
-    if (!el.value) {
-      return
-    }
-
-    el.value.removeEventListener('mousedown', onMouseDown)
-  })
-}
+import { ref, type Ref, onMounted, onUnmounted } from 'vue'
+
+export const useCarouselScroll = (el: Ref<HTMLElement>) => {
+  const x = ref<number>(0)
+
+  function onMouseDown (e) {
+    el.value.style.scrollSnapType = 'none'
+    el.value.style.scrollBehavior = 'auto'
+
+    x.value = e.pageX
+
+    window.addEventListener('mousemove', onMouseMove)
+    window.addEventListener('mouseup', onMouseUp)
+  }
+
+  function onMouseUp () {
+    el.value.style.removeProperty('scroll-behavior')
+    el.value.style.removeProperty('scroll-snap-type')
+
+    window.removeEventListener('mousemove', onMouseMove)
+    window.removeEventListener('mouseup', onMouseUp)
+  }
+
+  function onMouseMove (e) {
+    e.preventDefault()
+
+    const delta = e.pageX - x.value
+
+    x.value = e.pageX
+
+    el.value.scrollBy(-delta, 0)
+  }
+
+  onMounted(() => {
+    if (!el.value) {
+      return
+    }
+
+    el.value.addEventListener('mousedown', onMouseDown)
+  })
+
+  onUnmounted(() => {
+    if (!el.value) {
+      return
+    }
+
+    el.value.removeEventListener('mousedown', onMouseDown)
+  })
+}