bender/e772d565-07bc-4faa-b026-99af7802f846
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-09 17:56:20 +00:00
Conversation 0 Commits 2 Files Changed 2 +32 -32
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/layout.tsx
View File

@@ -1,43 +1,44 @@
import type { Metadata } from "next";
import { Public_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { ServiceWrapper } from "@/providers/serviceWrapper/ServiceWrapper";
import { Tag } from "@/components/tag/Tag";
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 geistSans = 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: "The Rustic Blade Co. | Premium Barbershop", description: "Discover luxury grooming at The Rustic Blade Co. Expert barbers, traditional straight-razor shaves, and premium beard care. Book your appointment today.", keywords: "barbershop, grooming, haircuts, straight razor shave, beard care, luxury barber, professional grooming, men's salon", openGraph: {
title: "The Rustic Blade Co. | Premium Barbershop", description: "Experience premium grooming crafted by expert barbers. Traditional techniques meet modern style.", type: "website", siteName: "The Rustic Blade Co."},
twitter: {
card: "summary_large_image", title: "The Rustic Blade Co. | Premium Barbershop", description: "Luxury grooming and expert barbering services"},
robots: {
index: true,
follow: true,
},
};
title: "The Rustic Blade Co. | Premium Barbershop", description: "Experience premium grooming at its finest. Master barbers blending traditional craftsmanship with modern style for exceptional haircuts, straight-razor shaves, and beard care."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${publicSans.variable} ${inter.variable} antialiased`}
>
<body className={`${geistSans.variable} ${geistMono.variable}`}>
<ServiceWrapper>
<Tag />
{children}
</ServiceWrapper>
<script
dangerouslySetInnerHTML={{
__html: `
if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
document.documentElement.classList.add('dark')
} else {
document.documentElement.classList.remove('dark')
}
`,
}}
/>
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1405,7 +1406,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

14
src/app/styles/variables.css
View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f7f6f7;
--card: #ffffff;
--foreground: #0c1325;
--primary-cta: #0798ff;
--background: #1a1512;
--card: #2a2217;
--foreground: #e8dcc8;
--primary-cta: #d4a574;
--primary-cta-text: #f7f6f7;
--secondary-cta: #ffffff;
--secondary-cta: #3a3227;
--secondary-cta-text: #0c1325;
--accent: #93c7ff;
--background-accent: #a8cde8;
--accent: #8b7355;
--background-accent: #5a5047;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);