bender/ad421ab8-aadf-492f-bd0b-9be0e64d4819
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-03-07 14:17:15 +00:00
Conversation 0 Commits 2 Files Changed 2 +48 -48
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/layout.tsx
View File

@@ -1,45 +1,28 @@
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 +1390,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

54
src/app/page.tsx
View File

@@ -49,30 +49,39 @@ 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" },
{ text: "Book Your Appointment Now", href: "tel:+39-081-8278988" },
{ text: "Learn More", href: "#services" },
]}
buttonAnimation="slide-up"
carouselPosition="right"
buttonClassName="first:font-bold first:bg-primary first:text-white"
/>
</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" },
],
},