Merge version_3 into main

Update src/app/shop/page.tsx
2026-02-21 14:28:40 +00:00 · 2026-02-21 14:28:36 +00:00 · 2026-02-21 14:28:36 +00:00 · 2026-02-21 14:28:35 +00:00 · 2026-02-21 14:28:35 +00:00 · 2026-02-21 14:28:35 +00:00
6 changed files with 251 additions and 284 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -24,19 +24,21 @@ export default function BlogPage() {
            headingFontWeight="extrabold"
        >
            <ReactLenis root>
-                <NavbarStyleFullscreen
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "Menu", id: "#products" },
-                        { name: "About", id: "#about" },
-                        { name: "Testimonials", id: "#testimonials" },
-                        { name: "FAQ", id: "#faq" },
-                        { name: "Contact", id: "#contact" },
-                    ]}
-                    brandName="ChimiChangaCo"
-                    bottomLeftText="Taste the Tradition"
-                    bottomRightText="Order Now!"
-                />
+                <div id="nav" data-section="nav">
+                    <NavbarStyleFullscreen
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "Menu", id: "/#products" },
+                            { name: "About", id: "/#about" },
+                            { name: "Testimonials", id: "/#testimonials" },
+                            { name: "FAQ", id: "/#faq" },
+                            { name: "Contact", id: "/#contact" },
+                        ]}
+                        brandName="ChimiC&quot;h&quot;angaCo"
+                        bottomLeftText="Taste the Tradition"
+                        bottomRightText="Order Now!"
+                    />
+                </div>

                {isLoading ? (
                    <div className="w-content-width mx-auto py-20 text-center">
@@ -53,32 +55,34 @@ export default function BlogPage() {
                        carouselMode="buttons"
                    />
                )}
-
-                <FooterBaseCard
-                    logoText="ChimiChangaCo"
-                    columns={[
-                        {
-                            title: "Menu",                            items: [
-                                { label: "Beef Chimichanga", href: "#products" },
-                                { label: "Chicken Chimichanga", href: "#products" },
-                                { label: "Vegetarian Chimichanga", href: "#products" },
-                            ],
-                        },
-                        {
-                            title: "Company",                            items: [
-                                { label: "About Us", href: "#about" },
-                                { label: "Contact", href: "#contact" },
-                            ],
-                        },
-                        {
-                            title: "Support",                            items: [
-                                { label: "FAQ", href: "#faq" },
-                                { label: "Privacy Policy", href: "/privacy" },
-                            ],
-                        },
-                    ]}
-                    copyrightText="© 2024 ChimiChangaCo. All rights reserved."
-                />
+                
+                <div id="footer" data-section="footer">
+                    <FooterBaseCard
+                        logoText="ChimiC&quot;h&quot;angaCo"
+                        columns={[
+                            {
+                                title: "Menu",                                items: [
+                                    { label: "Beef Chimichanga", href: "/#products" },
+                                    { label: "Chicken Chimichanga", href: "/#products" },
+                                    { label: "Vegetarian Chimichanga", href: "/#products" },
+                                ],
+                            },
+                            {
+                                title: "Company",                                items: [
+                                    { label: "About Us", href: "/#about" },
+                                    { label: "Contact", href: "/#contact" },
+                                ],
+                            },
+                            {
+                                title: "Support",                                items: [
+                                    { label: "FAQ", href: "/#faq" },
+                                    { label: "Privacy Policy", href: "/privacy" },
+                                ],
+                            },
+                        ]}
+                        copyrightText="© 2024 ChimiC&quot;h&quot;angaCo. All rights reserved."
+                    />
+                </div>
            </ReactLenis>
        </ThemeProvider>
    );
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,23 +1,21 @@
 import type { Metadata } from "next";
 import { Rubik } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";

 const rubik = Rubik({
  variable: "--font-rubik",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "ChimiChangaCo | Authentic & Delicious Chimichangas",  description: "Taste the best chimichangas in town! Crispy, flavorful, and made with fresh ingredients. Order online for delivery or pickup.",  keywords: ["chimichangas", "mexican food", "burritos", "fried burritos", "food delivery", "authentic mexican", "fast casual", "local food"],
+  title: "ChimiC\"h\"angaCo | Authentic & Delicious Chimichangas",  description: "Taste the best chimichangas in town! Crispy, flavorful, and made with fresh ingredients. Order online for delivery or pickup.",  keywords: ["chimichangas", "mexican food", "burritos", "fried burritos", "food delivery", "authentic mexican", "fast casual", "local food"],
  openGraph: {
-    title: "ChimiChangaCo | Authentic & Delicious Chimichangas",    description: "Savor the authentic taste of Mexico with our perfectly fried, flavor-packed chimichangas.",    url: "/",    siteName: "ChimiChangaCo",    images: [
+    title: "ChimiC\"h\"angaCo | Authentic & Delicious Chimichangas",    description: "Savor the authentic taste of Mexico with our perfectly fried, flavor-packed chimichangas.",    url: "/",    siteName: "ChimiC\"h\"angaCo",    images: [
      {
        url: "https://img.b2bpic.net/free-photo/front-view-sliced-shaurma-delicious-meat-sandwich-inside-brown-plate-dark-space_140725-95362.jpg",        alt: "Delicious crispy chimichanga on a plate"},
    ],
    type: "website"},
  twitter: {
-    card: "summary_large_image",    title: "ChimiChangaCo | Authentic & Delicious Chimichangas",    description: "Savor the authentic taste of Mexico with our perfectly fried, flavor-packed chimichangas.",    images: ["https://img.b2bpic.net/free-photo/front-view-sliced-shaurma-delicious-meat-sandwich-inside-brown-plate-dark-space_140725-95362.jpg"],
+    card: "summary_large_image",    title: "ChimiC\"h\"angaCo | Authentic & Delicious Chimichangas",    description: "Savor the authentic taste of Mexico with our perfectly fried, flavor-packed chimichangas.",    images: ["https://img.b2bpic.net/free-photo/front-view-sliced-shaurma-delicious-meat-sandwich-inside-brown-plate-dark-space_140725-95362.jpg"],
  },
  robots: {
    index: true,
@@ -32,13 +30,7 @@ export default function RootLayout({
 }>) {
  return (
    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${rubik.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+      <body className={`${rubik.variable} antialiased`}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1406,7 +1398,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,7 +30,7 @@ export default function LandingPage() {
      <div id="nav" data-section="nav">
        <NavbarStyleFullscreen 
          navItems={[{name:"Menu",id:"#products"},{name:"About",id:"#about"},{name:"Testimonials",id:"#testimonials"},{name:"FAQ",id:"#faq"},{name:"Contact",id:"#contact"}]}
-          brandName="ChimiChangaCo"
+          brandName="ChimiC&quot;h&quot;angaCo"
          bottomLeftText="Taste the Tradition"
          bottomRightText="Order Now!"
        />
@@ -38,7 +38,7 @@ export default function LandingPage() {

      <div id="hero" data-section="hero">
        <HeroLogoBillboardSplit 
-          logoText="ChimiChangaCo"
+          logoText="ChimiC&quot;h&quot;angaCo"
          description="Savor the authentic taste of Mexico with our perfectly fried, flavor-packed chimichangas. Crispy on the outside, incredibly tender on the inside."
          background={{ variant: "radial-gradient" }}
          buttons={[{text:"View Our Menu",href:"#products"},{text:"Order Now",href:"#contact"}]}
@@ -60,7 +60,7 @@ export default function LandingPage() {

      <div id="products" data-section="products">
        <ProductCardTwo 
-          products={[{id:"1",brand:"ChimiChangaCo",name:"Classic Beef Chimichanga",price:"$12.99",rating:5,reviewCount:"1.2k",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=1",imageAlt:"Classic Beef Chimichanga"},{id:"2",brand:"ChimiChangaCo",name:"Spicy Chicken Chimichanga",price:"$11.99",rating:4,reviewCount:"870",imageSrc:"https://img.b2bpic.net/free-photo/mexican-tacos-with-chicken-bell-peppers-black-beans-fresh-vegetables_2829-20051.jpg",imageAlt:"Spicy Chicken Chimichanga"},{id:"3",brand:"ChimiChangaCo",name:"Vegetarian Bean & Cheese",price:"$10.99",rating:4,reviewCount:"550",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=2",imageAlt:"Vegetarian Bean & Cheese Chimichanga"},{id:"4",brand:"ChimiChangaCo",name:"Smoky Pork Carnitas",price:"$13.49",rating:5,reviewCount:"980",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=3",imageAlt:"Smoky Pork Carnitas Chimichanga"}]}
+          products={[{id:"1",brand:"ChimiC\"h\"angaCo",name:"Classic Beef Chimichanga",price:"$12.99",rating:5,reviewCount:"1.2k",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=1",imageAlt:"Classic Beef Chimichanga"},{id:"2",brand:"ChimiC\"h\"angaCo",name:"Spicy Chicken Chimichanga",price:"$11.99",rating:4,reviewCount:"870",imageSrc:"https://img.b2bpic.net/free-photo/mexican-tacos-with-chicken-bell-peppers-black-beans-fresh-vegetables_2829-20051.jpg",imageAlt:"Spicy Chicken Chimichanga"},{id:"3",brand:"ChimiC\"h\"angaCo",name:"Vegetarian Bean & Cheese",price:"$10.99",rating:4,reviewCount:"550",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=2",imageAlt:"Vegetarian Bean & Cheese Chimichanga"},{id:"4",brand:"ChimiC\"h\"angaCo",name:"Smoky Pork Carnitas",price:"$13.49",rating:5,reviewCount:"980",imageSrc:"https://img.b2bpic.net/free-photo/lavash-stuffed-with-mixed-ingredients-finely-roasted_114579-1768.jpg?_wi=3",imageAlt:"Smoky Pork Carnitas Chimichanga"}]}
          title="Our Delicious Chimichangas"
          description="Explore our mouth-watering selection of handcrafted chimichangas, made with fresh ingredients and authentic recipes."
          textboxLayout="default"
@@ -126,9 +126,9 @@ export default function LandingPage() {

      <div id="footer" data-section="footer">
        <FooterBaseCard 
-          logoText="ChimiChangaCo"
+          logoText="ChimiC&quot;h&quot;angaCo"
          columns={[{title:"Menu",items:[{label:"Beef Chimichanga",href:"#products"},{label:"Chicken Chimichanga",href:"#products"},{label:"Vegetarian Chimichanga",href:"#products"}]},{title:"Company",items:[{label:"About Us",href:"#about"},{label:"Contact",href:"#contact"}]},{title:"Support",items:[{label:"FAQ",href:"#faq"},{label:"Privacy Policy",href:"/privacy"}]}]}
-          copyrightText="© 2024 ChimiChangaCo. All rights reserved."
+          copyrightText="© 2024 ChimiC&quot;h&quot;angaCo. All rights reserved."
        />
      </div>

--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -18,9 +18,22 @@ interface ProductPageProps {

 export default function ProductPage({ params }: ProductPageProps) {
    return (
-        <Suspense fallback={null}>
-            <ProductPageContent params={params} />
-        </Suspense>
+        <ThemeProvider
+            defaultButtonVariant="icon-arrow"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="soft"
+            contentWidth="compact"
+            sizing="medium"
+            background="fluid"
+            cardStyle="soft-shadow"
+            primaryButtonStyle="primary-glow"
+            secondaryButtonStyle="glass"
+            headingFontWeight="extrabold"
+        >
+            <Suspense fallback={null}>
+                <ProductPageContent params={params} />
+            </Suspense>
+        </ThemeProvider>
    );
 }

@@ -75,142 +88,107 @@ function ProductPageContent({ params }: ProductPageProps) {
    }, [cartItems, checkout, getCheckoutItems]);

    const navbarProps = {
-        navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
-        brandName: "ChimiChangaCo",        bottomLeftText: "Taste the Tradition",        bottomRightText: "Order Now!",        button: { text: "Cart", onClick: () => setCartOpen(true) }
+        navItems: [{
+            name: "Home",            id: "/"
+        }, {
+            name: "Shop",            id: "/shop"
+        }],
+        brandName: "ChimiC\"h\"angaCo",        bottomLeftText: "Taste the Tradition",        bottomRightText: "Order Now!",        button: { text: "Cart", onClick: () => setCartOpen(true) }
    };

    const footerProps = {
-        logoText: "ChimiChangaCo",        columns: [
-            { title: "Menu", items: [{ label: "Beef Chimichanga", href: "#products" }, { label: "Chicken Chimichanga", href: "#products" }, { label: "Vegetarian Chimichanga", href: "#products" }] },
-            { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Contact", href: "#contact" }] },
-            { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
+        logoText: "ChimiC\"h\"angaCo",        columns: [
+            { title: "Menu", items: [{ label: "Beef Chimichanga", href: "/#products" }, { label: "Chicken Chimichanga", href: "/#products" }, { label: "Vegetarian Chimichanga", href: "/#products" }] },
+            { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
+            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
        ],
-        copyrightText: "© 2024 ChimiChangaCo. All rights reserved."
+        copyrightText: "© 2024 ChimiC\"h\"angaCo. All rights reserved."
    };

    if (isLoading) {
        return (
-            <ThemeProvider
-                defaultButtonVariant="icon-arrow"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="soft"
-                contentWidth="compact"
-                sizing="medium"
-                background="fluid"
-                cardStyle="soft-shadow"
-                primaryButtonStyle="primary-glow"
-                secondaryButtonStyle="glass"
-                headingFontWeight="extrabold"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen {...navbarProps} />
-                    </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">
-                        <FooterBaseCard {...footerProps} />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
+            <ReactLenis root>
+                <div id="nav" data-section="nav">
+                    <NavbarStyleFullscreen {...navbarProps} />
+                </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">
+                    <FooterBaseCard {...footerProps} />
+                </div>
+            </ReactLenis>
        );
    }

    if (!product) {
        return (
-            <ThemeProvider
-                defaultButtonVariant="icon-arrow"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="soft"
-                contentWidth="compact"
-                sizing="medium"
-                background="fluid"
-                cardStyle="soft-shadow"
-                primaryButtonStyle="primary-glow"
-                secondaryButtonStyle="glass"
-                headingFontWeight="extrabold"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen {...navbarProps} />
-                    </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"
-                            >
-                                Back to Shop
-                            </button>
-                        </div>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBaseCard {...footerProps} />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    return (
-        <ThemeProvider
-            defaultButtonVariant="icon-arrow"
-            defaultTextAnimation="entrance-slide"
-            borderRadius="soft"
-            contentWidth="compact"
-            sizing="medium"
-            background="fluid"
-            cardStyle="soft-shadow"
-            primaryButtonStyle="primary-glow"
-            secondaryButtonStyle="glass"
-            headingFontWeight="extrabold"
-        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                    <NavbarStyleFullscreen {...navbarProps} />
                </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>
+                <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"
+                        >
+                            Back to Shop
+                        </button>
+                    </div>
+                </main>
                <div id="footer" data-section="footer">
                    <FooterBaseCard {...footerProps} />
                </div>
            </ReactLenis>
-        </ThemeProvider>
+        );
+    }
+
+    return (
+        <ReactLenis root>
+            <div id="nav" data-section="nav">
+                <NavbarStyleFullscreen {...navbarProps} />
+            </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">
+                <FooterBaseCard {...footerProps} />
+            </div>
+        </ReactLenis>
    );
 }
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -30,7 +30,10 @@ function ShopPageContent() {
        getCheckoutItems,
    } = useCart();

-    const { checkout, isLoading: isCheckoutLoading } = useCheckout();
+    const {
+        checkout,
+        isLoading: isCheckoutLoading
+    } = useCheckout();

    const handleCheckout = useCallback(async () => {
        if (cartItems.length === 0) return;
@@ -41,100 +44,27 @@ function ShopPageContent() {
        await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
    }, [cartItems, checkout, getCheckoutItems]);

-    const navItems = [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }];
+    const navItems = [{
+        name: "Home",        id: "/"
+    }, {
+        name: "Shop",        id: "/shop"
+    }];

    if (isLoading) {
        return (
-            <ThemeProvider
-                defaultButtonVariant="icon-arrow"
-                defaultTextAnimation="entrance-slide"
-                borderRadius="soft"
-                contentWidth="compact"
-                sizing="medium"
-                background="fluid"
-                cardStyle="soft-shadow"
-                primaryButtonStyle="primary-glow"
-                secondaryButtonStyle="glass"
-                headingFontWeight="extrabold"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleFullscreen
-                            navItems={navItems}
-                            brandName="ChimiChangaCo"
-                            bottomLeftText="Taste the Tradition"
-                            bottomRightText="Order Now!"
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading products...</p>
-                    </main>
-                    <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">
-                        <FooterBaseCard
-                            logoText="ChimiChangaCo"
-                            columns={[
-                                { title: "Menu", items: [{ label: "Beef Chimichanga", href: "#products" }, { label: "Chicken Chimichanga", href: "#products" }, { label: "Vegetarian Chimichanga", href: "#products" }] },
-                                { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Contact", href: "#contact" }] },
-                                { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
-                            ]}
-                            copyrightText="© 2024 ChimiChangaCo. All rights reserved."
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    return (
-        <ThemeProvider
-            defaultButtonVariant="icon-arrow"
-            defaultTextAnimation="entrance-slide"
-            borderRadius="soft"
-            contentWidth="compact"
-            sizing="medium"
-            background="fluid"
-            cardStyle="soft-shadow"
-            primaryButtonStyle="primary-glow"
-            secondaryButtonStyle="glass"
-            headingFontWeight="extrabold"
-        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                    <NavbarStyleFullscreen
                        navItems={navItems}
-                        brandName="ChimiChangaCo"
+                        brandName="ChimiC&quot;h&quot;angaCo"
                        bottomLeftText="Taste the Tradition"
                        bottomRightText="Order Now!"
                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                    />
                </div>
-                <div id="product-catalog" data-section="product-catalog">
-                    <ProductCatalog
-                        layout="page"
-                        products={products}
-                        searchValue={search}
-                        onSearchChange={setSearch}
-                        searchPlaceholder="Search products..."
-                        filters={filters}
-                        emptyMessage="No products found"
-                    />
-                </div>
+                <main className="min-h-screen flex items-center justify-center pt-20">
+                    <p className="text-foreground">Loading products...</p>
+                </main>
                <div id="product-cart" data-section="product-cart">
                    <ProductCart
                        isOpen={cartOpen}
@@ -152,24 +82,88 @@ function ShopPageContent() {
                </div>
                <div id="footer" data-section="footer">
                    <FooterBaseCard
-                        logoText="ChimiChangaCo"
+                        logoText="ChimiC&quot;h&quot;angaCo"
                        columns={[
-                            { title: "Menu", items: [{ label: "Beef Chimichanga", href: "#products" }, { label: "Chicken Chimichanga", href: "#products" }, { label: "Vegetarian Chimichanga", href: "#products" }] },
-                            { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Contact", href: "#contact" }] },
-                            { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
+                            { title: "Menu", items: [{ label: "Beef Chimichanga", href: "/#products" }, { label: "Chicken Chimichanga", href: "/#products" }, { label: "Vegetarian Chimichanga", href: "/#products" }] },
+                            { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
+                            { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
                        ]}
-                        copyrightText="© 2024 ChimiChangaCo. All rights reserved."
+                        copyrightText="© 2024 ChimiC&quot;h&quot;angaCo. All rights reserved."
                    />
                </div>
            </ReactLenis>
-        </ThemeProvider>
+        );
+    }
+
+    return (
+        <ReactLenis root>
+            <div id="nav" data-section="nav">
+                <NavbarStyleFullscreen
+                    navItems={navItems}
+                    brandName="ChimiC&quot;h&quot;angaCo"
+                    bottomLeftText="Taste the Tradition"
+                    bottomRightText="Order Now!"
+                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                />
+            </div>
+            <div id="product-catalog" data-section="product-catalog">
+                <ProductCatalog
+                    layout="page"
+                    products={products}
+                    searchValue={search}
+                    onSearchChange={setSearch}
+                    searchPlaceholder="Search products..."
+                    filters={filters}
+                    emptyMessage="No products found"
+                />
+            </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">
+                <FooterBaseCard
+                    logoText="ChimiC&quot;h&quot;angaCo"
+                    columns={[
+                        { title: "Menu", items: [{ label: "Beef Chimichanga", href: "/#products" }, { label: "Chicken Chimichanga", href: "/#products" }, { label: "Vegetarian Chimichanga", href: "/#products" }] },
+                        { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] },
+                        { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Privacy Policy", href: "/privacy" }] }
+                    ]}
+                    copyrightText="© 2024 ChimiC&quot;h&quot;angaCo. All rights reserved."
+                />
+            </div>
+        </ReactLenis>
    );
 }

 export default function ShopPage() {
    return (
-        <Suspense>
-            <ShopPageContent />
-        </Suspense>
+        <ThemeProvider
+            defaultButtonVariant="icon-arrow"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="soft"
+            contentWidth="compact"
+            sizing="medium"
+            background="fluid"
+            cardStyle="soft-shadow"
+            primaryButtonStyle="primary-glow"
+            secondaryButtonStyle="glass"
+            headingFontWeight="extrabold"
+        >
+            <Suspense>
+                <ShopPageContent />
+            </Suspense>
+        </ThemeProvider>
    );
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -2,21 +2,21 @@
  /* Base units */
  /* --vw is set by ThemeProvider */

-  /* --background: #f5faff;;
-  --card: #f1f8ff;;
-  --foreground: #001122;;
-  --primary-cta: #15479c;;
-  --secondary-cta: #ffffff;;
-  --accent: #a8cce8;;
-  --background-accent: #7ba3cf;; */
+  /* --background: #0a0a0a;;
+  --card: #1a1a1a;;
+  --foreground: #ffffffe6;;
+  --primary-cta: #e6e6e6;;
+  --secondary-cta: #1a1a1a;;
+  --accent: #737373;;
+  --background-accent: #737373;; */

-  --background: #f5faff;;
-  --card: #f1f8ff;;
-  --foreground: #001122;;
-  --primary-cta: #15479c;;
-  --secondary-cta: #ffffff;;
-  --accent: #a8cce8;;
-  --background-accent: #7ba3cf;;
+  --background: #0a0a0a;;
+  --card: #1a1a1a;;
+  --foreground: #ffffffe6;;
+  --primary-cta: #e6e6e6;;
+  --secondary-cta: #1a1a1a;;
+  --accent: #737373;;
+  --background-accent: #737373;;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	9b5ce7d3dc	Merge version_3 into main Merge version_3 into main	2026-02-21 14:28:40 +00:00
bender	b87d05f8ff	Update src/app/shop/page.tsx	2026-02-21 14:28:36 +00:00
bender	54286e8c30	Update src/app/shop/[id]/page.tsx	2026-02-21 14:28:36 +00:00
bender	3a40b8c1b4	Update src/app/page.tsx	2026-02-21 14:28:35 +00:00
bender	71fd6d2d84	Update src/app/layout.tsx	2026-02-21 14:28:35 +00:00
bender	c88af9f2e8	Update src/app/blog/page.tsx	2026-02-21 14:28:35 +00:00
bender	8141dc08d0	Merge version_3 into main Merge version_3 into main	2026-02-21 14:25:56 +00:00
bender	68f5fdd58f	Update src/app/styles/variables.css	2026-02-21 14:25:52 +00:00
bender	eb3de551b9	Update src/app/shop/page.tsx	2026-02-21 14:25:51 +00:00
bender	f1f9285d5f	Update src/app/shop/[id]/page.tsx	2026-02-21 14:25:51 +00:00
bender	cbbbde8954	Update src/app/layout.tsx	2026-02-21 14:25:51 +00:00
bender	75b232967b	Merge version_2 into main Merge version_2 into main	2026-02-21 14:22:21 +00:00
bender	42096a997d	Update src/app/shop/page.tsx	2026-02-21 14:22:17 +00:00
bender	c201148645	Update src/app/shop/[id]/page.tsx	2026-02-21 14:22:17 +00:00
bender	da540bb2b9	Update src/app/page.tsx	2026-02-21 14:22:16 +00:00
bender	e671d79bea	Update src/app/layout.tsx	2026-02-21 14:22:16 +00:00
bender	e2772df4fc	Update src/app/blog/page.tsx	2026-02-21 14:22:15 +00:00
bender	03ede62167	Merge version_2 into main Merge version_2 into main	2026-02-21 14:19:28 +00:00
bender	7b8ed3d089	Update src/app/styles/variables.css	2026-02-21 14:19:24 +00:00
bender	8d62b5998e	Merge version_1 into main Merge version_1 into main	2026-02-21 13:51:30 +00:00