bender/bf7ec5ea-b997-44a2-8e33-9961e673b210
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:version_2
Branches Tags
bender:main bender:version_2 bender:version_1

5 Commits
version_1 ... version_2

Author SHA1 Message Date
bender
20982c506b Update src/app/page.tsx 2026-03-05 19:31:34 +00:00
bender
8e0d2860a8 Update src/app/layout.tsx 2026-03-05 19:31:34 +00:00
bender
c1eb577a63 Merge version_1 into main 
Merge version_1 into main
 2026-03-05 19:30:48 +00:00
bender
48a9368674 Merge version_1 into main 
Merge version_1 into main
 2026-03-05 19:29:58 +00:00
bender
c823595bdf Merge version_1 into main 
Merge version_1 into main
 2026-03-05 19:28:47 +00:00
2 changed files with 7 additions and 37 deletions
Expand all files Collapse all files

42
src/app/layout.tsx
View File

@@ -1,49 +1,20 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import { Mulish } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({ const inter = Inter({ subsets: ["latin"] });
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "JR's Barbershop - Expert Haircuts & Professional Grooming", description: "Premium barbershop offering expert haircuts, straight razor shaves, and beard grooming. Visit JR's Barbershop for quality grooming services.", keywords: "barbershop, haircut, shave, beard grooming, professional barber, men's haircut, fade cut", openGraph: { title: "JR's Barbershop", description: "Premium grooming and professional haircuts"};
title: "JR's Barbershop - Premium Grooming Services", description: "Expert haircuts and professional grooming services. Your trusted barbershop for quality cuts and traditional shaves.", siteName: "JR's Barbershop", type: "website"},
twitter: {
card: "summary_large_image", title: "JR's Barbershop - Professional Haircuts & Grooming"},
robots: {
index: true,
follow: true,
},
};
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={inter.className}>{children}
<body
className={`${halant.variable} ${inter.variable} ${mulish.variable} antialiased`}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1411,7 +1382,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

2
src/app/page.tsx
View File

@@ -217,7 +217,7 @@ export default function LandingPage() {
description="Book your appointment today and experience the JR's Barbershop difference. Call us now or visit our shop to discuss your grooming needs with our expert team." description="Book your appointment today and experience the JR's Barbershop difference. Call us now or visit our shop to discuss your grooming needs with our expert team."
buttons={[ buttons={[
{ text: "Call Us Now", href: "tel:+15551234567" }, { text: "Call Us Now", href: "tel:+15551234567" },
{ text: "Visit Our Shop", href: "#" } { text: "Get Directions", href: "#" }
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
background={{ variant: "plain" }} background={{ variant: "plain" }}