Merge version_3 into main

Merge version_3 into main

src/app/page.tsx

@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -31,14 +31,10 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "Services",          id: "services"},
-        {
-          name: "About",          id: "about"},
-        {
-          name: "Admin",          id: "/admin/dashboard"},
+        { name: "Home", id: "hero" },
+        { name: "Services", id: "services" },
+        { name: "About", id: "about" },
+        { name: "Admin", id: "/admin/dashboard" },
       ]}
       brandName="Elegance Salon"
     />
@@ -46,23 +42,17 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroBillboardGallery
-      background={{
-        variant: "sparkles-gradient"}}
+      background={{ variant: "sparkles-gradient" }}
       title="Experience Timeless Beauty"
       description="Unlock exclusive rewards, book your session, and manage your beauty journey with Elegance Salon."
       buttons={[
-        {
-          text: "Book Now",          href: "#contact"},
-        {
-          text: "Login",          href: "#"},
+        { text: "Book Now", href: "#contact" },
+        { text: "Login", href: "#" },
       ]}
       mediaItems={[
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/natural-elements-spa-with-candles_23-2148199479.jpg?_wi=1",          imageAlt: "Salon Interior"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/lodge-wintertime-with-ski-gear_482257-76632.jpg?_wi=1",          imageAlt: "Spa Treatment"},
-        {
-          imageSrc: "http://img.b2bpic.net/free-photo/make-up-brushes-with-bottle-water-beauty-salon_627829-10772.jpg?_wi=1",          imageAlt: "Professional Service"},
+        { imageSrc: "http://img.b2bpic.net/free-photo/natural-elements-spa-with-candles_23-2148199479.jpg?_wi=1", imageAlt: "Salon Interior" },
+        { imageSrc: "http://img.b2bpic.net/free-photo/lodge-wintertime-with-ski-gear_482257-76632.jpg?_wi=1", imageAlt: "Spa Treatment" },
+        { imageSrc: "http://img.b2bpic.net/free-photo/make-up-brushes-with-bottle-water-beauty-salon_627829-10772.jpg?_wi=1", imageAlt: "Professional Service" },
       ]}
       mediaAnimation="blur-reveal"
     />
@@ -152,21 +142,28 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
-      useInvertedBackground={true}
-      background={{ variant: "sparkles-gradient" }}
-      text="Ready for your beauty transformation? Visit us today or chat with us on WhatsApp."
-    />
+      <ContactSplitForm
+        title="Get in Touch"
+        description="Have questions or want to book a session? Send us a message and we'll be in touch."
+        inputs={[
+            { name: "name", type: "text", placeholder: "Full Name", required: true },
+            { name: "email", type: "email", placeholder: "Email Address", required: true }
+        ]}
+        textarea={{ name: "message", placeholder: "How can we help?", rows: 4, required: true }}
+        onSubmit={(data) => console.log("Form submitted:", data)}
+        useInvertedBackground={true}
+        imageSrc="http://img.b2bpic.net/free-photo/natural-elements-spa-with-candles_23-2148199479.jpg?_wi=1"
+      />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBaseReveal
+      <FooterBaseCard
       logoText="Elegance Salon"
       columns={[
         { title: "Salon", items: [{ label: "Services", href: "#services" }] },
         { title: "Admin", items: [{ label: "Dashboard", href: "/admin/dashboard" }] },
       ]}
-      copyrightText="© 2024 Elegance Salon. All rights reserved."
+      copyrightText="© 2025 Elegance Salon. All rights reserved."
     />
   </div>
       </ReactLenis>