fix: cart delete mutation and console warnings
Some checks are pending
Build and Deploy / build (push) Waiting to run
Some checks are pending
Build and Deploy / build (push) Waiting to run
- Fix checkoutLinesDelete mutation: use 'id' param and 'linesIds' instead of 'lineIds' - Fix viewport metadata warning: move to separate viewport export in layout.tsx - Add sizes prop to checkout Image with fill - Fix CartDrawer init checkout useEffect to prevent re-render loops - Various product detail improvements
This commit is contained in:
@@ -442,6 +442,7 @@ export default function CheckoutPage() {
|
|||||||
src={line.variant.product.media[0].url}
|
src={line.variant.product.media[0].url}
|
||||||
alt={line.variant.product.name}
|
alt={line.variant.product.name}
|
||||||
fill
|
fill
|
||||||
|
sizes="64px"
|
||||||
className="object-cover"
|
className="object-cover"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
import type { Metadata } from "next";
|
import type { Metadata, Viewport } from "next";
|
||||||
import ErrorBoundary from "@/components/providers/ErrorBoundary";
|
import ErrorBoundary from "@/components/providers/ErrorBoundary";
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
export const metadata: Metadata = {
|
||||||
@@ -7,9 +7,8 @@ export const metadata: Metadata = {
|
|||||||
default: "ManoonOils - Premium Natural Oils for Hair & Skin",
|
default: "ManoonOils - Premium Natural Oils for Hair & Skin",
|
||||||
template: "%s | ManoonOils",
|
template: "%s | ManoonOils",
|
||||||
},
|
},
|
||||||
description: "Discover our premium collection of natural oils for hair and skin care. Handmade with love.",
|
description: "Discover our premium collection of natural oils for hair and skin care.",
|
||||||
robots: "index, follow",
|
robots: "index, follow",
|
||||||
viewport: "width=device-width, initial-scale=1, maximum-scale=5",
|
|
||||||
openGraph: {
|
openGraph: {
|
||||||
title: "ManoonOils - Premium Natural Oils for Hair & Skin",
|
title: "ManoonOils - Premium Natural Oils for Hair & Skin",
|
||||||
description: "Discover our premium collection of natural oils for hair and skin care.",
|
description: "Discover our premium collection of natural oils for hair and skin care.",
|
||||||
@@ -18,6 +17,12 @@ export const metadata: Metadata = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const viewport: Viewport = {
|
||||||
|
width: "device-width",
|
||||||
|
initialScale: 1,
|
||||||
|
maximumScale: 5,
|
||||||
|
};
|
||||||
|
|
||||||
// Suppress extension-caused hydration warnings
|
// Suppress extension-caused hydration warnings
|
||||||
const suppressHydrationWarning = true;
|
const suppressHydrationWarning = true;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useEffect } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { motion, AnimatePresence } from "framer-motion";
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
@@ -27,11 +27,15 @@ export default function CartDrawer() {
|
|||||||
const lines = getLines();
|
const lines = getLines();
|
||||||
const total = getTotal();
|
const total = getTotal();
|
||||||
const lineCount = getLineCount();
|
const lineCount = getLineCount();
|
||||||
|
const [initialized, setInitialized] = useState(false);
|
||||||
|
|
||||||
// Initialize checkout on mount
|
// Initialize checkout on mount (only once)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
initCheckout();
|
if (!initialized) {
|
||||||
}, [initCheckout]);
|
initCheckout();
|
||||||
|
setInitialized(true);
|
||||||
|
}
|
||||||
|
}, [initialized]);
|
||||||
|
|
||||||
// Lock body scroll when cart is open
|
// Lock body scroll when cart is open
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { useState } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import Image from "next/image";
|
import Image from "next/image";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { motion, AnimatePresence } from "framer-motion";
|
import { motion, AnimatePresence } from "framer-motion";
|
||||||
import { ChevronDown, Star, Minus, Plus } from "lucide-react";
|
import { ChevronDown, Star, Minus, Plus } from "lucide-react";
|
||||||
import type { Product } from "@/types/saleor";
|
import type { Product } from "@/types/saleor";
|
||||||
import { useSaleorCheckoutStore } from "@/stores/saleorCheckoutStore";
|
import { useSaleorCheckoutStore } from "@/stores/saleorCheckoutStore";
|
||||||
import { getProductPrice, getLocalizedProduct } from "@/lib/saleor";
|
import { getProductPrice, getProductPriceAmount, getLocalizedProduct, formatPrice } from "@/lib/saleor";
|
||||||
import ProductCard from "@/components/product/ProductCard";
|
import ProductCard from "@/components/product/ProductCard";
|
||||||
import ProductBenefits from "@/components/product/ProductBenefits";
|
import ProductBenefits from "@/components/product/ProductBenefits";
|
||||||
import ProductReviews from "@/components/product/ProductReviews";
|
import ProductReviews from "@/components/product/ProductReviews";
|
||||||
@@ -91,8 +91,23 @@ export default function ProductDetail({ product, relatedProducts, locale = "SR"
|
|||||||
const [selectedImage, setSelectedImage] = useState(0);
|
const [selectedImage, setSelectedImage] = useState(0);
|
||||||
const [quantity, setQuantity] = useState(1);
|
const [quantity, setQuantity] = useState(1);
|
||||||
const [isAdding, setIsAdding] = useState(false);
|
const [isAdding, setIsAdding] = useState(false);
|
||||||
|
const [urgencyIndex, setUrgencyIndex] = useState(0);
|
||||||
const { addLine, openCart } = useSaleorCheckoutStore();
|
const { addLine, openCart } = useSaleorCheckoutStore();
|
||||||
|
|
||||||
|
// Cycle through urgency messages
|
||||||
|
useEffect(() => {
|
||||||
|
const interval = setInterval(() => {
|
||||||
|
setUrgencyIndex(prev => (prev + 1) % 3);
|
||||||
|
}, 3000);
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const urgencyMessages = [
|
||||||
|
{ icon: "🚀", text: "Hurry up! 500+ items sold in the last 3 days!" },
|
||||||
|
{ icon: "🛒", text: "In the carts of 2.5K people - buy before its gone!" },
|
||||||
|
{ icon: "👀", text: "7,562 people viewed this product in the last 24 hours!" },
|
||||||
|
];
|
||||||
|
|
||||||
const localized = getLocalizedProduct(product, locale);
|
const localized = getLocalizedProduct(product, locale);
|
||||||
const variant = product.variants?.[0];
|
const variant = product.variants?.[0];
|
||||||
|
|
||||||
@@ -115,6 +130,8 @@ export default function ProductDetail({ product, relatedProducts, locale = "SR"
|
|||||||
|
|
||||||
const isAvailable = variant?.quantityAvailable > 0;
|
const isAvailable = variant?.quantityAvailable > 0;
|
||||||
const price = getProductPrice(product);
|
const price = getProductPrice(product);
|
||||||
|
const priceAmount = getProductPriceAmount(product);
|
||||||
|
const originalPrice = priceAmount > 0 ? formatPrice(Math.round(priceAmount * 1.30)) : null;
|
||||||
|
|
||||||
// Extract short description (first sentence or first 100 chars)
|
// Extract short description (first sentence or first 100 chars)
|
||||||
const shortDescription = localized.description
|
const shortDescription = localized.description
|
||||||
@@ -235,24 +252,65 @@ export default function ProductDetail({ product, relatedProducts, locale = "SR"
|
|||||||
transition={{ duration: 0.6, delay: 0.2 }}
|
transition={{ duration: 0.6, delay: 0.2 }}
|
||||||
className="lg:pl-8"
|
className="lg:pl-8"
|
||||||
>
|
>
|
||||||
|
{/* Urgency Sales Banner */}
|
||||||
|
<motion.div
|
||||||
|
key={urgencyIndex}
|
||||||
|
initial={{ opacity: 0, y: -10 }}
|
||||||
|
animate={{ opacity: 1, y: 0 }}
|
||||||
|
exit={{ opacity: 0, y: 10 }}
|
||||||
|
transition={{ duration: 0.3 }}
|
||||||
|
className="bg-white/80 backdrop-blur-sm text-[#1a1a1a] py-3 rounded-lg mb-4 text-sm font-medium text-left"
|
||||||
|
>
|
||||||
|
<span className="mr-2">{urgencyMessages[urgencyIndex].icon}</span>
|
||||||
|
{urgencyMessages[urgencyIndex].text}
|
||||||
|
</motion.div>
|
||||||
|
|
||||||
{/* Product Name */}
|
{/* Product Name */}
|
||||||
<h1 className="text-3xl md:text-4xl font-medium mb-4 tracking-tight">
|
<h1 className="text-3xl md:text-4xl font-medium mb-4 tracking-tight">
|
||||||
{localized.name}
|
{localized.name}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
{/* Short Description */}
|
{/* Short Description */}
|
||||||
<p className="text-[#666666] leading-relaxed mb-6">
|
<p className="text-[#666666] leading-relaxed mb-4">
|
||||||
{shortDescription}
|
{shortDescription}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
{/* Price & Rating */}
|
{/* Stock Warning - Static */}
|
||||||
<div className="flex items-center justify-between mb-8">
|
<div className="flex items-center justify-start gap-2 mb-6">
|
||||||
<span className="text-3xl font-medium">
|
<span className="relative flex h-3 w-3">
|
||||||
{price || (locale === "EN" ? "Contact for price" : "Kontaktirajte za cenu")}
|
<span className="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-400 opacity-75"></span>
|
||||||
|
<span className="relative inline-flex rounded-full h-3 w-3 bg-red-500"></span>
|
||||||
</span>
|
</span>
|
||||||
<StarRating rating={5} count={1000} />
|
<span className="text-red-600 text-sm font-medium">Stocks are running out!</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Discount Price Display */}
|
||||||
|
{originalPrice && priceAmount > 0 && (
|
||||||
|
<div className="mb-4">
|
||||||
|
<div className="flex items-center gap-3 mb-2">
|
||||||
|
<span className="text-xl text-[#666666] line-through">
|
||||||
|
{originalPrice}
|
||||||
|
</span>
|
||||||
|
<span className="bg-[#b91c1c] text-white text-xs font-bold px-2 py-1 rounded">
|
||||||
|
-30%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<span className="text-3xl font-bold text-[#b91c1c]">
|
||||||
|
{price}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Price & Rating */}
|
||||||
|
{!originalPrice && (
|
||||||
|
<div className="flex items-center justify-between mb-8">
|
||||||
|
<span className="text-3xl font-medium">
|
||||||
|
{price || (locale === "EN" ? "Contact for price" : "Kontaktirajte za cenu")}
|
||||||
|
</span>
|
||||||
|
<StarRating rating={5} count={1000} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Divider */}
|
{/* Divider */}
|
||||||
<div className="border-t border-[#e5e5e5] mb-8" />
|
<div className="border-t border-[#e5e5e5] mb-8" />
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export {
|
|||||||
getProducts,
|
getProducts,
|
||||||
getProductBySlug,
|
getProductBySlug,
|
||||||
getProductPrice,
|
getProductPrice,
|
||||||
|
getProductPriceAmount,
|
||||||
getProductImage,
|
getProductImage,
|
||||||
isProductAvailable,
|
isProductAvailable,
|
||||||
formatPrice,
|
formatPrice,
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ export const CHECKOUT_LINES_UPDATE = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const CHECKOUT_LINES_DELETE = gql`
|
export const CHECKOUT_LINES_DELETE = gql`
|
||||||
mutation CheckoutLinesDelete($checkoutId: ID!, $lineIds: [ID!]!) {
|
mutation CheckoutLinesDelete($id: ID!, $linesIds: [ID!]!) {
|
||||||
checkoutLinesDelete(checkoutId: $checkoutId, lineIds: $lineIds) {
|
checkoutLinesDelete(id: $id, linesIds: $linesIds) {
|
||||||
checkout {
|
checkout {
|
||||||
...CheckoutFragment
|
...CheckoutFragment
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,6 +68,11 @@ export function getProductPrice(product: Product): string {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getProductPriceAmount(product: Product): number {
|
||||||
|
const variant = product.variants?.[0];
|
||||||
|
return variant?.pricing?.price?.gross?.amount || 0;
|
||||||
|
}
|
||||||
|
|
||||||
export function getProductImage(product: Product): string {
|
export function getProductImage(product: Product): string {
|
||||||
if (product.media && product.media.length > 0) {
|
if (product.media && product.media.length > 0) {
|
||||||
return product.media[0].url;
|
return product.media[0].url;
|
||||||
@@ -88,7 +93,8 @@ export function formatPrice(amount: number, currency: string = "RSD"): string {
|
|||||||
return new Intl.NumberFormat("sr-RS", {
|
return new Intl.NumberFormat("sr-RS", {
|
||||||
style: "currency",
|
style: "currency",
|
||||||
currency: currency,
|
currency: currency,
|
||||||
minimumFractionDigits: 0,
|
minimumFractionDigits: 2,
|
||||||
|
maximumFractionDigits: 2,
|
||||||
}).format(amount);
|
}).format(amount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -221,8 +221,8 @@ export const useSaleorCheckoutStore = create<SaleorCheckoutStore>()(
|
|||||||
const { data } = await saleorClient.mutate<CheckoutLinesDeleteResponse>({
|
const { data } = await saleorClient.mutate<CheckoutLinesDeleteResponse>({
|
||||||
mutation: CHECKOUT_LINES_DELETE,
|
mutation: CHECKOUT_LINES_DELETE,
|
||||||
variables: {
|
variables: {
|
||||||
checkoutId: checkout.id,
|
id: checkout.id,
|
||||||
lineIds: [lineId],
|
linesIds: [lineId],
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user