From 99c892e00c48091cca7a34ae941aa31dcf2cb901 Mon Sep 17 00:00:00 2001
From: bender <kudin.dima@gmail.com>
Date: Sun, 22 Feb 2026 13:47:36 +0000
Subject: [PATCH] Update src/app/shop/[id]/page.tsx

---
 src/app/shop/[id]/page.tsx | 240 +++++++++++++------------------------
 1 file changed, 85 insertions(+), 155 deletions(-)

diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index 2b990f6..6d233a4 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -2,7 +2,6 @@
 
 import { Suspense, use, useCallback } from "react";
 import { useRouter } from "next/navigation";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
 import ProductCart from "@/components/ecommerce/cart/ProductCart";
@@ -11,6 +10,7 @@ import { useCart } from "@/hooks/useCart";
 import { useCheckout } from "@/hooks/useCheckout";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
+import Link from 'next/link';
 
 interface ProductPageProps {
     params: Promise<{ id: string }>;
@@ -19,12 +19,12 @@ interface ProductPageProps {
 export default function ProductPage({ params }: ProductPageProps) {
     return (
         <Suspense fallback={null}>
-            <ProductPageContent params={params} />
+            <ProductPageContentWrapper params={params} />
         </Suspense>
     );
 }
 
-function ProductPageContent({ params }: ProductPageProps) {
+function ProductPageContentWrapper({ params }: ProductPageProps) {
     const { id } = use(params);
     const router = useRouter();
 
@@ -74,100 +74,52 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
-    if (isLoading) {
+    const content = () => {
+        if (isLoading) {
+            return (
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading product...</p>
+                </main>
+            )
+        }
+        if (!product) {
+            return (
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <div className="text-center">
+                        <p className="text-foreground mb-4">Product not found</p>
+                        <button
+                            onClick={() => router.push("/shop")}
+                            className="primary-button px-6 py-2 rounded-theme text-primary-cta-text"
+                        >
+                            Back to Shop
+                        </button>
+                    </div>
+                </main>
+            )
+        }
         return (
-            <ThemeProvider
-                defaultButtonVariant="text-stagger"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="soft"
-                contentWidth="mediumSmall"
-                sizing="largeSmall"
-                background="noise"
-                cardStyle="solid"
-                primaryButtonStyle="double-inset"
-                secondaryButtonStyle="glass"
-                headingFontWeight="normal"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            brandName="Dobry Khlib"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading product...</p>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterMedia 
-                            imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=6"
-                            imageAlt="Assortment of freshly baked Ukrainian goods"
-                            columns={[
-                                {title: "Bakery", items: [{label: "Our Story", href: "#about"}, {label: "Products", href: "#products"}, {label: "Order Online", href: "#products"}]},
-                                {title: "Support", items: [{label: "FAQ", href: "#faq"}, {label: "Contact Us", href: "#contact"}]},
-                                {title: "Legal", items: [{label: "Privacy Policy", href: "/privacy"}, {label: "Terms of Service", href: "/terms"}]}
-                            ]}
-                            logoText="Dobry Khlib"
-                            copyrightText="© 2024 Dobry Khlib. All rights reserved."
-                            onPrivacyClick={() => console.log('Privacy Policy clicked')}
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    if (!product) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="text-stagger"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="soft"
-                contentWidth="mediumSmall"
-                sizing="largeSmall"
-                background="noise"
-                cardStyle="solid"
-                primaryButtonStyle="double-inset"
-                secondaryButtonStyle="glass"
-                headingFontWeight="normal"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            brandName="Dobry Khlib"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <div className="text-center">
-                            <p className="text-foreground mb-4">Product not found</p>
-                            <button
-                                onClick={() => router.push("/shop")}
-                                className="primary-button px-6 py-2 rounded-theme text-primary-cta-text"
-                            >
-                                Back to Shop
-                            </button>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterMedia 
-                            imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=7"
-                            imageAlt="Assortment of freshly baked Ukrainian goods"
-                            columns={[
-                                {title: "Bakery", items: [{label: "Our Story", href: "#about"}, {label: "Products", href: "#products"}, {label: "Order Online", href: "#products"}]},
-                                {title: "Support", items: [{label: "FAQ", href: "#faq"}, {label: "Contact Us", href: "#contact"}]},
-                                {title: "Legal", items: [{label: "Privacy Policy", href: "/privacy"}, {label: "Terms of Service", href: "/terms"}]}
-                            ]}
-                            logoText="Dobry Khlib"
-                            copyrightText="© 2024 Dobry Khlib. All rights reserved."
-                            onPrivacyClick={() => console.log('Privacy Policy clicked')}
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
+            <div id="product-detail-card" data-section="product-detail-card">
+                <ProductDetailCard
+                    layout="page"
+                    name={product.name}
+                    price={product.price}
+                    salePrice={meta.salePrice}
+                    rating={product.rating || 0}
+                    description={product.description}
+                    images={images}
+                    variants={variants.length > 0 ? variants : undefined}
+                    quantity={quantityVariant}
+                    ribbon={meta.ribbon}
+                    inventoryStatus={meta.inventoryStatus}
+                    inventoryQuantity={meta.inventoryQuantity}
+                    sku={meta.sku}
+                    buttons={[
+                        { text: "Add To Cart", onClick: handleAddToCart },
+                        { text: "Buy Now", onClick: handleBuyNow },
+                    ]}
+                />
+            </div>
+        )
     }
 
     return (
@@ -183,65 +135,43 @@ function ProductPageContent({ params }: ProductPageProps) {
             secondaryButtonStyle="glass"
             headingFontWeight="normal"
         >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingOverlay
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        brandName="Dobry Khlib"
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    />
-                </div>
-                <div id="product-detail-card" data-section="product-detail-card">
-                    <ProductDetailCard
-                        layout="page"
-                        name={product.name}
-                        price={product.price}
-                        salePrice={meta.salePrice}
-                        rating={product.rating || 0}
-                        description={product.description}
-                        images={images}
-                        variants={variants.length > 0 ? variants : undefined}
-                        quantity={quantityVariant}
-                        ribbon={meta.ribbon}
-                        inventoryStatus={meta.inventoryStatus}
-                        inventoryQuantity={meta.inventoryQuantity}
-                        sku={meta.sku}
-                        buttons={[
-                            { text: "Add To Cart", onClick: handleAddToCart },
-                            { text: "Buy Now", onClick: handleBuyNow },
-                        ]}
-                    />
-                </div>
-                <div id="product-cart" data-section="product-cart">
-                    <ProductCart
-                        isOpen={cartOpen}
-                        onClose={() => setCartOpen(false)}
-                        items={cartItems}
-                        onQuantityChange={updateQuantity}
-                        onRemove={removeItem}
-                        total={`$${cartTotal}`}
-                        buttons={[
-                            {
-                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                            },
-                        ]}
-                    />
-                </div>
-                <div id="footer" data-section="footer">
-                    <FooterMedia 
-                        imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=8"
-                        imageAlt="Assortment of freshly baked Ukrainian goods"
-                        columns={[
-                            {title: "Bakery", items: [{label: "Our Story", href: "#about"}, {label: "Products", href: "#products"}, {label: "Order Online", href: "#products"}]},
-                            {title: "Support", items: [{label: "FAQ", href: "#faq"}, {label: "Contact Us", href: "#contact"}]},
-                            {title: "Legal", items: [{label: "Privacy Policy", href: "/privacy"}, {label: "Terms of Service", href: "/terms"}]}
-                        ]}
-                        logoText="Dobry Khlib"
-                        copyrightText="© 2024 Dobry Khlib. All rights reserved."
-                        onPrivacyClick={() => console.log('Privacy Policy clicked')}
-                    />
-                </div>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingOverlay
+                    navItems={[{ name: "Home", id: "/" }]}
+                    brandName="Dobry Khlib"
+                    button={{ text: `Cart (${cartItems.length})`, onClick: () => setCartOpen(true) }}
+                />
+            </div>
+            {content()}
+            <div id="product-cart" data-section="product-cart">
+                <ProductCart
+                    isOpen={cartOpen}
+                    onClose={() => setCartOpen(false)}
+                    items={cartItems}
+                    onQuantityChange={updateQuantity}
+                    onRemove={removeItem}
+                    total={`$${cartTotal}`}
+                    buttons={[
+                        {
+                            text: isCheckoutLoading ? "Processing..." : "Check Out",                            onClick: handleCheckout,
+                        },
+                    ]}
+                />
+            </div>
+            <div id="footer" data-section="footer">
+                <FooterMedia 
+                    imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
+                    imageAlt="Assortment of freshly baked Ukrainian goods"
+                    columns={[
+                        {title: "Bakery", items: [{label: "Our Story", href: "/#about"}, {label: "Products", href: "/#products"}, {label: "Order Online", href: "/#products"}]},
+                        {title: "Support", items: [{label: "FAQ", href: "/#faq"}, {label: "Contact Us", href: "/#contact"}]},
+                        {title: "Legal", items: [{label: "Privacy Policy", href: "/privacy"}, {label: "Terms of Service", href: "/terms"}]}
+                    ]}
+                    logoText="Dobry Khlib"
+                    copyrightText="© 2024 Dobry Khlib. All rights reserved."
+                    onPrivacyClick={() => console.log('Privacy Policy clicked')}
+                />
+            </div>
         </ThemeProvider>
     );
 }