Merge version_2 into main

Update src/app/page.tsx
2026-04-18 13:53:34 +00:00 · 2026-04-18 13:53:31 +00:00 · 2026-04-18 13:53:10 +00:00 · 2026-04-18 13:53:04 +00:00
1 changed files with 32 additions and 109 deletions
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -3,7 +3,7 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+import FeatureCardTwentyNine from '@/components/sections/feature/featureCardTwentyNine/FeatureCardTwentyNine';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 import HeroLogo from '@/components/sections/hero/HeroLogo';
 import MediaAbout from '@/components/sections/about/MediaAbout';
@@ -29,21 +29,13 @@ export default function LandingPage() {
      <NavbarStyleFullscreen
      navItems={[
        {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
        {
-          name: "Services",
-          id: "services",
-        },
+          name: "Services",          id: "services"},
        {
-          name: "Reviews",
-          id: "testimonials",
-        },
+          name: "Reviews",          id: "testimonials"},
        {
-          name: "Location",
-          id: "contact",
-        },
+          name: "Location",          id: "contact"},
      ]}
      brandName="Gary Rom Man"
    />
@@ -55,9 +47,7 @@ export default function LandingPage() {
      description="Premium grooming experience at Sandton Gate. Where classic skill meets modern style."
      buttons={[
        {
-          text: "Book Now",
-          href: "#contact",
-        },
+          text: "Book Now",          href: "#contact"},
      ]}
      buttonAnimation="slide-up"
      imageSrc="http://img.b2bpic.net/free-photo/full-shot-man-getting-haircut_23-2149141753.jpg"
@@ -76,49 +66,24 @@ export default function LandingPage() {
  </div>

  <div id="services" data-section="services">
-      <FeatureCardMedia
-      animationType="slide-up"
+      <FeatureCardTwentyNine
+      animationType="blur-reveal"
+      gridVariant="bento-grid"
      textboxLayout="split"
      useInvertedBackground={false}
-      features={[
-        {
-          id: "cut",
-          title: "Precision Cut",
-          description: "Customized haircuts tailored to your style.",
-          tag: "From R350",
-          imageSrc: "http://img.b2bpic.net/free-photo/big-black-dog-getting-procedure-groomer-salon-young-woman-white-tshirt-combing-dog-dog-is-tied-blue-table_1157-51544.jpg",
-        },
-        {
-          id: "shave",
-          title: "Signature Shave",
-          description: "Classic hot towel shave for a smooth finish.",
-          tag: "From R250",
-          imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-grooming-their-client_23-2149205884.jpg",
-        },
-        {
-          id: "grooming",
-          title: "Beard Grooming",
-          description: "Precision beard shaping and conditioning.",
-          tag: "From R200",
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-having-his-hair-dryed_23-2148506346.jpg",
-        },
-        {
-          id: "styling",
-          title: "Professional Styling",
-          description: "Finish with high-quality grooming products.",
-          tag: "From R150",
-          imageSrc: "http://img.b2bpic.net/free-photo/brushing-teeth-process-small-dog-sits-table-dog-brushed-by-professional_1157-48823.jpg",
-        },
-        {
-          id: "treatments",
-          title: "Scalp Treatment",
-          description: "Deep clean and invigorating massage.",
-          tag: "From R400",
-          imageSrc: "http://img.b2bpic.net/free-photo/yorkshire-terrier-getting-procedure-groomer-salon-young-woman-white-tshirt-trimming-little-dog-yorkshire-terrier-puppy-getting-haircut-with-shaving-machine_1157-51387.jpg",
-        },
-      ]}
      title="Services & Pricing"
      description="Precision cuts, expert shaves, and grooming excellence."
+      features={[
+        {
+          title: "Precision Cut",          description: "Customized haircuts tailored to your style.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png?_wi=1",          titleImageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png",          buttonText: "Book Now"
+        },
+        {
+          title: "Signature Shave",          description: "Classic hot towel shave for a smooth finish.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png?_wi=2",          titleImageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png",          buttonText: "Book Now"
+        },
+        {
+          title: "Beard Grooming",          description: "Precision beard shaping and conditioning.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png?_wi=3",          titleImageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CX7VVyzMcQvVU7wbKnG4fPzBZx/uploaded-1776520373207-6vi2zym0.png",          buttonText: "Book Now"
+        }
+      ]}
    />
  </div>

@@ -129,40 +94,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "1",
-          name: "Ruhan S.",
-          role: "Client",
-          testimonial: "Great service and great shave from Tino.",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-getting-haircut-salon_23-2149220568.jpg",
-        },
+          id: "1",          name: "Ruhan S.",          role: "Client",          testimonial: "Great service and great shave from Tino.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-getting-haircut-salon_23-2149220568.jpg"},
        {
-          id: "2",
-          name: "Joe Z.",
-          role: "Client",
-          testimonial: "Well located, very nice services with efficiency. Highly recommended.",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg",
-        },
+          id: "2",          name: "Joe Z.",          role: "Client",          testimonial: "Well located, very nice services with efficiency. Highly recommended.",          imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg"},
        {
-          id: "3",
-          name: "Henco K.",
-          role: "Client",
-          testimonial: "What an experience!!!! Top class service!",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg",
-        },
-        {
-          id: "4",
-          name: "Anonymous",
-          role: "Client",
-          testimonial: "Professional, efficient, and perfectly located.",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506183.jpg",
-        },
-        {
-          id: "5",
-          name: "Anonymous",
-          role: "Client",
-          testimonial: "The best haircut in Sandton, hands down.",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665445.jpg",
-        },
+          id: "3",          name: "Henco K.",          role: "Client",          testimonial: "What an experience!!!! Top class service!",          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-getting-haircut_23-2150665444.jpg"},
      ]}
      title="Client Reviews"
      description="See why we are the top-rated choice in Sandton."
@@ -173,16 +109,13 @@ export default function LandingPage() {
      <ContactCTA
      useInvertedBackground={false}
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      tag="Visit Us"
      title="Sandton Gate, Johannesburg"
      description="Ready for your next cut? Book an appointment now or visit us at our new location."
      buttons={[
        {
-          text: "Book Now",
-          href: "#",
-        },
+          text: "Book Now",          href: "#"},
      ]}
    />
  </div>
@@ -193,29 +126,19 @@ export default function LandingPage() {
      logoText="GARY ROM MAN"
      columns={[
        {
-          title: "Links",
-          items: [
+          title: "Links",          items: [
            {
-              label: "About",
-              href: "#about",
-            },
+              label: "About",              href: "#about"},
            {
-              label: "Services",
-              href: "#services",
-            },
+              label: "Services",              href: "#services"},
          ],
        },
        {
-          title: "Social",
-          items: [
+          title: "Social",          items: [
            {
-              label: "Instagram",
-              href: "#",
-            },
+              label: "Instagram",              href: "#"},
            {
-              label: "Facebook",
-              href: "#",
-            },
+              label: "Facebook",              href: "#"},
          ],
        },
      ]}
@@ -224,4 +147,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
Author	SHA1	Message	Date
bender	d04ddd4b49	Merge version_2 into main Merge version_2 into main	2026-04-18 13:53:34 +00:00
bender	039c96f506	Update src/app/page.tsx	2026-04-18 13:53:31 +00:00
bender	24aae72326	Merge version_2 into main Merge version_2 into main	2026-04-18 13:53:10 +00:00
bender	2ebab1d319	Update src/app/page.tsx	2026-04-18 13:53:04 +00:00