bender/3beff073-4158-4bed-ad1e-aa882232a931
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-05 14:45:40 +00:00
Conversation 0 Commits 2 Files Changed 2 +7 -45
2 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/layout.tsx
View File

@@ -1,57 +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: "Meraki Spa - Premium Wellness & Relaxation Treatments", description: "Discover tranquility at Meraki Spa. Experience personalized wellness treatments including massage, facials, and aromatherapy. Book your rejuvenating spa experience today.", keywords: "spa, massage, wellness, relaxation, facial, aromatherapy, therapy, self-care", metadataBase: new URL("https://www.merakispa.com"),
alternates: {
canonical: "https://www.merakispa.com"},
openGraph: {
title: "Meraki Spa - Wellness & Relaxation", description: "Transform your well-being with expert spa treatments at Meraki. Premium wellness services in a serene sanctuary.", url: "https://www.merakispa.com", siteName: "Meraki Spa", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg", alt: "Meraki Spa - Serene Wellness Environment"},
],
},
twitter: {
card: "summary_large_image", title: "Meraki Spa - Premium Wellness Treatments", description: "Discover tranquility and rejuvenation at Meraki Spa. Experience personalized wellness treatments.", images: ["http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "Meraki Spa - Wellness & Rejuvenation", description: "Discover tranquility and rejuvenation at Meraki Spa. Experience personalized wellness treatments designed to restore balance and inner peace."};
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: `
@@ -1419,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

2
src/app/page.tsx
View File

@@ -60,7 +60,7 @@ export default function LandingPage() {
<div id="about" data-section="about">
<MediaAbout
title="Welcome to Meraki Spa"
description="At Meraki, we believe true wellness comes from a holistic approach to self-care. Our expert therapists and estheticians are dedicated to providing transformative experiences that nourish both body and soul. With over 15 years of combined experience, we create personalized treatment plans tailored to your unique needs."
description="At Meraki, we believe true wellness comes from a holistic approach to self-care. Our expert therapists and estheticians are dedicated to providing transformative experiences that nourish both body and soul. With licenses in therapeutic massage, aromatherapy, and advanced skincare, our team brings over 15 years of combined professional experience. We create personalized treatment plans tailored to your unique needs, combining evidence-based techniques with time-honored wellness philosophies to deliver authentic rejuvenation."
tag="Our Story"
tagIcon={Waves}
imageSrc="http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg?_wi=2"