Merge version_3 into main #3

Merged
development merged 4 commits from version_3 into main 2026-01-29 16:35:36 +00:00
4 changed files with 12 additions and 15 deletions

View File

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

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -7,7 +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 PricingCardThree from '@/components/sections/pricing/PricingCardThree';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { Sparkles, Leaf, Heart, Truck, Award } from 'lucide-react';
@@ -98,7 +98,6 @@ export default function LandingPage() {
},
]}
gridVariant="uniform-all-items-equal"
carouselMode="buttons"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground="noInvert"
@@ -194,4 +193,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
import PricingCardThree from '@/components/sections/pricing/PricingCardThree';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { Sparkles, Leaf, Heart } from 'lucide-react';
@@ -37,14 +37,14 @@ export default function PricingPage() {
</div>
<div id="pricing" data-section="pricing">
<PricingCardTwo
<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", subtitle: "Perfect for birthdays and celebrations", buttons: [
price: "$49.99", name: "Perfect for birthdays and celebrations", buttons: [
{ text: "Choose Plan", href: "/products" },
{ text: "Customize", href: "/products" },
],
@@ -54,7 +54,7 @@ export default function PricingPage() {
},
{
id: "2", badge: "Premium Bouquet", badgeIcon: Sparkles,
price: "$84.99", subtitle: "Best for romantic occasions", buttons: [
price: "$84.99", name: "Best for romantic occasions", buttons: [
{ text: "Choose Plan", href: "/products" },
{ text: "Customize", href: "/products" },
],
@@ -64,7 +64,7 @@ export default function PricingPage() {
},
{
id: "3", badge: "Grand Celebration", badgeIcon: Heart,
price: "$149.99", subtitle: "For unforgettable moments", buttons: [
price: "$149.99", name: "For unforgettable moments", buttons: [
{ text: "Choose Plan", href: "/products" },
{ text: "Customize", href: "/products" },
],
@@ -73,7 +73,7 @@ export default function PricingPage() {
],
},
{
id: "4", price: "$199.99", subtitle: "For corporate events and weddings", buttons: [
id: "4", price: "$199.99", name: "For corporate events and weddings", buttons: [
{ text: "Contact Us", href: "contact" },
{ text: "Learn More", href: "/pricing" },
],
@@ -85,7 +85,6 @@ export default function PricingPage() {
animationType="slide-up"
textboxLayout="default"
useInvertedBackground="noInvert"
carouselMode="buttons"
/>
</div>
@@ -95,4 +94,4 @@ export default function PricingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -83,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"
@@ -96,4 +95,4 @@ export default function ProductsPage() {
</div>
</ThemeProvider>
);
}
}