Merge version_12 into main

Update src/app/page.tsx
2026-02-17 15:03:55 +00:00 · 2026-02-17 15:03:50 +00:00 · 2026-02-17 15:03:50 +00:00 · 2026-02-17 14:38:37 +00:00 · 2026-02-17 14:38:32 +00:00 · 2026-02-17 14:38:31 +00:00
5 changed files with 50 additions and 51 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -98,4 +98,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -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";

-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: "Handcrafted floral arrangements delivered with love and passion"
 };

 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>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,14 +1,15 @@
-"use client"
+"use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
+import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import AboutMetric from '@/components/sections/about/AboutMetric';
 import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
 import ContactCTA from '@/components/sections/contact/ContactCTA';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import MetricCardTen from '@/components/sections/metrics/MetricCardTen';
 import { Flower2, Sparkles, Heart, Flower, Award, MapPin, Leaf, Mail } from "lucide-react";

 export default function LandingPage() {
@@ -38,21 +39,20 @@ export default function LandingPage() {
      </div>

      <div id="hero" data-section="hero">
-        <HeroCarouselLogo
-          logoText="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."
+        <HeroLogoBillboard
+          logoText="Giina"
+          description="Handcrafted floral arrangements delivered with love, passion, and attention to every detail. Fresh flowers for every moment."
+          background={{ variant: "plain" }}
          buttons={[
-            { text: "Shop Now", href: "products" },
-            { 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", 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" },
-            { imageSrc: "https://img.b2bpic.net/free-photo/red-rose-bouquet-grey-background_23-2148017688.jpg", imageAlt: "Red rose bouquet" },
-            { 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" }
+            { text: "Shop Now", href: "/shop" },
+            { text: "Learn More", href: "#about" }
          ]}
+          buttonAnimation="blur-reveal"
+          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="slide-up"
+          frameStyle="card"
+          ariaLabel="Hero section with floral arrangements"
        />
      </div>

@@ -81,7 +81,7 @@ export default function LandingPage() {
            }
          ]}
          buttons={[
-            { text: "View All Collections", href: "contact" }
+            { text: "View All Collections", href: "/shop" }
          ]}
          buttonAnimation="blur-reveal"
          useInvertedBackground={false}
@@ -132,6 +132,27 @@ export default function LandingPage() {
        />
      </div>

+      <div id="metrics" data-section="metrics">
+        <MetricCardTen
+          metrics={[
+            {
+              id: "1",              title: "Senior Florist, Boutique Design",              subtitle: "London, UK · Full-time · Remote eligible",              category: "Design",              value: "£35K – £45K",              buttons: [{ text: "Apply Now", href: "#" }]
+            },
+            {
+              id: "2",              title: "Product Manager, E-Commerce",              subtitle: "New York, NY · Full-time",              category: "Product",              value: "$95K – $130K",              buttons: [{ text: "Apply Now", href: "#" }]
+            },
+            {
+              id: "3",              title: "Marketing Specialist, Brand",              subtitle: "Remote · Full-time",              category: "Marketing",              value: "$60K – $85K",              buttons: [{ text: "Apply Now", href: "#" }]
+            }
+          ]}
+          title="Join Our Growing Team"
+          description="We're looking for talented individuals who are passionate about flowers and customer excellence. Explore open positions and grow with Giina."
+          textboxLayout="default"
+          useInvertedBackground={false}
+          animationType="slide-up"
+        />
+      </div>
+
      <div id="testimonials" data-section="testimonials">
        <TestimonialCardFifteen
          testimonial="Giina flowers transformed my wedding day. The arrangements were breathtaking, fresh, and exactly what I envisioned. The team's attention to detail and customer service was exceptional. I couldn't have asked for better!"
@@ -213,4 +234,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -332,4 +332,4 @@ export default function ProductPage({ params }: ProductPageProps) {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -176,4 +176,4 @@ export default function ShopPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
Author	SHA1	Message	Date
bender	ac49725a82	Merge version_12 into main Merge version_12 into main	2026-02-17 15:03:55 +00:00
bender	873c0bcdee	Update src/app/page.tsx	2026-02-17 15:03:50 +00:00
bender	3092a2a600	Update src/app/layout.tsx	2026-02-17 15:03:50 +00:00
bender	2a1fa61650	Merge version_11 into main Merge version_11 into main	2026-02-17 14:38:37 +00:00
bender	f6ef7cefdb	Update src/app/page.tsx	2026-02-17 14:38:32 +00:00
bender	01dc6a0057	Update src/app/layout.tsx	2026-02-17 14:38:31 +00:00
bender	4da424142b	Merge version_10 into main Merge version_10 into main	2026-02-17 14:11:15 +00:00
bender	196bdef6b6	Update src/app/page.tsx	2026-02-17 14:11:10 +00:00
bender	6e9af91b20	Merge version_9 into main Merge version_9 into main	2026-02-17 13:56:55 +00:00
bender	f47c5633ab	Update src/app/page.tsx	2026-02-17 13:56:50 +00:00
bender	119add91be	Merge version_8 into main Merge version_8 into main	2026-02-17 13:54:39 +00:00
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