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

9 Commits
version_6 ... 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
cc72489a2b Merge version_6 into main 
Merge version_6 into main
 2026-02-17 13:22:15 +00:00
5 changed files with 21 additions and 47 deletions
Expand all files Collapse all files

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

@@ -98,4 +98,4 @@ export default function BlogPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

42
src/app/layout.tsx
View File

@@ -1,43 +1,22 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter_Tight } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "@/app/globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const interTight = Inter_Tight({ const inter = Inter({
variable: "--font-inter-tight", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
}); });
export const metadata: Metadata = { 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", description: "Exquisite handcrafted floral arrangements delivered with love"};
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
}
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={inter.variable}>{children}
<body
className={`${interTight.variable} antialiased`}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1290,7 +1269,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

20
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 HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo'; import HeroLogo from '@/components/sections/hero/HeroLogo';
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,21 +38,17 @@ export default function LandingPage() {
</div> </div>
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroCarouselLogo <HeroLogo
logoText="Exquisite Flowers for Every Moment" 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." description="Discover the beauty of nature with Giina's handcrafted floral arrangements. Fresh flowers delivered with love, passion, and attention to every detail."
buttons={[ buttons={[
{ text: "Shop Now", href: "products" }, { text: "Shop Now", href: "products" },
{ text: "Learn More", href: "about" } { text: "Learn More", href: "about" }
]} ]}
slides={[ 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" }, showDimOverlay={false}
{ imageSrc: "https://img.b2bpic.net/free-photo/red-rose-bouquet-grey-background_23-2148017688.jpg", imageAlt: "Red rose bouquet" }, ariaLabel="Hero section with logo"
{ 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>
@@ -213,4 +209,4 @@ export default function LandingPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -332,4 +332,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -176,4 +176,4 @@ export default function ShopPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }