bender/02fdc1ee-8290-4bca-a0f8-640fa0ead5ef
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

7 Commits
version_1 ... main

Author SHA1 Message Date
bender
50caff645e Merge version_2 into main 
Merge version_2 into main
 2026-03-06 00:57:06 +00:00
bender
09ebf9add3 Update src/app/page.tsx 2026-03-06 00:57:02 +00:00
bender
41368dbba1 Update src/app/layout.tsx 2026-03-06 00:57:01 +00:00
bender
7b5bc82056 Merge version_1 into main 
Merge version_1 into main
 2026-03-06 00:55:53 +00:00
bender
60497b0256 Merge version_1 into main 
Merge version_1 into main
 2026-03-06 00:55:08 +00:00
bender
1ae424213c Merge version_1 into main 
Merge version_1 into main
 2026-03-06 00:53:42 +00:00
bender
ae05ec9b96 Merge version_1 into main 
Merge version_1 into main
 2026-03-06 00:52:29 +00:00
2 changed files with 13 additions and 29 deletions
Expand all files Collapse all files

40
src/app/layout.tsx
View File

@@ -1,43 +1,28 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Public_Sans } from "next/font/google"; import { Geist, Geist_Mono } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const publicSans = Public_Sans({ const geist = Geist({
variable: "--font-public-sans", subsets: ["latin"], variable: "--font-geist-sans", subsets: ["latin"],
}); });
const inter = Inter({ const geistMono = Geist_Mono({
variable: "--font-inter", subsets: ["latin"], variable: "--font-geist-mono", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
title: "A'S BARBERSHOP | Professional Haircuts & Grooming", description: "Premium barbershop services including professional haircuts, fades, and straight razor shaves. Book your appointment with our expert barbers today.", keywords: "barbershop, haircuts, professional grooming, barber, fades, shaves, local barbershop", robots: { title: "A's Barbershop", description: "Premium cuts and timeless style at A's Barbershop"};
index: true,
follow: true,
},
openGraph: {
title: "A'S BARBERSHOP | Professional Haircuts & Grooming", description: "Experience quality haircuts and grooming services at A's Barbershop. Expert barbers, competitive pricing, and a welcoming atmosphere.", type: "website", siteName: "A'S BARBERSHOP"},
twitter: {
card: "summary_large_image", title: "A'S BARBERSHOP | Premium Cuts, Timeless Style", description: "Book your appointment with expert barbers today."},
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
<body {children}
className={`${publicSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1405,7 +1390,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

@@ -49,7 +49,7 @@ export default function LandingPage() {
tagIcon={Scissors} tagIcon={Scissors}
tagAnimation="slide-up" tagAnimation="slide-up"
buttons={[ buttons={[
{ text: "Book Now", href: "#contact" }, { text: "Book Your Cut", href: "#contact" },
{ text: "Learn More", href: "#services" }, { text: "Learn More", href: "#services" },
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"