Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-03-05 04:38:01 +00:00
2 changed files with 8 additions and 38 deletions

View File

@@ -1,49 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Nunito_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Stevie A Barbershop | Expert Haircuts & Grooming", description: "Premium barbershop offering expert haircuts, precision shaves, and beard grooming services. Book your appointment at Stevie A Barbershop today.", keywords: "barbershop, haircuts, shaves, beard grooming, professional barber, salon, men's grooming", openGraph: {
title: "Stevie A Barbershop | Expert Haircuts & Grooming", description: "Premium barbershop offering expert haircuts, precision shaves, and beard grooming services.", siteName: "Stevie A Barbershop", type: "website"},
twitter: {
card: "summary_large_image", title: "Stevie A Barbershop", description: "Expert barbering services and professional grooming"},
robots: {
index: true,
follow: true,
},
};
title: "Stevie A Barbershop", description: "Premium barbering services with expert barbers"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${nunitoSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1411,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -85,8 +85,8 @@ export default function LandingPage() {
<FeatureBorderGlow
title="Our Services"
description="Expertly crafted grooming services tailored to meet your unique style and needs."
tag="Premium Grooming"
tagIcon={CheckCircle}
tag="Expert Barbers"
tagIcon={Shield}
tagAnimation="slide-up"
features={[
{ icon: Scissors, title: "Professional Haircuts", description: "Classic to contemporary styles, expertly executed with precision and attention to detail." },