Merge version_4 into main

Update src/app/products/page.tsx
2026-01-29 16:52:27 +00:00 · 2026-01-29 16:52:22 +00:00 · 2026-01-29 16:52:21 +00:00 · 2026-01-29 16:52:21 +00:00 · 2026-01-29 16:52:20 +00:00 · 2026-01-29 16:52:18 +00:00
4 changed files with 178 additions and 46 deletions
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+
+export default function ContactPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-bubble"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="aurora"
+      cardStyle="soft-shadow"
+      primaryButtonStyle="double-inset"
+      secondaryButtonStyle="layered"
+      headingFontWeight="light"
+    >
+      <div className="min-h-screen bg-background">
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            brandName="Bee Job"
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Products", id: "/products" },
+              { name: "Pricing", id: "/pricing" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            button={{
+              text: "Order Now",              href: "/products"
+            }}
+          />
+        </div>
+
+        <div id="contact" data-section="contact">
+          <ContactSplit
+            tag="Get In Touch"
+            title="Ready to Order Your Flowers?"
+            description="Subscribe to our newsletter for exclusive deals, new arrivals, and floral care tips delivered right to your inbox."
+            useInvertedBackground="invertDefault"
+            imageSrc="https://img.b2bpic.net/free-photo/day-beauti-flowers-flower-white_1303-2012.jpg"
+            imageAlt="Gorgeous flower arrangement in a gift box"
+            mediaPosition="right"
+            inputPlaceholder="Enter your email address"
+            buttonText="Subscribe"
+            termsText="We respect your privacy. Unsubscribe anytime from our mailing list."
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterLogoReveal logoText="Bee Job" />
+        </div>
+      </div>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,4 @@
-"use client"
+"use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -7,8 +7,7 @@ import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import AboutMetric from '@/components/sections/about/AboutMetric';
 import FeatureCardSixteen from '@/components/sections/feature/FeatureCardSixteen';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
+import PricingCardThree from '@/components/sections/pricing/PricingCardThree';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { Sparkles, Leaf, Heart, Truck, Award } from 'lucide-react';

@@ -30,14 +29,13 @@ export default function LandingPage() {
        <NavbarLayoutFloatingOverlay
          brandName="Bee Job"
          navItems={[
-            { name: "Home", id: "hero" },
-            { name: "Products", id: "products" },
-            { name: "About", id: "about" },
-            { name: "Testimonials", id: "testimonials" },
-            { name: "Contact", id: "contact" },
+            { name: "Home", id: "/" },
+            { name: "Products", id: "/products" },
+            { name: "Pricing", id: "/pricing" },
+            { name: "Contact", id: "/contact" },
          ]}
          button={{
-            text: "Order Now",            href: "#products"
+            text: "Order Now",            href: "/products"
          }}
        />
      </div>
@@ -49,8 +47,8 @@ export default function LandingPage() {
          tag="Premium Flowers"
          tagIcon={Sparkles}
          buttons={[
-            { text: "Shop Now", href: "#products" },
-            { text: "Learn More", href: "#about" },
+            { text: "Shop Now", href: "/products" },
+            { text: "View Pricing", href: "/pricing" },
          ]}
          carouselItems={[
            {
@@ -99,12 +97,11 @@ export default function LandingPage() {
            },
          ]}
          gridVariant="uniform-all-items-equal"
-          carouselMode="buttons"
          animationType="slide-up"
          textboxLayout="default"
          useInvertedBackground="noInvert"
          buttons={[
-            { text: "View All Collections", href: "#products" },
+            { text: "View All Collections", href: "/products" },
          ]}
        />
      </div>
@@ -176,16 +173,15 @@ export default function LandingPage() {
      </div>

      <div id="pricing" data-section="pricing">
-        <PricingCardTwo
-          title="Flexible Plans for Every Occasion"
-          description="Choose the perfect arrangement package for your special moment"
-          tag="Pricing"
+        <PricingCardThree
+          title="Ready to Transform Your Occasions?"
+          description="Subscribe to our newsletter for exclusive deals, new arrivals, and floral care tips delivered right to your inbox."
+          tag="Pricing & Offers"
          plans={[
            {
              id: "1",              badge: "Classic Arrangement",              badgeIcon: Leaf,
-              price: "$49.99",              subtitle: "Perfect for birthdays and celebrations",              buttons: [
-                { text: "Choose Plan" },
-                { text: "Customize" },
+              price: "$49.99",              name: "Perfect for birthdays and celebrations",              buttons: [
+                { text: "Choose Plan", href: "/products" },
              ],
              features: [
                "6-8 stems of premium flowers",                "Elegant vase included",                "Standard delivery available",                "Free greeting card"
@@ -193,9 +189,8 @@ export default function LandingPage() {
            },
            {
              id: "2",              badge: "Premium Bouquet",              badgeIcon: Sparkles,
-              price: "$84.99",              subtitle: "Best for romantic occasions",              buttons: [
-                { text: "Choose Plan" },
-                { text: "Customize" },
+              price: "$84.99",              name: "Best for romantic occasions",              buttons: [
+                { text: "Choose Plan", href: "/products" },
              ],
              features: [
                "12-15 stems of luxury flowers",                "Premium decorative vase",                "Same-day delivery included",                "Personalized message card",                "Complimentary ribbon wrap"
@@ -203,9 +198,8 @@ export default function LandingPage() {
            },
            {
              id: "3",              badge: "Grand Celebration",              badgeIcon: Heart,
-              price: "$149.99",              subtitle: "For unforgettable moments",              buttons: [
-                { text: "Choose Plan" },
-                { text: "Customize" },
+              price: "$149.99",              name: "For unforgettable moments",              buttons: [
+                { text: "Choose Plan", href: "/products" },
              ],
              features: [
                "20+ stems of exotic varieties",                "Designer luxury arrangement",                "Priority same-day delivery",                "Bespoke consultation included",                "Premium packaging",                "Flower care guide provided"
@@ -215,22 +209,6 @@ export default function LandingPage() {
          animationType="slide-up"
          textboxLayout="default"
          useInvertedBackground="noInvert"
-          carouselMode="buttons"
-        />
-      </div>
-
-      <div id="contact" data-section="contact">
-        <ContactSplit
-          tag="Get In Touch"
-          title="Ready to Order Your Flowers?"
-          description="Subscribe to our newsletter for exclusive deals, new arrivals, and floral care tips delivered right to your inbox."
-          useInvertedBackground="invertDefault"
-          imageSrc="https://img.b2bpic.net/free-photo/day-beauti-flowers-flower-white_1303-2012.jpg"
-          imageAlt="Gorgeous flower arrangement in a gift box"
-          mediaPosition="right"
-          inputPlaceholder="Enter your email address"
-          buttonText="Subscribe"
-          termsText="We respect your privacy. Unsubscribe anytime from our mailing list."
        />
      </div>

--- a/src/app/pricing/page.tsx
+++ b/src/app/pricing/page.tsx
@@ -0,0 +1,97 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import PricingCardThree from '@/components/sections/pricing/PricingCardThree';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import { Sparkles, Leaf, Heart } from 'lucide-react';
+
+export default function PricingPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-bubble"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="aurora"
+      cardStyle="soft-shadow"
+      primaryButtonStyle="double-inset"
+      secondaryButtonStyle="layered"
+      headingFontWeight="light"
+    >
+      <div className="min-h-screen bg-background">
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            brandName="Bee Job"
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Products", id: "/products" },
+              { name: "Pricing", id: "/pricing" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            button={{
+              text: "Order Now",              href: "/products"
+            }}
+          />
+        </div>
+
+        <div id="pricing" data-section="pricing">
+          <PricingCardThree
+            title="Flexible Plans for Every Occasion"
+            description="Choose the perfect arrangement package for your special moment. All plans include free greeting card and careful delivery."
+            tag="Pricing"
+            plans={[
+              {
+                id: "1",                badge: "Classic Arrangement",                badgeIcon: Leaf,
+                price: "$49.99",                name: "Perfect for birthdays and celebrations",                buttons: [
+                  { text: "Choose Plan", href: "/products" },
+                  { text: "Customize", href: "/products" },
+                ],
+                features: [
+                  "6-8 stems of premium flowers",                  "Elegant vase included",                  "Standard delivery available",                  "Free greeting card"
+                ],
+              },
+              {
+                id: "2",                badge: "Premium Bouquet",                badgeIcon: Sparkles,
+                price: "$84.99",                name: "Best for romantic occasions",                buttons: [
+                  { text: "Choose Plan", href: "/products" },
+                  { text: "Customize", href: "/products" },
+                ],
+                features: [
+                  "12-15 stems of luxury flowers",                  "Premium decorative vase",                  "Same-day delivery included",                  "Personalized message card",                  "Complimentary ribbon wrap"
+                ],
+              },
+              {
+                id: "3",                badge: "Grand Celebration",                badgeIcon: Heart,
+                price: "$149.99",                name: "For unforgettable moments",                buttons: [
+                  { text: "Choose Plan", href: "/products" },
+                  { text: "Customize", href: "/products" },
+                ],
+                features: [
+                  "20+ stems of exotic varieties",                  "Designer luxury arrangement",                  "Priority same-day delivery",                  "Bespoke consultation included",                  "Premium packaging",                  "Flower care guide provided"
+                ],
+              },
+              {
+                id: "4",                price: "$199.99",                name: "For corporate events and weddings",                buttons: [
+                  { text: "Contact Us", href: "/contact" },
+                  { text: "Learn More", href: "/pricing" },
+                ],
+                features: [
+                  "30+ stems of premium selection",                  "Custom color schemes",                  "Multiple arrangement options",                  "Dedicated florist consultation",                  "Event planning support",                  "White glove delivery service",                  "Special occasion guarantee"
+                ],
+              },
+            ]}
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground="noInvert"
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterLogoReveal logoText="Bee Job" />
+        </div>
+      </div>
+    </ThemeProvider>
+  );
+}
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -66,9 +66,8 @@ export default function ProductsPage() {
            navItems={[
              { name: "Home", id: "/" },
              { name: "Products", id: "/products" },
-              { name: "About", id: "about" },
-              { name: "Testimonials", id: "testimonials" },
-              { name: "Contact", id: "contact" },
+              { name: "Pricing", id: "/pricing" },
+              { name: "Contact", id: "/contact" },
            ]}
            button={{
              text: "Order Now",              href: "/products"
@@ -84,7 +83,6 @@ export default function ProductsPage() {
            tagIcon={Leaf}
            products={allProducts}
            gridVariant="three-columns-all-equal-width"
-            carouselMode="buttons"
            animationType="slide-up"
            textboxLayout="default"
            useInvertedBackground="noInvert"
Author	SHA1	Message	Date
development	146364ded1	Merge version_4 into main Merge version_4 into main	2026-01-29 16:52:27 +00:00
development	7684e01b7c	Update src/app/products/page.tsx	2026-01-29 16:52:22 +00:00
development	633853135c	Update src/app/pricing/page.tsx	2026-01-29 16:52:21 +00:00
development	9892932712	Update src/app/page.tsx	2026-01-29 16:52:21 +00:00
development	f8623526be	Update src/app/layout.tsx	2026-01-29 16:52:20 +00:00
development	dab3041b5c	Add src/app/contact/page.tsx	2026-01-29 16:52:18 +00:00
development	d88a08cd70	Merge version_3 into main Merge version_3 into main	2026-01-29 16:35:36 +00:00
development	f66393042a	Update src/app/products/page.tsx	2026-01-29 16:35:31 +00:00
development	38a0c2a63e	Update src/app/pricing/page.tsx	2026-01-29 16:35:31 +00:00
development	610b48abd8	Update src/app/page.tsx	2026-01-29 16:35:30 +00:00
development	d378232109	Update src/app/layout.tsx	2026-01-29 16:35:29 +00:00
development	be6ec21cf1	Merge version_3 into main Merge version_3 into main	2026-01-29 16:33:02 +00:00
development	adf94618cb	Update src/app/products/page.tsx	2026-01-29 16:32:57 +00:00
development	dcb5391aa2	Add src/app/pricing/page.tsx	2026-01-29 16:32:56 +00:00
development	52c6ef419b	Update src/app/page.tsx	2026-01-29 16:32:55 +00:00
development	a7e590d30e	Merge version_2 into main Merge version_2 into main	2026-01-29 16:17:57 +00:00