5 Commits

17 changed files with 421 additions and 218 deletions

7
bo/components.d.ts vendored
View File

@@ -12,13 +12,14 @@ export {}
declare module 'vue' { declare module 'vue' {
export interface GlobalComponents { export interface GlobalComponents {
CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default'] CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default'] CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default'] CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
CountryCurrencySwitch: typeof import('./src/components/inner/CountryCurrencySwitch.vue')['default']
Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.vue')['default'] Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.vue')['default']
Cs_TermsAndConditionsView: typeof import('./src/components/terms/cs_TermsAndConditionsView.vue')['default'] Cs_TermsAndConditionsView: typeof import('./src/components/terms/cs_TermsAndConditionsView.vue')['default']
En_PrivacyPolicyView: typeof import('./src/components/terms/en_PrivacyPolicyView.vue')['default'] En_PrivacyPolicyView: typeof import('./src/components/terms/en_PrivacyPolicyView.vue')['default']
En_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default'] En_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default']
LangSwitch: typeof import('./src/components/inner/langSwitch.vue')['default'] LangSwitch: typeof import('./src/components/inner/LangSwitch.vue')['default']
PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default'] PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default'] PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default'] PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
@@ -34,7 +35,7 @@ declare module 'vue' {
ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default'] ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink'] RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView'] RouterView: typeof import('vue-router')['RouterView']
ThemeSwitch: typeof import('./src/components/inner/themeSwitch.vue')['default'] ThemeSwitch: typeof import('./src/components/inner/ThemeSwitch.vue')['default']
TopBar: typeof import('./src/components/TopBar.vue')['default'] TopBar: typeof import('./src/components/TopBar.vue')['default']
TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default'] TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default'] UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']

View File

@@ -1,13 +1,49 @@
<template>
<header
class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
<!-- px-4 sm:px-6 lg:px-8 -->
<div class="container mx-auto px-4">
<div class="flex items-center justify-between h-14">
<!-- Logo -->
<RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
<div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
<UIcon name="i-heroicons-clock" class="w-5 h-5" />
</div>
<span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
</RouterLink>
<UNavigationMenu :type="'trigger'" :ui="{
root: 'justify-center',
list: 'gap-4'
}" :items="menuItems" class="w-full"></UNavigationMenu>
<div class="flex items-center gap-2">
<CountryCurrencySwitch />
<!-- Language Switcher -->
<LangSwitch />
<!-- Theme Switcher -->
<ThemeSwitch />
<!-- Logout Button (only when authenticated) -->
<button v-if="authStore.isAuthenticated" @click="authStore.logout()"
class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
{{ $t('general.logout') }}
</button>
</div>
</div>
</div>
</header>
</template>
<script setup lang="ts"> <script setup lang="ts">
import { useFetchJson } from '@/composable/useFetchJson' import { useFetchJson } from '@/composable/useFetchJson'
import LangSwitch from './inner/langSwitch.vue' import LangSwitch from './inner/LangSwitch.vue'
import ThemeSwitch from './inner/themeSwitch.vue' import ThemeSwitch from './inner/ThemeSwitch.vue'
import { useAuthStore } from '@/stores/auth' import { useAuthStore } from '@/stores/auth'
import { computed, onMounted, ref } from 'vue' import { computed, ref } from 'vue'
import { currentLang } from '@/router/langs' import { currentLang } from '@/router/langs'
import type { LabelTrans, TopMenuItem } from '@/types' import type { LabelTrans, TopMenuItem } from '@/types'
import type { NavigationMenuItem } from '@nuxt/ui' import type { NavigationMenuItem } from '@nuxt/ui'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import CountryCurrencySwitch from './inner/CountryCurrencySwitch.vue'
const authStore = useAuthStore() const authStore = useAuthStore()
let menu = ref() let menu = ref()
@@ -51,37 +87,3 @@ function transformMenu(items: TopMenuItem[], locale: string | undefined): Naviga
} }
await getTopMenu() await getTopMenu()
</script> </script>
<template>
<header
class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
<!-- px-4 sm:px-6 lg:px-8 -->
<div class="container mx-auto px-4">
<div class="flex items-center justify-between h-14">
<!-- Logo -->
<RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
<div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
<UIcon name="i-heroicons-clock" class="w-5 h-5" />
</div>
<span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
</RouterLink>
<UNavigationMenu :type="'trigger'" :ui="{
root: 'justify-center',
list: 'gap-4'
}" :items="menuItems" class="w-full"></UNavigationMenu>
<div class="flex items-center gap-2">
<!-- Language Switcher -->
<LangSwitch />
<!-- Theme Switcher -->
<ThemeSwitch />
<!-- Logout Button (only when authenticated) -->
<button v-if="authStore.isAuthenticated" @click="authStore.logout()"
class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
{{ $t('general.logout') }}
</button>
</div>
</div>
</div>
</header>
</template>

View File

@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import LangSwitch from './inner/langSwitch.vue' import LangSwitch from './inner/LangSwitch.vue'
import ThemeSwitch from './inner/themeSwitch.vue' import ThemeSwitch from './inner/ThemeSwitch.vue'
import { useAuthStore } from '@/stores/auth' import { useAuthStore } from '@/stores/auth'
const authStore = useAuthStore() const authStore = useAuthStore()

View File

@@ -7,7 +7,7 @@
<UTable :data="productsList" :columns="columns" class="flex-1 w-full" /> <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
<UPagination v-model:page="page" :total="total" :items-per-page="perPage" /> <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
</div> </div>
</div> </div> -->
</component> </component>
</suspense> </suspense>
</template> </template>
@@ -18,7 +18,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
import Default from '@/layouts/default.vue' import Default from '@/layouts/default.vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import type { TableColumn } from '@nuxt/ui' import type { TableColumn } from '@nuxt/ui'
import CategoryMenu from '../inner/categoryMenu.vue' import CategoryMenu from '../inner/CategoryMenu.vue'
import type { Product } from '@/types/product' import type { Product } from '@/types/product'
const router = useRouter() const router = useRouter()

View File

@@ -2,31 +2,59 @@
<component :is="Default || 'div'"> <component :is="Default || 'div'">
<div class="container my-10 mx-auto"> <div class="container my-10 mx-auto">
<div <div class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
<div class="flex items-end gap-3"> <div class="flex items-center gap-3">
<USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!"
valueKey="iso_code"> <template v-if="!isViewingExistingTranslation">
<USelectMenu
v-model="selectedLangId"
:items="langOptions"
value-key="id"
class="w-40"
:search-input="false"
>
<template #default="{ modelValue }"> <template #default="{ modelValue }">
<div class="flex items-center gap-2"> <span class="dark:text-white text-black">
<span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span> {{ langOptions.find(l => l.id === modelValue)?.name }}
<span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code == </span>
modelValue)?.name}}</span>
</div>
</template> </template>
<template #item-leading="{ item }"> <template #item-leading="{ item }">
<div class="flex items-center rounded-md cursor-pointer transition-colors"> <span class="dark:text-white text-black font-medium">
<span class="text-md">{{ item.flag }}</span> {{ item.name }}
<span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span> </span>
</div>
</template> </template>
</USelect> </USelectMenu>
</div>
<UButton @click="translateToSelectedLanguage" color="primary" :loading="translating" <UButton
class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!"> @click="translateOrSave"
:disabled="selectedLangId === defaultLangId"
:loading="translating"
class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!"
>
Translate Translate
</UButton> </UButton>
</template>
<template v-else>
<UButton
@click="goBackToDefault"
color="neutral"
variant="outline"
class="cursor-pointer"
>
<UIcon name="i-lucide-arrow-left" class="mr-1" />
<p class="dark:text-white">Back to Polish</p>
</UButton>
</template>
</div> </div>
</div>
<p v-if="noTranslation" class="text-red-500 mt-2">
No translation available
</p>
<div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"> <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
<div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl"> <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
@@ -38,18 +66,23 @@
<div v-if="productStore.loading" class="flex items-center justify-center py-20"> <div v-if="productStore.loading" class="flex items-center justify-center py-20">
<UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" /> <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
</div> </div>
<div v-else-if="productStore.error" class="flex items-center justify-center py-20"> <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
<p class="text-red-500">{{ productStore.error }}</p> <p class="text-red-500">{{ productStore.error }}</p>
</div> </div>
<div v-else-if="productStore.productDescription" class="flex items-start gap-30"> <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
<div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center"> <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
<span class="text-gray-500 dark:text-gray-400">Product Image</span> <span class="text-gray-500 dark:text-gray-400">Product Image</span>
</div> </div>
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<p class="text-[25px] font-bold text-black dark:text-white"> <p class="text-[25px] font-bold text-black dark:text-white">
{{ productStore.productDescription.name || 'Product Name' }} {{ productName || 'Product Name' }}
</p> </p>
<p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
<p v-html="displayedShortDescription" class="text-black dark:text-white"></p>
<div class="space-y-[10px]"> <div class="space-y-[10px]">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" /> <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
@@ -57,6 +90,7 @@
{{ productStore.productDescription.available_now }} {{ productStore.productDescription.available_now }}
</p> </p>
</div> </div>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" /> <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
<p class="text-[18px] font-bold text-black dark:text-white"> <p class="text-[18px] font-bold text-black dark:text-white">
@@ -67,63 +101,43 @@
</div> </div>
</div> </div>
<!-- TABS -->
<div v-if="productStore.productDescription" class="mt-16"> <div v-if="productStore.productDescription" class="mt-16">
<div class="flex gap-4 my-6"> <div class="flex gap-4 my-6">
<UButton @click="activeTab = 'description'" <UButton @click="activeTab = 'description'" :class="btnClass('description')" variant="outline">
:class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral" Description
variant="outline">
<p class="dark:text-white">Description</p>
</UButton> </UButton>
<UButton @click="activeTab = 'usage'" <UButton @click="activeTab = 'usage'" :class="btnClass('usage')" variant="outline">
:class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral" Usage
variant="outline">
<p class="dark:text-white">Usage</p>
</UButton> </UButton>
</div> </div>
<div v-if="activeTab === 'usage'" <!-- USAGE -->
class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)"> <div v-if="activeTab === 'usage'" class="box">
<div class="flex justify-end mb-4 gap-2">
<div class="flex justify-end items-center gap-3 mb-4"> <UButton v-if="!isEditing" @click="enableUsageEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
<UButton v-if="!isEditing" @click="enableEdit" Edit Usage
class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
<p class="text-white">Change Text</p>
<UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
</UButton>
<UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
<p class="dark:text-white text-black">Save the edited text</p>
</UButton>
<UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline"
class="p-2.5 cursor-pointer">
Cancel
</UButton> </UButton>
<UButton v-if="isEditing" @click="saveUsage" class="px-3 py-1 border rounded">Save</UButton>
<UButton v-if="isEditing" @click="cancelUsageEdit" class="px-3 py-1 border rounded">Cancel</UButton>
</div> </div>
<p ref="usageRef" v-html="productStore.productDescription.usage" <p ref="usageRef" v-html="displayedUsage || 'Usage information not available'" class="text-black dark:text-white"></p>
class="flex flex-col justify-center w-full text-start dark:text-white! text-black!"></p>
</div> </div>
<div v-if="activeTab === 'description'" <!-- DESCRIPTION -->
class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)"> <div v-if="activeTab === 'description'" class="box">
<div class="flex items-center justify-end gap-3 mb-4"> <div class="flex justify-end mb-4 gap-2">
<UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit" <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!"> Edit Description
<p class="text-white">Change Text</p>
<UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
</UButton> </UButton>
<UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline" <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" class="px-3 py-1 border rounded">Save</UButton>
class="p-2.5 cursor-pointer"> <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" class="px-3 py-1 border rounded">Cancel</UButton>
<p class="dark:text-white text-black ">Save the edited text</p>
</UButton>
<UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral"
variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
</div>
<div ref="descriptionRef" v-html="productStore.productDescription.description"
class="flex flex-col justify-center dark:text-white text-black">
</div> </div>
<div ref="descriptionRef" v-html="displayedDescription || 'Description not available'" class="text-black dark:text-white"></div>
</div> </div>
</div> </div>
</div> </div>
</component> </component>
</template> </template>
@@ -132,118 +146,175 @@
import { ref, computed, onMounted, watch } from 'vue' import { ref, computed, onMounted, watch } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { useProductStore } from '@/stores/product' import { useProductStore } from '@/stores/product'
import { useEditable } from '@/composable/useConteditable' import { useSettingsStore } from '@/stores/settings'
import { langs } from '@/router/langs' import { langs } from '@/router/langs'
import type { Language } from '@/types' import { useEditable } from '@/composable/useConteditable'
import Default from '@/layouts/default.vue' import Default from '@/layouts/default.vue'
const route = useRoute() const route = useRoute()
const activeTab = ref('description')
const productStore = useProductStore() const productStore = useProductStore()
const settingsStore = useSettingsStore()
const activeTab = ref('description')
const translating = ref(false) const translating = ref(false)
const noTranslation = ref(false)
const isEditing = ref(false) const defaultLangId = ref(0)
const selectedLangId = ref(0)
const availableLangs = computed(() => langs) const activeLangId = ref(0)
const productID = ref(0)
const selectedLanguage = ref('en')
const currentLangId = ref(2)
const productID = ref<number>(0)
// Watch for language changes and refetch product description
watch(selectedLanguage, async (newLang: string) => {
if (productID.value) {
await fetchForLanguage(newLang)
}
})
const fetchForLanguage = async (langCode: string) => {
const lang = langs.find((l: Language) => l.iso_code === langCode)
if (lang && productID.value) {
await productStore.getProductDescription(lang.id, productID.value)
currentLangId.value = lang.id
}
}
const translateToSelectedLanguage = async () => {
const targetLang = langs.find((l: Language) => l.iso_code === selectedLanguage.value)
if (targetLang && currentLangId.value && productID.value) {
translating.value = true
try {
await productStore.translateProductDescription(productID.value, currentLangId.value, targetLang.id)
currentLangId.value = targetLang.id
} finally {
translating.value = false
}
}
}
onMounted(async () => {
const id = route.params.product_id
if (id) {
productID.value = Number(id)
await fetchForLanguage(selectedLanguage.value)
}
})
const descriptionRef = ref<HTMLElement | null>(null) const descriptionRef = ref<HTMLElement | null>(null)
const usageRef = ref<HTMLElement | null>(null) const usageRef = ref<HTMLElement | null>(null)
const descriptionEdit = useEditable(descriptionRef) const descriptionEdit = useEditable(descriptionRef)
const usageEdit = useEditable(usageRef) const usageEdit = useEditable(usageRef)
const isEditing = ref(false)
const originalDescription = ref('')
const originalUsage = ref('') const originalUsage = ref('')
const originalDescription = ref('')
const saveDescription = async () => { const langOptions = computed(() => langs.filter(l => l.active !== false))
descriptionEdit.disableEdit()
await productStore.saveProductDescription(productID.value) watch(selectedLangId, async (newLang) => {
if (!productID.value) return
if (newLang === defaultLangId.value) {
noTranslation.value = false
activeLangId.value = defaultLangId.value
await productStore.getProductDescription(defaultLangId.value, productID.value)
await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
return
} }
const cancelDescriptionEdit = () => { await productStore.getProductDescription(newLang, productID.value)
if (descriptionRef.value) {
descriptionRef.value.innerHTML = originalDescription.value const desc = productStore.productDescription
if (!desc || (!desc.description && !desc.description_short && !desc.usage)) {
noTranslation.value = true
activeLangId.value = defaultLangId.value
await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
} else {
noTranslation.value = false
activeLangId.value = newLang
} }
descriptionEdit.disableEdit() })
const isViewingExistingTranslation = computed(() => activeLangId.value !== defaultLangId.value && !noTranslation.value)
const productName = computed(() => {
if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
return productStore.productDescription?.name || ''
}
return productStore.defaultProductDescription?.name || productStore.productDescription?.name || ''
})
const displayedDescription = computed(() => {
if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
return productStore.productDescription?.description || ''
}
return productStore.defaultProductDescription?.description || ''
})
const displayedShortDescription = computed(() => {
if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
return productStore.productDescription?.description_short || ''
}
return productStore.defaultProductDescription?.description_short || ''
})
const displayedUsage = computed(() => {
if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
return productStore.productDescription?.usage || ''
}
return productStore.defaultProductDescription?.usage || ''
})
const goBackToDefault = async () => {
selectedLangId.value = defaultLangId.value
activeLangId.value = defaultLangId.value
noTranslation.value = false
await productStore.getProductDescription(defaultLangId.value, productID.value)
await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
} }
const translateOrSave = async () => {
if (!productID.value || selectedLangId.value === defaultLangId.value) return
translating.value = true
try {
const res = await productStore.translateProductDescription(productID.value, defaultLangId.value, selectedLangId.value)
if (res) {
activeLangId.value = selectedLangId.value
noTranslation.value = false
}
} finally {
translating.value = false
}
}
const btnClass = (tab: string) => ['cursor-pointer px-4 py-2', activeTab.value === tab ? 'bg-blue-500 text-white' : '']
/* USAGE EDIT */
const enableUsageEdit = () => {
originalUsage.value = displayedUsage.value
usageEdit.enableEdit()
isEditing.value = true
}
const saveUsage = async () => {
if (usageRef.value && productStore.productDescription) {
productStore.productDescription.usage = usageRef.value.innerHTML
}
usageEdit.disableEdit()
isEditing.value = false
await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
}
const cancelUsageEdit = () => {
if (usageRef.value) usageRef.value.innerHTML = originalUsage.value
if (productStore.productDescription) productStore.productDescription.usage = originalUsage.value
usageEdit.disableEdit()
isEditing.value = false
}
/* DESCRIPTION EDIT */
const enableDescriptionEdit = () => { const enableDescriptionEdit = () => {
if (descriptionRef.value) { originalDescription.value = displayedDescription.value
originalDescription.value = descriptionRef.value.innerHTML
}
descriptionEdit.enableEdit() descriptionEdit.enableEdit()
} }
const saveDescription = async () => {
const enableEdit = () => { if (descriptionRef.value && productStore.productDescription) {
if (usageRef.value) { productStore.productDescription.description = descriptionRef.value.innerHTML
originalUsage.value = usageRef.value.innerHTML
} }
isEditing.value = true descriptionEdit.disableEdit()
usageEdit.enableEdit() await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
}
const cancelDescriptionEdit = () => {
if (descriptionRef.value) descriptionRef.value.innerHTML = originalDescription.value
if (productStore.productDescription) productStore.productDescription.description = originalDescription.value
descriptionEdit.disableEdit()
} }
const saveText = () => { onMounted(async () => {
usageEdit.disableEdit() const settings = await settingsStore.getSettings()
isEditing.value = false if (settings) {
productStore.saveProductDescription(productID.value) defaultLangId.value = settings.app.shop_default_language
selectedLangId.value = defaultLangId.value
activeLangId.value = defaultLangId.value
} }
const id = route.params.product_id
const cancelEdit = () => { if (id) {
if (usageRef.value) { productID.value = Number(id)
usageRef.value.innerHTML = originalUsage.value await productStore.getProductDescription(defaultLangId.value, productID.value)
await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
} }
usageEdit.disableEdit() })
isEditing.value = false
}
</script> </script>
<style> <style>
.images { .box {
display: flex; padding: 20px;
align-items: center; border: 1px solid var(--border-light);
gap: 70px; border-radius: 8px;
margin: 20px 0 20px 0;
} }
</style> </style>

View File

@@ -46,7 +46,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
import Default from '@/layouts/default.vue' import Default from '@/layouts/default.vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import type { TableColumn } from '@nuxt/ui' import type { TableColumn } from '@nuxt/ui'
import CategoryMenu from '../inner/categoryMenu.vue' import CategoryMenu from '../inner/CategoryMenu.vue'
interface Product { interface Product {
reference: number reference: number

View File

@@ -0,0 +1,68 @@
<template>
<p>Country: {{ currentCountry?.name }}</p>
<p>Currency: {{ currentCountry?.ps_currency.iso_code }}</p>
<USelectMenu v-model="country" :items="countries"
class="w-40 bg-(--main-light) dark:bg-(--black) rounded-md shadow-sm hover:none!" valueKey="id"
:searchInput="false">
<template #default="{ modelValue }">
<div class="flex items-center gap-1">
<span class="font-medium dark:text-white text-black">{{ modelValue.name }}</span>
</div>
</template>
<template #item-leading="{ item }">
<div class="flex items-center rounded-md cursor-pointer transition-colors">
<span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
</div>
</template>
</USelectMenu>
</template>
<script setup lang="ts">
import { countries, currentCountry } from '@/router/langs'
import { useRouter, useRoute } from 'vue-router'
import { useCookie } from '@/composable/useCookie'
import { computed, watch } from 'vue'
import { i18n } from '@/plugins/02_i18n'
import { useFetchJson } from '@/composable/useFetchJson'
const router = useRouter()
const route = useRoute()
const cookie = useCookie()
const country = computed({
get() {
return currentCountry.value
},
set(value: string) {
// i18n.locale.value = value
currentCountry.value = countries.find((x) => x.id == Number(value))
cookie.setCookie('country_id', `${countries.find((x) => x.id == Number(value))?.id}`, { days: 60, secure: true, sameSite: 'Lax' })
// changeLang()
},
})
// async function changeLang() {
// try {
// const { items } = await useFetchJson('/api/v1/public/auth/update-choice', {
// method: 'POST'
// })
// } catch (error) {
// console.log(error)
// }
// }
watch(
() => country,
(newCountry) => {
if (newCountry) {
console.log(newCountry.value);
// i18n.locale.value = newLocale
currentCountry.value = countries.find((x) => x.id == Number(newCountry.value?.id))
}
},
{ immediate: true },
)
</script>

View File

@@ -1,11 +1,12 @@
import { useFetchJson } from '@/composable/useFetchJson' import { useFetchJson } from '@/composable/useFetchJson'
import { initLangs, langs } from '@/router/langs' import { initCountryCurrency, initLangs, langs } from '@/router/langs'
import { watch } from 'vue' import { watch } from 'vue'
import { createI18n, type PathValue } from 'vue-i18n' import { createI18n, type PathValue } from 'vue-i18n'
// const x = // const x =
await initLangs() await initLangs()
await initCountryCurrency()
export const i18ninstall = createI18n({ export const i18ninstall = createI18n({
legacy: false, // you must set `false`, to use Composition API legacy: false, // you must set `false`, to use Composition API
locale: 'en', locale: 'en',

View File

@@ -1,12 +1,16 @@
import { useCookie } from "@/composable/useCookie" import { useCookie } from "@/composable/useCookie"
import { useFetchJson } from "@/composable/useFetchJson" import { useFetchJson } from "@/composable/useFetchJson"
import type { Language } from "@/types" import type { Country, Language } from "@/types"
import { reactive, ref } from "vue" import { reactive, ref } from "vue"
export const langs = reactive([] as Language[]) export const langs = reactive([] as Language[])
export const currentLang = ref<Language>() export const currentLang = ref<Language>()
const deflang = ref<Language>() export const countries = reactive([] as Country[])
export const currentCountry = ref<Country>()
const defLang = ref<Language>()
const defCountry = ref<Country>()
const cookie = useCookie() const cookie = useCookie()
// Get available language codes for route matching // Get available language codes for route matching
// export const availableLocales = computed(() => langs.map((l) => l.lang_code)) // export const availableLocales = computed(() => langs.map((l) => l.lang_code))
@@ -22,8 +26,27 @@ export async function initLangs() {
if (cc) { if (cc) {
idfromcookie = langs.find((x) => x.id == parseInt(cc)) idfromcookie = langs.find((x) => x.id == parseInt(cc))
} }
deflang.value = items.find((x) => x.is_default == true) defLang.value = items.find((x) => x.is_default == true)
currentLang.value = idfromcookie ?? deflang.value currentLang.value = idfromcookie ?? defLang.value
} catch (error) {
console.error('Failed to fetch languages:', error)
}
}
// Initialize country/currency from API
export async function initCountryCurrency() {
try {
const { items } = await useFetchJson<Country[]>('/api/v1/restricted/langs-and-countries/get-countries')
countries.push(...items)
let idfromcookie = null
const cc = cookie.getCookie('country_id')
if (cc) {
idfromcookie = langs.find((x) => x.id == parseInt(cc))
}
defCountry.value = items.find((x) => x.id === defLang.value?.id)
currentCountry.value = idfromcookie ?? defCountry.value
} catch (error) { } catch (error) {
console.error('Failed to fetch languages:', error) console.error('Failed to fetch languages:', error)
} }

View File

@@ -23,7 +23,8 @@ export interface ProductResponse {
} }
export const useProductStore = defineStore('product', () => { export const useProductStore = defineStore('product', () => {
const productDescription = ref() const productDescription = ref<ProductDescription | null>(null)
const defaultProductDescription = ref<ProductDescription | null>(null)
const currentProduct = ref<Product | null>(null) const currentProduct = ref<Product | null>(null)
const loading = ref(false) const loading = ref(false)
const error = ref<string | null>(null) const error = ref<string | null>(null)
@@ -37,7 +38,6 @@ export const useProductStore = defineStore('product', () => {
`/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}` `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
) )
productDescription.value = response.items productDescription.value = response.items
} catch (e: unknown) { } catch (e: unknown) {
error.value = e instanceof Error ? e.message : 'Failed to load product description' error.value = e instanceof Error ? e.message : 'Failed to load product description'
} finally { } finally {
@@ -45,20 +45,30 @@ export const useProductStore = defineStore('product', () => {
} }
} }
async function saveProductDescription(productID?: number) { async function getDefaultProductDescription(langId: number, productID: number) {
try {
const response = await useFetchJson<ProductDescription>(
`/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
)
defaultProductDescription.value = response.items
} catch (e: unknown) {
console.error('Failed to load default product description:', e)
}
}
async function saveProductDescription(productID?: number, langId?: number, shopId = 1) {
const id = productID || 1 const id = productID || 1
try { try {
const data = await useFetchJson( const data = await useFetchJson(
`/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=1&productLangID=1`, `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=${shopId}&productLangID=${langId ?? 1}`,
{ {
method: 'POST', method: 'POST',
body: JSON.stringify( body: JSON.stringify({
{ description: productDescription.value?.description,
description: productDescription.value.description, description_short: productDescription.value?.description_short,
description_short: productDescription.value.description_short, meta_description: productDescription.value?.meta_description,
meta_description: productDescription.value.meta_description, available_now: productDescription.value?.available_now,
available_now: productDescription.value.available_now, usage: productDescription.value?.usage
usage: productDescription.value.usage
}) })
} }
) )
@@ -90,10 +100,12 @@ export const useProductStore = defineStore('product', () => {
return { return {
productDescription, productDescription,
defaultProductDescription,
currentProduct, currentProduct,
loading, loading,
error, error,
getProductDescription, getProductDescription,
getDefaultProductDescription,
clearCurrentProduct, clearCurrentProduct,
saveProductDescription, saveProductDescription,
translateProductDescription, translateProductDescription,

View File

@@ -2,13 +2,19 @@ import { useFetchJson } from '@/composable/useFetchJson'
import type { Resp } from '@/types' import type { Resp } from '@/types'
import type { Settings } from '@/types/settings' import type { Settings } from '@/types/settings'
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { ref } from 'vue'
export const useSettingsStore = defineStore('settings', () => { export const useSettingsStore = defineStore('settings', () => {
async function getSettings() { const settings = ref<Settings | null>(null)
const { items } = await useFetchJson<Resp<Settings>>('/api/v1/settings',) const loaded = ref(false)
console.log(items);
async function getSettings(): Promise<Settings | null> {
if (loaded.value && settings.value) return settings.value
const resp = await useFetchJson<Settings>('/api/v1/settings')
settings.value = resp.items
loaded.value = true
return resp.items
} }
getSettings() return { settings, loaded, getSettings }
return {}
}) })

View File

@@ -12,3 +12,20 @@ export interface Language {
active: boolean active: boolean
flag: string flag: string
} }
export interface Country {
id: number
name: string
flag: string
currency_id: string
ps_currency: {
id_currency: string
name: string
iso_code: string
numeric_iso_code: string
precision: number
conversion_rate: number
deleted: boolean
active: boolean
}
}

View File

@@ -5,6 +5,7 @@ export interface ProductDescription {
description_short: string description_short: string
meta_description: string meta_description: string
available_now: string available_now: string
delivery_in_stock?: string
usage: string usage: string
} }

View File

@@ -12,6 +12,7 @@ export interface App {
environment: string environment: string
base_url: string base_url: string
password_regex: string password_regex: string
shop_default_language: number
} }
export interface Server { export interface Server {