Update src/app/page.tsx

Merge version_2 into main

src/app/about/page.tsx

@@ -0,0 +1,92 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+import FooterCard from '@/components/sections/footer/FooterCard';
+import { Coffee, MapPin, Instagram, Facebook, Twitter } from "lucide-react";
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="elastic-effect"
+      defaultTextAnimation="background-highlight"
+      borderRadius="soft"
+      contentWidth="mediumSmall"
+      sizing="largeSizeMediumTitles"
+      background="circleGradient"
+      cardStyle="glass-depth"
+      primaryButtonStyle="radial-glow"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleApple 
+          brandName="Brew Haven"
+          navItems={[
+            { name: "About", id: "/about" },
+            { name: "Menu", id: "products" },
+            { name: "Process", id: "features" },
+            { name: "Reviews", id: "testimonial" },
+            { name: "Contact", id: "contact" }
+          ]}
+        />
+      </div>
+
+      <div id="about" data-section="about">
+        <MetricSplitMediaAbout
+          title="About Brew Haven"
+          description="We are passionate about delivering the finest specialty coffee experience. Our mission is to source the best beans from around the world and craft them into extraordinary beverages. Founded with a commitment to excellence and sustainability, Brew Haven has become a destination for coffee enthusiasts seeking premium quality and exceptional craftsmanship."
+          tag="Our Story"
+          tagIcon={Coffee}
+          metrics={[
+            { value: "25+", title: "Origins Worldwide" },
+            { value: "100%", title: "Ethically Sourced" }
+          ]}
+          imageSrc="https://img.b2bpic.net/free-photo/coffee-beans-glass-jar-black-background-closeup-selective-focus-vertical-frame-roasting-preparing-coffee-vertical-frame_166373-2289.jpg?_wi=2"
+          imageAlt="Premium coffee beans"
+          mediaAnimation="slide-up"
+          metricsAnimation="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="contact" data-section="contact">
+        <ContactCTA
+          tag="Get In Touch"
+          tagIcon={MapPin}
+          title="Visit Our Roastery Today"
+          description="Stop by for an espresso, explore our selection, or book a private coffee tasting session. We'd love to welcome you to our community of coffee lovers."
+          buttons={[
+            { text: "Find Us On Maps", href: "#" },
+            { text: "Book A Tasting", href: "#" }
+          ]}
+          background={{ variant: "plain" }}
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterCard
+          logoText="Brew Haven"
+          copyrightText="© 2025 Brew Haven Coffee Roastery. All rights reserved."
+          socialLinks={[
+            {
+              icon: Instagram,
+              href: "https://instagram.com",              ariaLabel: "Instagram"
+            },
+            {
+              icon: Facebook,
+              href: "https://facebook.com",              ariaLabel: "Facebook"
+            },
+            {
+              icon: Twitter,
+              href: "https://twitter.com",              ariaLabel: "Twitter"
+            }
+          ]}
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/blog/page.tsx

@@ -29,8 +29,7 @@ export default function BlogPage() {
                     <NavbarStyleApple
                         brandName="Brew Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "About", id: "/about" },
-                            { name: "About", id: "about" },
                             { name: "Menu", id: "products" },
                             { name: "Process", id: "features" },
                             { name: "Reviews", id: "testimonial" },

src/app/page.tsx

@@ -1,9 +1,9 @@
-"use client"
+"use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import HeroOverlay from '@/components/sections/hero/HeroOverlay';
-import SplitAbout from '@/components/sections/about/SplitAbout';
+import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import FeatureProcessSteps from '@/components/sections/feature/FeatureProcessSteps';
 import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
@@ -30,7 +30,7 @@ export default function CoffeeShopPage() {
         <NavbarStyleApple 
           brandName="Brew Haven"
           navItems={[
-            { name: "About", id: "about" },
+            { name: "About", id: "/about" },
             { name: "Menu", id: "products" },
             { name: "Process", id: "features" },
             { name: "Reviews", id: "testimonial" },
@@ -57,28 +57,20 @@ export default function CoffeeShopPage() {
       </div>
 
       <div id="about" data-section="about">
-        <SplitAbout
+        <MetricSplitMediaAbout
           title="About Brew Haven"
           description="We are passionate about delivering the finest specialty coffee experience. Our mission is to source the best beans from around the world and craft them into extraordinary beverages."
           tag="Our Story"
           tagIcon={Coffee}
-          bulletPoints={[
+          metrics={[
-            {
+            { value: "25+", title: "Origins Worldwide" },
-              title: "Ethically Sourced",              description: "Direct relationships with coffee farmers ensuring fair trade and premium quality beans",              icon: Leaf
+            { value: "100%", title: "Ethically Sourced" }
-            },
-            {
-              title: "Expert Roasting",              description: "Small-batch roasting process that brings out the unique flavors and characteristics of each origin",              icon: Flame
-            },
-            {
-              title: "Skilled Baristas",              description: "Certified professionals dedicated to perfecting every espresso shot and beverage",              icon: Users
-            }
           ]}
-          imageSrc="https://img.b2bpic.net/free-photo/coffee-beans-glass-jar-black-background-closeup-selective-focus-vertical-frame-roasting-preparing-coffee-vertical-frame_166373-2289.jpg"
+          imageSrc="https://img.b2bpic.net/free-photo/coffee-beans-glass-jar-black-background-closeup-selective-focus-vertical-frame-roasting-preparing-coffee-vertical-frame_166373-2289.jpg?_wi=1"
           imageAlt="Premium coffee beans"
           mediaAnimation="slide-up"
-          textboxLayout="default"
+          metricsAnimation="slide-up"
           useInvertedBackground={false}
-          imagePosition="right"
         />
       </div>
 

src/app/shop/[id]/page.tsx

@@ -86,8 +86,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarStyleApple
                             brandName="Brew Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "About", id: "/about" },
-                                { name: "Shop", id: "/shop" },
+                                { name: "Menu", id: "products" },
+                                { name: "Process", id: "features" },
+                                { name: "Reviews", id: "testimonial" },
                                 { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -131,8 +133,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarStyleApple
                             brandName="Brew Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "About", id: "/about" },
-                                { name: "Shop", id: "/shop" },
+                                { name: "Menu", id: "products" },
+                                { name: "Process", id: "features" },
+                                { name: "Reviews", id: "testimonial" },
                                 { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -183,8 +187,10 @@ export default function ProductPage({ params }: ProductPageProps) {
                     <NavbarStyleApple
                         brandName="Brew Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "About", id: "/about" },
-                            { name: "Shop", id: "/shop" },
+                            { name: "Menu", id: "products" },
+                            { name: "Process", id: "features" },
+                            { name: "Reviews", id: "testimonial" },
                             { name: "Contact", id: "contact" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}

src/app/shop/page.tsx

@@ -39,8 +39,10 @@ export default function ShopPage() {
                         <NavbarStyleApple
                             brandName="Brew Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "About", id: "/about" },
-                                { name: "Shop", id: "/shop" },
+                                { name: "Menu", id: "products" },
+                                { name: "Process", id: "features" },
+                                { name: "Reviews", id: "testimonial" },
                                 { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -83,8 +85,10 @@ export default function ShopPage() {
                     <NavbarStyleApple
                         brandName="Brew Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "About", id: "/about" },
-                            { name: "Shop", id: "/shop" },
+                            { name: "Menu", id: "products" },
+                            { name: "Process", id: "features" },
+                            { name: "Reviews", id: "testimonial" },
                             { name: "Contact", id: "contact" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}