bender/fcf9d265-f59a-490a-877e-5bd109de2521
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_3
Branches Tags
bender:main bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_5
Branches Tags
bender:main bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

9 Commits
version_3 ... version_5

Author SHA1 Message Date
bender
41e7a11197 Update src/app/shop/page.tsx 2026-02-17 13:14:29 +00:00
bender
4adaa2a974 Update src/app/shop/[id]/page.tsx 2026-02-17 13:14:29 +00:00
bender
6a383e825d Update src/app/page.tsx 2026-02-17 13:14:28 +00:00
bender
6fec0f1434 Update src/app/blog/page.tsx 2026-02-17 13:14:27 +00:00
bender
5d61d15a29 Merge version_4 into main 
Merge version_4 into main
 2026-02-17 13:05:43 +00:00
bender
822703222c Update src/app/page.tsx 2026-02-17 13:05:38 +00:00
bender
e250953f4e Merge version_4 into main 
Merge version_4 into main
 2026-02-17 13:03:15 +00:00
bender
977b321c0b Update src/app/page.tsx 2026-02-17 13:03:10 +00:00
bender
7ed3da4abf Merge version_3 into main 
Merge version_3 into main
 2026-02-17 12:55:16 +00:00
4 changed files with 71 additions and 67 deletions
Expand all files Collapse all files

16
src/app/blog/page.tsx
View File

@@ -61,23 +61,23 @@ export default function BlogPage() {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }

42
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard'; import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
import ProductCardOne from '@/components/sections/product/ProductCardOne'; import ProductCardOne from '@/components/sections/product/ProductCardOne';
import AboutMetric from '@/components/sections/about/AboutMetric'; import AboutMetric from '@/components/sections/about/AboutMetric';
import FeatureCardEight from '@/components/sections/feature/FeatureCardEight'; import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
@@ -38,19 +38,23 @@ export default function LandingPage() {
</div> </div>
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroLogoBillboard <HeroBillboardCarousel
logoText="Exquisite Flowers for Every Moment" title="Exquisite Flowers for Every Moment"
description="Discover the beauty of nature with Giina's handcrafted floral arrangements. Fresh flowers delivered with love, passion, and attention to every detail." description="Discover the beauty of nature with Giina's handcrafted floral arrangements. Fresh flowers delivered with love, passion, and attention to every detail."
background={{ variant: "plain" }}
buttons={[ buttons={[
{ text: "Shop Now", href: "#products" }, { text: "Shop Now", href: "products" },
{ text: "Learn More", href: "#about" } { text: "Learn More", href: "about" }
]} ]}
buttonAnimation="slide-up" buttonAnimation="slide-up"
background={{ variant: "radial-gradient" }} mediaItems={[
imageSrc="https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg" { imageSrc: "https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg", imageAlt: "Fresh rose bouquet arrangement" },
imageAlt="Fresh rose bouquet arrangement" { imageSrc: "https://img.b2bpic.net/free-photo/beautiful-vase-pink-roses-grey-table_114579-39503.jpg", imageAlt: "Pink roses in vase" },
mediaAnimation="blur-reveal" { imageSrc: "https://img.b2bpic.net/free-photo/red-rose-bouquet-grey-background_23-2148017688.jpg", imageAlt: "Red rose bouquet" },
frameStyle="card" { imageSrc: "https://img.b2bpic.net/free-photo/beautiful-bouquet-pink-roses-grey-table_114579-39487.jpg", imageAlt: "Pink peony arrangement" },
{ imageSrc: "https://img.b2bpic.net/free-photo/some-pink-roses-basket-white-background_268835-1382.jpg", imageAlt: "Pink roses basket" },
{ imageSrc: "https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg", imageAlt: "Roses with sunlight" }
]}
/> />
</div> </div>
@@ -79,7 +83,7 @@ export default function LandingPage() {
} }
]} ]}
buttons={[ buttons={[
{ text: "View All Collections", href: "#contact" } { text: "View All Collections", href: "contact" }
]} ]}
buttonAnimation="blur-reveal" buttonAnimation="blur-reveal"
useInvertedBackground={false} useInvertedBackground={false}
@@ -175,23 +179,23 @@ export default function LandingPage() {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }

48
src/app/shop/[id]/page.tsx
View File

@@ -103,23 +103,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }
@@ -187,23 +187,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }
@@ -295,23 +295,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }

32
src/app/shop/page.tsx
View File

@@ -56,23 +56,23 @@ export default function ShopPage() {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }
@@ -139,23 +139,23 @@ export default function ShopPage() {
columns={[ columns={[
{ {
title: "Collections", items: [ title: "Collections", items: [
{ label: "All Flowers", href: "#products" }, { label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "#products" }, { label: "Seasonal", href: "products" },
{ label: "Premium", href: "#products" }, { label: "Premium", href: "products" },
{ label: "Custom Orders", href: "#contact" } { label: "Custom Orders", href: "contact" }
] ]
}, },
{ {
title: "About", items: [ title: "About", items: [
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "#features" }, { label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "#testimonials" }, { label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" } { label: "Blog", href: "#" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" }, { label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" }, { label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" } { label: "FAQ", href: "#" }