From 4e4ca127340432c444a3827205ff288fe4aebe13 Mon Sep 17 00:00:00 2001
From: bender <kudin.dima@gmail.com>
Date: Sat, 21 Feb 2026 16:49:35 +0000
Subject: [PATCH] Update src/app/shop/page.tsx

---
 src/app/shop/page.tsx | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 1585464..4cdd42a 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -4,7 +4,7 @@ import { Suspense, useCallback } from "react";
 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import Footer from '@/components/footer/Footer';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import ProductCart from "@/components/ecommerce/cart/ProductCart";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
@@ -56,14 +56,16 @@ function ShopPageContent() {
                 headingFontWeight="light"
             >
                 <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="navbar" data-section="navbar" className="relative">
                         <NavbarStyleApple
                             navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
                             brandName="Lakeside Construction"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        >
-                             <button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
-                        </NavbarStyleApple>
+                        />
+                        <div className="absolute top-0 right-0 h-full flex items-center pr-4">
+                            <button onClick={() => setCartOpen(true)} className="text-lg">
+                                Cart ({cartItems.length})
+                            </button>
+                        </div>
                     </div>
                     <main className="min-h-screen flex items-center justify-center pt-20">
                         <p className="text-foreground">Loading products...</p>
@@ -102,14 +104,16 @@ function ShopPageContent() {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="navbar" data-section="navbar" className="relative">
                     <NavbarStyleApple
                         navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
                         brandName="Lakeside Construction"
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    >
-                        <button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
-                    </NavbarStyleApple>
+                    />
+                    <div className="absolute top-0 right-0 h-full flex items-center pr-4">
+                        <button onClick={() => setCartOpen(true)} className="text-lg">
+                           Cart ({cartItems.length})
+                        </button>
+                    </div>
                 </div>
                 <div id="product-catalog" data-section="product-catalog">
                     <ProductCatalog
@@ -138,7 +142,13 @@ function ShopPageContent() {
                     />
                 </div>
                 <div id="footer" data-section="footer">
-                    <Footer />
+                    <FooterLogoEmphasis
+                        columns={[
+                            { items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }] },
+                            { items: [{ label: "Privacy Policy", href: "/privacy" }] },
+                        ]}
+                        logoText="Lakeside Construction Inc."
+                    />
                 </div>
             </ReactLenis>
         </ThemeProvider>