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_1
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_7
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

20 Commits
version_1 ... version_7

Author SHA1 Message Date
bender
cab508c61b Update src/app/page.tsx 2026-02-17 13:31:43 +00:00
bender
585c981546 Merge version_6 into main 
Merge version_6 into main
 2026-02-17 13:24:46 +00:00
bender
5d7ad9e87e Update src/app/page.tsx 2026-02-17 13:24:42 +00:00
bender
cc72489a2b Merge version_6 into main 
Merge version_6 into main
 2026-02-17 13:22:15 +00:00
bender
7600558766 Update src/app/page.tsx 2026-02-17 13:22:10 +00:00
bender
8b5c57f878 Merge version_5 into main 
Merge version_5 into main
 2026-02-17 13:14:34 +00:00
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
bender
2aa5838ce4 Update src/app/page.tsx 2026-02-17 12:55:11 +00:00
bender
aae9debf47 Update src/app/blog/page.tsx 2026-02-17 12:55:10 +00:00
bender
07cf220bfc Merge version_2 into main 
Merge version_2 into main
 2026-02-17 12:47:12 +00:00
bender
cc3de9fdce Update src/app/shop/page.tsx 2026-02-17 12:47:07 +00:00
bender
25c1c9a290 Update src/app/shop/[id]/page.tsx 2026-02-17 12:47:07 +00:00
4 changed files with 79 additions and 94 deletions
Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
"use client";
import ReactLenis from "lenis/react";
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -43,7 +43,7 @@ export default function BlogPage() {
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardTwo
<BlogCardOne
blogs={posts}
title="Flower Care & Inspiration"
description="Discover the art of flower arrangement, care tips, and seasonal inspiration from our expert florists"
@@ -61,23 +61,23 @@ export default function BlogPage() {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }

58
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroBillboardGallery from '@/components/sections/hero/HeroBillboardGallery';
import HeroSplitDualMedia from '@/components/sections/hero/HeroSplitDualMedia';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import AboutMetric from '@/components/sections/about/AboutMetric';
import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
@@ -38,36 +38,26 @@ export default function LandingPage() {
</div>
<div id="hero" data-section="hero">
<HeroBillboardGallery
<HeroSplitDualMedia
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."
tag="Premium Blooms"
tagIcon={Flower2}
tagAnimation="slide-up"
background={{ variant: "radial-gradient" }}
background={{ variant: "plain" }}
tag="Fresh Blooms"
tagIcon={Sparkles}
tagAnimation="opacity"
buttons={[
{ text: "Shop Now", href: "#products" },
{ text: "Learn More", href: "#about" }
{ text: "Shop Now", href: "products" },
{ text: "Learn More", href: "about" }
]}
buttonAnimation="slide-up"
buttonAnimation="blur-reveal"
mediaItems={[
{
imageSrc: "https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg", imageAlt: "Fresh rose bouquet arrangement"
},
{
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-288.jpg", imageAlt: "Colorful tulip collection"
},
{
imageSrc: "https://img.b2bpic.net/free-photo/floral-art-wreath-mixed-flowers-hands-man_114579-2484.jpg", imageAlt: "Bright sunflower bouquet"
},
{
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg", imageAlt: "Elegant white lily arrangement"
},
{
imageSrc: "https://img.b2bpic.net/free-photo/florist-charming-venue-details-decorative_1304-2503.jpg", imageAlt: "Exotic purple orchid display"
}
{ imageSrc: "https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg", 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"
mediaAnimation="slide-up"
rating={5}
ratingText="Rated by loving Customers"
ariaLabel="Hero section with dual media"
/>
</div>
@@ -96,7 +86,7 @@ export default function LandingPage() {
}
]}
buttons={[
{ text: "View All Collections", href: "#contact" }
{ text: "View All Collections", href: "contact" }
]}
buttonAnimation="blur-reveal"
useInvertedBackground={false}
@@ -192,23 +182,23 @@ export default function LandingPage() {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }

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

@@ -89,8 +89,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "Why Giina", id: "features" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -104,23 +103,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }
@@ -166,8 +165,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "Why Giina", id: "features" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -189,23 +187,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }
@@ -250,8 +248,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "Why Giina", id: "features" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -298,23 +295,23 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }

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

@@ -42,8 +42,7 @@ export default function ShopPage() {
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "Why Giina", id: "features" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -57,23 +56,23 @@ export default function ShopPage() {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }
@@ -118,8 +117,7 @@ export default function ShopPage() {
{ name: "Collections", id: "products" },
{ name: "About", id: "about" },
{ name: "Why Giina", id: "features" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -141,23 +139,23 @@ export default function ShopPage() {
columns={[
{
title: "Collections", items: [
{ label: "All Flowers", href: "#products" },
{ label: "Seasonal", href: "#products" },
{ label: "Premium", href: "#products" },
{ label: "Custom Orders", href: "#contact" }
{ label: "All Flowers", href: "products" },
{ label: "Seasonal", href: "products" },
{ label: "Premium", href: "products" },
{ label: "Custom Orders", href: "contact" }
]
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Why Choose Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "Our Story", href: "about" },
{ label: "Why Choose Us", href: "features" },
{ label: "Testimonials", href: "testimonials" },
{ label: "Blog", href: "#" }
]
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "contact" },
{ label: "Delivery Info", href: "#" },
{ label: "Care Guide", href: "#" },
{ label: "FAQ", href: "#" }