Merge version_2 into main

Update src/app/team/page.tsx
2026-03-16 01:51:45 +00:00 · 2026-03-16 01:51:41 +00:00 · 2026-03-16 01:51:40 +00:00 · 2026-03-16 01:51:40 +00:00 · 2026-03-16 01:51:39 +00:00 · 2026-03-16 01:43:14 +00:00
4 changed files with 138 additions and 367 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -3,76 +3,50 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
-import HeroBillboardScroll from "@/components/sections/hero/HeroBillboardScroll";
+import MediaAbout from "@/components/sections/about/MediaAbout";
 import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";

 export default function AboutPage() {
  const navigationItems = [
    { id: "home", name: "HOME", href: "/" },
-    { id: "services", name: "SERVICES", href: "/services" },
+    { id: "services", name: "SERVICES", href: "/#services" },
    { id: "team", name: "MEET THE TEAM", href: "/team" },
    { id: "about", name: "ABOUT", href: "/about" },
  ];

  const footerColumns = [
    {
-      title: "Visit The Rose Room",
-      items: [
+      title: "Visit The Rose Room",      items: [
        {
-          label: "(513) 524-2911",
-          href: "tel:(513)524-2911",
-        },
+          label: "(513) 524-2911",          href: "tel:(513)524-2911"},
        {
-          label: "318 S College Ave, Oxford OH 45056",
-          href: "#",
-        },
+          label: "318 S College Ave, Oxford OH 45056",          href: "#"},
        {
-          label: "Book via fresha.com",
-          href: "https://fresha.com",
-        },
+          label: "Book via fresha.com",          href: "https://fresha.com"},
      ],
    },
    {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
        {
-          label: "Monday - Friday: 9am - 6pm",
-          href: "#",
-        },
+          label: "Monday - Friday: 9am - 6pm",          href: "#"},
        {
-          label: "Saturday: 10am - 5pm",
-          href: "#",
-        },
+          label: "Saturday: 10am - 5pm",          href: "#"},
        {
-          label: "Sunday: Closed",
-          href: "#",
-        },
+          label: "Sunday: Closed",          href: "#"},
      ],
    },
    {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
        {
-          label: "Home",
-          href: "/",
-        },
+          label: "Home",          href: "/"},
        {
-          label: "Services",
-          href: "/services",
-        },
+          label: "Services",          href: "/#services"},
        {
-          label: "Meet the Team",
-          href: "/team",
-        },
+          label: "Meet the Team",          href: "/team"},
        {
-          label: "About",
-          href: "/about",
-        },
+          label: "About",          href: "/about"},
        {
-          label: "Book Now",
-          href: "https://fresha.com",
-        },
+          label: "Book Now",          href: "https://fresha.com"},
      ],
    },
  ];
@@ -98,31 +72,43 @@ export default function AboutPage() {
        />
      </div>

-      <div id="about-hero" data-section="about-hero">
-        <HeroBillboardScroll
+      <div id="about" data-section="about">
+        <MediaAbout
          title="About The Rose Room"
-          description="OXFORD'S PREMIER DESTINATION FOR BEAUTY & WELLNESS"
-          background={{ variant: "plain" }}
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png?_wi=2"
-          imageAlt="The Rose Room Salon exterior"
-          tag="Professional Excellence Since 2020"
+          description="Oxford's premier salon located at 318 S College Ave in the heart of Stewart Square business district. We offer a diverse range of cutting-edge services for men, women, and children with a team of highly skilled master stylists."
+          tag="Welcoming & Professional"
          tagAnimation="blur-reveal"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png?_wi=1"
+          imageAlt="The Rose Room Salon interior"
+          useInvertedBackground={false}
+          buttons={[
+            { text: "Book Your Visit", href: "https://fresha.com" },
+            { text: "Call Us", href: "tel:(513)524-2911" },
+          ]}
          buttonAnimation="slide-up"
-          ariaLabel="About The Rose Room hero section"
+          ariaLabel="About The Rose Room section"
        />
      </div>

-      <div id="about" data-section="about">
-        <TextSplitAbout
-          title="Our Story & Mission"
-          description={[
-            "The Rose Room Salon offers a highly skilled group of master stylists who keep updated on all of the latest trends. They are very professional, kind, and provide a warm welcoming to every client.",
-            "Every client is accommodated with a coffee bar, refrigerated drinks, and a light snack. Outdoor seating, an indoor waiting area, and free WiFi are also available.",
-            "Located at 318 S College Ave in the heart of Oxford, Ohio's newly renovated Stewart Square business district — within walking distance from Miami University campus with onsite parking available. Licensed to offer a wide variety of cutting-edge services for men, women, and children.",
-          ]}
-          useInvertedBackground={true}
-          showBorder={false}
-        />
+      <div id="map" data-section="map" className="w-full bg-gray-100 py-12">
+        <div className="container mx-auto px-4 max-w-6xl">
+          <div className="text-center mb-8">
+            <h2 className="text-3xl font-bold mb-2">Find Us</h2>
+            <p className="text-gray-600">318 S College Ave, Oxford, OH 45056</p>
+          </div>
+          <div className="rounded-lg overflow-hidden shadow-lg h-96 w-full">
+            <iframe
+              src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3079.7624652842847!2d-84.73892!3d39.50592!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x88408a7c8c7c8c8d%3A0x8c7c8c8c8c8c8c8c!2s318%20S%20College%20Ave%2C%20Oxford%2C%20OH%2045056!5e0!3m2!1sen!2sus!4v1234567890"
+              width="100%"
+              height="100%"
+              style={{ border: 0 }}
+              allowFullScreen={true}
+              loading="lazy"
+              referrerPolicy="no-referrer-when-downgrade"
+              title="The Rose Room Salon location on Google Maps"
+            />
+          </div>
+        </div>
      </div>

      <div id="footer" data-section="footer">
@@ -134,4 +120,4 @@ export default function AboutPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -12,69 +12,44 @@ import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
 export default function HomePage() {
  const navigationItems = [
    { id: "home", name: "HOME", href: "/" },
-    { id: "services", name: "SERVICES", href: "/services" },
+    { id: "services", name: "SERVICES", href: "#services" },
    { id: "team", name: "MEET THE TEAM", href: "/team" },
    { id: "about", name: "ABOUT", href: "/about" },
  ];

  const footerColumns = [
    {
-      title: "Visit The Rose Room",
-      items: [
+      title: "Visit The Rose Room",      items: [
        {
-          label: "(513) 524-2911",
-          href: "tel:(513)524-2911",
-        },
+          label: "(513) 524-2911",          href: "tel:(513)524-2911"},
        {
-          label: "318 S College Ave, Oxford OH 45056",
-          href: "#",
-        },
+          label: "318 S College Ave, Oxford OH 45056",          href: "#"},
        {
-          label: "Book via fresha.com",
-          href: "https://fresha.com",
-        },
+          label: "Book via fresha.com",          href: "https://fresha.com"},
      ],
    },
    {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
        {
-          label: "Monday - Friday: 9am - 6pm",
-          href: "#",
-        },
+          label: "Monday - Friday: 9am - 6pm",          href: "#"},
        {
-          label: "Saturday: 10am - 5pm",
-          href: "#",
-        },
+          label: "Saturday: 10am - 5pm",          href: "#"},
        {
-          label: "Sunday: Closed",
-          href: "#",
-        },
+          label: "Sunday: Closed",          href: "#"},
      ],
    },
    {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
        {
-          label: "Home",
-          href: "/",
-        },
+          label: "Home",          href: "/"},
        {
-          label: "Services",
-          href: "/services",
-        },
+          label: "Services",          href: "#services"},
        {
-          label: "Meet the Team",
-          href: "/team",
-        },
+          label: "Meet the Team",          href: "/team"},
        {
-          label: "About",
-          href: "/about",
-        },
+          label: "About",          href: "/about"},
        {
-          label: "Book Now",
-          href: "https://fresha.com",
-        },
+          label: "Book Now",          href: "https://fresha.com"},
      ],
    },
  ];
@@ -128,65 +103,23 @@ export default function HomePage() {
          useInvertedBackground={false}
          products={[
            {
-              id: "fill-in-builder-gel",
-              brand: "Nail Services",
-              name: "Fill-in Builder Gel",
-              price: "$50",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=1",
-              imageAlt: "builder gel manicure nail salon",
-            },
+              id: "fill-in-builder-gel",              brand: "Nail Services",              name: "Fill-in Builder Gel",              price: "$50",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=1",              imageAlt: "builder gel manicure nail salon"},
            {
-              id: "gel-x-full-set",
-              brand: "Nail Services",
-              name: "Gel-X Full Set",
-              price: "$65",
-              rating: 5,
-              reviewCount: "1 hr 30 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=1",
-              imageAlt: "gel-x nail extensions full set",
-            },
+              id: "gel-x-full-set",              brand: "Nail Services",              name: "Gel-X Full Set",              price: "$65",              rating: 5,
+              reviewCount: "1 hr 30 min",              imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=1",              imageAlt: "gel-x nail extensions full set"},
            {
-              id: "gel-x-fill-in",
-              brand: "Nail Services",
-              name: "Gel-X Fill In",
-              price: "$60",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=1",
-              imageAlt: "gel-x fill in manicure maintenance",
-            },
+              id: "gel-x-fill-in",              brand: "Nail Services",              name: "Gel-X Fill In",              price: "$60",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=1",              imageAlt: "gel-x fill in manicure maintenance"},
            {
-              id: "gel-manicure",
-              brand: "Nail Services",
-              name: "Gel Manicure",
-              price: "$35",
-              rating: 5,
-              reviewCount: "45 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=1",
-              imageAlt: "gel manicure polish nails salon",
-            },
+              id: "gel-manicure",              brand: "Nail Services",              name: "Gel Manicure",              price: "$35",              rating: 5,
+              reviewCount: "45 min",              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=1",              imageAlt: "gel manicure polish nails salon"},
            {
-              id: "sns-dip",
-              brand: "Nail Services",
-              name: "SNS Dip",
-              price: "$55",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=1",
-              imageAlt: "SNS dip powder nails salon",
-            },
+              id: "sns-dip",              brand: "Nail Services",              name: "SNS Dip",              price: "$55",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=1",              imageAlt: "SNS dip powder nails salon"},
            {
-              id: "sns-dip-tip",
-              brand: "Nail Services",
-              name: "SNS Dip with Tip",
-              price: "$65",
-              rating: 5,
-              reviewCount: "1 hr 30 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=1",
-              imageAlt: "SNS dip powder with acrylic tips",
-            },
+              id: "sns-dip-tip",              brand: "Nail Services",              name: "SNS Dip with Tip",              price: "$65",              rating: 5,
+              reviewCount: "1 hr 30 min",              imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=1",              imageAlt: "SNS dip powder with acrylic tips"},
          ]}
        />
      </div>
@@ -201,29 +134,13 @@ export default function HomePage() {
          useInvertedBackground={false}
          members={[
            {
-              id: "julie",
-              name: "Julie",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png?_wi=1",
-              imageAlt: "Julie, team member",
-            },
+              id: "julie",              name: "Julie",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png?_wi=1",              imageAlt: "Julie, team member"},
            {
-              id: "leah",
-              name: "Leah",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png?_wi=1",
-              imageAlt: "Leah, team member",
-            },
+              id: "leah",              name: "Leah",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png?_wi=1",              imageAlt: "Leah, team member"},
            {
-              id: "brittany",
-              name: "Brittany",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=1",
-              imageAlt: "Brittany, team member",
-            },
+              id: "brittany",              name: "Brittany",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=1",              imageAlt: "Brittany, team member"},
            {
-              id: "mariah",
-              name: "Mariah",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=1",
-              imageAlt: "Mariah, team member",
-            },
+              id: "mariah",              name: "Mariah",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=1",              imageAlt: "Mariah, team member"},
          ]}
          ariaLabel="Team members gallery"
        />
@@ -233,10 +150,7 @@ export default function HomePage() {
        <TextSplitAbout
          title="About The Rose Room"
          description={[
-            "The Rose Room Salon offers a highly skilled group of master stylists who keep updated on all of the latest trends. They are very professional, kind, and provide a warm welcoming to every client.",
-            "Every client is accommodated with a coffee bar, refrigerated drinks, and a light snack. Outdoor seating, an indoor waiting area, and free WiFi are also available.",
-            "Located at 318 S College Ave in the heart of Oxford, Ohio's newly renovated Stewart Square business district — within walking distance from Miami University campus with onsite parking available. Licensed to offer a wide variety of cutting-edge services for men, women, and children.",
-          ]}
+            "The Rose Room Salon offers a highly skilled group of master stylists who keep updated on all of the latest trends. They are very professional, kind, and provide a warm welcoming to every client.",            "Every client is accommodated with a coffee bar, refrigerated drinks, and a light snack. Outdoor seating, an indoor waiting area, and free WiFi are also available.",            "Located at 318 S College Ave in the heart of Oxford, Ohio's newly renovated Stewart Square business district — within walking distance from Miami University campus with onsite parking available. Licensed to offer a wide variety of cutting-edge services for men, women, and children."]}
          useInvertedBackground={true}
          showBorder={false}
        />
@@ -251,4 +165,4 @@ export default function HomePage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -7,71 +7,40 @@ import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
 import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";

 export default function ServicesPage() {
-  const navItems = [
-    { id: "home", name: "HOME" },
-    { id: "services", name: "SERVICES" },
-    { id: "team", name: "MEET THE TEAM" },
-    { id: "about", name: "ABOUT" },
+  const navigationItems = [
+    { id: "home", name: "HOME", href: "/" },
+    { id: "services", name: "SERVICES", href: "/services" },
  ];

  const footerColumns = [
    {
-      title: "Visit The Rose Room",
-      items: [
+      title: "Visit The Rose Room",      items: [
        {
-          label: "(513) 524-2911",
-          href: "tel:(513)524-2911",
-        },
+          label: "(513) 524-2911",          href: "tel:(513)524-2911"},
        {
-          label: "318 S College Ave, Oxford OH 45056",
-          href: "#",
-        },
+          label: "318 S College Ave, Oxford OH 45056",          href: "#"},
        {
-          label: "Book via fresha.com",
-          href: "https://fresha.com",
-        },
+          label: "Book via fresha.com",          href: "https://fresha.com"},
      ],
    },
    {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
        {
-          label: "Monday - Friday: 9am - 6pm",
-          href: "#",
-        },
+          label: "Monday - Friday: 9am - 6pm",          href: "#"},
        {
-          label: "Saturday: 10am - 5pm",
-          href: "#",
-        },
+          label: "Saturday: 10am - 5pm",          href: "#"},
        {
-          label: "Sunday: Closed",
-          href: "#",
-        },
+          label: "Sunday: Closed",          href: "#"},
      ],
    },
    {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
        {
-          label: "Home",
-          href: "/",
-        },
+          label: "Home",          href: "/"},
        {
-          label: "Services",
-          href: "/services",
-        },
+          label: "Services",          href: "/services"},
        {
-          label: "Meet the Team",
-          href: "/team",
-        },
-        {
-          label: "About",
-          href: "/about",
-        },
-        {
-          label: "Book Now",
-          href: "https://fresha.com",
-        },
+          label: "Book Now",          href: "https://fresha.com"},
      ],
    },
  ];
@@ -92,11 +61,8 @@ export default function ServicesPage() {
      <div id="nav" data-section="nav">
        <NavbarLayoutFloatingOverlay
          brandName="The Rose Room"
-          navItems={navItems}
-          button={{
-            text: "BOOK NOW",
-            href: "https://fresha.com",
-          }}
+          navItems={navigationItems.map(item => ({ id: item.id, name: item.name }))}
+          button={{ text: "BOOK NOW", href: "https://fresha.com" }}
        />
      </div>

@@ -110,65 +76,23 @@ export default function ServicesPage() {
          useInvertedBackground={false}
          products={[
            {
-              id: "fill-in-builder-gel",
-              brand: "Nail Services",
-              name: "Fill-in Builder Gel",
-              price: "$50",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=2",
-              imageAlt: "builder gel manicure nail salon",
-            },
+              id: "fill-in-builder-gel",              brand: "Nail Services",              name: "Fill-in Builder Gel",              price: "$50",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=1",              imageAlt: "builder gel manicure nail salon"},
            {
-              id: "gel-x-full-set",
-              brand: "Nail Services",
-              name: "Gel-X Full Set",
-              price: "$65",
-              rating: 5,
-              reviewCount: "1 hr 30 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=2",
-              imageAlt: "gel-x nail extensions full set",
-            },
+              id: "gel-x-full-set",              brand: "Nail Services",              name: "Gel-X Full Set",              price: "$65",              rating: 5,
+              reviewCount: "1 hr 30 min",              imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=1",              imageAlt: "gel-x nail extensions full set"},
            {
-              id: "gel-x-fill-in",
-              brand: "Nail Services",
-              name: "Gel-X Fill In",
-              price: "$60",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=2",
-              imageAlt: "gel-x fill in manicure maintenance",
-            },
+              id: "gel-x-fill-in",              brand: "Nail Services",              name: "Gel-X Fill In",              price: "$60",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=1",              imageAlt: "gel-x fill in manicure maintenance"},
            {
-              id: "gel-manicure",
-              brand: "Nail Services",
-              name: "Gel Manicure",
-              price: "$35",
-              rating: 5,
-              reviewCount: "45 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=2",
-              imageAlt: "gel manicure polish nails salon",
-            },
+              id: "gel-manicure",              brand: "Nail Services",              name: "Gel Manicure",              price: "$35",              rating: 5,
+              reviewCount: "45 min",              imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=1",              imageAlt: "gel manicure polish nails salon"},
            {
-              id: "sns-dip",
-              brand: "Nail Services",
-              name: "SNS Dip",
-              price: "$55",
-              rating: 5,
-              reviewCount: "1 hr",
-              imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=2",
-              imageAlt: "SNS dip powder nails salon",
-            },
+              id: "sns-dip",              brand: "Nail Services",              name: "SNS Dip",              price: "$55",              rating: 5,
+              reviewCount: "1 hr",              imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=1",              imageAlt: "SNS dip powder nails salon"},
            {
-              id: "sns-dip-tip",
-              brand: "Nail Services",
-              name: "SNS Dip with Tip",
-              price: "$65",
-              rating: 5,
-              reviewCount: "1 hr 30 min",
-              imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=2",
-              imageAlt: "SNS dip powder with acrylic tips",
-            },
+              id: "sns-dip-tip",              brand: "Nail Services",              name: "SNS Dip with Tip",              price: "$65",              rating: 5,
+              reviewCount: "1 hr 30 min",              imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=1",              imageAlt: "SNS dip powder with acrylic tips"},
          ]}
        />
      </div>
--- a/src/app/team/page.tsx
+++ b/src/app/team/page.tsx
@@ -3,76 +3,50 @@
 import Link from "next/link";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
-import TeamCardTen from "@/components/sections/team/TeamCardTen";
-import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
+import TeamCardOne from "@/components/sections/team/TeamCardOne";
 import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";

 export default function TeamPage() {
  const navigationItems = [
    { id: "home", name: "HOME", href: "/" },
-    { id: "services", name: "SERVICES", href: "/services" },
+    { id: "services", name: "SERVICES", href: "/#services" },
    { id: "team", name: "MEET THE TEAM", href: "/team" },
    { id: "about", name: "ABOUT", href: "/about" },
  ];

  const footerColumns = [
    {
-      title: "Visit The Rose Room",
-      items: [
+      title: "Visit The Rose Room",      items: [
        {
-          label: "(513) 524-2911",
-          href: "tel:(513)524-2911",
-        },
+          label: "(513) 524-2911",          href: "tel:(513)524-2911"},
        {
-          label: "318 S College Ave, Oxford OH 45056",
-          href: "#",
-        },
+          label: "318 S College Ave, Oxford OH 45056",          href: "#"},
        {
-          label: "Book via fresha.com",
-          href: "https://fresha.com",
-        },
+          label: "Book via fresha.com",          href: "https://fresha.com"},
      ],
    },
    {
-      title: "Hours",
-      items: [
+      title: "Hours",      items: [
        {
-          label: "Monday - Friday: 9am - 6pm",
-          href: "#",
-        },
+          label: "Monday - Friday: 9am - 6pm",          href: "#"},
        {
-          label: "Saturday: 10am - 5pm",
-          href: "#",
-        },
+          label: "Saturday: 10am - 5pm",          href: "#"},
        {
-          label: "Sunday: Closed",
-          href: "#",
-        },
+          label: "Sunday: Closed",          href: "#"},
      ],
    },
    {
-      title: "Quick Links",
-      items: [
+      title: "Quick Links",      items: [
        {
-          label: "Home",
-          href: "/",
-        },
+          label: "Home",          href: "/"},
        {
-          label: "Services",
-          href: "/services",
-        },
+          label: "Services",          href: "/#services"},
        {
-          label: "Meet the Team",
-          href: "/team",
-        },
+          label: "Meet the Team",          href: "/team"},
        {
-          label: "About",
-          href: "/about",
-        },
+          label: "About",          href: "/about"},
        {
-          label: "Book Now",
-          href: "https://fresha.com",
-        },
+          label: "Book Now",          href: "https://fresha.com"},
      ],
    },
  ];
@@ -99,56 +73,29 @@ export default function TeamPage() {
      </div>

      <div id="team" data-section="team">
-        <TeamCardTen
-          title="Meet the Team"
-          tag="A diverse group of master stylists who welcome everyone."
+        <TeamCardOne
+          title="Our Master Stylists"
+          description="Meet the talented team dedicated to making you feel beautiful."
+          tag="Experienced professionals committed to your satisfaction"
          tagAnimation="blur-reveal"
-          membersAnimation="slide-up"
-          memberVariant="card"
+          gridVariant="four-items-2x2-equal-grid"
+          animationType="slide-up"
+          textboxLayout="default"
          useInvertedBackground={false}
          members={[
            {
-              id: "julie",
-              name: "Julie",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png?_wi=2",
-              imageAlt: "Julie, team member",
-            },
+              id: "julie",              name: "Julie",              role: "Master Stylist",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625853495-38ran118.png",              imageAlt: "Julie, Master Stylist at The Rose Room"},
            {
-              id: "leah",
-              name: "Leah",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png?_wi=2",
-              imageAlt: "Leah, team member",
-            },
+              id: "leah",              name: "Leah",              role: "Master Stylist",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625853495-vqat3ih6.png",              imageAlt: "Leah, Master Stylist at The Rose Room"},
            {
-              id: "brittany",
-              name: "Brittany",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=2",
-              imageAlt: "Brittany, team member",
-            },
+              id: "brittany",              name: "Brittany",              role: "Master Stylist",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=1",              imageAlt: "Brittany, Master Stylist at The Rose Room"},
            {
-              id: "mariah",
-              name: "Mariah",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=2",
-              imageAlt: "Mariah, team member",
-            },
+              id: "mariah",              name: "Mariah",              role: "Master Stylist",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=1",              imageAlt: "Mariah, Master Stylist at The Rose Room"},
          ]}
          ariaLabel="Team members gallery"
        />
      </div>

-      <div id="team-description" data-section="team-description">
-        <TextSplitAbout
-          title="Our Stylists"
-          description={[
-            "Each member of our team brings unique expertise and a passion for hair, nails, and beauty services.",
-            "We stay current with the latest trends, techniques, and products to ensure you receive the highest quality service.",
-            "Our team is committed to creating a welcoming and comfortable environment where every client feels valued and heard.",
-          ]}
-          useInvertedBackground={true}
-          showBorder={false}
-        />
-      </div>
-
      <div id="footer" data-section="footer">
        <FooterBaseCard
          logoText="The Rose Room"
@@ -158,4 +105,4 @@ export default function TeamPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
Author	SHA1	Message	Date
bender	4e19911972	Merge version_2 into main Merge version_2 into main	2026-03-16 01:51:45 +00:00
bender	1d3e373a4a	Update src/app/team/page.tsx	2026-03-16 01:51:41 +00:00
bender	173cdf1cae	Update src/app/services/page.tsx	2026-03-16 01:51:40 +00:00
bender	11484f563c	Update src/app/page.tsx	2026-03-16 01:51:40 +00:00
bender	cdbb137cc6	Update src/app/about/page.tsx	2026-03-16 01:51:39 +00:00
bender	7ff2cc69a4	Merge version_1 into main Merge version_1 into main	2026-03-16 01:43:14 +00:00