Update src/app/page.tsx

Merge version_2 into main

src/app/blog/page.tsx

@@ -28,7 +28,7 @@ export default function BlogPage() {
                     <NavbarStyleCentered
                         brandName="Refined Barber"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "Home", id: "hero" },
                             { name: "Services", id: "services" },
                             { name: "About", id: "about" },
                             { name: "Team", id: "team" },

src/app/page.tsx

@@ -2,9 +2,9 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
-import HeroCentered from '@/components/sections/hero/HeroCentered';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
-import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
+import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
-import SplitAbout from '@/components/sections/about/SplitAbout';
+import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
 import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
 import TeamCardSix from '@/components/sections/team/TeamCardSix';
@@ -43,7 +43,7 @@ export default function LandingPage() {
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroCentered
+        <HeroBillboard
           title="Premium Barbershop Experience"
           description="Expertly crafted grooming services in a refined atmosphere. From classic haircuts to precision beard work, we deliver timeless style with modern expertise."
           background={{
@@ -69,41 +69,39 @@ export default function LandingPage() {
               text: "View Services",              href: "services"
             }
           ]}
+          imageSrc="https://img.b2bpic.net/free-photo/handsome-man-hair-salon-facing-camera_23-2148242826.jpg"
+          imageAlt="Premium barbershop experience"
+          mediaAnimation="slide-up"
         />
       </div>
 
       <div id="services" data-section="services">
-        <FeatureHoverPattern
+        <FeatureCardOne
           title="Our Services"
           description="A complete range of grooming services designed to keep you looking sharp"
           tag="Premium Grooming"
           tagIcon={Scissors}
           features={[
             {
-              icon: Scissors,
+              title: "Classic Haircuts",              description: "Timeless styles executed with precision and attention to detail. From fades to tapers, we craft the perfect cut for you.",              imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg",              imageAlt: "Classic Haircuts"
-              title: "Classic Haircuts",              description: "Timeless styles executed with precision and attention to detail. From fades to tapers, we craft the perfect cut for you."
             },
             {
-              icon: Scissors,
+              title: "Beard Grooming",              description: "Professional beard trimming, shaping, and conditioning. Maintain that distinguished look with expert care.",              imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg",              imageAlt: "Beard Grooming"
-              title: "Beard Grooming",              description: "Professional beard trimming, shaping, and conditioning. Maintain that distinguished look with expert care."
             },
             {
-              icon: Sparkles,
+              title: "Hot Shave",              description: "Traditional hot towel shaves using premium products and classic techniques for the ultimate relaxation.",              imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg",              imageAlt: "Hot Shave"
-              title: "Hot Shave",              description: "Traditional hot towel shaves using premium products and classic techniques for the ultimate relaxation."
             },
             {
-              icon: Wand2,
+              title: "Hair Styling",              description: "Modern styling with premium products. Whether it's pomade or gel, we'll give you the look you want.",              imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg",              imageAlt: "Hair Styling"
-              title: "Hair Styling",              description: "Modern styling with premium products. Whether it's pomade or gel, we'll give you the look you want."
             },
             {
-              icon: Heart,
+              title: "Signature Treatments",              description: "Exclusive grooming treatments including scalp massage and conditioning therapy for complete wellness.",              imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg",              imageAlt: "Signature Treatments"
-              title: "Signature Treatments",              description: "Exclusive grooming treatments including scalp massage and conditioning therapy for complete wellness."
             },
             {
-              icon: Crown,
+              title: "VIP Experience",              description: "Premium service package with extended time, complimentary beverages, and personalized consultation.",              imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg",              imageAlt: "VIP Experience"
-              title: "VIP Experience",              description: "Premium service package with extended time, complimentary beverages, and personalized consultation."
             }
           ]}
+          gridVariant="uniform-all-items-equal"
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
@@ -111,36 +109,17 @@ export default function LandingPage() {
       </div>
 
       <div id="about" data-section="about">
-        <SplitAbout
+        <TestimonialAboutCard
           title="Refined Barbershop Heritage"
-          description="With over 15 years in the grooming industry, we've perfected the art of classic barbering combined with modern expertise. Our shop is a sanctuary where tradition meets innovation."
+          description="With over 15 years in the grooming industry, we've perfected the art of classic barbering combined with modern expertise."
+          subdescription="Our shop is a sanctuary where tradition meets innovation, delivering exceptional grooming experiences with personalized attention to every client."
           tag="Our Story"
           tagIcon={History}
-          bulletPoints={[
+          icon={Award}
-            {
+          imageSrc="https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg"
-              title: "Master Craftsmen",              description: "Our barbers are certified professionals with decades of combined experience in traditional and modern grooming techniques.",              icon: Award
+          imageAlt="Refined Barbershop Heritage"
-            },
-            {
-              title: "Premium Products",              description: "We use only the finest grooming products from trusted international brands to ensure superior results and client satisfaction.",              icon: Zap
-            },
-            {
-              title: "Comfortable Atmosphere",              description: "Step into a relaxing environment designed for comfort, featuring vintage barbershop aesthetics and modern amenities.",              icon: Home
-            },
-            {
-              title: "Personalized Service",              description: "Every client receives customized attention. We listen to your preferences and deliver results that exceed expectations."
-            }
-          ]}
-          imageSrc="https://img.b2bpic.net/free-photo/handsome-man-hair-salon-facing-camera_23-2148242826.jpg"
-          imageAlt="Refined barbershop interior"
           mediaAnimation="slide-up"
-          textboxLayout="default"
           useInvertedBackground={true}
-          imagePosition="right"
-          buttons={[
-            {
-              text: "Meet the Team",              href: "team"
-            }
-          ]}
         />
       </div>
 

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

@@ -85,8 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarStyleCentered
                             brandName="Refined Barber"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "Home", id: "hero" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Services", id: "services" },
+                                { name: "About", id: "about" },
+                                { name: "Team", id: "team" },
+                                { name: "Testimonials", id: "testimonials" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -125,8 +128,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarStyleCentered
                             brandName="Refined Barber"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "Home", id: "hero" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Services", id: "services" },
+                                { name: "About", id: "about" },
+                                { name: "Team", id: "team" },
+                                { name: "Testimonials", id: "testimonials" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -172,8 +178,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                     <NavbarStyleCentered
                         brandName="Refined Barber"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "Home", id: "hero" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Services", id: "services" },
+                            { name: "About", id: "about" },
+                            { name: "Team", id: "team" },
+                            { name: "Testimonials", id: "testimonials" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />

src/app/shop/page.tsx

@@ -35,8 +35,11 @@ export default function ShopPage() {
                         <NavbarStyleCentered
                             brandName="Refined Barber"
                             navItems={[
-                                { name: "Home", id: "/" },
+                                { name: "Home", id: "hero" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Services", id: "services" },
+                                { name: "About", id: "about" },
+                                { name: "Team", id: "team" },
+                                { name: "Testimonials", id: "testimonials" }
                             ]}
                             button={{ text: "Cart", onClick: () => console.log("cart") }}
                         />
@@ -74,8 +77,11 @@ export default function ShopPage() {
                     <NavbarStyleCentered
                         brandName="Refined Barber"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "Home", id: "hero" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Services", id: "services" },
+                            { name: "About", id: "about" },
+                            { name: "Team", id: "team" },
+                            { name: "Testimonials", id: "testimonials" }
                         ]}
                         button={{ text: "Cart", onClick: () => console.log("cart") }}
                     />