Merge version_3 into main

Update src/app/page.tsx
2026-03-07 14:20:19 +00:00 · 2026-03-07 14:20:15 +00:00 · 2026-03-07 14:20:14 +00:00 · 2026-03-07 14:17:14 +00:00 · 2026-03-07 14:17:10 +00:00 · 2026-03-07 14:17:10 +00:00
2 changed files with 47 additions and 46 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,45 +1,29 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
-import { Nunito_Sans } 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 halant = Halant({
-  variable: "--font-halant",  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
+const geist = Geist({
+  variable: "--font-geist-sans",  subsets: ["latin"],
 });

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

 export const metadata: Metadata = {
-  title: "Nando Parrucchiere | Professional Hair Salon Ottaviano",  description: "Premium hair salon in Ottaviano, Naples. Expert haircuts, coloring, and styling services. Call +39 081 8278988 to book your appointment today.",  keywords: "hair salon Ottaviano, barber Ottaviano, professional haircuts, hair coloring, styling services, Nando Parrucchiere",  openGraph: {
-    title: "Nando Parrucchiere | Professional Hair Salon",    description: "Transform your look with our expert hair services in Ottaviano. Professional styling, coloring, and haircuts.",    url: "https://nandoparrucchiere.com",    siteName: "Nando Parrucchiere",    type: "website"},
-  twitter: {
-    card: "summary_large_image",    title: "Nando Parrucchiere - Hair Salon Ottaviano",    description: "Premium hair salon in Ottaviano, Naples. Expert haircuts, coloring, and styling services."},
+  title: "Nando Parrucchiere",  description: "Premium hair care experience in Ottaviano"
 };

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${nunitoSans.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1407,7 +1391,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -49,23 +49,31 @@ export default function LandingPage() {
          background={{ variant: "animated-grid" }}
          leftCarouselItems={[
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=1",              imageAlt: "Professional haircut service"},
+              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=1",              imageAlt: "Professional haircut service"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=1",              imageAlt: "Hair coloring treatment"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=1",              imageAlt: "Hair coloring treatment"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=1",              imageAlt: "Professional hair styling"},
+              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=1",              imageAlt: "Professional hair styling"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/view-modern-entryway-with-interior-designed-furniture_23-2150791080.jpg?_wi=1",              imageAlt: "Salon interior"},
+              imageSrc: "http://img.b2bpic.net/free-photo/view-modern-entryway-with-interior-designed-furniture_23-2150791080.jpg?_wi=1",              imageAlt: "Salon interior"
+            },
          ]}
          rightCarouselItems={[
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/view-modern-entryway-with-interior-designed-furniture_23-2150791080.jpg?_wi=2",              imageAlt: "Modern salon workspace"},
+              imageSrc: "http://img.b2bpic.net/free-photo/view-modern-entryway-with-interior-designed-furniture_23-2150791080.jpg?_wi=2",              imageAlt: "Modern salon workspace"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=2",              imageAlt: "Styling expertise"},
+              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=2",              imageAlt: "Styling expertise"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=2",              imageAlt: "Color services"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=2",              imageAlt: "Color services"
+            },
            {
-              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=2",              imageAlt: "Haircut expertise"},
+              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=2",              imageAlt: "Haircut expertise"
+            },
          ]}
          buttons={[
            { text: "Book Appointment", href: "tel:+39-081-8278988" },
@@ -73,6 +81,7 @@ export default function LandingPage() {
          ]}
          buttonAnimation="slide-up"
          carouselPosition="right"
+          buttonClassName="first:shadow-lg first:scale-105 first:font-bold first:bg-primary first:text-white hover:first:scale-110 transition-transform"
        />
      </div>

@@ -84,13 +93,16 @@ export default function LandingPage() {
          features={[
            {
              id: "1",              title: "Men's Haircuts & Styling",              tags: ["Classic", "Modern"],
-              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=3",              imageAlt: "Men's haircut service"},
+              imageSrc: "http://img.b2bpic.net/free-photo/stylish-man-sitting-barbershop_1157-27165.jpg?_wi=3",              imageAlt: "Men's haircut service"
+            },
            {
              id: "2",              title: "Hair Coloring & Treatments",              tags: ["Natural", "Fashion Colors"],
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=3",              imageAlt: "Hair coloring service"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-hairdresser-washing-off-dye_23-2147769786.jpg?_wi=3",              imageAlt: "Hair coloring service"
+            },
            {
              id: "3",              title: "Professional Styling",              tags: ["Events", "Special Occasions"],
-              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=3",              imageAlt: "Professional styling service"},
+              imageSrc: "http://img.b2bpic.net/free-photo/make-up-artist-doing-make-up-woman_23-2148332500.jpg?_wi=3",              imageAlt: "Professional styling service"
+            },
          ]}
          animationType="slide-up"
          textboxLayout="default"
@@ -142,16 +154,20 @@ export default function LandingPage() {
          testimonials={[
            {
              id: "1",              name: "Marco Russo",              role: "Regular Client",              company: "Professional Excellence",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-with-red-hair-cafe-drinks-summer-cocktail-happy-laughs-smiles_1321-3715.jpg",              imageAlt: "Marco Russo"},
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-with-red-hair-cafe-drinks-summer-cocktail-happy-laughs-smiles_1321-3715.jpg",              imageAlt: "Marco Russo"
+            },
            {
              id: "2",              name: "Antonio Ferrari",              role: "Satisfied Customer",              company: "Years of Trust",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/man-isolated-showing-facial-emotions_1303-20271.jpg",              imageAlt: "Antonio Ferrari"},
+              imageSrc: "http://img.b2bpic.net/free-photo/man-isolated-showing-facial-emotions_1303-20271.jpg",              imageAlt: "Antonio Ferrari"
+            },
            {
              id: "3",              name: "Giuseppe Moretti",              role: "Loyal Client",              company: "Top Quality Service",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businessman-office-2_1262-1488.jpg",              imageAlt: "Giuseppe Moretti"},
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-businessman-office-2_1262-1488.jpg",              imageAlt: "Giuseppe Moretti"
+            },
            {
              id: "4",              name: "Paolo Fontana",              role: "Regular Visitor",              company: "Expert Craftsmanship",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/woman-showing-ok-sign_23-2148990150.jpg",              imageAlt: "Paolo Fontana"},
+              imageSrc: "http://img.b2bpic.net/free-photo/woman-showing-ok-sign_23-2148990150.jpg",              imageAlt: "Paolo Fontana"
+            },
          ]}
        />
      </div>
@@ -192,9 +208,11 @@ export default function LandingPage() {
            {
              items: [
                {
-                  label: "Via Roma 2, Ottaviano NA",                  href: "https://maps.google.com/?q=Via+Roma+2+Ottaviano+Naples"},
+                  label: "Via Roma 2, Ottaviano NA",                  href: "https://maps.google.com/?q=Via+Roma+2+Ottaviano+Naples"
+                },
                {
-                  label: "Directions",                  href: "https://maps.google.com/?q=Via+Roma+2+Ottaviano+Naples"},
+                  label: "Directions",                  href: "https://maps.google.com/?q=Via+Roma+2+Ottaviano+Naples"
+                },
                { label: "+39 081 8278988", href: "tel:+39-081-8278988" },
              ],
            },
Author	SHA1	Message	Date
bender	75b7db0a22	Merge version_3 into main Merge version_3 into main	2026-03-07 14:20:19 +00:00
bender	cb0a1242e8	Update src/app/page.tsx	2026-03-07 14:20:15 +00:00
bender	e2ce7f41c9	Update src/app/layout.tsx	2026-03-07 14:20:14 +00:00
bender	1be963fcdb	Merge version_2 into main Merge version_2 into main	2026-03-07 14:17:14 +00:00
bender	41bc559a7b	Update src/app/page.tsx	2026-03-07 14:17:10 +00:00
bender	bd28193720	Update src/app/layout.tsx	2026-03-07 14:17:10 +00:00
bender	8a9bddcdb4	Merge version_1 into main Merge version_1 into main	2026-03-07 14:13:10 +00:00
bender	45d418d3f6	Merge version_1 into main Merge version_1 into main	2026-03-07 14:12:25 +00:00
bender	ff71d807cb	Merge version_1 into main Merge version_1 into main	2026-03-07 14:11:17 +00:00