Merge version_1 into main

2026-02-13 13:33:17 +00:00
parent 1cf3190ac1 1cd7b86621
commit 1c5b682297
8 changed files with 228 additions and 182 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -65,6 +65,7 @@ export default function AboutPage() {
          imagePosition="right"
          textboxLayout="default"
          useInvertedBackground={true}
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
        />
      </div>
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,11 +1,33 @@
 "use client";

-import ReactLenis from "lenis/react";
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import BlogCardThree from '@/components/sections/blog/BlogCardThree';
 import { useBlogPosts } from "@/hooks/useBlogPosts";

+const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Menu", id: "/menu" },
+    { name: "Contact", id: "/contact" },
+];
+
+const Footer = () => (
+    <footer className="py-8 bg-card border-t">
+      <div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
+        <p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
+        <nav className="flex gap-4">
+          {navItems.map((item) => (
+            <Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
+              {item.name}
+            </Link>
+          ))}
+        </nav>
+      </div>
+    </footer>
+);
+
 export default function BlogPage() {
    const { posts, isLoading } = useBlogPosts();

@@ -22,43 +44,34 @@ export default function BlogPage() {
            secondaryButtonStyle="solid"
            headingFontWeight="semibold"
        >
-            <ReactLenis root>
-                <div id="nav" data-section="nav">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Brew Haven"
-                        navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Menu", id: "menu" },
-                            { name: "About", id: "about" },
-                            { name: "Testimonials", id: "testimonials" },
-                            { name: "FAQ", id: "faq" },
-                            { name: "Contact", id: "contact" },
-                        ]}
-                        button={{ text: "Order Now", href: "#menu" }}
-                        buttonClassName="shadow-md"
-                        logoHref="#"
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Brew Haven"
+                    navItems={navItems}
+                    button={{ text: "Order Now", href: "/menu" }}
+                    buttonClassName="shadow-md"
+                    logoHref="/"
+                />
+            </div>
+
+            {isLoading ? (
+                <div className="w-content-width mx-auto py-20 text-center">
+                    <p className="text-foreground">Loading posts...</p>
+                </div>
+            ) : (
+                <div id="blog" data-section="blog">
+                    <BlogCardThree
+                        blogs={posts}
+                        title="From Our Roastery"
+                        description="Discover the stories, techniques, and passion behind every cup."
+                        tag="Coffee Chronicles"
+                        animationType="slide-up"
+                        textboxLayout="default"
+                        useInvertedBackground={false}
+                        carouselMode="buttons"
                    />
                </div>
-
-                {isLoading ? (
-                    <div className="w-content-width mx-auto py-20 text-center">
-                        <p className="text-foreground">Loading posts...</p>
-                    </div>
-                ) : (
-                    <div id="blog" data-section="blog">
-                        <BlogCardThree
-                            blogs={posts}
-                            title="From Our Roastery"
-                            description="Discover the stories, techniques, and passion behind every cup."
-                            tag="Coffee Chronicles"
-                            animationType="slide-up"
-                            textboxLayout="default"
-                            useInvertedBackground={false}
-                            carouselMode="buttons"
-                        />
-                    </div>
-                )}
-            </ReactLenis>
+            )}\n            <Footer />
        </ThemeProvider>
    );
 }
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -64,6 +64,7 @@ export default function ContactPage() {
          imageAlt="A modern, inviting coffee shop interior"
          mediaPosition="right"
          useInvertedBackground={false}
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
          formCardClassName="p-6 md:p-8 rounded-lg shadow-lg"
          titleClassName="text-3xl font-semibold"
@@ -85,6 +86,7 @@ export default function ContactPage() {
          textboxLayout="default"
          useInvertedBackground={true}
          faqsAnimation="slide-up"
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
          containerClassName="max-w-7xl mx-auto"
        />
@@ -101,6 +103,7 @@ export default function ContactPage() {
          imagePosition="right"
          textboxLayout="default"
          useInvertedBackground={false}
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
        />
      </div>
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,36 +3,23 @@ import { Barlow } from "next/font/google";
 import "./globals.css";

 const barlow = Barlow({
-  variable: "--font-barlow",
-  subsets: ["latin"],
+  variable: "--font-barlow",  subsets: ["latin"],
  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
 });

 export const metadata: Metadata = {
-  title: "Brew Haven - Your Daily Coffee Escape",
-  description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere. Brew Haven is your perfect spot for quality brews and relaxation.",
-  robots: {
+  title: "Brew Haven - Your Daily Coffee Escape",  description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere. Brew Haven is your perfect spot for quality brews and relaxation.",  robots: {
    index: true,
    follow: true,
  },
  openGraph: {
-    title: "Brew Haven - Premium Coffee Shop",
-    description: "Indulge in the best coffee experience at Brew Haven. Freshly brewed, ethically sourced, and passionately served.",
-    url: "https://www.brewhaven.com",
-    siteName: "Brew Haven",
-    images: [
+    title: "Brew Haven - Premium Coffee Shop",    description: "Indulge in the best coffee experience at Brew Haven. Freshly brewed, ethically sourced, and passionately served.",    url: "https://www.brewhaven.com",    siteName: "Brew Haven",    images: [
      {
-        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn",
-        alt: "Freshly roasted coffee beans and a steaming cup of coffee",
-      },
+        url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn",        alt: "Freshly roasted coffee beans and a steaming cup of coffee"},
    ],
-    type: "website",
-  },
+    type: "website"},
  twitter: {
-    card: "summary_large_image",
-    title: "Brew Haven - Your Daily Coffee Escape",
-    description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere.",
-    images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn"],
+    card: "summary_large_image",    title: "Brew Haven - Your Daily Coffee Escape",    description: "Experience the finest coffee, expertly crafted in a cozy and welcoming atmosphere.",    images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9h4xtn"],
  },
 };

--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -104,6 +104,7 @@ export default function MenuPage() {
          textboxLayout="default"
          useInvertedBackground={false}
          faqsAnimation="slide-up"
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
          containerClassName="max-w-7xl mx-auto"
        />
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -83,6 +83,7 @@ export default function HomePage() {
          imagePosition="right"
          textboxLayout="default"
          useInvertedBackground={true}
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
        />
      </div>
@@ -154,6 +155,7 @@ export default function HomePage() {
          textboxLayout="default"
          useInvertedBackground={true}
          faqsAnimation="slide-up"
+          mediaAnimation="slide-up"
          className="py-16 md:py-24 lg:py-32"
          containerClassName="max-w-7xl mx-auto"
          contentClassName="grid grid-cols-1 md:grid-cols-2 gap-8 md:gap-12"
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -2,7 +2,7 @@

 import { use, useCallback } from "react";
 import { useRouter } from "next/navigation";
-import ReactLenis from "lenis/react";
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
@@ -15,6 +15,28 @@ interface ProductPageProps {
    params: Promise<{ id: string }>;
 }

+const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Menu", id: "/menu" },
+    { name: "Contact", id: "/contact" },
+];
+
+const Footer = () => (
+    <footer className="py-8 bg-card border-t">
+      <div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
+        <p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
+        <nav className="flex gap-4">
+          {navItems.map((item) => (
+            <Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
+              {item.name}
+            </Link>
+          ))}
+        </nav>
+      </div>
+    </footer>
+);
+
 export default function ProductPage({ params }: ProductPageProps) {
    const { id } = use(params);
    const router = useRouter();
@@ -79,22 +101,21 @@ export default function ProductPage({ params }: ProductPageProps) {
                secondaryButtonStyle="solid"
                headingFontWeight="semibold"
            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Brew Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            buttonClassName="shadow-md"
-                            logoHref="#"
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading product...</p>
-                        </main>
-                    </div>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Brew Haven"
+                        navItems={navItems}
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        buttonClassName="shadow-md"
+                        logoHref="/"
+                    />
+                </div>
+                <div id="loading-section" data-section="loading-section">
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <p className="text-foreground">Loading product...</p>
+                    </main>
+                </div>
+                <Footer />
            </ThemeProvider>
        );
    }
@@ -113,30 +134,29 @@ export default function ProductPage({ params }: ProductPageProps) {
                secondaryButtonStyle="solid"
                headingFontWeight="semibold"
            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Brew Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                            buttonClassName="shadow-md"
-                            logoHref="#"
-                        />
-                    </div>
-                    <div id="not-found-section" data-section="not-found-section">
-                        <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>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Brew Haven"
+                        navItems={navItems}
+                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        buttonClassName="shadow-md"
+                        logoHref="/"
+                    />
+                </div>
+                <div id="not-found-section" data-section="not-found-section">
+                    <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>
+                <Footer />
            </ThemeProvider>
        );
    }
@@ -154,53 +174,52 @@ export default function ProductPage({ params }: ProductPageProps) {
            secondaryButtonStyle="solid"
            headingFontWeight="semibold"
        >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Brew Haven"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        buttonClassName="shadow-md"
-                        logoHref="#"
-                    />
-                </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>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Brew Haven"
+                    navItems={navItems}
+                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    buttonClassName="shadow-md"
+                    logoHref="/"
+                />
+            </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>
+            <Footer />
        </ThemeProvider>
    );
 }
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,11 +1,33 @@
 "use client";

-import ReactLenis from "lenis/react";
+import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import { useProductCatalog } from "@/hooks/useProductCatalog";

+const navItems = [
+    { name: "Home", id: "/" },
+    { name: "About", id: "/about" },
+    { name: "Menu", id: "/menu" },
+    { name: "Contact", id: "/contact" },
+];
+
+const Footer = () => (
+    <footer className="py-8 bg-card border-t">
+      <div className="container mx-auto px-4 md:px-6 flex flex-col md:flex-row justify-between items-center">
+        <p className="text-foreground/80 text-sm mb-4 md:mb-0">{`© ${new Date().getFullYear()} Brew Haven. All rights reserved.`}</p>
+        <nav className="flex gap-4">
+          {navItems.map((item) => (
+            <Link key={item.name} href={item.id} className="text-sm text-foreground hover:text-[var(--primary-cta)] transition-colors">
+              {item.name}
+            </Link>
+          ))}
+        </nav>
+      </div>
+    </footer>
+);
+
 export default function ShopPage() {
    const {
        products,
@@ -29,22 +51,21 @@ export default function ShopPage() {
                secondaryButtonStyle="solid"
                headingFontWeight="semibold"
            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarLayoutFloatingOverlay
-                            brandName="Brew Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            button={{ text: "Cart", onClick: () => {} }}
-                            buttonClassName="shadow-md"
-                            logoHref="#"
-                        />
-                    </div>
-                    <div id="loading-section" data-section="loading-section">
-                        <main className="min-h-screen flex items-center justify-center pt-20">
-                            <p className="text-foreground">Loading products...</p>
-                        </main>
-                    </div>
-                </ReactLenis>
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingOverlay
+                        brandName="Brew Haven"
+                        navItems={navItems}
+                        button={{ text: "Cart", onClick: () => {} }}
+                        buttonClassName="shadow-md"
+                        logoHref="/"
+                    />
+                </div>
+                <div id="loading-section" data-section="loading-section">
+                    <main className="min-h-screen flex items-center justify-center pt-20">
+                        <p className="text-foreground">Loading products...</p>
+                    </main>
+                </div>
+                <Footer />
            </ThemeProvider>
        );
    }
@@ -62,28 +83,27 @@ export default function ShopPage() {
            secondaryButtonStyle="solid"
            headingFontWeight="semibold"
        >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarLayoutFloatingOverlay
-                        brandName="Brew Haven"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        button={{ text: "Cart", onClick: () => {} }}
-                        buttonClassName="shadow-md"
-                        logoHref="#"
-                    />
-                </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>
-            </ReactLenis>
+            <div id="nav" data-section="nav">
+                <NavbarLayoutFloatingOverlay
+                    brandName="Brew Haven"
+                    navItems={navItems}
+                    button={{ text: "Cart", onClick: () => {} }}
+                    buttonClassName="shadow-md"
+                    logoHref="/"
+                />
+            </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>
+            <Footer />
        </ThemeProvider>
    );
 }