Merge version_3 into main

Update src/app/page.tsx
2026-03-10 04:55:32 +00:00 · 2026-03-10 04:55:28 +00:00 · 2026-03-10 04:54:16 +00:00 · 2026-03-10 04:54:11 +00:00 · 2026-03-10 04:54:10 +00:00 · 2026-03-10 04:51:38 +00:00
2 changed files with 23 additions and 34 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,44 +1,28 @@
 import type { Metadata } from "next";
-import { DM_Sans } from "next/font/google";
-import { Inter } from "next/font/google";
+import { Geist, Geist_Mono } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";

-const dmSans = DM_Sans({
-  variable: "--font-dm-sans",  subsets: ["latin"],
+const geist = Geist({
+  variable: "--font-geist-sans",  subsets: ["latin"],
 });

-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "HAIR 4 ALL - Premium Barbershop | Expert Cuts & Styling",  description: "Professional barbershop offering expert haircuts, fades, and beard grooming. Book your appointment online at HAIR 4 ALL today.",  keywords: "barbershop, haircut, fade, beard grooming, professional barber, men's grooming",  openGraph: {
-    title: "HAIR 4 ALL - Premium Barbershop",    description: "Expert barbers delivering precision cuts and premium grooming services.",    siteName: "HAIR 4 ALL",    type: "website",    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/young-bearded-man-getting-haircut-by-hairdresser-while-sitting-chair-barbershop-barber-soul_627829-6322.jpg",        alt: "HAIR 4 ALL Barbershop"},
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",    title: "HAIR 4 ALL - Premium Barbershop",    description: "Expert barbers delivering precision cuts and premium grooming services.",    images: ["http://img.b2bpic.net/free-photo/young-bearded-man-getting-haircut-by-hairdresser-while-sitting-chair-barbershop-barber-soul_627829-6322.jpg"],
-  },
-};
+  title: "HAIR 4 ALL - Premium Barbershop",  description: "Professional grooming excellence at HAIR 4 ALL. Expert barbers delivering timeless cuts, sharp fades, and meticulous beard grooming."};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${dmSans.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1406,7 +1390,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -34,7 +34,7 @@ export default function LandingPage() {
            { name: "Team", id: "team" },
            { name: "Contact", id: "booking" },
          ]}
-          button={{ text: "Book Now", href: "https://www.setmore.com" }}
+          button={{ text: "Book Now", href: "https://hair4allbarbersalon.setmore.com" }}
          brandName="HAIR 4 ALL"
        />
      </div>
@@ -57,7 +57,7 @@ export default function LandingPage() {
          imageAlt="Professional barbershop interior"
          mediaAnimation="slide-up"
          buttons={[
-            { text: "Book Your Appointment", href: "https://www.setmore.com" },
+            { text: "Book Your Appointment", href: "https://hair4allbarbersalon.setmore.com" },
            { text: "Learn More", href: "#about" },
          ]}
        />
@@ -152,6 +152,12 @@ export default function LandingPage() {
            {
              src: "http://img.b2bpic.net/free-photo/portrait-bearded-black-man-wool-suit_613910-1886.jpg",              alt: "Satisfied client"
            },
+            {
+              src: "http://img.b2bpic.net/free-photo/happy-young-man-showing-okay-gesture_171337-7646.jpg",              alt: "Trusted customer"
+            },
+            {
+              src: "http://img.b2bpic.net/free-photo/handsome-man-outdoors-portrait_158595-3551.jpg",              alt: "Returning client"
+            },
          ]}
        />
      </div>
@@ -200,8 +206,8 @@ export default function LandingPage() {
            },
            {
              title: "Booking",              items: [
-                { label: "Schedule Appointment", href: "https://www.setmore.com" },
-                { label: "View Availability", href: "https://www.setmore.com" },
+                { label: "Schedule Appointment", href: "https://hair4allbarbersalon.setmore.com" },
+                { label: "View Availability", href: "https://hair4allbarbersalon.setmore.com" },
                { label: "Pricing", href: "#services" },
                { label: "Gift Cards", href: "#" },
              ],
@@ -211,4 +217,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
Author	SHA1	Message	Date
bender	a7b15894c8	Merge version_3 into main Merge version_3 into main	2026-03-10 04:55:32 +00:00
bender	86904eef11	Update src/app/page.tsx	2026-03-10 04:55:28 +00:00
bender	7c72389572	Merge version_2 into main Merge version_2 into main	2026-03-10 04:54:16 +00:00
bender	5eec0cac3c	Update src/app/page.tsx	2026-03-10 04:54:11 +00:00
bender	540d60386d	Update src/app/layout.tsx	2026-03-10 04:54:10 +00:00
bender	bf11e516da	Merge version_1 into main Merge version_1 into main	2026-03-10 04:51:38 +00:00
bender	774ddea5d8	Merge version_1 into main Merge version_1 into main	2026-03-10 04:50:31 +00:00