Merge version_3 into main

Merge version_3 into main

src/app/blog/page.tsx

@@ -1,45 +1,13 @@
-"use client";
+"use client"
 
-import ReactLenis from "lenis/react";
-import BlogCardOne from "@/components/sections/blog/BlogCardOne";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterCard from '@/components/sections/footer/FooterCard';
-import { Heart, Leaf, Mail, Sparkles } from "lucide-react";
-
-const footerColumns: FooterColumn[] = [
-    {
-        title: "Product",
-        items: [
-            { label: "Features", href: "/features" },
-            { label: "Pricing", href: "/pricing" },
-            { label: "FAQ", href: "/faq" },
-        ],
-    },
-    {
-        title: "Company",
-        items: [
-            { label: "About", href: "/about" },
-            { label: "Blog", href: "/blog" },
-            { label: "Careers", href: "/careers" },
-        ],
-    },
-    {
-        title: "Resources",
-        items: [
-            { label: "Documentation", href: "/docs" },
-            { label: "Support", href: "/support" },
-            { label: "Contact", href: "/contact" },
-        ],
-    },
-];
 
 export default function BlogPage() {
-    const { posts, isLoading } = useBlogPosts();
-
-    return (
-        <ThemeProvider defaultButtonVariant="directional-hover"
+  return (
+    <ThemeProvider
+      defaultButtonVariant="directional-hover"
       defaultTextAnimation="entrance-slide"
       borderRadius="soft"
       contentWidth="mediumSmall"
@@ -48,49 +16,67 @@ export default function BlogPage() {
       cardStyle="layered-gradient"
       primaryButtonStyle="shadow"
       secondaryButtonStyle="solid"
-      headingFontWeight="medium">
-            <ReactLenis root>
-                <div id="nav" data-section="nav">
-
-                    <NavbarLayoutFloatingInline brandName="Orio"
+      headingFontWeight="medium"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingInline
+          brandName="Orio"
           navItems={[
-            { name: "Collections", id: "products" },
-            { name: "About", id: "about" },
-            { name: "Services", id: "features" },
+            { name: "Home", id: "/" },
+            { name: "Collections", id: "/products" },
+            { name: "About", id: "/about" },
+            { name: "Services", id: "/features" },
             { name: "News", id: "/news" },
-            { name: "Contact", id: "contact" }
+            { name: "Contact", id: "/contact" },
           ]}
           button={{
             text: "Book Now",            href: "#contact"
           }}
-          animateOnLoad={true} />
-                </div>
-
-                    {isLoading ? (
-                        <div className="w-content-width mx-auto py-20 text-center">
-                            <p className="text-foreground">Loading posts...</p>
-                        </div>
-                    ) : (
-                        <div id="blog" data-section="blog">
-                            <BlogCardOne
-                                blogs={posts}
-                                title="Latest Articles"
-                                description="Stay updated with our latest insights"
-                                textboxLayout="default"
-                                useInvertedBackground={false}
-                                carouselMode="buttons"
-                                animationType="slide-up"
-                            />
-                        </div>
-                    )}
-
-                    <div id="footer" data-section="footer">
-
-                        <FooterCard logoText="Orio"
-          copyrightText="© 2024 Orio Flowers. Handcrafted with love." />
-                    </div>
-            </ReactLenis>
-        </ThemeProvider>
-    );
-}
+          animateOnLoad={true}
+        />
+      </div>
+      
+      <div className="py-20">
+        <div className="container mx-auto px-4">
+          <h1 className="text-4xl font-bold text-center mb-8">Floral Design Blog</h1>
+          <p className="text-center text-lg text-muted-foreground mb-12">
+            Discover the latest trends, tips, and inspiration from the world of floral design.
+          </p>
+          
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
+            <div className="border rounded-lg p-6">
+              <h2 className="text-xl font-semibold mb-4">Seasonal Arrangements</h2>
+              <p className="text-muted-foreground mb-4">
+                Learn how to create stunning seasonal floral arrangements that capture the essence of each time of year.
+              </p>
+              <span className="text-sm text-muted-foreground">March 15, 2024</span>
+            </div>
+            
+            <div className="border rounded-lg p-6">
+              <h2 className="text-xl font-semibold mb-4">Wedding Flower Trends</h2>
+              <p className="text-muted-foreground mb-4">
+                Explore the hottest wedding flower trends for 2024, from bold color palettes to sustainable choices.
+              </p>
+              <span className="text-sm text-muted-foreground">March 10, 2024</span>
+            </div>
+            
+            <div className="border rounded-lg p-6">
+              <h2 className="text-xl font-semibold mb-4">Care Tips for Fresh Flowers</h2>
+              <p className="text-muted-foreground mb-4">
+                Expert tips on how to extend the life of your fresh flower arrangements and keep them looking beautiful.
+              </p>
+              <span className="text-sm text-muted-foreground">March 5, 2024</span>
+            </div>
+          </div>
+        </div>
+      </div>
 
+      <div id="footer" data-section="footer">
+        <FooterCard
+          logoText="Orio"
+          copyrightText="© 2024 Orio Flowers. Handcrafted with love."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/layout.tsx

@@ -1409,4 +1409,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -165,9 +165,9 @@ export default function LandingPage() {
 
       <div id="contact" data-section="contact">
         <ContactSplit
-          tag="Get In Touch"
+          tag="Newsletter"
           title="Ready to bring beauty into your life?"
-          description="Subscribe to our newsletter for exclusive offers, seasonal collections, and floral inspiration delivered straight to your inbox."
+          description="Subscribe to our newsletter for early access to seasonal collections, seasonal tips, and 15% off your first order. Plus exclusive offers and floral inspiration delivered straight to your inbox."
           tagIcon={Mail}
           background={{ variant: "radial-gradient" }}
           useInvertedBackground={false}
@@ -189,4 +189,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}