bender/47d1beaf-8820-41c3-b9ae-b2382dda1ec6
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-06 19:14:33 +00:00
Conversation 0 Commits 2 Files Changed 2 +15 -72
2 changed files with 15 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/app/layout.tsx
View File

@@ -1,76 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Public_Sans } 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 inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
});
import "./styles/variables.css";
import "./styles/base.css";
export const metadata: Metadata = {
title: "Etobicoke Barber & Hairstyling | Premium Men's Grooming",
description: "Professional barbershop in Etobicoke, Ontario. Expert haircuts, fades, beard trims, and hot towel shaves. Experienced barbers delivering precision grooming services.",
keywords: "barber Etobicoke, men's haircut, beard trim, fade haircut, barbershop Ontario, professional grooming",
metadataBase: new URL("https://etobicoke-barber.com"),
alternates: {
canonical: "https://etobicoke-barber.com",
},
openGraph: {
title: "Etobicoke Barber & Hairstyling | Premium Men's Grooming",
description: "Experience luxury grooming at our professional barbershop in Etobicoke. Expert cuts, fades, and traditional shaves.",
url: "https://etobicoke-barber.com",
siteName: "Etobicoke Barber & Hairstyling",
images: [
{
url: "http://img.b2bpic.net/free-photo/tools-shaving-beard-desk_23-2148181852.jpg",
alt: "Etobicoke Barber & Hairstyling barbershop interior",
},
],
type: "website",
},
twitter: {
card: "summary_large_image",
title: "Etobicoke Barber & Hairstyling | Premium Men's Grooming",
description: "Professional barbershop in Etobicoke. Expert haircuts, fades, beard trims, and hot towel shaves.",
images: [
"http://img.b2bpic.net/free-photo/tools-shaving-beard-desk_23-2148181852.jpg",
],
},
robots: {
index: true,
follow: true,
},
};
title: "OzoelKutz - Premium Barber Services", description: "Experience luxury grooming at OzoelKutz. Expert barbers, precision cuts, sharp fades, and traditional hot towel shaves in Etobicoke."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${publicSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1438,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

12
src/app/page.tsx
View File

@@ -36,7 +36,7 @@ export default function HomePage() {
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarStyleApple brandName="Etobicoke Barber" navItems={navItems} />
<NavbarStyleApple brandName="OzoelKutz" navItems={navItems} />
</div>
<div id="hero" data-section="hero">
@@ -71,7 +71,7 @@ export default function HomePage() {
<TextSplitAbout
title="About Us"
description={[
"Etobicoke Barber & Hairstyling is your premier destination for professional grooming services in the heart of Etobicoke, Ontario. With years of dedicated experience in men's barbering and styling, we pride ourselves on delivering exceptional results and a welcoming atmosphere for every client.", "Our team of skilled barbers combines traditional barbershop expertise with modern techniques to give you the perfect cut every time. We believe in building lasting relationships with our clients through quality service, attention to detail, and genuine hospitality. Whether you're looking for a classic cut, a sharp fade, or a complete grooming experience, we've got you covered."
"OzoelKutz is your premier destination for professional grooming services in the heart of Etobicoke, Ontario. With years of dedicated experience in men's barbering and styling, we pride ourselves on delivering exceptional results and a welcoming atmosphere for every client.", "Our team of skilled barbers combines traditional barbershop expertise with modern techniques to give you the perfect cut every time. We believe in building lasting relationships with our clients through quality service, attention to detail, and genuine hospitality. Whether you're looking for a classic cut, a sharp fade, or a complete grooming experience, we've got you covered."
]}
buttons={[
{
@@ -184,7 +184,7 @@ export default function HomePage() {
id: "4", name: "Tony S.", imageSrc: "http://img.b2bpic.net/free-photo/young-woman-white-clothes-smiling_23-2148056219.jpg", imageAlt: "Tony S., loyal client"
},
]}
cardTitle="Over 1,000+ satisfied customers trust Etobicoke Barber & Hairstyling for their grooming needs"
cardTitle="Over 1,000+ satisfied customers trust OzoelKutz for their grooming needs"
cardTag="Trusted by the community"
cardTagIcon={Heart}
cardAnimation="slide-up"
@@ -198,11 +198,11 @@ export default function HomePage() {
tagIcon={Mail}
tagAnimation="slide-up"
title="Ready for Your Next Great Haircut?"
description="Visit Etobicoke Barber & Hairstyling today. Walk-ins welcome, or book your appointment online for guaranteed availability. We look forward to serving you."
description="Visit OzoelKutz today. Walk-ins welcome, or book your appointment online for guaranteed availability. We look forward to serving you."
background={{ variant: "plain" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-vector/studio-website-template_23-2147537143.jpg"
imageAlt="Location map for Etobicoke Barber & Hairstyling"
imageAlt="Location map for OzoelKutz"
mediaAnimation="slide-up"
mediaPosition="right"
inputPlaceholder="Enter your email"
@@ -239,7 +239,7 @@ export default function HomePage() {
],
},
]}
copyrightText="© 2025 Etobicoke Barber & Hairstyling. All rights reserved."
copyrightText="© 2025 OzoelKutz. All rights reserved."
/>
</div>
</ThemeProvider>