Merge version_2 into main

Merge version_2 into main

src/app/about/page.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline navItems={[{name: "Home", id: "/"}, {name: "Blog/Vlog", id: "/blog"}, {name: "Recipes", id: "/recipes"}, {name: "About", id: "/about"}, {name: "Gallery", id: "/gallery"}, {name: "Contact", id: "/contact"}]} brandName="Lumiere" button={{ text: "Contact", href: "/contact" }} />
+        <div className="min-h-screen pt-32 pb-20 px-6 max-w-4xl mx-auto">
+            <h1 className="text-4xl font-bold mb-8">About Us</h1>
+            <p>We are a passionate team dedicated to sharing high-quality content and clean beauty.</p>
+        </div>
+        <FooterLogoEmphasis columns={[]} logoText="Lumiere" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/blog/page.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function BlogPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline navItems={[{name: "Home", id: "/"}, {name: "Blog/Vlog", id: "/blog"}, {name: "Recipes", id: "/recipes"}, {name: "About", id: "/about"}, {name: "Gallery", id: "/gallery"}, {name: "Contact", id: "/contact"}]} brandName="Lumiere" button={{ text: "Contact", href: "/contact" }} />
+        <div className="min-h-screen pt-32 pb-20 px-6 max-w-4xl mx-auto">
+            <h1 className="text-4xl font-bold mb-8">Blog & Vlog Archive</h1>
+            <p>Welcome to our archive where we share our latest adventures and insights.</p>
+        </div>
+        <FooterLogoEmphasis columns={[]} logoText="Lumiere" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/gallery/page.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function GalleryPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline navItems={[{name: "Home", id: "/"}, {name: "Blog/Vlog", id: "/blog"}, {name: "Recipes", id: "/recipes"}, {name: "About", id: "/about"}, {name: "Gallery", id: "/gallery"}, {name: "Contact", id: "/contact"}]} brandName="Lumiere" button={{ text: "Contact", href: "/contact" }} />
+        <div className="min-h-screen pt-32 pb-20 px-6 max-w-4xl mx-auto">
+            <h1 className="text-4xl font-bold mb-8">Gallery</h1>
+            <p>Explore our visual journey through photography and highlights.</p>
+        </div>
+        <FooterLogoEmphasis columns={[]} logoText="Lumiere" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -28,18 +28,16 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingInline
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",          id: "hero"},
+        { name: "Blog/Vlog", id: "/blog" },
-        {
+        { name: "Recipes", id: "/recipes" },
-          name: "Products",          id: "products"},
+        { name: "About", id: "/about" },
-        {
+        { name: "Gallery", id: "/gallery" },
-          name: "About",          id: "about"},
+        { name: "Contact", id: "/contact" },
-        {
-          name: "Contact",          id: "contact"},
       ]}
       brandName="Lumiere"
       button={{
-          text: "Get Started",          href: "#contact"
+          text: "Get Started",          href: "/contact"
       }}
     />
   </div>
@@ -51,22 +49,11 @@ export default function LandingPage() {
       title="Unveil Your Natural Radiance."
       description="Discover a collection of high-performance makeup designed to enhance your beauty, not hide it."
       buttons={[
-        {
+        { text: "Shop Collection", href: "#products" },
-          text: "Shop Collection",          href: "#products"},
       ]}
       mediaItems={[
-        {
+        { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-high-end-artistic-photograph-of-a-make-1774700168621-c34966d0.png?_wi=1", imageAlt: "Makeup set on marble" },
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-high-end-artistic-photograph-of-a-make-1774700168621-c34966d0.png?_wi=1",          imageAlt: "Makeup set on marble"},
+        { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-soft-focus-close-up-shot-of-a-model-ap-1774700170720-ef1c8efc.png?_wi=1", imageAlt: "Model applying blush" },
-        {
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-soft-focus-close-up-shot-of-a-model-ap-1774700170720-ef1c8efc.png?_wi=1",          imageAlt: "Model applying blush"},
-        {
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/an-aesthetic-flat-lay-of-makeup-brushes--1774700167350-9fa7a4da.png?_wi=1",          imageAlt: "Makeup brushes flatlay"},
-        {
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-artistic-capture-of-a-liquid-foundatio-1774700168066-76d1ad95.png",          imageAlt: "Liquid foundation splash"},
-        {
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/elegant-lipstick-tubes-standing-on-organ-1774700166239-d8c966b5.png",          imageAlt: "Lipstick display"},
-        {
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-beautiful-view-of-organic-ingredient-h-1774700167418-80409f87.png",          imageAlt: "Organic ingredients"},
       ]}
     />
   </div>
@@ -77,24 +64,7 @@ export default function LandingPage() {
       textboxLayout="split"
       useInvertedBackground={false}
       features={[
-        {
+        { id: "f1", title: "Clean Ingredients", description: "Formulated without parabens, sulfates, or artificial fragrances.", media: { imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-high-end-artistic-photograph-of-a-make-1774700168621-c34966d0.png?_wi=2", imageAlt: "Natural ingredients" }, items: [], reverse: false },
-          id: "f1",          title: "Clean Ingredients",          description: "Formulated without parabens, sulfates, or artificial fragrances.",          media: {
-            imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-high-end-artistic-photograph-of-a-make-1774700168621-c34966d0.png?_wi=2",            imageAlt: "Natural ingredients"},
-          items: [],
-          reverse: false,
-        },
-        {
-          id: "f2",          title: "Cruelty-Free",          description: "Committed to ethical standards, never tested on animals.",          media: {
-            imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-soft-focus-close-up-shot-of-a-model-ap-1774700170720-ef1c8efc.png?_wi=2",            imageAlt: "Cruelty free"},
-          items: [],
-          reverse: true,
-        },
-        {
-          id: "f3",          title: "Long-Lasting Wear",          description: "Flawless coverage that lasts from morning until night.",          media: {
-            imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/an-aesthetic-flat-lay-of-makeup-brushes--1774700167350-9fa7a4da.png?_wi=2",            imageAlt: "Long lasting"},
-          items: [],
-          reverse: false,
-        },
       ]}
       title="Why Lumiere Stands Out"
       description="Our formulas are meticulously crafted with skin-loving ingredients."
@@ -108,12 +78,7 @@ export default function LandingPage() {
       gridVariant="three-columns-all-equal-width"
       useInvertedBackground={false}
       products={[
-        {
+        { id: "p1", name: "Velvet Matte Lipstick", price: "$28.00", variant: "Rosewood", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/close-up-of-a-high-pigmented-matte-lipst-1774700166610-caa5c8d8.png" },
-          id: "p1",          name: "Velvet Matte Lipstick",          price: "$28.00",          variant: "Rosewood",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/close-up-of-a-high-pigmented-matte-lipst-1774700166610-caa5c8d8.png"},
-        {
-          id: "p2",          name: "Earthtone Eyeshadow",          price: "$42.00",          variant: "Neutral Palette",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-velvet-textured-eyeshadow-palette-open-1774700167496-4bb3a1c5.png"},
-        {
-          id: "p3",          name: "Dewy Radiance Highlighter",          price: "$34.00",          variant: "Moonlight",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BZcf4rJRiZMgavh29SicgQnU5y/a-glass-bottle-of-dewy-liquid-highlighte-1774700166377-77becbc3.png"},
       ]}
       title="Our Best Sellers"
       description="Discover our signature products curated for every skin tone."
@@ -125,30 +90,11 @@ export default function LandingPage() {
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
-      testimonials={[
+      testimonials={[]}
-        {
-          id: "t1",          name: "Elena R.",          role: "Makeup Artist",          company: "Studio L",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-woman-looking-hopeful-smiling-lean-head-hands-thinking-sitting_1258-194400.jpg?_wi=1"},
-        {
-          id: "t2",          name: "Sarah J.",          role: "Influencer",          company: "Vogue Style",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-smiling-kitchen_107420-12357.jpg"},
-        {
-          id: "t3",          name: "Michael K.",          role: "Customer",          company: "Self-Employed",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-with-book_23-2147767502.jpg"},
-        {
-          id: "t4",          name: "Jessica M.",          role: "Editor",          company: "Beauty Mag",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/girl-beautifully-painted-brown-eyes-with-eyeliner-highlighting-features-face-model-red-blouse-sends-air-kiss_197531-12005.jpg"},
-        {
-          id: "t5",          name: "Chloe B.",          role: "Beauty Blogger",          company: "Luxe Life",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-woman-looking-hopeful-smiling-lean-head-hands-thinking-sitting_1258-194400.jpg?_wi=2"},
-      ]}
       kpiItems={[
-        {
+        { value: "50K+", label: "Happy Clients" },
-          value: "50K+",          label: "Happy Clients"},
+        { value: "4.9/5", label: "Avg. Rating" },
-        {
+        { value: "100%", label: "Clean Ingredients" },
-          value: "4.9/5",          label: "Avg. Rating"},
-        {
-          value: "100%",          label: "Clean Ingredients"},
       ]}
       title="Loved By Beauty Enthusiasts"
       description="See why thousands trust Lumiere for their daily routine."
@@ -158,8 +104,7 @@ export default function LandingPage() {
   <div id="contact" data-section="contact">
       <ContactSplit
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain"}}
       tag="Newsletter"
       title="Join the Lumiere Family"
       description="Sign up for exclusive early access to new collections and beauty tips."
@@ -173,30 +118,8 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoEmphasis
       columns={[
-        {
+        { items: [{ label: "Shop", href: "/products" }, { label: "About", href: "/about" }] },
-          items: [
+        { items: [{ label: "Support", href: "#" }, { label: "Terms", href: "#" }] },
-            {
-              label: "Shop",              href: "#products"},
-            {
-              label: "About Us",              href: "#about"},
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Support",              href: "#"},
-            {
-              label: "Terms of Service",              href: "#"},
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Instagram",              href: "https://instagram.com"},
-            {
-              label: "Twitter",              href: "https://twitter.com"},
-          ],
-        },
       ]}
       logoText="Lumiere"
     />

src/app/recipes/page.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+
+export default function RecipesPage() {
+  return (
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline navItems={[{name: "Home", id: "/"}, {name: "Blog/Vlog", id: "/blog"}, {name: "Recipes", id: "/recipes"}, {name: "About", id: "/about"}, {name: "Gallery", id: "/gallery"}, {name: "Contact", id: "/contact"}]} brandName="Lumiere" button={{ text: "Contact", href: "/contact" }} />
+        <div className="min-h-screen pt-32 pb-20 px-6 max-w-4xl mx-auto">
+            <h1 className="text-4xl font-bold mb-8">Our Recipes</h1>
+            <p>Delicious, healthy, and easy-to-follow recipes for every occasion.</p>
+        </div>
+        <FooterLogoEmphasis columns={[]} logoText="Lumiere" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}