Merge version_3 into main

Merge version_3 into main

src/app/awards/page.tsx

@@ -36,39 +36,25 @@ export default function AwardsPage() {
           brandName="HAUS"
           navItems={navItems}
           button={{
-            text: "Book Now",
+            text: "Book Now",            href: "https://booksy.com"}}
-            href: "https://booksy.com",
-          }}
         />
       </div>
 
       <div id="awards" data-section="awards">
         <MetricCardOne
-          title="Industry Recognition"
+          title="HAUS Won 2 Major Awards: Barbershop of the Year & Best Client Experience"
           description="HAUS has been awarded multiple industry accolades for excellence in barbering and client experience"
           tag="Awards"
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
+              id: "1",              value: "5",              title: "Awards",              description: "Salon of the Year & Client Experience",              icon: Trophy,
-              value: "5",
-              title: "Awards",
-              description: "Salon of the Year & Client Experience",
-              icon: Trophy,
             },
             {
-              id: "2",
+              id: "2",              value: "1000+",              title: "Satisfied Clients",              description: "Premium grooming experiences delivered",              icon: Users,
-              value: "1000+",
-              title: "Satisfied Clients",
-              description: "Premium grooming experiences delivered",
-              icon: Users,
             },
             {
-              id: "3",
+              id: "3",              value: "10+",              title: "Years",              description: "Excellence in barbering and community",              icon: Award,
-              value: "10+",
-              title: "Years",
-              description: "Excellence in barbering and community",
-              icon: Award,
             },
           ]}
           gridVariant="uniform-all-items-equal"
@@ -86,26 +72,11 @@ export default function AwardsPage() {
           tagAnimation="slide-up"
           products={[
             {
-              id: "1",
+              id: "1",              name: "Best Fade 2024",              price: "Award Winner",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-barbershop_23-2148506273.jpg?_wi=5",              imageAlt: "Award-winning men modern haircut style"},
-              name: "Best Fade 2024",
-              price: "Award Winner",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-barbershop_23-2148506273.jpg?_wi=5",
-              imageAlt: "Award-winning men modern haircut style",
-            },
             {
-              id: "2",
+              id: "2",              name: "Excellence Cut",              price: "Certified",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-leather-barber-shop-chair_23-2148242807.jpg?_wi=5",              imageAlt: "Award-winning professional men hairstyle"},
-              name: "Excellence Cut",
-              price: "Certified",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-leather-barber-shop-chair_23-2148242807.jpg?_wi=5",
-              imageAlt: "Award-winning professional men hairstyle",
-            },
             {
-              id: "3",
+              id: "3",              name: "Premium Style",              price: "Recognized",              imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-with-long-mustache-after-haircut-barbershop_618663-44.jpg?_wi=5",              imageAlt: "Award-winning men premium haircut"},
-              name: "Premium Style",
-              price: "Recognized",
-              imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-with-long-mustache-after-haircut-barbershop_618663-44.jpg?_wi=5",
-              imageAlt: "Award-winning men premium haircut",
-            },
           ]}
           gridVariant="three-columns-all-equal-width"
           animationType="slide-up"
@@ -118,13 +89,9 @@ export default function AwardsPage() {
         <FooterLogoReveal
           logoText="HAUS"
           leftLink={{
-            text: "Privacy Policy",
+            text: "Privacy Policy",            href: "#"}}
-            href: "#",
-          }}
           rightLink={{
-            text: "Terms of Service",
+            text: "Terms of Service",            href: "#"}}
-            href: "#",
-          }}
         />
       </div>
     </ThemeProvider>

src/app/page.tsx

@@ -3,14 +3,14 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import HeroSplit from "@/components/sections/hero/HeroSplit";
+import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
-import MetricCardOne from "@/components/sections/metrics/MetricCardOne";
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
-import TextAbout from "@/components/sections/about/TextAbout";
+import TextAbout from '@/components/sections/about/TextAbout';
-import FeatureCardNine from "@/components/sections/feature/FeatureCardNine";
+import FeatureCardNine from '@/components/sections/feature/FeatureCardNine';
-import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
+import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
-import ProductCardOne from "@/components/sections/product/ProductCardOne";
+import ProductCardOne from '@/components/sections/product/ProductCardOne';
-import ContactFaq from "@/components/sections/contact/ContactFaq";
+import ContactFaq from '@/components/sections/contact/ContactFaq';
-import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { Award, Sparkles, Scissors, Star, Image, Calendar, Trophy, Users } from "lucide-react";
 
 const navItems = [
@@ -41,59 +41,55 @@ export default function HomePage() {
           brandName="HAUS"
           navItems={navItems}
           button={{
-            text: "Book Now",
+            text: "Book Now",            href: "https://booksy.com"
-            href: "https://booksy.com"
           }}
         />
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroSplit
+        <HeroBillboardCarousel
           title="Award-Winning Barbershop in Bournemouth"
           description="Premium precision haircuts, expert skin fades, and exceptional grooming services. Industry-recognized for excellence in men's grooming and outstanding client experience."
           tag="Est. 2015"
           tagIcon={Award}
           tagAnimation="slide-up"
-          background={{ variant: "plain" }}
-          imageSrc="http://img.b2bpic.net/free-photo/man-hair-salon-facing-camera_23-2148242763.jpg?_wi=1"
-          imageAlt="HAUS Male Grooming Interior"
-          imagePosition="right"
-          mediaAnimation="slide-up"
           buttons={[
             { text: "Book Appointment", href: "https://booksy.com" },
             { text: "View Services", href: "/services" }
           ]}
+          buttonAnimation="slide-up"
+          mediaItems={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/man-hair-salon-facing-camera_23-2148242763.jpg?_wi=1",              imageAlt: "HAUS Male Grooming Interior 1"
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/man-cuts-his-beard-barbershop_1157-16145.jpg?_wi=1",              imageAlt: "HAUS Male Grooming Interior 2"
+            },
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-barbershop_23-2148506273.jpg?_wi=1",              imageAlt: "HAUS Male Grooming Interior 3"
+            }
+          ]}
+          background={{ variant: "plain" }}
+          ariaLabel="Hero carousel section"
         />
       </div>
 
       <div id="awards" data-section="awards">
         <MetricCardOne
-          title="Industry Recognition"
+          title="HAUS Won 2 Major Awards: Barbershop of the Year & Best Client Experience"
           description="HAUS has been awarded multiple industry accolades for excellence in barbering and client experience"
           tag="Awards"
           tagIcon={Trophy}
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
+              id: "1",              value: "5",              title: "Awards",              description: "Salon of the Year & Client Experience",              icon: Trophy
-              value: "5",
-              title: "Awards",
-              description: "Salon of the Year & Client Experience",
-              icon: Trophy
             },
             {
-              id: "2",
+              id: "2",              value: "1000+",              title: "Satisfied Clients",              description: "Premium grooming experiences delivered",              icon: Users
-              value: "1000+",
-              title: "Satisfied Clients",
-              description: "Premium grooming experiences delivered",
-              icon: Users
             },
             {
-              id: "3",
+              id: "3",              value: "10+",              title: "Years",              description: "Excellence in barbering and community",              icon: Award
-              value: "10+",
-              title: "Years",
-              description: "Excellence in barbering and community",
-              icon: Award
             }
           ]}
           gridVariant="uniform-all-items-equal"
@@ -126,9 +122,7 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Premium Haircuts",
+              title: "Premium Haircuts",              description: "Precision cuts tailored to your face shape and style preferences. Our master barbers combine traditional techniques with modern styling.",              phoneOne: {
-              description: "Precision cuts tailored to your face shape and style preferences. Our master barbers combine traditional techniques with modern styling.",
-              phoneOne: {
                 imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg?_wi=1"
               },
               phoneTwo: {
@@ -137,9 +131,7 @@ export default function HomePage() {
             },
             {
               id: 2,
-              title: "Skin Fades",
+              title: "Skin Fades",              description: "Expert skin fade techniques with meticulous blending. Clean lines and smooth transitions for a sharp, contemporary look.",              phoneOne: {
-              description: "Expert skin fade techniques with meticulous blending. Clean lines and smooth transitions for a sharp, contemporary look.",
-              phoneOne: {
                 imageSrc: "http://img.b2bpic.net/free-photo/crop-teen-man-with-curls_23-2148203572.jpg?_wi=1"
               },
               phoneTwo: {
@@ -148,9 +140,7 @@ export default function HomePage() {
             },
             {
               id: 3,
-              title: "Beard Grooming",
+              title: "Beard Grooming",              description: "Professional beard trimming, shaping, and care. From classic clean looks to distinguished full beards, we've got you covered.",              phoneOne: {
-              description: "Professional beard trimming, shaping, and care. From classic clean looks to distinguished full beards, we've got you covered.",
-              phoneOne: {
                 imageSrc: "http://img.b2bpic.net/free-photo/barber-using-shaving-cream-contour-male-customer-s-beard_23-2148985735.jpg?_wi=1"
               },
               phoneTwo: {
@@ -174,51 +164,27 @@ export default function HomePage() {
           tagAnimation="slide-up"
           testimonials={[
             {
-              id: "1",
+              id: "1",              name: "James Mitchell",              role: "Business Owner",              company: "Mitchell & Co",              rating: 5,
-              name: "James Mitchell",
-              role: "Business Owner",
-              company: "Mitchell & Co",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/confident-entrepreneur-satisfied-with-own-success_1163-5474.jpg?_wi=1"
             },
             {
-              id: "2",
+              id: "2",              name: "David Chen",              role: "Marketing Director",              company: "TechFlow Ltd",              rating: 5,
-              name: "David Chen",
-              role: "Marketing Director",
-              company: "TechFlow Ltd",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/blond-man-happy-expression_1194-2901.jpg?_wi=1"
             },
             {
-              id: "3",
+              id: "3",              name: "Christopher Brown",              role: "Creative Director",              company: "Studio Design",              rating: 5,
-              name: "Christopher Brown",
-              role: "Creative Director",
-              company: "Studio Design",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1651.jpg?_wi=1"
             },
             {
-              id: "4",
+              id: "4",              name: "Michael Rodriguez",              role: "Entrepreneur",              company: "Startup Hub",              rating: 5,
-              name: "Michael Rodriguez",
-              role: "Entrepreneur",
-              company: "Startup Hub",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-redhead-bearded-male-dressed-suit-posing-grey-background_613910-11594.jpg?_wi=1"
             },
             {
-              id: "5",
+              id: "5",              name: "Thomas Wilson",              role: "Finance Manager",              company: "Capital Advisors",              rating: 5,
-              name: "Thomas Wilson",
-              role: "Finance Manager",
-              company: "Capital Advisors",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/man-portrait-posing-loft-modern-space_158595-5367.jpg?_wi=1"
             },
             {
-              id: "6",
+              id: "6",              name: "Richard Anderson",              role: "Project Manager",              company: "Build Solutions",              rating: 5,
-              name: "Richard Anderson",
-              role: "Project Manager",
-              company: "Build Solutions",
-              rating: 5,
               imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-redhead-bearded-male-dressed-suit-posing-grey-background_613910-11594.jpg?_wi=2"
             }
           ]}
@@ -238,22 +204,13 @@ export default function HomePage() {
           tagAnimation="slide-up"
           products={[
             {
-              id: "1",
+              id: "1",              name: "Modern Fade",              price: "£25",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-barbershop_23-2148506273.jpg?_wi=2"
-              name: "Modern Fade",
-              price: "£25",
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-barbershop_23-2148506273.jpg?_wi=2"
             },
             {
-              id: "2",
+              id: "2",              name: "Classic Cut",              price: "£25",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-leather-barber-shop-chair_23-2148242807.jpg?_wi=2"
-              name: "Classic Cut",
-              price: "£25",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-leather-barber-shop-chair_23-2148242807.jpg?_wi=2"
             },
             {
-              id: "3",
+              id: "3",              name: "Textured Style",              price: "£25",              imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-with-long-mustache-after-haircut-barbershop_618663-44.jpg?_wi=2"
-              name: "Textured Style",
-              price: "£25",
-              imageSrc: "http://img.b2bpic.net/free-photo/handsome-man-with-long-mustache-after-haircut-barbershop_618663-44.jpg?_wi=2"
             }
           ]}
           gridVariant="three-columns-all-equal-width"
@@ -268,30 +225,21 @@ export default function HomePage() {
           ctaTitle="Ready to Experience Premium Grooming?"
           ctaDescription="Book your appointment now and discover why HAUS is Bournemouth's award-winning barbershop."
           ctaButton={{
-            text: "Book on Booksy",
+            text: "Book on Booksy",            href: "https://booksy.com"
-            href: "https://booksy.com"
           }}
           ctaIcon={Calendar}
           faqs={[
             {
-              id: "1",
+              id: "1",              title: "How do I book an appointment?",              content: "You can book directly through our Booksy system or visit our salon. We accept walk-ins subject to availability. For the best experience, we recommend booking in advance."
-              title: "How do I book an appointment?",
-              content: "You can book directly through our Booksy system or visit our salon. We accept walk-ins subject to availability. For the best experience, we recommend booking in advance."
             },
             {
-              id: "2",
+              id: "2",              title: "What are your opening hours?",              content: "Monday to Friday: 9am - 7pm, Saturday: 9am - 6pm, Sunday: 10am - 5pm. We're located in the heart of Bournemouth town centre."
-              title: "What are your opening hours?",
-              content: "Monday to Friday: 9am - 7pm, Saturday: 9am - 6pm, Sunday: 10am - 5pm. We're located in the heart of Bournemouth town centre."
             },
             {
-              id: "3",
+              id: "3",              title: "Do you offer other grooming services?",              content: "Beyond haircuts and beard grooming, we offer restyling consultations, head shaves, and specialized grooming treatments. Ask our team about customized services."
-              title: "Do you offer other grooming services?",
-              content: "Beyond haircuts and beard grooming, we offer restyling consultations, head shaves, and specialized grooming treatments. Ask our team about customized services."
             },
             {
-              id: "4",
+              id: "4",              title: "What is your cancellation policy?",              content: "We require 24 hours notice for cancellations. Cancellations made less than 24 hours before your appointment may incur a charge."
-              title: "What is your cancellation policy?",
-              content: "We require 24 hours notice for cancellations. Cancellations made less than 24 hours before your appointment may incur a charge."
             }
           ]}
           useInvertedBackground={false}
@@ -303,12 +251,10 @@ export default function HomePage() {
         <FooterLogoReveal
           logoText="HAUS"
           leftLink={{
-            text: "Privacy Policy",
+            text: "Privacy Policy",            href: "#"
-            href: "#"
           }}
           rightLink={{
-            text: "Terms of Service",
+            text: "Terms of Service",            href: "#"
-            href: "#"
           }}
         />
       </div>