Update src/app/page.tsx

Merge version_16 into main

src/app/booking/page.tsx

@@ -4,7 +4,6 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 
 export default function BookingPage() {
   return (
@@ -14,56 +13,76 @@ export default function BookingPage() {
       borderRadius="soft"
       contentWidth="small"
       sizing="mediumLargeSizeLargeTitles"
-      background="grid"
+      background="none"
       cardStyle="subtle-shadow"
       primaryButtonStyle="diagonal-gradient"
       secondaryButtonStyle="glass"
       headingFontWeight="semibold"
     >
       <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarStyleFullscreen
-            navItems={[
-              { name: "Home", id: "/" },
-              { name: "About", id: "/#about" },
-              { name: "Services", id: "/#features" },
-              { name: "Pricing", id: "/#pricing" },
-              { name: "Team", id: "/#team" },
-              { name: "Book", id: "/booking" },
-              { name: "Contact", id: "/#contact" },
-            ]}
-            brandName="Maybach Cutz"
-          />
-        </div>
-
-        <div className="py-20 text-center">
-          <h1 className="text-4xl font-bold mb-6">Book Your Appointment</h1>
-          <p className="mb-8 text-xl">Call us directly to schedule your visit</p>
-          <a 
-            href="tel:7863780141" 
-            className="inline-block bg-primary-cta text-primary-cta-text px-8 py-4 rounded-full text-lg font-semibold hover:opacity-90 transition"
-          >
-            Call Now: (786) 378-0141
-          </a>
-          <div className="mt-12">
-            <p className="font-bold">Visit us at:</p>
-            <p>10693 Wiles Rd, Coral Springs, FL 33076</p>
+        <div className="bg-[#0a0a0a] text-[#f5f5f5] min-h-screen flex flex-col">
+          <div id="nav" data-section="nav">
+            <NavbarStyleFullscreen
+              navItems={[
+                { name: "Home", id: "/" },
+                { name: "About", id: "/#about" },
+                { name: "Services", id: "/#features" },
+                { name: "Pricing", id: "/#pricing" },
+                { name: "Team", id: "/#team" },
+                { name: "Book", id: "/booking" },
+                { name: "Contact", id: "/#contact" },
+              ]}
+              brandName="Maybach Cutz"
+            />
           </div>
-        </div>
 
-        <div id="footer" data-section="footer">
-          <FooterMedia
-            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776264324714-kh1wpzii.webp?_wi=2"
-            logoText="Brookside Barbers"
-            columns={[
-              { title: "Location", items: [{ label: "10693 Wiles Rd, Coral Springs, FL 33076", href: "#" }] },
-              { title: "Contact", items: [{ label: "(786) 378-0141", href: "tel:7863780141" }] },
-              { title: "Services", items: [{ label: "Haircut", href: "/#pricing" }, { label: "Beard Trim", href: "/#pricing" }, { label: "Kids Cut", href: "/#pricing" }] },
-            ]}
-            copyrightText="© 2025 Brookside Barbers"
-          />
+          <div className="flex-grow py-20 text-center">
+            <h1 className="text-4xl font-bold mb-6">Book Your Appointment</h1>
+            <p className="mb-8 text-xl">Call us directly to schedule your visit</p>
+            <a 
+              href="tel:7863780141" 
+              className="inline-block bg-[#e1b875] text-[#0a0a0a] px-8 py-4 rounded-full text-lg font-bold transition hover:opacity-90"
+            >
+              Call Now
+            </a>
+            <div className="mt-12 space-y-4">
+              <a 
+                href="tel:7863780141"
+                className="block text-[#e1b875] hover:underline"
+              >
+                Phone: (786) 378-0141
+              </a>
+              <a 
+                href="https://www.google.com/maps/search/?api=1&query=10693+Wiles+Rd,+Coral+Springs,+FL+33076"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="block text-[#e1b875] hover:underline"
+              >
+                10693 Wiles Rd, Coral Springs, FL 33076
+              </a>
+              <div className="mt-8">
+                <h3 className="font-bold mb-2 uppercase text-[#e1b875]">Business Hours</h3>
+                <p>Mon-Fri: 9:00 AM - 7:00 PM</p>
+                <p>Sat: 9:00 AM - 5:00 PM</p>
+                <p>Sun: Closed</p>
+              </div>
+            </div>
+          </div>
+
+          <div id="footer" data-section="footer">
+            <FooterMedia
+              imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776264324714-kh1wpzii.webp?_wi=2"
+              logoText="Brookside Barbers"
+              columns={[
+                { title: "Location", items: [{ label: "10693 Wiles Rd, Coral Springs, FL 33076", href: "#" }] },
+                { title: "Contact", items: [{ label: "(786) 378-0141", href: "tel:7863780141" }] },
+                { title: "Services", items: [{ label: "Haircut", href: "/#pricing" }, { label: "Beard Trim", href: "/#pricing" }, { label: "Kids Cut", href: "/#pricing" }] },
+              ]}
+              copyrightText="© 2025 Brookside Barbers"
+            />
+          </div>
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -6,8 +6,8 @@ import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import HeroLogo from '@/components/sections/hero/HeroLogo';
-import MediaAbout from '@/components/sections/about/MediaAbout';
+import HeroOverlay from '@/components/sections/hero/HeroOverlay';
+import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
 import TeamCardSix from '@/components/sections/team/TeamCardSix';
@@ -22,7 +22,7 @@ export default function LandingPage() {
         borderRadius="soft"
         contentWidth="small"
         sizing="mediumLargeSizeLargeTitles"
-        background="grid"
+        background="none"
         cardStyle="subtle-shadow"
         primaryButtonStyle="diagonal-gradient"
         secondaryButtonStyle="glass"
@@ -40,28 +40,36 @@ export default function LandingPage() {
         { name: "Book", id: "booking" },
         { name: "Contact", id: "contact" },
       ]}
-      brandName="Maybach Cutz"
+      brandName=""
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroLogo
-      logoText="Brookside Barbers"
-      description="Experience luxury grooming in the heart of Coral Springs. Professional, clean, and dedicated service for the modern gentleman."
+      <HeroOverlay
+      title="Maybach Barber        shop "
+      description="Professional styling and precision grooming in the heart of Coral Springs."
       buttons={[
-        { text: "Book Now", href: "/booking" },
+        { text: "Book Your Appointment", href: "/booking" },
       ]}
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776263927063-aohm0713.webp?_wi=1"
-      imageAlt="Luxury barber shop interior"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776275636014-o8w0rm32.png"
+      imageAlt="Barber shop professional styling"
+      showDimOverlay={true}
+      showBlur={true}
+      textPosition="bottom"
     />
+    <div className="text-center py-6 bg-[#0a0a0a] text-[#e1b875]">
+      <a href="tel:7863780141" className="block hover:text-white transition">Tel: (786) 378-0141</a>
+      <a href="#" className="block hover:text-white transition mt-2">10693 Wiles Rd, Coral Springs, FL 33076</a>
+    </div>
   </div>
 
   <div id="about" data-section="about">
-      <MediaAbout
-      useInvertedBackground={true}
+      <TextSplitAbout
       title="Exceptional Service, Professional Vibe"
-      description="Located inside Brookside Square, we offer an upscale, clean, and welcoming environment. Our expert team focuses on precision grooming and personalized care for every client."
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776263927063-aohm0713.webp?_wi=2"
+      description={[
+        "Located inside Brookside Square, we offer an upscale, clean, and welcoming environment.",        "Our expert team focuses on precision grooming and personalized care for every client."
+      ]}
+      useInvertedBackground={true}
     />
   </div>
 
@@ -160,7 +168,7 @@ export default function LandingPage() {
 
   <div id="footer" data-section="footer">
       <FooterMedia
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776264324714-kh1wpzii.webp?_wi=1"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CKIUaXr59FE1QYCKDNglueswIR/uploaded-1776264007384-5m6rlv1y.webp"
       logoText="Brookside Barbers"
       columns={[
         { title: "Location", items: [{ label: "10693 Wiles Rd, Coral Springs, FL 33076", href: "#" }] },
@@ -173,4 +181,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #f5f5f5;
-  --card: #ffffff;
-  --foreground: #1c1c1c;
-  --primary-cta: #1c1c1c;
-  --primary-cta-text: #f5f5f5;
-  --secondary-cta: #ffffff;
-  --secondary-cta-text: #1c1c1c;
-  --accent: #6139e6;
-  --background-accent: #b3a8e8;
+  --background: #f5f4ef;
+  --card: #dad6cd;
+  --foreground: #2a2928;
+  --primary-cta: #2a2928;
+  --primary-cta-text: #ffffff;
+  --secondary-cta: #ecebea;
+  --secondary-cta-text: #000f06e6;
+  --accent: #ffffff;
+  --background-accent: #c6b180;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);