bender/4db95cd9-9f6d-482a-8b68-59b5abe93a0a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bender:version_1
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
..
compare: bender:main
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

9 Commits
version_1 ... main

Author SHA1 Message Date
bender
ef99e48747 Merge version_3 into main 
Merge version_3 into main
 2026-03-04 17:12:41 +00:00
bender
cf75427891 Update src/app/page.tsx 2026-03-04 17:12:37 +00:00
bender
b7cb868602 Update src/app/layout.tsx 2026-03-04 17:12:36 +00:00
bender
673c6e0c30 Merge version_2 into main 
Merge version_2 into main
 2026-03-04 17:10:28 +00:00
bender
fbea55565f Update src/app/page.tsx 2026-03-04 17:10:24 +00:00
bender
6e36513911 Update src/app/layout.tsx 2026-03-04 17:10:24 +00:00
bender
2a645db1f8 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 17:08:44 +00:00
bender
fa4a607056 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 17:07:49 +00:00
bender
140430a0a8 Merge version_1 into main 
Merge version_1 into main
 2026-03-04 17:06:26 +00:00
2 changed files with 18 additions and 45 deletions
Expand all files Collapse all files

47
src/app/layout.tsx
View File

@@ -1,50 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Manrope } from "next/font/google";
import { DM_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "@/styles/globals.css";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "U.S. BARBER | Premium Barbershop Services", description: "Experience expert barbering at U.S. BARBER. Precision haircuts, beard grooming, and traditional shaving services by master barbers. Book your appointment today.", keywords: "barbershop, haircut, barber, beard grooming, fades, shaving, grooming services", openGraph: {
title: "U.S. BARBER | Premium Barbershop Services", description: "Experience expert barbering at U.S. BARBER. Precision haircuts, beard grooming, and traditional shaving services by master barbers.", siteName: "U.S. BARBER", type: "website"},
twitter: {
card: "summary_large_image", title: "U.S. BARBER | Premium Barbershop Services", description: "Experience expert barbering at U.S. BARBER. Premium haircuts and grooming services."},
};
title: "U.S. BARBER - Premium Barbershop Services", description: "Experience traditional barbering excellence with modern expertise. Premium haircuts, expert shaving, and grooming services."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${manrope.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1412,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

16
src/app/page.tsx
View File

@@ -82,25 +82,29 @@ export default function LandingPage() {
carouselMode="buttons"
features={[
{
title: "Classic Haircuts", description: "Precision cuts tailored to your style and face shape", bentoComponent: "icon-info-cards", items: [
title: "Classic Haircuts", description: "Precision cuts tailored to your style and face shape", button: { text: "Book Now", href: "contact" },
bentoComponent: "icon-info-cards", items: [
{ icon: Zap, label: "Quick Service", value: "45 min" },
{ icon: Award, label: "Expert Skills", value: "20+ years" },
{ icon: Users, label: "Team Size", value: "8 barbers" }
]
},
{
title: "Beard Grooming", description: "Professional beard shaping and maintenance", bentoComponent: "3d-stack-cards", items: [
title: "Beard Grooming", description: "Professional beard shaping and maintenance", button: { text: "Book Now", href: "contact" },
bentoComponent: "3d-stack-cards", items: [
{ icon: Shield, title: "Precision", subtitle: "Expert Shaping", detail: "Detailed beard sculpting" },
{ icon: Sparkles, title: "Care", subtitle: "Premium Products", detail: "Quality beard care" },
{ icon: Award, title: "Finish", subtitle: "Perfect Edge", detail: "Crisp, clean lines" }
]
},
{
title: "Fade Variations", description: "Modern fade styles from subtle to bold", bentoComponent: "marquee", centerIcon: Scissors,
title: "Fade Variations", description: "Modern fade styles from subtle to bold", button: { text: "Book Now", href: "contact" },
bentoComponent: "marquee", centerIcon: Scissors,
variant: "text", texts: ["Skin Fade", "Drop Fade", "Temple Fade", "Burst Fade"]
},
{
title: "Hot Towel Shave", description: "Classic straight razor shaving experience", bentoComponent: "reveal-icon", icon: Zap
title: "Hot Towel Shave", description: "Classic straight razor shaving experience", button: { text: "Book Now", href: "contact" },
bentoComponent: "reveal-icon", icon: Zap
}
]}
/>
@@ -197,7 +201,7 @@ export default function LandingPage() {
background={{ variant: "plain" }}
useInvertedBackground={false}
inputPlaceholder="your@email.com"
buttonText="Schedule Now"
buttonText="Book My Cut"
termsText="We respect your privacy. Unsubscribe at any time."
/>
</div>
@@ -235,4 +239,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}