Update src/app/about/page.tsx

Merge version_3 into main

src/app/about/page.tsx

@@ -3,9 +3,8 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import SplitAbout from '@/components/sections/about/SplitAbout';
+import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import { Users, Scissors, MapPin } from "lucide-react";
 
 export default function AboutPage() {
   return (
@@ -26,8 +25,10 @@ export default function AboutPage() {
           <NavbarLayoutFloatingOverlay
             navItems={[
               { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
               { name: "About", id: "/about" },
-              { name: "Contact & Booking", id: "/contact-booking" }
+              { name: "Gallery", id: "/gallery" },
+              { name: "Contact and Booking", id: "/contact-booking" }
             ]}
             brandName="Gentlemens HQ"
             button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
@@ -35,25 +36,11 @@ export default function AboutPage() {
         </div>
 
         <div id="about-split" data-section="about-split">
-          <SplitAbout
+          <TextSplitAbout
-            tag="Our Story"
             title="Over 15 Years of Craftsmanship"
-            description="Founded on the principles of community, family, and precision, Gentlemens HQ has been a staple in Alpharetta since our doors first opened. We believe that a haircut is more than just a service—it's a ritual of care and connection."
+            titleClassName="text-3xl"
-            imageSrc="http://img.b2bpic.net/free-photo/barber-cutting-hair-client_23-2148733221.jpg"
+            description={["Founded on the principles of community, family, and precision, Gentlemens HQ has been a staple in Alpharetta since our doors first opened. We believe that a haircut is more than just a service—it's a ritual of care and connection."]}
-            imagePosition="left"
-            textboxLayout="split-description"
             useInvertedBackground={false}
-            bulletPoints={[
-              {
-                title: "Family Owned & Operated",                description: "Rooted in tradition, our shop is a true family endeavor serving our local community with heart.",                icon: Users
-              },
-              {
-                title: "Alpharetta Roots",                description: "Deeply connected to our home, we're proud to serve the gentlemen of Alpharetta, GA for over a decade and a half.",                icon: MapPin
-              },
-              {
-                title: "Professional Expertise",                description: "Our team of master barbers and stylists brings a wealth of experience and precision to every chair.",                icon: Scissors
-              }
-            ]}
           />
         </div>
 

src/app/contact-booking/page.tsx

@@ -25,8 +25,10 @@ export default function ContactBookingPage() {
           <NavbarLayoutFloatingOverlay
             navItems={[
                 { name: "Home", id: "/" },
+                { name: "Services", id: "/services" },
                 { name: "About", id: "/about" },
-                { name: "Contact & Booking", id: "/contact-booking" },
+                { name: "Gallery", id: "/gallery" },
+                { name: "Contact and Booking", id: "/contact-booking" },
             ]}
             brandName="Gentlemens HQ"
             button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
@@ -36,6 +38,7 @@ export default function ContactBookingPage() {
         <div id="contact-main" data-section="contact-main">
             <ContactSplit 
                 title="Send us a message"
+                titleClassName="text-3xl"
                 description="Have questions? Reach out to our team via phone at (770) 562-7668 or leave us a message below."
                 tag="Contact"
                 background={{ variant: "plain" }}

src/app/contact/page.tsx

@@ -7,7 +7,7 @@ import ContactText from '@/components/sections/contact/ContactText';
 import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 
-export default function LandingPage() {
+export default function ContactPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="text-shift"
@@ -25,47 +25,24 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingOverlay
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Services", id: "/services" },
-          id: "/",
+        { name: "About", id: "/about" },
-        },
+        { name: "Gallery", id: "/gallery" },
-        {
+        { name: "Contact", id: "/contact" },
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Gentlemens HQ"
-      button={{
+      button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
-        text: "Book Now",
-        href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N",
-      }}
     />
   </div>
 
   <div id="contact-info" data-section="contact-info">
       <ContactText
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       text="Visit us at 5155 Atlanta Hwy #9, Alpharetta GA 30004. Call (770) 562-7668. Hours: Tue-Fri 9am-6pm, Sat 10am-3pm."
       buttons={[
-        {
+        { text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" },
-          text: "Book Now",
-          href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N",
-        },
       ]}
     />
   </div>
@@ -73,9 +50,7 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactSplit
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       tag="Find us"
       title="Located in Alpharetta"
       description="Centrally located to serve the community."
@@ -87,49 +62,9 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterBase
       columns={[
-        {
+        { title: "Information", items: [{ label: "Services", href: "/services" }, { label: "About", href: "/about" }, { label: "Gallery", href: "/gallery" }] },
-          title: "Information",
+        { title: "Location", items: [{ label: "5155 Atlanta Hwy #9", href: "#" }, { label: "Alpharetta, GA 30004", href: "#" }] },
-          items: [
+        { title: "Contact", items: [{ label: "(770) 562-7668", href: "tel:7705627668" }, { label: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }] },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "About",
-              href: "/about",
-            },
-            {
-              label: "Gallery",
-              href: "/gallery",
-            },
-          ],
-        },
-        {
-          title: "Location",
-          items: [
-            {
-              label: "5155 Atlanta Hwy #9",
-              href: "#",
-            },
-            {
-              label: "Alpharetta, GA 30004",
-              href: "#",
-            },
-          ],
-        },
-        {
-          title: "Contact",
-          items: [
-            {
-              label: "(770) 562-7668",
-              href: "tel:7705627668",
-            },
-            {
-              label: "Book Now",
-              href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N",
-            },
-          ],
-        },
       ]}
       logoText="Gentlemens HQ"
     />
@@ -137,4 +72,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/gallery/page.tsx

@@ -28,17 +28,17 @@ export default function GalleryPage() {
                 { name: "Services", id: "/services" },
                 { name: "About", id: "/about" },
                 { name: "Gallery", id: "/gallery" },
-                { name: "Contact", id: "/contact" },
+                { name: "Contact and Booking", id: "/contact-booking" },
             ]}
             brandName="Gentlemens HQ"
-            button={{
+            button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
-                text: "Book Now",                href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N"}}
             />
         </div>
 
         <div id="gallery" data-section="gallery">
             <FeatureCardTwentyFour
                 title="Our Gallery"
+                cardTitleClassName="text-3xl"
                 description="Explore our premium barbershop interiors, skilled barbers at work, and our signature cuts and styles."
                 textboxLayout="default"
                 animationType="slide-up"
@@ -49,7 +49,7 @@ export default function GalleryPage() {
                     { id: "3", title: "Sharp Fades", author: "Signature Look", description: "Clean, modern fade styles.", tags: ["Fade", "Style"], imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-man-getting-haircut_23-2148224304.jpg" },
                     { id: "4", title: "Beard Trims", author: "Grooming", description: "Expert beard shaping and maintenance.", tags: ["Beard", "Grooming"], imageSrc: "http://img.b2bpic.net/free-photo/bearded-man-getting-beard-trim-barbershop_23-2148506385.jpg" },
                     { id: "5", title: "Women's Styling", author: "Salon Services", description: "Professional styling for women.", tags: ["Women's", "Style"], imageSrc: "http://img.b2bpic.net/free-photo/crop-hairdresser-washing-hair-blonde_23-2147769799.jpg" },
-                    { id: "6", title: "Kids Haircuts", author: "Family Friendly", description: "Specialized cuts for the little ones.", tags: ["Kids", "Friendly"], imageSrc: "http://img.b2bpic.net/free-photo/little-boy-getting-haircut-barbershop_23-2148506399.jpg" },
+                    { id: "6", title: "Kids Haircuts", author: "Family Friendly", description: "Specialized cuts for the little ones.", tags: ["Kids", "Friendly"], imageSrc: "http://img.b2bpic.net/little-boy-getting-haircut-barbershop_23-2148506399.jpg" },
                 ]}
             />
         </div>

src/app/page.tsx

@@ -3,12 +3,10 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FeatureCardTwelve from '@/components/sections/feature/FeatureCardTwelve';
 import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
+import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
 import { Award, Star, Users } from "lucide-react";
 
 export default function LandingPage() {
@@ -33,11 +31,10 @@ export default function LandingPage() {
         { name: "Services", id: "/services" },
         { name: "About", id: "/about" },
         { name: "Gallery", id: "/gallery" },
-        { name: "Contact & Booking", id: "/contact-booking" },
+        { name: "Contact and Booking", id: "/contact-booking" },
       ]}
       brandName="Gentlemens HQ"
-      button={{
+      button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
-        text: "Book Now",        href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N"}}
     />
   </div>
 
@@ -46,6 +43,7 @@ export default function LandingPage() {
       background={{ variant: "plain" }}
       logoText="Gentlemens HQ"
       description="Alpharetta's premier grooming destination. Delivering confidence, craftsmanship, and professional care for over 15 years."
+      logoClassName="text-3xl"
       buttons={[
         { text: "Book Your Appointment", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" },
       ]}
@@ -68,16 +66,17 @@ export default function LandingPage() {
   </div>
 
   <div id="testimonials" data-section="testimonials">
-      <TestimonialCardSix
+      <TestimonialCardThirteen
       animationType="slide-up"
       textboxLayout="split"
+      showRating={true}
       useInvertedBackground={false}
       testimonials={[
-        { id: "1", name: "Ray Drummond", handle: "5 Stars", testimonial: "Been coming here for 20 years since they opened, amazing people all especially Angela who is always upbeat and gives a superb haircut.", imageSrc: "http://img.b2bpic.net/free-photo/blond-man-happy-expression_1194-2900.jpg" },
+        { id: "1", name: "Ray Drummond", handle: "5 Stars", rating: 5, testimonial: "Been coming here for 20 years since they opened, amazing people all especially Angela who is always upbeat and gives a superb haircut.", imageSrc: "http://img.b2bpic.net/free-photo/blond-man-happy-expression_1194-2900.jpg" },
-        { id: "2", name: "Ryan Carter", handle: "5 Stars", testimonial: "I have been going here for over 2 years. I have seen 3 different barbers and all were great. Everyone is friendly and professional.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-thoughtful-bearded-male-dressed-red-fleece-shirt-grey-background_613910-13481.jpg" },
+        { id: "2", name: "Ryan Carter", handle: "5 Stars", rating: 5, testimonial: "I have been going here for over 2 years. I have seen 3 different barbers and all were great. Everyone is friendly and professional.", imageSrc: "http://img.b2bpic.net/free-photo/portrait-thoughtful-bearded-male-dressed-red-fleece-shirt-grey-background_613910-13481.jpg" },
-        { id: "3", name: "Jacob Dodd", handle: "5 Stars", testimonial: "Madisyn is awesome. She has been cutting my son and myself for several months. Would highly recommend.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-sideways-portrait-man-getting-haircut_23-2148224304.jpg" },
+        { id: "3", name: "Jacob Dodd", handle: "5 Stars", rating: 5, testimonial: "Madisyn is awesome. She has been cutting my son and myself for several months. Would highly recommend.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-sideways-portrait-man-getting-haircut_23-2148224304.jpg" },
-        { id: "4", name: "Antonio", handle: "5 Stars", testimonial: "They are very friendly and make you feel like family the moment you enter. The southern hospitality brings a smile to all.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-bearded-male-with-haircut-dressed-shirt-jacket-with-backpack-standing-park_613910-19391.jpg" },
+        { id: "4", name: "Antonio", handle: "5 Stars", rating: 5, testimonial: "They are very friendly and make you feel like family the moment you enter. The southern hospitality brings a smile to all.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-bearded-male-with-haircut-dressed-shirt-jacket-with-backpack-standing-park_613910-19391.jpg" },
-        { id: "5", name: "Mark Scheller", handle: "5 Stars", testimonial: "I love these folks. They provide first rate hair service and a most welcoming environment. No waiting in line!", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-blond-bearded-male-dressed-black-leather-jacket_613910-11927.jpg" },
+        { id: "5", name: "Mark Scheller", handle: "5 Stars", rating: 5, testimonial: "I love these folks. They provide first rate hair service and a most welcoming environment. No waiting in line!", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-blond-bearded-male-dressed-black-leather-jacket_613910-11927.jpg" },
       ]}
       title="What Our Clients Say"
       description="Building trust and family atmosphere for over 15 years."
@@ -97,4 +96,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/services/page.tsx

@@ -27,17 +27,17 @@ export default function ServicesPage() {
                 { name: "Services", id: "/services" },
                 { name: "About", id: "/about" },
                 { name: "Gallery", id: "/gallery" },
-                { name: "Contact", id: "/contact" },
+                { name: "Contact and Booking", id: "/contact-booking" },
             ]}
             brandName="Gentlemens HQ"
-            button={{
+            button={{ text: "Book Now", href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N" }}
-                text: "Book Now",                href: "https://app.squareup.com/appointments/buyer/widget/5ll7uiams0fu51/L5ATHJ9JYCH5N"}}
         />
         <FeatureCardTwelve
             animationType="slide-up"
             textboxLayout="default"
             useInvertedBackground={false}
             title="Our Services"
+            cardTitleClassName="text-3xl"
             description="Expert grooming tailored to your style."
             features={[
                 { id: "1", label: "Cuts", title: "Precision Scissor Cuts", items: ["Master stylist consultation", "Expert shaping and texturizing", "Scalp conditioning wash"] },