Merge version_19 into main

Merge version_19 into main

src/app/page.tsx

@@ -2,13 +2,13 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
 import MediaAbout from '@/components/sections/about/MediaAbout';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
-import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
+import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
 
 export default function LandingPage() {
   return (
@@ -18,7 +18,7 @@ export default function LandingPage() {
         borderRadius="rounded"
         contentWidth="smallMedium"
         sizing="largeSizeMediumTitles"
-        background="floatingGradient"
+        background="none"
         cardStyle="solid"
         primaryButtonStyle="diagonal-gradient"
         secondaryButtonStyle="radial-glow"
@@ -31,6 +31,7 @@ export default function LandingPage() {
         { name: "Home", id: "home" },
         { name: "About", id: "about" },
         { name: "Pricing", id: "pricing" },
+        { name: "Testimonials", id: "testimonial" },
         { name: "Contact", id: "contact" },
       ]}
       brandName="FlawLikeMigo"
@@ -87,46 +88,35 @@ export default function LandingPage() {
   </div>
 
   <div id="testimonial" data-section="testimonial">
-      <TestimonialCardSix
+      <TestimonialCardTwo
-      animationType="slide-up"
+      animationType="blur-reveal"
-      textboxLayout="default"
+      textboxLayout="split"
       useInvertedBackground={false}
-      testimonials={[
+      title="Client Reviews"
-        {
+      description="What our community has to say about the Migo experience."
-          id: "t1",          name: "James R.",          handle: "@jamesr",          testimonial: "Best fade I've had in years. Migo is a perfectionist.",          imageSrc: "http://img.b2bpic.net/free-photo/happy-young-man-sitting-isolated-grey_171337-10568.jpg?_wi=1"},
+      testimonials={[]}
-        {
-          id: "t2",          name: "Marcus W.",          handle: "@m_w",          testimonial: "Clean, sharp, and consistent. The service is always top tier.",          imageSrc: "http://img.b2bpic.net/free-photo/joyful-young-handsome-barber-holding-hair-clippers-winner-cup-isolated-olive-green_141793-84218.jpg"},
-        {
-          id: "t3",          name: "David L.",          handle: "@dl_styles",          testimonial: "Top quality service. I walk out feeling like a new man every time.",          imageSrc: "http://img.b2bpic.net/free-photo/hairstylist-giving-haircut-customer_23-2148506233.jpg"}
-      ]}
-      title="What Clients Say"
-      description="Don't just take our word for it."
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactSplitForm
+      <ContactSplit
-      useInvertedBackground={false}
+      tag="Book Now"
-      title="Schedule Your Visit (512-504-6134)"
+      title="Schedule Your Visit"
       description="Ready to get fresh? Reach out and let's get you on the schedule."
-      inputs={[
+      background={{ variant: "plain" }}
-        { name: "name", type: "text", placeholder: "Your Name", required: true },
+      useInvertedBackground={false}
-        { name: "email", type: "email", placeholder: "Your Email", required: true },
+      mediaPosition="right"
-      ]}
-      textarea={{
-        name: "message",        placeholder: "Which service do you need?",        required: true,
-      }}
       imageSrc="http://img.b2bpic.net/free-photo/tools-from-barbershop-wooden-background_1303-10377.jpg"
-      mediaAnimation="slide-up"
-      videoSrc="https://www.w3schools.com/howto/img_video.mp4?_wi=3"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterBase
+      columns={[
+        { title: "Navigation", items: [{ label: "Home", href: "#home" }, { label: "Pricing", href: "#pricing" }] },
+        { title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com" }, { label: "Terms", href: "#" }] }
+      ]}
       logoText="FlawLikeMigo"
-      leftLink={{ text: "Instagram", href: "https://instagram.com" }}
-      rightLink={{ text: "Terms of Service", href: "#" }}
     />
   </div>
       </ReactLenis>

src/app/styles/variables.css

@@ -13,12 +13,12 @@
   --background: #ffffff;
   --card: #f9f9f9;
   --foreground: #1a1a1a;
-  --primary-cta: #15479c;
+  --primary-cta: #1c1c1c;
   --primary-cta-text: #f5f4f0;
-  --secondary-cta: #f9f9f9;
+  --secondary-cta: #f0f0f0;
   --secondary-cta-text: #1a1a1a;
-  --accent: #e2e2e2;
+  --accent: #e5e5e5;
-  --background-accent: #c4c4c4;
+  --background-accent: #f4f4f4;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);