Merge version_4 into main

Update src/app/page.tsx
2026-04-15 16:26:25 +00:00 · 2026-04-15 16:26:22 +00:00 · 2026-04-15 16:26:01 +00:00 · 2026-04-15 16:25:55 +00:00 · 2026-04-15 16:11:11 +00:00 · 2026-04-15 16:11:08 +00:00
4 changed files with 91 additions and 13 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Montserrat } from "next/font/google";
+import { Open_Sans } from "next/font/google";



@@ -20,8 +21,9 @@ export const metadata: Metadata = {
  },
 };

-const montserrat = Montserrat({
-  variable: "--font-montserrat",
+
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
  subsets: ["latin"],
 });

@@ -33,7 +35,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${montserrat.variable} antialiased`}>
+        <body className={`${openSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -10,6 +10,8 @@ import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSp
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
+import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
+import { Sparkles } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -29,7 +31,7 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarStyleFullscreen
      navItems={[
-        { name: "Services", id: "#services" },
+        { name: "Services", id: "/services" },
        { name: "About", id: "#about" },
        { name: "Reviews", id: "#testimonials" },
        { name: "Contact", id: "#contact" },
@@ -40,7 +42,7 @@ export default function LandingPage() {

  <div id="hero" data-section="hero">
      <HeroSplitDualMedia
-      background={{ variant: "plain" }}
+      background={{ variant: "glowing-orb" }}
      title="Top-Rated Hair Salon in Rome, GA"
      description="Expert haircuts, color, and styling with a welcoming, professional touch. Serving Rome, GA and surrounding areas."
      tag="Rated 4.8/5 from 100+ clients"
@@ -49,7 +51,7 @@ export default function LandingPage() {
        { text: "Book Appointment Online", href: "#contact" },
      ]}
      mediaItems={[
-        { imageSrc: "http://img.b2bpic.net/free-photo/vintage-room-with-wooden-table_1203-564.jpg", imageAlt: "Modern welcoming salon interior" },
+        { videoSrc: "https://www.w3schools.com/html/mov_bbb.mp4?_wi=1", imageAlt: "Modern welcoming salon interior" },
        { imageSrc: "http://img.b2bpic.net/free-photo/side-view-leather-barber-shop-chair_23-2148242807.jpg", imageAlt: "Professional stylist working" }
      ]}
      mediaAnimation="slide-up"
@@ -58,6 +60,21 @@ export default function LandingPage() {
    />
  </div>

+  <div id="stats-3d" data-section="stats-3d">
+    <MetricCardThree 
+      title="Our Impact"
+      description="Real results, real transformations, real style."
+      textboxLayout="default"
+      animationType="depth-3d"
+      useInvertedBackground={false}
+      metrics={[
+        { id: "1", icon: Sparkles, title: "Styles Created", value: "5,000+" },
+        { id: "2", icon: Sparkles, title: "Happy Clients", value: "2,000+" },
+        { id: "3", icon: Sparkles, title: "Years Experience", value: "15+" }
+      ]}
+    />
+  </div>
+
  <div id="testimonials" data-section="testimonials">
      <TestimonialCardTen
      textboxLayout="split-description"
@@ -80,9 +97,9 @@ export default function LandingPage() {
      textboxLayout="default"
      useInvertedBackground={true}
      features={[
-        { title: "Haircuts & Styling", description: "Precision cuts tailored to your unique face shape and lifestyle.", imageSrc: "http://img.b2bpic.net/free-photo/female-barber-drying-head-customer_23-2147737074.jpg", imageAlt: "Haircuts and styling" },
-        { title: "Custom Color", description: "Balayage, highlights, and expert color services to refresh your look.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-work_52683-130985.jpg", imageAlt: "Custom hair color" },
-        { title: "Curly Hair Expertise", description: "Specialized treatments and cuts specifically for curly and thick hair.", imageSrc: "http://img.b2bpic.net/free-photo/happy-dark-skinned-woman-makes-face-palm-cannot-stop-laughing-after-hearing-joke-expresses-positive-emotions-wears-hair-curlers-look-fabulous-tomorrow-party-dressed-silk-gown-hairstyling_273609-40017.jpg", imageAlt: "Curly hair services" },
+        { title: "Haircuts & Styling", description: "Precision cuts tailored to your unique face shape and lifestyle.", imageSrc: "http://img.b2bpic.net/free-photo/female-barber-drying-head-customer_23-2147737074.jpg?_wi=1", imageAlt: "Haircuts and styling" },
+        { title: "Custom Color", description: "Balayage, highlights, and expert color services to refresh your look.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-work_52683-130985.jpg?_wi=1", imageAlt: "Custom hair color" },
+        { title: "Curly Hair Expertise", description: "Specialized treatments and cuts specifically for curly and thick hair.", imageSrc: "http://img.b2bpic.net/free-photo/happy-dark-skinned-woman-makes-face-palm-cannot-stop-laughing-after-hearing-joke-expresses-positive-emotions-wears-hair-curlers-look-fabulous-tomorrow-party-dressed-silk-gown-hairstyling_273609-40017.jpg?_wi=1", imageAlt: "Curly hair services" },
      ]}
      title="Our Professional Services"
      description="From precision cuts to custom color, we deliver personalized care."
@@ -110,7 +127,7 @@ export default function LandingPage() {
        { id: "1", brand: "Style", name: "Transformation 1", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/attractive-barber-shaving-hair-client_23-2147778750.jpg" },
        { id: "2", brand: "Style", name: "Transformation 2", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/young-pretty-woman-studio-fashion-portrait_1301-4486.jpg" },
        { id: "3", brand: "Style", name: "Transformation 3", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/best-friends-smiling-each-other_23-2148238236.jpg" },
-        { id: "4", brand: "Style", name: "Transformation 4", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/front-view-bride-getting-hair-done_23-2149860769.jpg" },
+        { id: "4", brand: "Style", name: "Transformation 4", price: "", rating: 5, reviewCount: "1", imageSrc: "https://www.w3schools.com/html/mov_bbb.mp4?_wi=2" },
        { id: "5", brand: "Style", name: "Transformation 5", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-young-woman-teaching-sign-language_23-2148803694.jpg" },
        { id: "6", brand: "Style", name: "Transformation 6", price: "", rating: 5, reviewCount: "1", imageSrc: "http://img.b2bpic.net/free-photo/women-make-up-stand-each-other-apply-hair-rollers-mascara-use-eyelashes-curler-prepare-special-occasion-want-look-beautiful_273609-52775.jpg" },
      ]}
@@ -150,7 +167,7 @@ export default function LandingPage() {
        },
        {
          title: "Links",          items: [
-            { label: "Services", href: "#services" },
+            { label: "Services", href: "/services" },
            { label: "About", href: "#about" },
            { label: "Book Now", href: "#contact" },
          ],
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
+import FooterBase from '@/components/sections/footer/FooterBase';
+
+export default function ServicesPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="rounded"
+        contentWidth="medium"
+        sizing="largeSmall"
+        background="aurora"
+        cardStyle="gradient-mesh"
+        primaryButtonStyle="gradient"
+        secondaryButtonStyle="radial-glow"
+        headingFontWeight="light"
+    >
+      <ReactLenis root>
+        <NavbarStyleFullscreen
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Services", id: "/services" },
+            { name: "About", id: "/#about" },
+            { name: "Contact", id: "/#contact" },
+          ]}
+          brandName="Wiyanna’s Salon & Co."
+        />
+        
+        <div className="pt-32 pb-20">
+          <FeatureCardSeven
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            title="Our Services"
+            description="Explore our comprehensive range of professional hair care services."
+            features={[
+              { title: "Professional Haircuts", description: "Tailored styles for every hair type.", imageSrc: "http://img.b2bpic.net/free-photo/female-barber-drying-head-customer_23-2147737074.jpg?_wi=2" },
+              { title: "Color Services", description: "Balayage, highlights, and full color transformations.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-work_52683-130985.jpg?_wi=2" },
+              { title: "Curly Hair Specialist", description: "Expert care for curly and thick hair textures.", imageSrc: "http://img.b2bpic.net/free-photo/happy-dark-skinned-woman-makes-face-palm-cannot-stop-laughing-after-hearing-joke-expresses-positive-emotions-wears-hair-curlers-look-fabulous-tomorrow-party-dressed-silk-gown-hairstyling_273609-40017.jpg?_wi=2" },
+            ]}
+          />
+        </div>
+
+        <FooterBase
+          columns={[
+            { title: "Links", items: [{ label: "Home", href: "/" }, { label: "About", href: "/#about" }] },
+            { title: "Contact", items: [{ label: "(706) 232-4247", href: "tel:7062324247" }] }
+          ]}
+          logoText="Wiyanna’s Salon & Co."
+        />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
 }
Author	SHA1	Message	Date
bender	5453e4c554	Merge version_4 into main Merge version_4 into main	2026-04-15 16:26:25 +00:00
bender	11b39b6c79	Update src/app/page.tsx	2026-04-15 16:26:22 +00:00
bender	62e392f05e	Merge version_4 into main Merge version_4 into main	2026-04-15 16:26:01 +00:00
bender	6b70e39420	Update src/app/page.tsx	2026-04-15 16:25:55 +00:00
bender	d13a52df94	Merge version_3 into main Merge version_3 into main	2026-04-15 16:11:11 +00:00
bender	60ca3c228d	Update src/app/services/page.tsx	2026-04-15 16:11:08 +00:00
bender	357981aab5	Update src/app/page.tsx	2026-04-15 16:11:07 +00:00
bender	53c8526b58	Merge version_3 into main Merge version_3 into main	2026-04-15 16:10:31 +00:00
bender	af748b29d2	Add src/app/services/page.tsx	2026-04-15 16:10:28 +00:00
bender	88f24a4058	Update src/app/page.tsx	2026-04-15 16:10:27 +00:00
bender	e33f10dfb8	Merge version_2 into main Merge version_2 into main	2026-04-15 16:09:11 +00:00
bender	1bd8d2b9e4	Update theme fonts	2026-04-15 16:09:07 +00:00
bender	81cd6ec5a9	Update theme fonts	2026-04-15 16:09:07 +00:00
bender	b35222df2b	Merge version_2 into main Merge version_2 into main	2026-04-15 16:06:56 +00:00
bender	f85dd57693	Update src/app/page.tsx	2026-04-15 16:06:52 +00:00
bender	0d5c8df230	Merge version_2 into main Merge version_2 into main	2026-04-15 16:06:16 +00:00
bender	4efdcad599	Update src/app/page.tsx	2026-04-15 16:06:13 +00:00
bender	3207a41810	Merge version_1 into main Merge version_1 into main	2026-04-15 16:03:07 +00:00