Update src/app/page.tsx

Merge version_2 into main

src/app/blog/page.tsx

@@ -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"

src/app/page.tsx

@@ -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 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';
@@ -38,36 +38,19 @@ export default function LandingPage() {
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroBillboardGallery
-          title="Exquisite Flowers for Every Moment"
+        <HeroLogoBillboard
+          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."
-          tag="Premium Blooms"
-          tagIcon={Flower2}
-          tagAnimation="slide-up"
-          background={{ variant: "radial-gradient" }}
           buttons={[
             { text: "Shop Now", href: "#products" },
             { text: "Learn More", href: "#about" }
           ]}
           buttonAnimation="slide-up"
-          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"
-            }
-          ]}
+          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"
         />
       </div>
 

src/app/shop/[id]/page.tsx

@@ -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) }}
                     />
@@ -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) }}
                         />
@@ -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) }}
                 />

src/app/shop/page.tsx

@@ -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) }}
                     />
@@ -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) }}
                 />