Merge version_2 into main

Merge version_2 into main

src/app/our-sweets/page.tsx

@@ -0,0 +1,71 @@
+"use client";
+
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import ProductCatalog from '@/components/ecommerce/productCatalog/ProductCatalog';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+
+export default function OurSweetsPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="background-highlight"
+      borderRadius="pill"
+      contentWidth="mediumLarge"
+      sizing="mediumSizeLargeTitles"
+      background="grid"
+      cardStyle="gradient-bordered"
+      primaryButtonStyle="diagonal-gradient"
+      secondaryButtonStyle="layered"
+      headingFontWeight="bold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleApple
+          brandName="Sweet World Worldwide"
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "About", id: "#about" },
+            { name: "Our Sweets", id: "/our-sweets" },
+            { name: "Reviews", id: "#testimonials" },
+            { name: "FAQ", id: "#faq" },
+            { name: "Contact", id: "#contact" }
+          ]}
+        />
+      </div>
+
+      <div id="product-catalog" data-section="product-catalog">
+        <ProductCatalog
+          layout="page"
+          products={[
+            { id: "chocolates-truffles", category: "Sweets", name: "Gourmet Chocolate Truffles", price: "$29.99", rating: 5, reviewCount: "120", imageSrc: "http://img.b2bpic.net/free-photo/chocolates-with-white-red-coating-black-board-seastones-side-view_141793-15476.jpg", imageAlt: "Assortment of gourmet chocolate truffles" },
+            { id: "gourmet-cupcakes", category: "Sweets", name: "Assorted Gourmet Cupcakes", price: "$24.00", rating: 4, reviewCount: "85", imageSrc: "http://img.b2bpic.net/free-photo/delicious-chocolate-cupcake-with-chocolate-cream_181624-3430.jpg", imageAlt: "Colorful gourmet cupcakes" },
+            { id: "belgian-waffles", category: "Waffles", name: "Classic Belgian Waffles", price: "$15.50", rating: 5, reviewCount: "75", imageSrc: "http://img.b2bpic.net/free-photo/waffles-with-berries-table_23-2148455800.jpg", imageAlt: "Belgian waffles with fresh berries" },
+            { id: "berry-blast-waffles", category: "Waffles", name: "Berry Blast Waffles", price: "$17.00", rating: 4, reviewCount: "60", imageSrc: "http://img.b2bpic.net/free-photo/waffles_1339-4467.jpg", imageAlt: "Waffles with various berry toppings" },
+            { id: "vanilla-bean-shake", category: "Shakes", name: "Creamy Vanilla Bean Shake", price: "$8.99", rating: 5, reviewCount: "90", imageSrc: "http://img.b2bpic.net/free-photo/strawberry-milkshake-with-straw_23-2147754323.jpg", imageAlt: "Vanilla bean milkshake with whipped cream" },
+            { id: "chocolate-fudge-shake", category: "Shakes", name: "Rich Chocolate Fudge Shake", price: "$9.50", rating: 5, reviewCount: "110", imageSrc: "http://img.b2bpic.net/free-photo/chocolate-milkshake-with-whipped-cream-chocolate-sauce_23-2148408587.jpg", imageAlt: "Chocolate fudge milkshake" },
+            { id: "tropical-smoothie", category: "Smoothies", name: "Tropical Paradise Smoothie", price: "$7.99", rating: 4, reviewCount: "50", imageSrc: "http://img.b2bpic.net/free-photo/side-view-fresh-healthy-smoothie-glass-with-straw-fruit-slice-cup-berries-brown-towel-black-surface_140725-103306.jpg", imageAlt: "Tropical fruit smoothie" },
+            { id: "green-detox-smoothie", category: "Smoothies", name: "Energizing Green Detox Smoothie", price: "$8.50", rating: 4, reviewCount: "40", imageSrc: "http://img.b2bpic.net/free-photo/fruit-smoothie-glass-with-straw_23-2147761007.jpg", imageAlt: "Green detox smoothie with fresh ingredients" }
+          ]}
+          searchPlaceholder="Search our sweet treats..."
+          filters={[
+            { label: "Category", options: ["All", "Sweets", "Waffles", "Shakes", "Smoothies"], selected: "All", onChange: (value) => console.log(value) }
+          ]}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBaseCard
+          logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9rch4s"
+          logoAlt="Sweet World Worldwide Logo"
+          logoText="Sweet World Worldwide"
+          columns={[
+            { title: "Explore", items: [{ label: "Home", href: "/" }, { label: "About Us", href: "#about" }, { label: "Our Sweets", href: "/our-sweets" }] },
+            { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Shipping", href: "#" }] },
+            { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
+          ]}
+          copyrightText="© 2024 Sweet World Worldwide. All rights reserved."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -4,7 +4,7 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
 import HeroCentered from '@/components/sections/hero/HeroCentered';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
 import FeatureCardTwentyEight from '@/components/sections/feature/FeatureCardTwentyEight';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
+
 import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
 import FaqBase from '@/components/sections/faq/FaqBase';
 import ContactSplit from '@/components/sections/contact/ContactSplit';
@@ -31,7 +31,7 @@ export default function Page() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "About", id: "#about" },
-            { name: "Sweets", id: "#products" },
+            { name: "Our Sweets", id: "/our-sweets" },
             { name: "Reviews", id: "#testimonials" },
             { name: "FAQ", id: "#faq" },
             { name: "Contact", id: "#contact" }
@@ -51,7 +51,7 @@ export default function Page() {
           ]}
           avatarText="Loved by sweet enthusiasts everywhere!"
           buttons={[
-            { text: "Explore Our Sweets", href: "#products" },
+            { text: "Explore Our Sweets", href: "/our-sweets" },
             { text: "Contact Us", href: "#contact" }
           ]}
           buttonAnimation="opacity"
@@ -87,24 +87,7 @@ export default function Page() {
           useInvertedBackground={true}
         />
       </div>
-      <div id="products" data-section="products">
-        <ProductCardFour
-          products={[
-            { id: "chocolate-truffles", name: "Gourmet Chocolate Truffles", price: "$29.99", variant: "Assorted Box", imageSrc: "http://img.b2bpic.net/free-photo/chocolates-with-white-red-coating-black-board-seastones-side-view_141793-15476.jpg", imageAlt: "Assortment of gourmet chocolate truffles" },
-            { id: "rainbow-gummies", name: "Rainbow Fruit Gummies", price: "$12.50", variant: "Large Bag", imageSrc: "http://img.b2bpic.net/free-photo/top-view-colorful-pastries_23-2147987870.jpg", imageAlt: "Vibrant colorful gummy candies" },
-            { id: "signature-cookies", name: "Signature Assorted Cookies", price: "$18.00", variant: "Baker's Dozen", imageSrc: "http://img.b2bpic.net/free-photo/bunch-cookies-bundled-together-marble-background_114579-25950.jpg", imageAlt: "Stack of freshly baked signature cookies" },
-            { id: "french-macarons", name: "Elegant French Macarons", price: "$24.99", variant: "Dessert Box", imageSrc: "http://img.b2bpic.net/free-photo/top-view-meringues-macarons-delicious-sweet-yellow-color-rainbow-candy_140725-25132.jpg", imageAlt: "Assorted elegant macarons" },
-            { id: "seasonal-cake-pops", name: "Seasonal Celebration Cake Pops", price: "$15.00", variant: "Party Pack", imageSrc: "http://img.b2bpic.net/free-photo/closeup-different-flovoured-lollipop_53876-31907.jpg", imageAlt: "Festive seasonal cake pops" },
-            { id: "candied-pecans", name: "Crunchy Candied Pecans", price: "$9.75", variant: "Snack Pouch", imageSrc: "http://img.b2bpic.net/free-photo/healthy-mix-dried-nuts-sweets-was-glass-wooden-background-studio-photo_482257-36590.jpg", imageAlt: "Candied pecans in a bowl" }
-          ]}
-          gridVariant="two-columns-alternating-heights"
-          animationType="slide-up"
-          title="Explore Our Delectable Collection"
-          description="A curated selection of our most loved and newest sweet creations, perfect for gifting or a personal treat that brings pure joy."
-          textboxLayout="default"
-          useInvertedBackground={false}
-        />
-      </div>
+      
       <div id="testimonials" data-section="testimonials">
         <TestimonialCardFive
           testimonials={[
@@ -156,7 +139,7 @@ export default function Page() {
           logoAlt="Sweet World Worldwide Logo"
           logoText="Sweet World Worldwide"
           columns={[
-            { title: "Explore", items: [{ label: "Home", href: "/" }, { label: "About Us", href: "#about" }, { label: "Our Sweets", href: "#products" }] },
+            { title: "Explore", items: [{ label: "Home", href: "/" }, { label: "About Us", href: "#about" }, { label: "Our Sweets", href: "/our-sweets" }] },
             { title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact", href: "#contact" }, { label: "Shipping", href: "#" }] },
             { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
           ]}