bender/84ed7676-0ff5-4e60-919d-1adc1eb28231
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 3 commits from version_1 into main 2026-03-11 03:11:56 +00:00
Conversation 0 Commits 3 Files Changed 3 +57 -18
3 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/app/layout.tsx
View File

@@ -1,24 +1,61 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Figtree } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Figtree } from "next/font/google";
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
title: "Webild components 2",
description: "Generated by create next app",
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const figtree = Figtree({
variable: "--font-figtree",
subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Barber Night - Premium Haircuts & Grooming in Marrakech",
description: "Premium barbershop in Marrakech offering expert haircuts, skin fades, beard grooming, and complete grooming services. Book your appointment online.",
keywords: "barber, barbershop, Marrakech, haircut, fade, beard grooming, men's grooming, premium barber",
metadataBase: new URL("https://barbernight.ma"),
alternates: {
canonical: "https://barbernight.ma",
},
openGraph: {
title: "Barber Night - Premium Barbershop Marrakech",
description: "Premium barbershop in Marrakech with master barbers offering expert haircuts, fades, and grooming services.",
url: "https://barbernight.ma",
siteName: "Barber Night",
type: "website",
images: [
{
url: "http://img.b2bpic.net/free-photo/low-angle-man-hair-salon_23-2150665447.jpg",
alt: "Barber Night Premium Barbershop",
},
],
},
twitter: {
card: "summary_large_image",
title: "Barber Night - Premium Barbershop",
description: "Expert haircuts and grooming in Marrakech",
images: ["http://img.b2bpic.net/free-photo/low-angle-man-hair-salon_23-2150665447.jpg"],
},
robots: {
index: true,
follow: true,
},
};
export default function RootLayout({
children,
}: Readonly<{
@@ -27,7 +64,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${figtree.variable} antialiased`}>
<body
className={`${halant.variable} ${inter.variable} ${figtree.variable} antialiased`}
>
<Tag />
{children}
<script
@@ -39,4 +78,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

10
src/app/page.tsx
View File

@@ -131,7 +131,7 @@ export default function HomePage() {
price: "150 MAD",
rating: 5,
reviewCount: "500+",
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-sparying-hair-client_23-2147778777.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-sparying-hair-client_23-2147778777.jpg?_wi=1",
imageAlt: "professional barber cutting modern man haircut",
},
{
@@ -141,7 +141,7 @@ export default function HomePage() {
price: "180 MAD",
rating: 5,
reviewCount: "450+",
imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-brutal-bearded-male-grey-vignette-background_613910-1309.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-brutal-bearded-male-grey-vignette-background_613910-1309.jpg?_wi=1",
imageAlt: "skin fade haircut technique barber professional",
},
{
@@ -151,7 +151,7 @@ export default function HomePage() {
price: "100 MAD",
rating: 5,
reviewCount: "380+",
imageSrc: "http://img.b2bpic.net/free-photo/young-man-arranging-his-beard-with-shaving-machine_23-2148298347.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/young-man-arranging-his-beard-with-shaving-machine_23-2148298347.jpg?_wi=1",
imageAlt: "barber trimming grooming beard with precision scissors",
},
{
@@ -161,7 +161,7 @@ export default function HomePage() {
price: "250 MAD",
rating: 5,
reviewCount: "520+",
imageSrc: "http://img.b2bpic.net/free-photo/barber-straighten-mustache-senior-client_23-2148181909.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/barber-straighten-mustache-senior-client_23-2148181909.jpg?_wi=1",
imageAlt: "barber cutting hair and beard grooming combo service",
},
{
@@ -171,7 +171,7 @@ export default function HomePage() {
price: "80 MAD",
rating: 5,
reviewCount: "320+",
imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg?_wi=1",
imageAlt: "barber cutting child boy hair kids haircut",
},
]}

10
src/app/services/page.tsx
View File

@@ -60,7 +60,7 @@ export default function ServicesPage() {
price: "150 MAD",
rating: 5,
reviewCount: "500+",
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-sparying-hair-client_23-2147778777.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-sparying-hair-client_23-2147778777.jpg?_wi=2",
},
{
id: "fade",
@@ -69,7 +69,7 @@ export default function ServicesPage() {
price: "180 MAD",
rating: 5,
reviewCount: "450+",
imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-brutal-bearded-male-grey-vignette-background_613910-1309.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/studio-portrait-brutal-bearded-male-grey-vignette-background_613910-1309.jpg?_wi=2",
},
{
id: "beard",
@@ -78,7 +78,7 @@ export default function ServicesPage() {
price: "100 MAD",
rating: 5,
reviewCount: "380+",
imageSrc: "http://img.b2bpic.net/free-photo/young-man-arranging-his-beard-with-shaving-machine_23-2148298347.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/young-man-arranging-his-beard-with-shaving-machine_23-2148298347.jpg?_wi=2",
},
{
id: "combo",
@@ -87,7 +87,7 @@ export default function ServicesPage() {
price: "250 MAD",
rating: 5,
reviewCount: "520+",
imageSrc: "http://img.b2bpic.net/free-photo/barber-straighten-mustache-senior-client_23-2148181909.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/barber-straighten-mustache-senior-client_23-2148181909.jpg?_wi=2",
},
{
id: "kids",
@@ -96,7 +96,7 @@ export default function ServicesPage() {
price: "80 MAD",
rating: 5,
reviewCount: "320+",
imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/man-getting-haircut-barbershop_23-2148506184.jpg?_wi=2",
},
]}
/>