Merge version_7 into main

Merge version_7 into main

src/app/blog/page.tsx

@@ -35,6 +35,7 @@ export default function BlogPage() {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
+                            { name: "Pricing", id: "/#pricing" },
                             { name: "Shop", id: "/shop" },
                             { name: "Team", id: "/#team" },
                             { name: "Testimonials", id: "/#testimonials" },
@@ -73,21 +74,21 @@ export default function BlogPage() {
                                 title: "Shop",                                items: [
                                     { label: "Bouquets", href: "/shop" },
                                     { label: "Arrangements", href: "/shop" },
-                                    { label: "Custom Orders", href: "/#contact" }
+                                    { label: "Custom Orders", href: "/#contact" },
-                                ]
+                                ],
                             },
                             {
                                 title: "Company",                                items: [
                                     { label: "About Us", href: "/#about" },
-                                    { label: "Contact", href: "/#contact" }
+                                    { label: "Contact", href: "/#contact" },
-                                ]
+                                ],
                             },
                             {
                                 title: "Connect",                                items: [
                                     { label: "Instagram", href: "https://instagram.com/angola_flowers" },
-                                    { label: "Facebook", href: "https://facebook.com/angola_flowers" }
+                                    { label: "Facebook", href: "https://facebook.com/angola_flowers" },
-                                ]
+                                ],
-                            }
+                            },
                         ]}
                         logoText="Angola"
                         copyrightText="© 2024 Angola Flowers Studio. All rights reserved."

src/app/layout.tsx

@@ -12,16 +12,16 @@ export const metadata: Metadata = {
   title: "Angola Flowers Studio - Exquisite Floral Arrangements",  description: "Discover stunning floral arrangements and custom bouquets from Angola Flowers Studio. Perfect for weddings, events, and everyday beauty.",  openGraph: {
     title: "Angola Flowers Studio - Exquisite Floral Arrangements",    description: "Discover stunning floral arrangements and custom bouquets from Angola Flowers Studio. Perfect for weddings, events, and everyday beauty.",    url: "https://www.angola-flowers.com",    siteName: "Angola Flowers Studio",    images: [
       {
-        url: "http://img.b2bpic.net/free-photo/man-winter-outfits-with-bouquet-mixed-flowers_114579-2706.jpg",        alt: "A luxurious bouquet of fresh flowers"}
+        url: "http://img.b2bpic.net/free-photo/man-winter-outfits-with-bouquet-mixed-flowers_114579-2706.jpg",        alt: "A luxurious bouquet of fresh flowers"},
     ],
     type: "website"},
   twitter: {
-    card: "summary_large_image",    title: "Angola Flowers Studio - Exquisite Floral Arrangements",    description: "Discover stunning floral arrangements and custom bouquets from Angola Flowers Studio. Perfect for weddings, events, and everyday beauty.",    images: ["http://img.b2bpic.net/free-photo/man-winter-outfits-with-bouquet-mixed-flowers_114579-2706.jpg"]
+    card: "summary_large_image",    title: "Angola Flowers Studio - Exquisite Floral Arrangements",    description: "Discover stunning floral arrangements and custom bouquets from Angola Flowers Studio. Perfect for weddings, events, and everyday beauty.",    images: ["http://img.b2bpic.net/free-photo/man-winter-outfits-with-bouquet-mixed-flowers_114579-2706.jpg"],
   },
   robots: {
     index: true,
-    follow: true
+    follow: true,
-  }
+  },
 };
 
 export default function RootLayout({

src/app/page.tsx

@@ -4,11 +4,13 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
 import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
+import PricingCardOne from '@/components/sections/pricing/PricingCardOne';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
 import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import TeamCardOne from '@/components/sections/team/TeamCardOne';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
+import { Shield, Users } from 'lucide-react';
 
 export default function LandingPage() {
   return (
@@ -29,6 +31,7 @@ export default function LandingPage() {
           navItems={[
             { name: "Home", id: "/" },
             { name: "About", id: "/#about" },
+            { name: "Pricing", id: "/#pricing" },
             { name: "Shop", id: "/shop" },
             { name: "Team", id: "/#team" },
             { name: "Testimonials", id: "/#testimonials" },
@@ -46,7 +49,7 @@ export default function LandingPage() {
           description="Crafting exquisite floral arrangements for every occasion, bringing beauty and joy to your special moments."
           buttons={[
             { text: "Shop Now", href: "/shop" },
-            { text: "Our Story", href: "/#about" }
+            { text: "Our Story", href: "/#about" },
           ]}
           slides={[
             {
@@ -54,7 +57,7 @@ export default function LandingPage() {
             {
               imageSrc: "http://img.b2bpic.net/free-photo/empty-clothing-store-filled-casual-formal-wear-items-hanging-fashion-store-racks-hangers-full-with-fashionable-clothes-accessories-discount-small-business-commercial-activity_482257-65075.jpg",              imageAlt: "An elegant flower studio interior with various arrangements"},
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/closeup-colorful-flower-bouquets-containers-outdoor-shop_181624-28754.jpg",              imageAlt: "A vibrant display of various flower types in a shop"}
+              imageSrc: "http://img.b2bpic.net/free-photo/closeup-colorful-flower-bouquets-containers-outdoor-shop_181624-28754.jpg",              imageAlt: "A vibrant display of various flower types in a shop"},
           ]}
           autoplayDelay={5000}
           showDimOverlay={true}
@@ -68,13 +71,37 @@ export default function LandingPage() {
             "At Angola, we believe in the power of flowers to express emotions, celebrate milestones, and create unforgettable memories. Our studio is dedicated to sourcing the freshest, most beautiful blooms and transforming them into stunning works of art.",            "Every arrangement is crafted with meticulous care and a keen eye for design, ensuring that each bouquet tells its own unique story. We pour our heart into every petal, bringing beauty and elegance to your world."]}
           buttons={[
             { text: "Meet Our Team", href: "#team" },
-            { text: "Contact Us", href: "/#contact" }
+            { text: "Contact Us", href: "/#contact" },
           ]}
           useInvertedBackground={false}
           showBorder={false}
         />
       </div>
 
+      <div id="pricing" data-section="pricing">
+        <PricingCardOne
+          title="Choose Your Perfect Plan"
+          description="Unlock the full potential with our flexible pricing options."
+          plans={[
+            {
+              id: "1",              badge: "Basic",              badgeIcon: Shield,
+              price: "$19/mo",              subtitle: "Perfect for individuals",              features: ["5 Users", "50GB Storage", "Email Support"],
+            },
+            {
+              id: "2",              badge: "Pro",              badgeIcon: Shield,
+              price: "$49/mo",              subtitle: "Ideal for small teams",              features: ["20 Users", "200GB Storage", "Priority Support"],
+            },
+            {
+              id: "3",              badge: "Enterprise",              badgeIcon: Shield,
+              price: "$99/mo",              subtitle: "For growing businesses",              features: ["Unlimited Users", "1TB Storage", "24/7 Support"],
+            },
+          ]}
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={false}
+        />
+      </div>
+
       <div id="products" data-section="products">
         <ProductCardFour
           title="Featured Floral Collections"
@@ -86,7 +113,7 @@ export default function LandingPage() {
             {
               id: "2",              name: "Garden Fresh Medley",              price: "$60",              variant: "Seasonal Mix (Small, Medium)",              imageSrc: "http://img.b2bpic.net/free-photo/woman-holding-bouquet-yellow-orange-dahliason-light-background_169016-39443.jpg",              imageAlt: "A colorful medley of garden fresh flowers"},
             {
-              id: "3",              name: "Elegant Lily Arrangement",              price: "$85",              variant: "White Lilies (Classic, Deluxe)",              imageSrc: "http://img.b2bpic.net/free-photo/bouquet-beautiful-fresh-white-blooms-vase_23-2148069253.jpg",              imageAlt: "An elegant arrangement of white lilies"}
+              id: "3",              name: "Elegant Lily Arrangement",              price: "$85",              variant: "White Lilies (Classic, Deluxe)",              imageSrc: "http://img.b2bpic.net/free-photo/bouquet-beautiful-fresh-white-blooms-vase_23-2148069253.jpg",              imageAlt: "An elegant arrangement of white lilies"},
           ]}
           gridVariant="four-items-2x2-equal-grid"
           animationType="slide-up"
@@ -104,7 +131,7 @@ export default function LandingPage() {
             { src: "http://img.b2bpic.net/free-photo/woman-showing-ok-sign_23-2148990150.jpg", alt: "Maria P." },
             { src: "http://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg", alt: "John D." },
             { src: "http://img.b2bpic.net/free-photo/portrait-woman-with-cabbage-dress_23-2150539813.jpg", alt: "Sophia L." },
-            { src: "http://img.b2bpic.net/free-photo/business-woman-standing_1187-1543.jpg", alt: "David K." }
+            { src: "http://img.b2bpic.net/free-photo/business-woman-standing_1187-1543.jpg", alt: "David K." },
           ]}
           ratingAnimation="slide-up"
           avatarsAnimation="slide-up"
@@ -118,11 +145,11 @@ export default function LandingPage() {
           description="Have a question, special request, or need help with an order? Fill out the form below and we'll get back to you shortly."
           inputs={[
             { name: "name", type: "text", placeholder: "Your Name", required: true },
-            { name: "email", type: "email", placeholder: "Your Email", required: true }
+            { name: "email", type: "email", placeholder: "Your Email", required: true },
           ]}
           textarea={{
             name: "message",            placeholder: "Tell us about your floral needs or inquiry...",            rows: 5,
-            required: true
+            required: true,
           }}
           useInvertedBackground={false}
           imageSrc="http://img.b2bpic.net/free-photo/top-view-hands-with-gladiolus-flower-pink-alstroemeria-with-lilac-daisy-flowers-sketchbook-with-red-stapler-paper-clips-wooden-background_141793-7805.jpg"
@@ -136,25 +163,24 @@ export default function LandingPage() {
       <div id="team" data-section="team">
         <TeamCardOne
           title="Meet Our Talented Team"
-          description="Dedicated to bringing beauty and creativity to every floral design."
+          description="Dedicated to bringing your floral visions to life."
           members={[
             {
-              id: "1",              name: "Elena Petrova",              role: "Head Florist",              imageSrc: "https://images.unsplash.com/photo-1580489944761-15a19d654956?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3w0MDk0MnwwfDF8c2VhcmNofDEzfHxmZW1hbGUlMjBwb3J0cmFpdHxlbnwwfHx8fDE3MTQ5NjM2OTV8MA&ixlib=rb-4.0.3&q=80&w=1080",              imageAlt: "Portrait of Elena Petrova"
+              id: "1",              name: "Sarah Johnson",              role: "Founder",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-smiling-outside_23-2148135804.jpg",              imageAlt: "Portrait of Sarah Johnson"
             },
             {
-              id: "2",              name: "Marcus Chen",              role: "Design Lead",              imageSrc: "https://images.unsplash.com/photo-1507003211169-e6955a6d80bd?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3w0MDk0MnwwfDF8c2VhcmNofDh8fG1hbGUlMjBwb3J0cmFpdHxlbnwwfHx8fDE3MTQ5NjM3NTh8MA&ixlib=rb-4.0.3&q=80&w=1080",              imageAlt: "Portrait of Marcus Chen"
+              id: "2",              name: "Michael Chen",              role: "Lead Designer",              imageSrc: "http://img.b2bpic.net/free-photo/handsome-bearded-guy-posing-white-t-shirt_273609-17367.jpg",              imageAlt: "Portrait of Michael Chen"
             },
             {
-              id: "3",              name: "Sophia Rodriguez",              role: "Creative Director",              imageSrc: "https://images.unsplash.com/photo-1544005313-94ddf0286df2?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3w0MDk0MnwwfDF8c2VhcmNofDE4fHxmZW1hbGUlMjBwb3J0cmFpdHxlbnwwfHx8fDE3MTQ5NjM2OTV8MA&ixlib=rb-4.0.3&q=80&w=1080",              imageAlt: "Portrait of Sophia Rodriguez"
+              id: "3",              name: "Emily White",              role: "Event Specialist",              imageSrc: "http://img.b2bpic.net/free-photo/portrait-african-american-young-woman_23-2148737271.jpg",              imageAlt: "Portrait of Emily White"
             },
-            {
-              id: "4",              name: "David Kim",              role: "Operations Manager",              imageSrc: "https://images.unsplash.com/photo-1521119989691-e022f03028bb?crop=entropy&cs=tinysrgb&fit=max&fm=jpg&ixid=M3w0MDk0MnwwfDF8c2VhcmNofDh8fGhlYWRzaG90fGVufDB8fHx8MTcxNDk2MzY4NHww&ixlib=rb-4.0.3&q=80&w=1080",              imageAlt: "Portrait of David Kim"
-            }
           ]}
+          gridVariant="uniform-all-items-equal"
           animationType="slide-up"
           textboxLayout="default"
-          useInvertedBackground={false}
+          useInvertedBackground={true}
-          gridVariant="four-items-2x2-equal-grid"
+          tag="Our Experts"
+          tagIcon={Users}
         />
       </div>
 
@@ -167,21 +193,21 @@ export default function LandingPage() {
               title: "Shop",              items: [
                 { label: "Bouquets", href: "/shop" },
                 { label: "Arrangements", href: "/shop" },
-                { label: "Custom Orders", href: "/#contact" }
+                { label: "Custom Orders", href: "/#contact" },
-              ]
+              ],
             },
             {
               title: "Company",              items: [
                 { label: "About Us", href: "/#about" },
-                { label: "Contact", href: "/#contact" }
+                { label: "Contact", href: "/#contact" },
-              ]
+              ],
             },
             {
               title: "Connect",              items: [
                 { label: "Instagram", href: "https://instagram.com/angola_flowers" },
-                { label: "Facebook", href: "https://facebook.com/angola_flowers" }
+                { label: "Facebook", href: "https://facebook.com/angola_flowers" },
-              ]
+              ],
-            }
+            },
           ]}
           logoText="Angola"
           copyrightText="© 2024 Angola Flowers Studio. All rights reserved."

src/app/shop/[id]/page.tsx

@@ -94,6 +94,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
+                            { name: "Pricing", id: "/#pricing" },
                             { name: "Shop", id: "/shop" },
                             { name: "Team", id: "/#team" },
                             { name: "Testimonials", id: "/#testimonials" },
@@ -135,6 +136,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                             navItems={[
                                 { name: "Home", id: "/" },
                                 { name: "About", id: "/#about" },
+                                { name: "Pricing", id: "/#pricing" },
                                 { name: "Shop", id: "/shop" },
                                 { name: "Team", id: "/#team" },
                                 { name: "Testimonials", id: "/#testimonials" },
@@ -183,6 +185,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
+                            { name: "Pricing", id: "/#pricing" },
                             { name: "Shop", id: "/shop" },
                             { name: "Team", id: "/#team" },
                             { name: "Testimonials", id: "/#testimonials" },
@@ -212,7 +215,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                           sku={meta.sku}
                           buttons={[
                               { text: "Add To Cart", onClick: handleAddToCart },
-                              { text: "Buy Now", onClick: handleBuyNow }
+                              { text: "Buy Now", onClick: handleBuyNow },
                           ]}
                       />
                   </div>
@@ -226,8 +229,8 @@ function ProductPageContent({ params }: ProductPageProps) {
                           total={`$${cartTotal}`}
                           buttons={[
                               {
-                                  text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout
+                                  text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                              }
+                              },
                           ]}
                       />
                   </div>

src/app/shop/page.tsx

@@ -37,6 +37,7 @@ function ShopPageContent() {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
+                            { name: "Pricing", id: "/#pricing" },
                             { name: "Shop", id: "/shop" },
                             { name: "Team", id: "/#team" },
                             { name: "Testimonials", id: "/#testimonials" },
@@ -77,6 +78,7 @@ function ShopPageContent() {
                         navItems={[
                             { name: "Home", id: "/" },
                             { name: "About", id: "/#about" },
+                            { name: "Pricing", id: "/#pricing" },
                             { name: "Shop", id: "/shop" },
                             { name: "Team", id: "/#team" },
                             { name: "Testimonials", id: "/#testimonials" },

src/app/styles/variables.css

@@ -2,23 +2,23 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f0fdf4;;
+  /* --background: #f5faff;;
-  --card: #e0f2f1;;
+  --card: #f1f8ff;;
-  --foreground: #1a202c;;
+  --foreground: #001122;;
-  --primary-cta: #10b981;;
+  --primary-cta: #0a7039;;
-  --secondary-cta: #3b82f6;;
+  --secondary-cta: #ffffff;;
-  --accent: #a7f3d0;;
+  --accent: #15479c;;
-  --background-accent: #bfdbfe;; */
+  --background-accent: #a8cce8;; */
 
-  --background: #f0fdf4;;
+  --background: #f5faff;;
-  --card: #e0f2f1;;
+  --card: #f1f8ff;;
-  --foreground: #1a202c;;
+  --foreground: #001122;;
-  --primary-cta: #10b981;;
+  --primary-cta: #0a7039;;
-  --primary-cta-text: #ffffff;;
+  --primary-cta-text: #f5faff;;
-  --secondary-cta: #3b82f6;;
+  --secondary-cta: #ffffff;;
-  --secondary-cta-text: #ffffff;;
+  --secondary-cta-text: #001122;;
-  --accent: #a7f3d0;;
+  --accent: #15479c;;
-  --background-accent: #bfdbfe;;
+  --background-accent: #a8cce8;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);