Merge version_2 into main #6

Merged
bender merged 2 commits from version_2 into main 2026-03-03 14:52:25 +00:00
2 changed files with 13 additions and 30 deletions

View File

@@ -1,44 +1,28 @@
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";
import { Inter } 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 dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
const geist = 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: "Skincare Luxe | Premium Natural Skincare Products", description: "Discover luxury skincare with 100% natural ingredients. Dermatologist-tested, cruelty-free products for radiant skin. Shop premium serums, creams, and cleansers today.", keywords: "skincare, luxury cosmetics, natural skincare, serums, moisturizer, cleanser, dermatologist-tested", metadataBase: new URL("https://skincarel.com"),
openGraph: {
title: "Skincare Luxe | Premium Natural Skincare", description: "Transform your skin with our curated collection of luxury, natural skincare products.", siteName: "Skincare Luxe", type: "website"},
twitter: {
card: "summary_large_image", title: "Skincare Luxe | Premium Natural Skincare", description: "Discover luxury skincare with 100% natural ingredients"},
robots: {
index: true,
follow: true,
},
};
title: "Skincare Luxe | Premium Natural Skincare", description: "Discover premium skincare crafted from nature's finest ingredients. Transform your complexion with our curated collection of luxury serums, creams, and treatments designed for radiant, healthy skin."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={`${geist.variable} ${geistMono.variable} antialiased`}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1406,7 +1390,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -46,7 +46,7 @@ export default function LandingPage() {
logoText="Skincare Luxe"
description="Discover premium skincare crafted from nature's finest ingredients. Transform your complexion with our curated collection of luxury serums, creams, and treatments designed for radiant, healthy skin."
buttons={[
{ text: "Explore Collection", href: "products" },
{ text: "Shop Premium Collection", href: "products" },
{ text: "Learn Our Story", href: "about" }
]}
buttonAnimation="slide-up"