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

Merge version_2 into main #5

Merged
bender merged 2 commits from version_2 into main 2026-03-06 00:57:06 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -29
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/app/layout.tsx
View File

@@ -1,43 +1,28 @@
import type { Metadata } from "next";
import { Public_Sans } from "next/font/google";
import { Inter } 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 publicSans = Public_Sans({
variable: "--font-public-sans", subsets: ["latin"],
const geist = Geist({
variable: "--font-geist-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const geistMono = Geist_Mono({
variable: "--font-geist-mono", subsets: ["latin"],
});
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: {
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."},
};
title: "A's Barbershop", description: "Premium cuts and timeless style at A's Barbershop"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${publicSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={`${geist.variable} ${geistMono.variable} antialiased`}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1405,7 +1390,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

2
src/app/page.tsx
View File

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