Update src/app/products/page.tsx

Merge version_6 into main

src/app/about/page.tsx

@@ -1,11 +1,13 @@
 "use client";
 
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import SplitAbout from '@/components/sections/about/SplitAbout';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Star, Mail } from "lucide-react";
+import { Heart, Leaf, Shield, Award, CheckCircle, Star, Mail } from "lucide-react";
+import Link from "next/link";
 
 export default function AboutPage() {
   return (
@@ -27,13 +29,50 @@ export default function AboutPage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "Products", id: "/products" },
-            { name: "Pricing", id: "/pricing" },
+            { name: "About", id: "/about" },
             { name: "FAQ", id: "/faq" }
           ]}
           button={{
             text: "Shop Now",            href: "/products"
           }}
         />
+        <nav className="hidden">
+          <Link href="/">Home</Link>
+          <Link href="/products">Products</Link>
+          <Link href="/about">About</Link>
+          <Link href="/faq">FAQ</Link>
+        </nav>
+      </div>
+
+      <div id="about" data-section="about">
+        <SplitAbout
+          title="Our Mission: Radiant Skin for Everyone"
+          description="Founded on the belief that effective skincare should be accessible, ethical, and results-driven. We've spent years researching and developing formulations that combine the best of science and nature to deliver transformative skincare experiences."
+          tag="About LuxeGlow"
+          tagIcon={Heart}
+          textboxLayout="default"
+          useInvertedBackground="noInvert"
+          imagePosition="right"
+          imageSrc="https://img.b2bpic.net/free-photo/minimalistic-science-banner-with-sample_23-2149431127.jpg"
+          imageAlt="LuxeGlow skincare laboratory and natural ingredients"
+          bulletPoints={[
+            {
+              title: "Natural Formulations",              description: "We use only the finest natural and organic ingredients sourced responsibly from around the world",              icon: Leaf
+            },
+            {
+              title: "Dermatologist Tested",              description: "Every product is rigorously tested and approved by leading dermatologists for safety and efficacy",              icon: Shield
+            },
+            {
+              title: "Cruelty-Free Promise",              description: "We are proud to be a 100% cruelty-free and vegan beauty brand committed to ethical practices",              icon: Award
+            },
+            {
+              title: "Proven Results",              description: "Our customers see noticeable improvements in skin texture, hydration, and radiance within weeks",              icon: CheckCircle
+            }
+          ]}
+          buttons={[
+            { text: "View Our Products", href: "/products" }
+          ]}
+        />
       </div>
 
       <div id="testimonials" data-section="testimonials">
@@ -75,4 +114,4 @@ export default function AboutPage() {
       <FooterLogoReveal logoText="LuxeGlow" />
     </ThemeProvider>
   );
-}
+}

src/app/faq/page.tsx

@@ -7,6 +7,7 @@ import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { Star, Mail } from "lucide-react";
+import Link from "next/link";
 
 export default function FaqPage() {
   return (
@@ -28,13 +29,19 @@ export default function FaqPage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "Products", id: "/products" },
-            { name: "Pricing", id: "/pricing" },
+            { name: "About", id: "/about" },
             { name: "FAQ", id: "/faq" }
           ]}
           button={{
             text: "Shop Now",            href: "/products"
           }}
         />
+        <nav className="hidden">
+          <Link href="/">Home</Link>
+          <Link href="/products">Products</Link>
+          <Link href="/about">About</Link>
+          <Link href="/faq">FAQ</Link>
+        </nav>
       </div>
 
       <div id="faq" data-section="faq">
@@ -106,4 +113,4 @@ export default function FaqPage() {
       <FooterLogoReveal logoText="LuxeGlow" />
     </ThemeProvider>
   );
-}
+}

src/app/layout.tsx

@@ -1259,4 +1259,4 @@ export default function RootLayout({
       </body>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -2,12 +2,14 @@
 
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
+import SplitAbout from '@/components/sections/about/SplitAbout';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Sparkles, Heart, Star, Mail } from "lucide-react";
+import { Sparkles, Heart, Leaf, Shield, Award, CheckCircle, Star, Mail } from "lucide-react";
+import Link from "next/link";
 
 export default function HomePage() {
   return (
@@ -29,13 +31,19 @@ export default function HomePage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "Products", id: "/products" },
-            { name: "Pricing", id: "/pricing" },
+            { name: "About", id: "/about" },
             { name: "FAQ", id: "/faq" }
           ]}
           button={{
             text: "Shop Now",            href: "/products"
           }}
         />
+        <nav className="hidden">
+          <Link href="/">Home</Link>
+          <Link href="/products">Products</Link>
+          <Link href="/about">About</Link>
+          <Link href="/faq">FAQ</Link>
+        </nav>
       </div>
 
       <div id="hero" data-section="hero">
@@ -64,7 +72,7 @@ export default function HomePage() {
           ]}
           buttons={[
             { text: "Explore Collection", href: "/products" },
-            { text: "Learn More", href: "/pricing" }
+            { text: "Learn More", href: "/about" }
           ]}
         />
       </div>
@@ -138,4 +146,4 @@ export default function HomePage() {
       <FooterLogoReveal logoText="LuxeGlow" />
     </ThemeProvider>
   );
-}
+}

src/app/products/page.tsx

@@ -3,10 +3,11 @@
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
-import PricingCardOne from '@/components/sections/pricing/PricingCardOne';
+import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { Sparkles, Zap, Star, Heart, Crown } from "lucide-react";
+import Link from "next/link";
 
 export default function ProductsPage() {
   return (
@@ -28,13 +29,19 @@ export default function ProductsPage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "Products", id: "/products" },
-            { name: "Pricing", id: "/pricing" },
+            { name: "About", id: "/about" },
             { name: "FAQ", id: "/faq" }
           ]}
           button={{
             text: "Shop Now",            href: "/products"
           }}
         />
+        <nav className="hidden">
+          <Link href="/">Home</Link>
+          <Link href="/products">Products</Link>
+          <Link href="/about">About</Link>
+          <Link href="/faq">FAQ</Link>
+        </nav>
       </div>
 
       <div id="products" data-section="products">
@@ -80,23 +87,24 @@ export default function ProductsPage() {
           useInvertedBackground="invertDefault"
           features={[
             {
-              id: 1,
-              title: "Deep Hydration",              description: "Our proprietary blend of hyaluronic acid and botanical extracts penetrates multiple skin layers to deliver intense, long-lasting moisture",              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-girl-standing-with-cream_1157-29503.jpg",              imageAlt: "Hydration benefits visualization"
+              id: "1",              title: "Deep Hydration",              tags: ["Hydration", "Moisture"],
+              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-girl-standing-with-cream_1157-29503.jpg",              imageAlt: "Hydration benefits visualization"
             },
             {
-              id: 2,
-              title: "Protective Shield",              description: "Advanced antioxidant complex protects against environmental stressors while strengthening your skin barrier",              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-woman-applying-moisturizer-her-face-bathroom_637285-3386.jpg",              imageAlt: "Skin protection technology demonstration"
+              id: "2",              title: "Protective Shield",              tags: ["Protection", "Barrier"],
+              imageSrc: "https://img.b2bpic.net/free-photo/beautiful-woman-applying-moisturizer-her-face-bathroom_637285-3386.jpg",              imageAlt: "Skin protection technology demonstration"
             },
             {
-              id: 3,
-              title: "Natural Nourishment",              description: "Plant-based vitamins and peptides work synergistically to improve texture, elasticity, and radiance",              imageSrc: "https://img.b2bpic.net/free-photo/woman-applying-cream-face-while-looking-mirror_23-2148875051.jpg",              imageAlt: "Natural ingredients and their benefits"
+              id: "3",              title: "Natural Nourishment",              tags: ["Natural", "Nourishment"],
+              imageSrc: "https://img.b2bpic.net/free-photo/woman-applying-cream-face-while-looking-mirror_23-2148875051.jpg",              imageAlt: "Natural ingredients and their benefits"
             }
           ]}
+          animationType="slide-up"
         />
       </div>
 
       <div id="pricing" data-section="pricing">
-        <PricingCardOne
+        <PricingCardEight
           title="Choose Your Skincare Journey"
           description="Select the perfect plan to achieve your best skin"
           tag="Pricing Plans"
@@ -107,20 +115,29 @@ export default function ProductsPage() {
           plans={[
             {
               id: "1",              badge: "Starter",              badgeIcon: Star,
-              price: "$49",              subtitle: "Essential skincare basics",              features: [
+              price: "49",              subtitle: "Essential skincare basics",              features: [
                 "Gentle Cleansing Oil",                "Hydrating Serum",                "Basic moisturizer",                "Access to skincare tips"
+              ],
+              buttons: [
+                { text: "Get Started", href: "/signup" }
               ]
             },
             {
               id: "2",              badge: "Most Popular",              badgeIcon: Heart,
-              price: "$129",              subtitle: "Complete daily routine",              features: [
+              price: "129",              subtitle: "Complete daily routine",              features: [
                 "All Starter products",                "Premium face cream",                "Weekly face mask",                "Email skincare support",                "15% member discount"
+              ],
+              buttons: [
+                { text: "Choose Plan", href: "/signup" }
               ]
             },
             {
               id: "3",              badge: "Luxury",              badgeIcon: Crown,
-              price: "$249",              subtitle: "Full professional regimen",              features: [
+              price: "249",              subtitle: "Full professional regimen",              features: [
                 "All Premium products",                "Exclusive serums & treatments",                "Monthly deliveries",                "Priority VIP support",                "Free consultations",                "25% member discount"
+              ],
+              buttons: [
+                { text: "Go Premium", href: "/signup" }
               ]
             }
           ]}
@@ -130,4 +147,4 @@ export default function ProductsPage() {
       <FooterLogoReveal logoText="LuxeGlow" />
     </ThemeProvider>
   );
-}
+}