Merge version_3 into main #2

Merged
bender merged 5 commits from version_3 into main 2026-02-16 08:54:27 +00:00
5 changed files with 31 additions and 52 deletions

View File

@@ -109,4 +109,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -1,51 +1,26 @@
import type { Metadata } from "next";
import { Noto_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import { Poppins } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const notoSans = Noto_Sans({
variable: "--font-noto-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
const poppins = Poppins({
variable: "--font-poppins", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
export const metadata: Metadata = {
title: "Beauty and the Beast | Luxury Handcrafted Cups & Mugs", description: "Discover enchanted, handcrafted drinkware inspired by timeless elegance. Premium cups and mugs made with artisan excellence. Explore our collection today.", keywords: "luxury cups, handcrafted mugs, premium drinkware, artisan cups, porcelain tea sets, elegant tableware", metadataBase: new URL("asset://hero-banner"),
alternates: {
canonical: "asset://hero-banner"
},
openGraph: {
title: "Beauty and the Beast | Enchanted Drinkware Collection", description: "Explore exquisite handcrafted cups and mugs that bring magic to every moment.", type: "website", siteName: "Beauty and the Beast", images: [{
url: "asset://hero-banner", alt: "Beauty and the Beast luxury cup collection"
}]
},
twitter: {
card: "summary_large_image", title: "Beauty and the Beast | Premium Handcrafted Cups", description: "Discover our enchanted collection of luxury drinkware.", images: ["asset://hero-banner"]
},
robots: {
index: true,
follow: true
}
};
title: "Beauty and the Beast | Enchanted Drinkware", description: "Discover exquisite handcrafted cups and mugs inspired by timeless elegance."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${notoSans.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={poppins.variable}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1264,7 +1239,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

View File

@@ -7,7 +7,7 @@ import ProductCardFour from '@/components/sections/product/ProductCardFour';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
import ContactText from '@/components/sections/contact/ContactText';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { Award, CheckCircle, Eye, Heart, Leaf, Package, Palette, Shield, Sparkles, Zap } from "lucide-react";
@@ -163,15 +163,20 @@ export default function LandingPage() {
</div>
<div id="contact" data-section="contact">
<ContactText
text="Ready to discover your perfect cup? Beauty and the Beast is dedicated to bringing timeless elegance and artisan craftsmanship into your home. Our enchanted drinkware collections are carefully curated to celebrate the beauty of handmade excellence. Whether you're looking for a personal treasure or the perfect gift, we're here to help you find something truly magical. Get in touch with our team or browse our full collection to experience the magic yourself."
animationType="entrance-slide"
background={{ variant: "plain" }}
<ContactSplit
tag="Newsletter"
title="Connect With Us"
description="Subscribe to stay updated with our latest collections and exclusive stories behind our enchanted drinkware."
background={{ variant: "sparkles-gradient" }}
useInvertedBackground={false}
buttons={[
{ text: "Start Shopping", href: "#products" },
{ text: "Send Message", href: "#" }
]}
imageSrc="https://img.b2bpic.net/free-photo/hands-working-pottery-wheel_181624-57055.jpg"
imageAlt="Artisan at pottery wheel"
mediaAnimation="slide-up"
mediaPosition="right"
inputPlaceholder="Enter your email"
buttonText="Subscribe"
termsText="By subscribing, you agree to receive updates about our latest collections and exclusive offers."
onSubmit={(email) => console.log('Email submitted:', email)}
/>
</div>
@@ -224,4 +229,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -338,4 +338,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -179,4 +179,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}