Merge version_3 into main #2

Merged
bender merged 2 commits from version_3 into main 2026-03-07 19:24:49 +00:00
2 changed files with 31 additions and 40 deletions

View File

@@ -1,54 +1,46 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Inter_Tight } from "next/font/google";
import "./styles/variables.css";
import "./styles/base.css";
import { ServiceWrapper } from "@/providers/serviceWrapper/ServiceWrapper";
import { Tag } from "@/components/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 openSans = Open_Sans({
variable: "--font-open-sans", subsets: ["latin"],
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
title: "Professional Massage Therapy & Wellness Services", description: "Expert therapeutic massage treatments to relieve tension, enhance wellness, and bring balance to your life. Book your session today.", keywords: "massage therapy, therapeutic massage, spa treatments, wellness, relaxation, professional massage", robots: {
index: true,
follow: true,
},
openGraph: {
title: "Professional Massage Therapy & Wellness Services", description: "Experience transformative healing with our certified massage therapists. Personalized treatments for relaxation and wellness.", url: "https://serenity-massage.com", siteName: "Serenity Massage", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/young-woman-practicing-yoga_72229-409.jpg", alt: "Professional massage therapy studio"},
],
},
twitter: {
card: "summary_large_image", title: "Professional Massage Therapy & Wellness", description: "Certified therapists offering personalized therapeutic massage for healing and relaxation.", images: ["http://img.b2bpic.net/free-photo/young-woman-practicing-yoga_72229-409.jpg"],
},
};
title: "Serenity Massage - Professional Therapeutic Massage Services", description: "Experience therapeutic massage treatments designed to relieve tension, enhance wellness, and bring balance to your life. Expert therapists dedicated to your healing journey."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${openSans.variable} antialiased`}
>
<body className={`${interTight.variable} antialiased`}>
<ServiceWrapper>
<Tag />
{children}
</ServiceWrapper>
<script
dangerouslySetInnerHTML={{
__html: `
(function() {
try {
const theme = localStorage.getItem('theme') || 'light';
document.documentElement.setAttribute('data-theme', theme);
if (theme === 'dark') {
document.documentElement.classList.add('dark');
}
} catch (e) {}
})()
`,
}}
/>
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1416,7 +1408,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -96,7 +96,7 @@ export default function LandingPage() {
},
],
}}
containerClassName="py-10 md:py-16 lg:py-20"
containerClassName="py-5 px-10 md:py-5 md:px-10 lg:py-12 lg:px-12"
/>
</div>