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_8
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

21 Commits
version_3 ... version_8

Author SHA1 Message Date
bender
61889b3dc3 Update src/app/shop/page.tsx 2026-02-17 13:54:35 +00:00
bender
69ab7853b1 Update src/app/shop/[id]/page.tsx 2026-02-17 13:54:34 +00:00
bender
f08a7c1987 Update src/app/page.tsx 2026-02-17 13:54:33 +00:00
bender
8409bf3dd4 Update src/app/layout.tsx 2026-02-17 13:54:33 +00:00
bender
8f9a8a0e1f Update src/app/blog/page.tsx 2026-02-17 13:54:32 +00:00
bender
38f4562b45 Merge version_7 into main 
Merge version_7 into main
 2026-02-17 13:31:48 +00:00
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
5 changed files with 78 additions and 102 deletions
Expand all files Collapse all files

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

@@ -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: "#" }
@@ -98,4 +98,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

42
src/app/layout.tsx
View File

@@ -1,43 +1,22 @@
import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Inter } from "next/font/google";
import "@/app/globals.css";
const interTight = Inter_Tight({
variable: "--font-inter-tight", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Giina Flowers - Fresh Floral Arrangements Delivered", description: "Discover exquisite handcrafted flower arrangements by Giina. Premium fresh blooms delivered with care. Shop our collections today.", keywords: "fresh flowers, flower delivery, floral arrangements, bouquets, premium flowers", openGraph: {
title: "Giina Flowers - Premium Floral Arrangements", description: "Experience the beauty of nature with Giina's handcrafted floral arrangements. Fresh flowers delivered with love.", type: "website", siteName: "Giina Flowers", images: [{
url: "https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg", alt: "Giina Flowers Collection"
}]
},
twitter: {
card: "summary_large_image", title: "Giina Flowers - Premium Floral Arrangements", description: "Handcrafted fresh flower bouquets delivered with care and expertise.", images: ["https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg"]
},
robots: {
index: true,
follow: true
}
};
title: "Giina Flowers", description: "Exquisite handcrafted floral arrangements delivered with love"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${interTight.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1290,7 +1269,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

36
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
import HeroLogo from '@/components/sections/hero/HeroLogo';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import AboutMetric from '@/components/sections/about/AboutMetric';
import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
@@ -38,19 +38,17 @@ export default function LandingPage() {
</div>
<div id="hero" data-section="hero">
<HeroLogoBillboard
logoText="Exquisite Flowers for Every Moment"
<HeroLogo
logoText="Giina"
description="Discover the beauty of nature with Giina's handcrafted floral arrangements. Fresh flowers delivered with love, passion, and attention to every detail."
buttons={[
{ text: "Shop Now", href: "#products" },
{ text: "Learn More", href: "#about" }
{ text: "Shop Now", href: "products" },
{ text: "Learn More", href: "about" }
]}
buttonAnimation="slide-up"
background={{ variant: "radial-gradient" }}
imageSrc="https://img.b2bpic.net/free-photo/closeup-shot-bouquet-with-roses-vase-near-window-sunlight_181624-30882.jpg"
imageAlt="Fresh rose bouquet arrangement"
mediaAnimation="blur-reveal"
frameStyle="card"
showDimOverlay={false}
ariaLabel="Hero section with logo"
/>
</div>
@@ -79,7 +77,7 @@ export default function LandingPage() {
}
]}
buttons={[
{ text: "View All Collections", href: "#contact" }
{ text: "View All Collections", href: "contact" }
]}
buttonAnimation="blur-reveal"
useInvertedBackground={false}
@@ -175,23 +173,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: "#" }
@@ -211,4 +209,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -103,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: "#" }
@@ -187,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: "#" }
@@ -295,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: "#" }
@@ -332,4 +332,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -56,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: "#" }
@@ -139,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: "#" }
@@ -176,4 +176,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}