Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -30,21 +30,13 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "#hero"},
-          id: "#hero",
-        },
         {
-          name: "Services",
+          name: "Services",          id: "#services"},
-          id: "#services",
-        },
         {
-          name: "Our Story",
+          name: "Our Story",          id: "#story"},
-          id: "#story",
-        },
         {
-          name: "Book Now",
+          name: "Book Now",          id: "#contact"},
-          id: "#contact",
-        },
       ]}
       brandName="Dee Beauty Spa"
     />
@@ -53,41 +45,26 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroBillboardCarousel
       background={{
-        variant: "sparkles-gradient",
+        variant: "sparkles-gradient"}}
-      }}
       title="Where Opulence Meets Serenity"
       description="Indulge in an elevated beauty experience designed to rejuvenate your spirit."
       buttons={[
         {
-          text: "Book Your Session",
+          text: "Reserve Your Spot",          href: "tel:0726383754"},
-          href: "tel:0726383754",
-        },
       ]}
       mediaItems={[
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/african-american-woman-overalls-beret-room-with-wooden-table-fireplace_627829-6883.jpg?_wi=1",
+          imageSrc: "http://img.b2bpic.net/free-photo/african-american-woman-overalls-beret-room-with-wooden-table-fireplace_627829-6883.jpg?_wi=1",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/home-interior-design-arrangement_23-2148986618.jpg",
+          imageSrc: "http://img.b2bpic.net/free-photo/home-interior-design-arrangement_23-2148986618.jpg",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-young-woman-towel-smokes-cigarette-reads-newspaper_1153-4068.jpg",
+          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-young-woman-towel-smokes-cigarette-reads-newspaper_1153-4068.jpg",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/spa-massage-concept-with-woman_23-2147817016.jpg",
+          imageSrc: "http://img.b2bpic.net/free-photo/spa-massage-concept-with-woman_23-2147817016.jpg",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/stones-orchid-black-background_23-2147684475.jpg",
+          imageSrc: "http://img.b2bpic.net/free-photo/stones-orchid-black-background_23-2147684475.jpg",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/top-view-tasty-mousse-cups_23-2148238754.jpg",
+          imageSrc: "http://img.b2bpic.net/free-photo/top-view-tasty-mousse-cups_23-2148238754.jpg",          imageAlt: "Luxury spa"},
-          imageAlt: "Luxury spa",
-        },
       ]}
     />
   </div>
@@ -99,17 +76,11 @@ export default function LandingPage() {
       description="At Dee Beauty Spa, we believe community spirit is the heart of luxury. Founder Dee isn't just delivering world-class treatments—she's training the next generation of therapists, turning every visit into a commitment to empowerment and excellence."
       metrics={[
         {
-          value: "10+",
+          value: "10+",          title: "Years Experience"},
-          title: "Years Experience",
-        },
         {
-          value: "500+",
+          value: "500+",          title: "Empowered Students"},
-          title: "Empowered Students",
-        },
         {
-          value: "5k+",
+          value: "5k+",          title: "Happy Clients"},
-          title: "Happy Clients",
-        },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/lifestyle-people-learning-make-sushi_23-2149865354.jpg?_wi=1"
       imageAlt="Founder of Dee Beauty Spa"
@@ -125,64 +96,34 @@ export default function LandingPage() {
       useInvertedBackground={false}
       features={[
         {
-          id: "1",
+          id: "1",          label: "Massage",          title: "Swedish Relaxation",          items: [
-          label: "Massage",
+            "Deep tissue release",            "Stress relief",            "60 min - R600"],
-          title: "Swedish Relaxation",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Deep tissue release",
-            "Stress relief",
-            "60 min - R600",
-          ],
         },
         {
-          id: "2",
+          id: "2",          label: "Skin",          title: "Signature Facial",          items: [
-          label: "Skin",
+            "Hydrating glow",            "Deep cleanse",            "45 min - R450"],
-          title: "Signature Facial",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Hydrating glow",
-            "Deep cleanse",
-            "45 min - R450",
-          ],
         },
         {
-          id: "3",
+          id: "3",          label: "Beauty",          title: "Gold Manicure",          items: [
-          label: "Beauty",
+            "Gel polish",            "Hand massage",            "60 min - R350"],
-          title: "Gold Manicure",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Gel polish",
-            "Hand massage",
-            "60 min - R350",
-          ],
         },
         {
-          id: "4",
+          id: "4",          label: "Body",          title: "Full Polish",          items: [
-          label: "Body",
+            "Exfoliation",            "Smoothing",            "30 min - R400"],
-          title: "Full Polish",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Exfoliation",
-            "Smoothing",
-            "30 min - R400",
-          ],
         },
         {
-          id: "5",
+          id: "5",          label: "Wellness",          title: "Hot Stone",          items: [
-          label: "Wellness",
+            "Warm muscle therapy",            "Circulation",            "90 min - R800"],
-          title: "Hot Stone",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Warm muscle therapy",
-            "Circulation",
-            "90 min - R800",
-          ],
         },
         {
-          id: "6",
+          id: "6",          label: "Special",          title: "Deep Clean",          items: [
-          label: "Special",
+            "Pore refined",            "Brightening",            "50 min - R550"],
-          title: "Deep Clean",
+          buttons: [{ text: "Reserve Your Spot", href: "tel:0726383754" }]
-          items: [
-            "Pore refined",
-            "Brightening",
-            "50 min - R550",
-          ],
         },
       ]}
       title="Our Signature Services"
@@ -197,30 +138,15 @@ export default function LandingPage() {
       tag="Luxury Standards"
       metrics={[
         {
-          id: "1",
+          id: "1",          value: "Pure",          description: "Ethical, premium products only."},
-          value: "Pure",
-          description: "Ethical, premium products only.",
-        },
         {
-          id: "2",
+          id: "2",          value: "Warm",          description: "A sanctuary of community spirit."},
-          value: "Warm",
-          description: "A sanctuary of community spirit.",
-        },
         {
-          id: "3",
+          id: "3",          value: "Expert",          description: "Highly skilled, trained therapists."},
-          value: "Expert",
-          description: "Highly skilled, trained therapists.",
-        },
         {
-          id: "4",
+          id: "4",          value: "Fair",          description: "Transparent, professional policies."},
-          value: "Fair",
-          description: "Transparent, professional policies.",
-        },
         {
-          id: "5",
+          id: "5",          value: "Elite",          description: "High-end luxury equipment and atmosphere."},
-          value: "Elite",
-          description: "High-end luxury equipment and atmosphere.",
-        },
       ]}
     />
   </div>
@@ -232,45 +158,15 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "1",
+          id: "1",          name: "Policy Note",          handle: "Standard Transparency",          testimonial: "To ensure our high standards, we require a 24-hour notice for cancellations, allowing us to serve every guest punctually.",          imageSrc: "http://img.b2bpic.net/free-photo/spa-treatment-dark-wall_176420-8885.jpg",          imageAlt: "massage spa treatment gold"},
-          name: "Policy Note",
-          handle: "Standard Transparency",
-          testimonial: "To ensure our high standards, we require a 24-hour notice for cancellations, allowing us to serve every guest punctually.",
-          imageSrc: "http://img.b2bpic.net/free-photo/spa-treatment-dark-wall_176420-8885.jpg",
-          imageAlt: "massage spa treatment gold",
-        },
         {
-          id: "2",
+          id: "2",          name: "Commitment",          handle: "Guest Promise",          testimonial: "We guarantee professional handling of every booking to protect our therapist time and your luxury service experience.",          imageSrc: "http://img.b2bpic.net/free-photo/african-american-woman-overalls-beret-room-with-wooden-table-fireplace_627829-6883.jpg?_wi=2",          imageAlt: "massage spa treatment gold"},
-          name: "Commitment",
-          handle: "Guest Promise",
-          testimonial: "We guarantee professional handling of every booking to protect our therapist time and your luxury service experience.",
-          imageSrc: "http://img.b2bpic.net/free-photo/african-american-woman-overalls-beret-room-with-wooden-table-fireplace_627829-6883.jpg?_wi=2",
-          imageAlt: "massage spa treatment gold",
-        },
         {
-          id: "3",
+          id: "3",          name: "Clarity",          handle: "Scheduling Policy",          testimonial: "Please arrive 10 minutes early to start your relaxation journey immediately upon check-in.",          imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-learning-make-sushi_23-2149865354.jpg?_wi=2",          imageAlt: "massage spa treatment gold"},
-          name: "Clarity",
-          handle: "Scheduling Policy",
-          testimonial: "Please arrive 10 minutes early to start your relaxation journey immediately upon check-in.",
-          imageSrc: "http://img.b2bpic.net/free-photo/lifestyle-people-learning-make-sushi_23-2149865354.jpg?_wi=2",
-          imageAlt: "massage spa treatment gold",
-        },
         {
-          id: "4",
+          id: "4",          name: "Values",          handle: "Fairness",          testimonial: "Our terms reflect our dedication to maintaining a professional, reliable environment for our community.",          imageSrc: "http://img.b2bpic.net/free-photo/spa-composition-with-coffee-massage-scrub-soap-wooden-surface_169016-29823.jpg",          imageAlt: "massage spa treatment gold"},
-          name: "Values",
-          handle: "Fairness",
-          testimonial: "Our terms reflect our dedication to maintaining a professional, reliable environment for our community.",
-          imageSrc: "http://img.b2bpic.net/free-photo/spa-composition-with-coffee-massage-scrub-soap-wooden-surface_169016-29823.jpg",
-          imageAlt: "massage spa treatment gold",
-        },
         {
-          id: "5",
+          id: "5",          name: "Focus",          handle: "Quality Time",          testimonial: "Late arrivals may result in shortened treatment times to ensure the next guest is never kept waiting.",          imageSrc: "http://img.b2bpic.net/free-photo/hand-with-glitter-decoration-balls_23-2148346355.jpg",          imageAlt: "massage spa treatment gold"},
-          name: "Focus",
-          handle: "Quality Time",
-          testimonial: "Late arrivals may result in shortened treatment times to ensure the next guest is never kept waiting.",
-          imageSrc: "http://img.b2bpic.net/free-photo/hand-with-glitter-decoration-balls_23-2148346355.jpg",
-          imageAlt: "massage spa treatment gold",
-        },
       ]}
       title="Client Care & Policy"
       description="We are committed to providing the best experience for every guest through fair and transparent practices."
@@ -281,14 +177,11 @@ export default function LandingPage() {
       <ContactText
       useInvertedBackground={false}
       background={{
-        variant: "sparkles-gradient",
+        variant: "sparkles-gradient"}}
-      }}
       text="Ready for your glow? Call Dee Beauty Spa today."
       buttons={[
         {
-          text: "072 638 3754",
+          text: "Reserve Your Spot",          href: "tel:0726383754"},
-          href: "tel:0726383754",
-        },
       ]}
     />
   </div>
@@ -297,29 +190,19 @@ export default function LandingPage() {
       <FooterBase
       columns={[
         {
-          title: "Connect",
+          title: "Connect",          items: [
-          items: [
             {
-              label: "Call Us",
+              label: "Call Us",              href: "tel:0726383754"},
-              href: "tel:0726383754",
-            },
             {
-              label: "Facebook",
+              label: "Facebook",              href: "https://facebook.com"},
-              href: "https://facebook.com",
-            },
           ],
         },
         {
-          title: "Legal",
+          title: "Legal",          items: [
-          items: [
             {
-              label: "Terms of Service",
+              label: "Terms of Service",              href: "#terms"},
-              href: "#terms",
-            },
             {
-              label: "Privacy",
+              label: "Privacy",              href: "#"},
-              href: "#",
-            },
           ],
         },
       ]}
@@ -329,4 +212,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #0a0a0a;
+  --background: #fffafb;
-  --card: #1a1a1a;
+  --card: #ffffff;
-  --foreground: #f5f5f5;
+  --foreground: #5a2d3c;
-  --primary-cta: #d4af37;
+  --primary-cta: #ff85a2;
   --primary-cta-text: #0a0a0a;
-  --secondary-cta: #1a1a1a;
+  --secondary-cta: #fce4ec;
   --secondary-cta-text: #f5f5f5;
-  --accent: #b8860b;
+  --accent: #ffccd5;
-  --background-accent: #2a2a2a;
+  --background-accent: #f8bbd0;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);