bender/e53edfc9-2ce6-4333-8a46-7e9f3333e4db
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-07 07:06:13 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -35
2 changed files with 13 additions and 35 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 { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Nunito } 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 halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
const geist = Geist({
variable: "--font-geist-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
const geistMono = Geist_Mono({
variable: "--font-geist-mono", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Serenity Wellness Studio - Self Care & Relaxation", description: "Discover holistic wellness services including massage therapy, yoga, and facial treatments. Your personal sanctuary for self-care and rejuvenation.", keywords: "self care, wellness, spa, massage therapy, yoga, meditation, relaxation", openGraph: {
title: "Serenity Wellness Studio - Transform Your Wellness Journey", description: "Experience personalized wellness treatments designed to rejuvenate your mind, body, and spirit.", url: "https://serenity-wellness.com", siteName: "Serenity", type: "website"},
twitter: {
card: "summary_large_image", title: "Serenity Wellness Studio", description: "Discover your path to wellness with our holistic self-care services."},
robots: {
index: true,
follow: true,
},
};
title: "Create Next App", description: "Generated by create next app"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${nunito.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>
);
}

2
src/app/page.tsx
View File

@@ -75,7 +75,7 @@ export default function LandingPage() {
<div id="services" data-section="services">
<FeatureBento
title="Our Signature Services"
title="Our 3 Core Services"
description="Discover a curated selection of wellness treatments designed to restore balance and vitality to your life."
tag="Services"
tagIcon={Leaf}