Refine catalog cart controls and show cart badge in header

This commit is contained in:
Ruslan Bakiev
2026-04-03 08:50:24 +07:00
parent 4f14c24e46
commit 0f7787de36
3 changed files with 39 additions and 9 deletions

View File

@@ -6,6 +6,7 @@ type NavItem = {
}; };
const route = useRoute(); const route = useRoute();
const { totalItems } = useClientCart();
const leftCapsule: NavItem[] = [ const leftCapsule: NavItem[] = [
{ to: '/profile', label: 'Профиль', icon: 'user' }, { to: '/profile', label: 'Профиль', icon: 'user' },
@@ -83,6 +84,9 @@ function isActive(path: string) {
<path d="M7 4h-2l-1 2v2h1l2.2 9h10.6l2.2-7H8.3L7.8 8H21V6h-12l-1-2Zm2 16a2 2 0 1 0 0 .01V20Zm8 0a2 2 0 1 0 0 .01V20Z" fill="currentColor" /> <path d="M7 4h-2l-1 2v2h1l2.2 9h10.6l2.2-7H8.3L7.8 8H21V6h-12l-1-2Zm2 16a2 2 0 1 0 0 .01V20Zm8 0a2 2 0 1 0 0 .01V20Z" fill="currentColor" />
</svg> </svg>
{{ item.label }} {{ item.label }}
<span v-if="item.to === '/cart' && totalItems > 0" class="badge badge-sm border-0 bg-[#139957] text-white">
{{ totalItems }}
</span>
</NuxtLink> </NuxtLink>
</div> </div>
</div> </div>

View File

@@ -12,8 +12,8 @@ export type ClientCartItem = {
}; };
function normalizeQuantity(value: number) { function normalizeQuantity(value: number) {
if (!Number.isFinite(value) || value < 1) { if (!Number.isFinite(value) || value < 0) {
return 1; return 0;
} }
return Math.floor(value); return Math.floor(value);
@@ -64,7 +64,13 @@ export function useClientCart() {
return; return;
} }
existing.quantity = normalizeQuantity(quantity); const normalizedQuantity = normalizeQuantity(quantity);
if (normalizedQuantity === 0) {
removeProduct(productId);
return;
}
existing.quantity = normalizedQuantity;
} }
function incrementQuantity(productId: string) { function incrementQuantity(productId: string) {
@@ -82,7 +88,13 @@ export function useClientCart() {
return; return;
} }
existing.quantity = normalizeQuantity(existing.quantity - 1); const normalizedQuantity = normalizeQuantity(existing.quantity - 1);
if (normalizedQuantity === 0) {
removeProduct(productId);
return;
}
existing.quantity = normalizedQuantity;
} }
function removeProduct(productId: string) { function removeProduct(productId: string) {

View File

@@ -6,7 +6,7 @@ import { useClientCart } from '~/composables/useClientCart';
const { result, loading, error } = useQuery(ClientProductsDocument); const { result, loading, error } = useQuery(ClientProductsDocument);
const search = ref(''); const search = ref('');
const stockFilter = ref<'ALL' | 'CUSTOM' | 'STANDARD'>('ALL'); const stockFilter = ref<'ALL' | 'CUSTOM' | 'STANDARD'>('ALL');
const { addProduct, getQuantity, totalItems } = useClientCart(); const { addProduct, getQuantity, totalItems, incrementQuantity, decrementQuantity } = useClientCart();
const coverPresets = [ const coverPresets = [
['#e9fbe5', '#acfcd5', '#7be9aa'], ['#e9fbe5', '#acfcd5', '#7be9aa'],
@@ -65,6 +65,14 @@ function addProductToCart(product: ClientProductsQuery['clientProducts'][number]
isCustomizable: product.isCustomizable, isCustomizable: product.isCustomizable,
}); });
} }
function incrementProduct(productId: string) {
incrementQuantity(productId);
}
function decrementProduct(productId: string) {
decrementQuantity(productId);
}
</script> </script>
<template> <template>
@@ -137,14 +145,20 @@ function addProductToCart(product: ClientProductsQuery['clientProducts'][number]
<div class="px-1 pb-2 pt-3"> <div class="px-1 pb-2 pt-3">
<h2 class="text-lg font-bold text-[#133826]">{{ product.name }}</h2> <h2 class="text-lg font-bold text-[#133826]">{{ product.name }}</h2>
<p class="text-xs text-base-content/65">SKU: {{ product.sku }}</p> <p class="text-xs text-base-content/65">SKU: {{ product.sku }}</p>
<div class="mt-3 flex items-center justify-between"> <div class="mt-3">
<span class="badge badge-outline">В корзине: {{ getQuantity(product.id) }}</span>
<button <button
class="btn btn-circle btn-sm border-0 bg-[#139957] text-white hover:bg-[#0d854a]" v-if="getQuantity(product.id) === 0"
class="btn w-full border-0 bg-[#139957] text-white hover:bg-[#0d854a]"
@click="addProductToCart(product)" @click="addProductToCart(product)"
> >
+ В корзину
</button> </button>
<div v-else class="flex items-center justify-between rounded-2xl border border-base-300 bg-base-100 px-2 py-1">
<button class="btn btn-square btn-sm" @click="decrementProduct(product.id)">-</button>
<span class="min-w-8 text-center font-semibold">{{ getQuantity(product.id) }}</span>
<button class="btn btn-square btn-sm" @click="incrementProduct(product.id)">+</button>
</div>
</div> </div>
</div> </div>
</article> </article>