bender/fe9c0eb0-8e8c-4194-86ed-9fb07d154b85
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-04 02:53:57 +00:00
Conversation 0 Commits 2 Files Changed 2 +14 -36
2 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/layout.tsx
View File

@@ -1,49 +1,28 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import { Halant } 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 inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const geist = Geist({
variable: "--font-geist-sans", subsets: ["latin"],
});
const openSans = Open_Sans({
variable: "--font-open-sans", subsets: ["latin"],
});
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const geistMono = Geist_Mono({
variable: "--font-geist-mono", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Jimmy's Haircuts | Premium Barbershop Haircuts & Grooming", description: "Expert fades, precision beard work, and classic hot towel shaves. Book your appointment at downtown's finest barbershop.", keywords: "barbershop, haircuts, beard trim, hot shave, downtown barber, men's grooming", robots: {
index: true,
follow: true,
},
openGraph: {
title: "Jimmy's Haircuts | Premium Barbershop", description: "Expert grooming for the modern gentleman. Expert fades, precision beards, classic shaves.", type: "website", siteName: "Jimmy's Haircuts"},
twitter: {
card: "summary_large_image", title: "Jimmy's Haircuts | Premium Barbershop", description: "Book your expert haircut at downtown's premier barbershop."},
};
title: "Jimmy's Haircuts", description: "Premium grooming for the modern gentleman"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${inter.variable} ${openSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={`${geist.variable} ${geistMono.variable} antialiased`}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1411,7 +1390,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

4
src/app/page.tsx
View File

@@ -10,7 +10,7 @@ import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCar
import ProductCardOne from "@/components/sections/product/ProductCardOne";
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import { Instagram } from "lucide-react";
import { Instagram, TrendingUp } from "lucide-react";
export default function LandingPage() {
return (
@@ -71,7 +71,7 @@ export default function LandingPage() {
useInvertedBackground={false}
plans={[
{
id: "classic-haircut", badge: "Popular", price: "$25", subtitle: "30 minutes", buttons: [{ text: "Book Now", href: "booking" }],
id: "classic-haircut", badge: "Most Booked", badgeIcon: TrendingUp, price: "$25", subtitle: "30 minutes", buttons: [{ text: "Book Now", href: "booking" }],
features: [
"Expert fade or style", "Precision line work", "Complimentary neck trim", "Fresh & clean finish"],
},