Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-03-06 02:17:48 +00:00
2 changed files with 11 additions and 42 deletions

View File

@@ -1,54 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Archivo } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "@/styles/globals.css";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const archivo = Archivo({
variable: "--font-archivo", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "SkinGlow - Premium Skincare Products", description: "Discover premium skincare solutions with natural ingredients. Science-backed formulas for radiant, healthy skin. Shop bestselling serums, creams, and more.", keywords: "skincare, skincare products, serums, moisturizer, natural skincare, dermatologist-approved, premium cosmetics", openGraph: {
title: "SkinGlow - Premium Skincare Products", description: "Transform your skin with our natural, clinically-proven skincare collection", siteName: "SkinGlow", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/serum-bottle-balanced-smooth-white-stones_9975-135599.jpg", alt: "SkinGlow Premium Skincare"},
],
},
twitter: {
card: "summary_large_image", title: "SkinGlow - Premium Skincare Products", description: "Transform your skin with our natural, clinically-proven skincare collection", images: ["http://img.b2bpic.net/free-photo/serum-bottle-balanced-smooth-white-stones_9975-135599.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "SkinGlow - Premium Skincare", description: "Discover our premium skincare collection formulated with natural ingredients to nourish, renew, and transform your skin."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${archivo.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1416,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -104,6 +104,10 @@ export default function LandingPage() {
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
cardNameClassName="text-xs text-gray-500 mb-1"
cardPriceClassName="text-sm font-semibold text-gray-900 mb-3"
cardClassName="relative flex flex-col h-full group"
imageClassName="w-full h-40 object-cover rounded-lg mb-3 group-hover:scale-105 transition-transform duration-300"
/>
</div>