-
-
-
-
- ![pics]()
-
-
-
- {{ productStore.productList[0]?.name }} -
-
-
- {{ productStore.productList[0]?.formatted_price }} -
-
-
-
-{{
- count }}
+
+
diff --git a/components/CountryCurrencySelector.vue b/components/CountryCurrencySelector.vue
index 88f166b..ce3d577 100644
--- a/components/CountryCurrencySelector.vue
+++ b/components/CountryCurrencySelector.vue
@@ -6,7 +6,7 @@
{{ menuStore.selectedCountry }}/{{ menuStore.selectedCurrency?.iso_code }}
-
+
-
- Přejít k pokladně
Celková částka
-- {{ productStore.productList[0]?.formatted_price }} -
+ -
+
diff --git a/components/HeaderBlock.vue b/components/HeaderBlock.vue
index 46417f2..eeaecd3 100644
--- a/components/HeaderBlock.vue
+++ b/components/HeaderBlock.vue
@@ -25,8 +25,12 @@
-
+
-
+
-
+
@@ -214,7 +218,7 @@ const productStore = useProductStore();
const open = ref(false);
const colorMode = useColorMode();
-// productStore.getCart()
+productStore.getCart()
const route = useRoute()
const isDark = computed({
diff --git a/components/section/InvestmentSave.vue b/components/section/InvestmentSave.vue
index c21ece5..1aeac86 100644
--- a/components/section/InvestmentSave.vue
+++ b/components/section/InvestmentSave.vue
@@ -23,7 +23,7 @@
}" />
+
20 {{ $t("years") }}
diff --git a/components/section/Product.vue b/components/section/Product.vue
index ff36f14..8e7072c 100644
--- a/components/section/Product.vue
+++ b/components/section/Product.vue
@@ -1,10 +1,10 @@
20 {{ $t("years") }}
diff --git a/components/section/Product.vue b/components/section/Product.vue
index ff36f14..8e7072c 100644
--- a/components/section/Product.vue
+++ b/components/section/Product.vue
@@ -1,10 +1,10 @@
- ![pics]()
+ @click="productStore.incrementCartItem(props.product?.id)">
{{ props.product?.name }}
@@ -19,7 +19,7 @@
@@ -27,15 +27,9 @@
diff --git a/components/section/ShopMain.vue b/components/section/ShopMain.vue
index 038cc73..9d468e6 100644
--- a/components/section/ShopMain.vue
+++ b/components/section/ShopMain.vue
@@ -137,13 +137,11 @@
- {{ component.section_lang_data.title }}
+ {{ component.front_section_lang[0].data.title }}
- {{ component.section_lang_data.description }}
+ {{ component.front_section_lang[0].data.description }}
- ![]()
+ ![]()
@@ -171,16 +169,27 @@ import Product from "./Product.vue";
import type { Feature, GenericResponse, GenericResponseChildren, GenericResponseItems, ProductType } from "~/types";
import CategoryTree from "./CategoryTree.vue";
-defineProps<{ component: Component }>();
-type Component = {
- image_collection: string;
- section_id: string;
- section_img: string;
- section_lang_data: {
- title: string;
- description: string
- };
-};
+const props = defineProps<{
+ component: {
+ id: number
+ name: string
+ img: string[]
+ component_name: string
+ is_no_lang: boolean
+ page_name: string
+ front_section_lang: {
+ data: {
+ title: string;
+ description: string
+ }
+ id_front_section: number
+ id_lang: number
+ }[]
+ }
+}>();
+
+console.log(props.component);
+
const openCategories = ref(false);
const isInfo = ref(true);
diff --git a/plugins/i18n.ts b/plugins/i18n.ts
index c0af135..900d767 100644
--- a/plugins/i18n.ts
+++ b/plugins/i18n.ts
@@ -1,5 +1,6 @@
import type { VueI18n } from "vue-i18n";
import { usePB } from "~/composables/usePB";
+import type { GenericResponse } from "~/types";
export default defineNuxtPlugin(async (nuxtApp) => {
const loaded = [] as Array;
@@ -11,16 +12,16 @@ export default defineNuxtPlugin(async (nuxtApp) => {
if (loaded.includes(newLocale)) return;
try {
- const translation = await pb.collection("translation").getList(1, 1, {
- expand: "id_lang",
- filter: `id_lang.iso='${newLocale}'`,
- });
+ // const translation = await pb.collection("translation").getList(1, 1, {
+ // expand: "id_lang",
+ // filter: `id_lang.iso='${newLocale}'`,
+ // });
- if (translation.totalItems === 1) {
- i18n.setLocaleMessage(newLocale, translation.items[0].data);
- } else {
- i18n.setLocaleMessage(newLocale, {});
- }
+ const { data } = await useMyFetch>(
+ "/api/public/front/translation"
+ );
+
+ i18n.setLocaleMessage(newLocale, data);
loaded.push(newLocale);
} catch (err) {
@@ -28,4 +29,4 @@ export default defineNuxtPlugin(async (nuxtApp) => {
throw err;
}
};
-});
\ No newline at end of file
+});
diff --git a/plugins/initLoad.ts b/plugins/initLoad.ts
index 5300ede..c2e2f98 100644
--- a/plugins/initLoad.ts
+++ b/plugins/initLoad.ts
@@ -3,7 +3,6 @@ import { defineNuxtPlugin } from "#app";
export default defineNuxtPlugin(async () => {
const menuStore = useMenuStore();
await menuStore.loadMenu();
- await menuStore.loadFooter();
await menuStore.getCountryList();
await menuStore.getCurrencies();
});
\ No newline at end of file
diff --git a/stores/menuStore.ts b/stores/menuStore.ts
index adca200..5ccde8c 100644
--- a/stores/menuStore.ts
+++ b/stores/menuStore.ts
@@ -30,13 +30,21 @@ import { useMyFetch } from "#imports";
// }));
// }
-function buildTreeRecursive(data: (FrontMenu | UIFrontMenu)[], parentId: number): UIFrontMenu[] {
- const children = data.filter((item): item is UIFrontMenu => item.id_parent === parentId && !item.is_default);
+function buildTreeRecursive(
+ data: (FrontMenu | UIFrontMenu)[],
+ parentId: number
+): UIFrontMenu[] {
+ const children = data.filter(
+ (item): item is UIFrontMenu =>
+ item.id_parent === parentId && !item.is_default
+ );
- return children.map((item) => ({ ...item, children: buildTreeRecursive(data, item.id) }));
+ return children.map((item) => ({
+ ...item,
+ children: buildTreeRecursive(data, item.id),
+ }));
}
-
export const useMenuStore = defineStore("menuStore", () => {
const pb = usePB();
const store = useStore();
@@ -72,15 +80,20 @@ export const useMenuStore = defineStore("menuStore", () => {
// sort: "position_id",
// })) as MenuListResponse;
- const { data } = await useMyFetch>(`/api/public/front/menu`, {
- onErrorOccured: (err, status) => {
- console.log(err, status);
- },
- // onSuccess(data) {
- // console.log(data.data, "data");
+ const { data } = await useMyFetch>(
+ `/api/public/front/menu`,
+ {
+ onErrorOccured: (err, status) => {
+ console.log(err, status);
+ },
+ // onSuccess(data) {
+ // console.log(data.data, "data");
- // },
- })
+ // },
+ }
+ );
+
+ menuItems.value = data;
const root = data.find((item) => item.is_root) as UIFrontMenu;
defaultMenu.value = data.find((item) => item.is_default);
@@ -92,7 +105,6 @@ export const useMenuStore = defineStore("menuStore", () => {
menu.value = [];
}
-
// const root = menuItems.value.items.find((item) => item.is_root);
// defaultMenu.value = menuItems.value.items.find((item) => item.is_default);
@@ -108,18 +120,6 @@ export const useMenuStore = defineStore("menuStore", () => {
}
};
- const loadFooter = async () => {
- try {
- footerItems.value = (await pb
- .collection("footer_view")
- .getList(1, 50, {
- filter: `id_lang="${$i18n.locale.value}"`,
- })) as FooterListResponse;
- } catch (error) {
- console.log(error);
- }
- };
-
const getCountryList = async () => {
try {
const { data } = await useMyFetch>(
@@ -136,14 +136,12 @@ export const useMenuStore = defineStore("menuStore", () => {
// }
// const data = await res.json();
- countryList.value = data
- if (countryList.value)
- selectedPhoneCountry.value = countryList.value[0]
-
+ countryList.value = data;
+ if (countryList.value) selectedPhoneCountry.value = countryList.value[0];
} catch (error) {
console.error("getList error:", error);
}
- }
+ };
const getCurrencies = async () => {
try {
@@ -153,7 +151,9 @@ export const useMenuStore = defineStore("menuStore", () => {
headers: {
"Content-Type": "application/json",
},
- onErrorOccured: (_, status) => { throw new Error(`HTTP error: ${status}`) },
+ onErrorOccured: (_, status) => {
+ throw new Error(`HTTP error: ${status}`);
+ },
}
);
@@ -162,14 +162,13 @@ export const useMenuStore = defineStore("menuStore", () => {
// }
// const data = await res.json();
- currencies.value = data.items
+ currencies.value = data.items;
// console.log(data.items, "data");
-
} catch (error) {
console.error("getList error:", error);
}
- }
+ };
const navigateToItem = (item?: UIFrontMenu) => {
if (item) {
@@ -178,12 +177,11 @@ export const useMenuStore = defineStore("menuStore", () => {
name: `id-slug___${$i18n.locale.value}`,
});
openDropDown.value = false;
- }
- else {
+ } else {
router.push({
params: {
- slug: defaultMenu.value.link_rewrite,
- id: defaultMenu.value.id_page,
+ slug: defaultMenu.value.front_menu_lang[0].link_rewrite,
+ id: defaultMenu.value.id,
},
name: `id-slug___${$i18n.locale.value}`,
});
@@ -191,7 +189,9 @@ export const useMenuStore = defineStore("menuStore", () => {
};
function navigateToShop() {
- navigateToItem(menuItems.value?.items.find(item => item.page_name === 'shop'))
+ console.log(menuItems.value);
+
+ navigateToItem(menuItems.value?.find((item) => item.id === 5));
}
// function redirectToPage(link_rewrite: string) {
@@ -218,9 +218,11 @@ export const useMenuStore = defineStore("menuStore", () => {
let img = "";
for (const s in store.components) {
store.components[s].section_img.map((item) => {
- img = `${req?.headers.get("x-forwarded-proto") || url.protocol}://${req?.headers.get("x-forwarded-host") || req?.headers.get("host")
- }/api/files/${store.components[s].image_collection}/${store.components[s].section_id
- }/${item}?thumb=400x0`;
+ img = `${req?.headers.get("x-forwarded-proto") || url.protocol}://${
+ req?.headers.get("x-forwarded-host") || req?.headers.get("host")
+ }/api/files/${store.components[s].image_collection}/${
+ store.components[s].section_id
+ }/${item}?thumb=400x0`;
});
if (img.length > 0) return img;
}
@@ -273,12 +275,11 @@ export const useMenuStore = defineStore("menuStore", () => {
watch($i18n.locale, async () => {
await loadMenu();
- await loadFooter();
});
watch(selectedCurrency, () => {
- store.getCalculator()
- })
+ store.getCalculator();
+ });
return {
menu,
menuItems,
@@ -294,10 +295,9 @@ export const useMenuStore = defineStore("menuStore", () => {
headMeta,
navigateToShop,
loadMenu,
- loadFooter,
getCountryList,
navigateToItem,
// redirectToPage,
- getCurrencies
+ getCurrencies,
};
});
diff --git a/stores/productStore.ts b/stores/productStore.ts
index 60fe220..49dc2a3 100644
--- a/stores/productStore.ts
+++ b/stores/productStore.ts
@@ -1,6 +1,7 @@
import { NuxtErrorBoundary } from "#components";
import { useMyFetch } from "#imports";
import type {
+ CartItem,
GenericResponse,
GenericResponseChildren,
GenericResponseItems,
@@ -59,10 +60,10 @@ export const useProductStore = defineStore("productStore", () => {
}
}
- async function addToCart(product: Product) {
+ async function incrementCartItem(id: number) {
try {
- const { data } = await useMyFetch>(
- `/api/public/user/cart/item/add/${product.id}/1`,
+ await useMyFetch(
+ `/api/public/user/cart/item/add/${id}/1`,
{
method: "PUT",
headers: {
@@ -73,11 +74,55 @@ export const useProductStore = defineStore("productStore", () => {
},
}
);
+
+ getCart();
} catch (error) {
console.error("getList error:", error);
}
}
+ async function decrementCartItem(id: number) {
+ try {
+ await useMyFetch(
+ `/api/public/user/cart/item/subtract/${id}/1`,
+ {
+ method: "PUT",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ onErrorOccured: (_, status) => {
+ throw new Error(`HTTP error: ${status}`);
+ },
+ }
+ );
+
+ getCart();
+ } catch (error) {
+ console.error("removeFromCart error:", error);
+ }
+ }
+
+ async function deleteCartItem(id: number) {
+ try {
+ await useMyFetch(
+ `/api/public/user/cart/item/${id}`,
+ {
+ method: "DELETE",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ onErrorOccured: (_, status) => {
+ throw new Error(`HTTP error: ${status}`);
+ },
+ }
+ );
+
+ getCart();
+ } catch (error) {
+ console.error("removeFromCart error:", error);
+ }
+ }
+
const cart = ref({} as UserCart);
async function getCart() {
try {
@@ -93,10 +138,6 @@ export const useProductStore = defineStore("productStore", () => {
}
);
- // if (!res.ok) {
- // throw new Error(`HTTP error: ${res.status}`);
- // }
-
cart.value = data;
} catch (error) {
console.error("getList error:", error);
@@ -106,9 +147,12 @@ export const useProductStore = defineStore("productStore", () => {
return {
productList,
modules,
+ cart,
getList,
getModules,
- addToCart,
- // getCart,
+ incrementCartItem,
+ decrementCartItem,
+ deleteCartItem,
+ getCart,
};
});
diff --git a/types/index.ts b/types/index.ts
index 388146f..9312c53 100644
--- a/types/index.ts
+++ b/types/index.ts
@@ -181,11 +181,22 @@ export interface Currency {
suffix: boolean;
}
+export interface CartItem {
+ cart_item_id: number;
+ link_rewrite: string;
+ name: string;
+ picture_uuid: string;
+ product_id: number;
+ quantity: number;
+ single_item_price: number;
+ total_price: number;
+}
export interface UserCart {
+ cart_items: CartItem[];
id: number;
checkout_in_progress: boolean;
- total_value: number;
currency_iso: string;
+ total_value: number;
}
export interface GenericResponse {
+ @click="productStore.incrementCartItem(props.product?.id)">
@@ -27,15 +27,9 @@
diff --git a/components/section/ShopMain.vue b/components/section/ShopMain.vue
index 038cc73..9d468e6 100644
--- a/components/section/ShopMain.vue
+++ b/components/section/ShopMain.vue
@@ -137,13 +137,11 @@
{{ props.product?.name }} @@ -19,7 +19,7 @@
- {{ component.section_lang_data.title }} + {{ component.front_section_lang[0].data.title }}
-{{ component.section_lang_data.description }}
+{{ component.front_section_lang[0].data.description }}