diff --git a/bo/components.d.ts b/bo/components.d.ts index 4a4c840..361fcb7 100644 --- a/bo/components.d.ts +++ b/bo/components.d.ts @@ -11,12 +11,16 @@ export {} /* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { + ButtonGoToProfile: typeof import('./src/components/customer-management/ButtonGoToProfile.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'] + copy: typeof import('./src/components/admin/ProductDetailView copy.vue')['default'] + CountryCurrencySwitch: typeof import('./src/components/inner/CountryCurrencySwitch.vue')['default'] Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.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_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default'] + FavoriteProducts: typeof import('./src/components/admin/FavoriteProducts.vue')['default'] LangSwitch: typeof import('./src/components/inner/LangSwitch.vue')['default'] PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default'] PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default'] @@ -33,8 +37,10 @@ declare module 'vue' { 'ProductDetailView copy': typeof import('./src/components/admin/ProductDetailView copy.vue')['default'] ProductEditor: typeof import('./src/components/inner/ProductEditor.vue')['default'] ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default'] + Profile: typeof import('./src/components/customer-management/Profile.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] + StorageFileBrowser: typeof import('./src/components/customer/StorageFileBrowser.vue')['default'] ThemeSwitch: typeof import('./src/components/inner/ThemeSwitch.vue')['default'] TopBar: typeof import('./src/components/TopBar.vue')['default'] TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default'] @@ -57,9 +63,12 @@ declare module 'vue' { UPagination: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Pagination.vue')['default'] USelect: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Select.vue')['default'] USelectMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/SelectMenu.vue')['default'] + UsersList: typeof import('./src/components/admin/UsersList.vue')['default'] + UsersSearch: typeof import('./src/components/admin/UsersSearch.vue')['default'] USidebar: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Sidebar.vue')['default'] UTable: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Table.vue')['default'] UTabs: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tabs.vue')['default'] UTextarea: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Textarea.vue')['default'] + UTree: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tree.vue')['default'] } } diff --git a/bo/src/App.vue b/bo/src/App.vue index 54265cd..8596791 100644 --- a/bo/src/App.vue +++ b/bo/src/App.vue @@ -1,6 +1,9 @@ - diff --git a/bo/src/app.config.ts b/bo/src/app.config.ts index e0c4961..44b4214 100644 --- a/bo/src/app.config.ts +++ b/bo/src/app.config.ts @@ -47,7 +47,7 @@ export const uiOptions: NuxtUIOptions = { table: { slots: { base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! bg-(--second-light) dark:bg-(--main-dark)', - tr: 'border-b! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! text-(--black)! dark:text-white!', + // tr: 'border-b! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! text-(--black)! dark:text-white!', } }, diff --git a/bo/src/components/TopBar.vue b/bo/src/components/TopBar.vue index 927feb5..0fb84d5 100644 --- a/bo/src/components/TopBar.vue +++ b/bo/src/components/TopBar.vue @@ -38,7 +38,7 @@ import { useFetchJson } from '@/composable/useFetchJson' import LangSwitch from './inner/LangSwitch.vue' import ThemeSwitch from './inner/ThemeSwitch.vue' -import { useAuthStore } from '@/stores/auth' +import { useAuthStore } from '@/stores/customer/auth' import { computed, ref } from 'vue' import { currentLang } from '@/router/langs' import type { LabelTrans, TopMenuItem } from '@/types' diff --git a/bo/src/components/TopBarLogin.vue b/bo/src/components/TopBarLogin.vue index d1820b9..921aa04 100644 --- a/bo/src/components/TopBarLogin.vue +++ b/bo/src/components/TopBarLogin.vue @@ -1,7 +1,7 @@ diff --git a/bo/src/components/admin/FavoriteProducts.vue b/bo/src/components/admin/FavoriteProducts.vue new file mode 100644 index 0000000..669e96e --- /dev/null +++ b/bo/src/components/admin/FavoriteProducts.vue @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/bo/src/components/admin/PageProducts.vue b/bo/src/components/admin/PageProducts.vue index c2d4e26..dbbd60a 100644 --- a/bo/src/components/admin/PageProducts.vue +++ b/bo/src/components/admin/PageProducts.vue @@ -141,7 +141,7 @@ async function fetchProductList() { if (route.params.category_id) params.append('category_id', String(route.params.category_id)) - const url = `/api/v1/restricted/list/list-products?elems=${perPage.value}&${params.toString()}` + const url = `/api/v1/restricted/product/list?elems=${perPage.value}&${params.toString()}` try { const response = await useFetchJson(url) productsList.value = response.items || [] @@ -161,7 +161,7 @@ function goToProduct(productId: number, linkRewrite: string) { } localStorage.setItem('back_from_product', JSON.stringify(path)) router.push({ - name: 'customer-product-details', + name: 'admin-product-details', params: { product_id: productId, link_rewrite: linkRewrite } }) } diff --git a/bo/src/components/admin/ProductDetailView copy.vue b/bo/src/components/admin/ProductDetailView copy.vue index aacca62..c0934ff 100644 --- a/bo/src/components/admin/ProductDetailView copy.vue +++ b/bo/src/components/admin/ProductDetailView copy.vue @@ -198,7 +198,7 @@ import { useEditable } from '@/composable/useConteditable'; import Default from '@/layouts/default.vue'; import { langs } from '@/router/langs'; import { useProductStore } from '@/stores/product'; -import { useSettingsStore } from '@/stores/settings'; +import { useSettingsStore } from '@/stores/admin/settings'; import type { EditorToolbarItem } from '@nuxt/ui'; import { onMounted, ref, watch } from 'vue'; import { useRoute, useRouter } from 'vue-router'; diff --git a/bo/src/components/admin/ProductDetailView.vue b/bo/src/components/admin/ProductDetailView.vue index 62be34c..6f79e6d 100644 --- a/bo/src/components/admin/ProductDetailView.vue +++ b/bo/src/components/admin/ProductDetailView.vue @@ -89,6 +89,14 @@ }" /> + +
+

Link rewrite:

+ +

Link rewrite:

@@ -152,8 +160,8 @@ \ No newline at end of file diff --git a/bo/src/components/admin/UsersSearch.vue b/bo/src/components/admin/UsersSearch.vue new file mode 100644 index 0000000..1db9f33 --- /dev/null +++ b/bo/src/components/admin/UsersSearch.vue @@ -0,0 +1,245 @@ + + + + + \ No newline at end of file diff --git a/bo/src/components/customer-management/Profile.vue b/bo/src/components/customer-management/Profile.vue new file mode 100644 index 0000000..0d76cc3 --- /dev/null +++ b/bo/src/components/customer-management/Profile.vue @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/bo/src/components/customer/CartDetails.vue b/bo/src/components/customer/CartDetails.vue index 261755d..4fef8a8 100644 --- a/bo/src/components/customer/CartDetails.vue +++ b/bo/src/components/customer/CartDetails.vue @@ -52,7 +52,7 @@