Merge version_2 into main

Merge version_2 into main

src/app/blog/page.tsx

@@ -14,9 +14,11 @@ export default function BlogPage() {
         { name: "Home", id: "/" },
         { name: "About", id: "/#about" },
         { name: "Products", id: "/#products" },
+        { name: "Shop", id: "/shop" },
         { name: "Testimonials", id: "/#testimonials" },
+        { name: "Blog", id: "/blog" },
         { name: "FAQ", id: "/#faq" },
-        { name: "Contact", id: "/#contact" },
+        { name: "Contact", id: "/#contact" }
     ];
     
     const footerColumns = [

src/app/page.tsx

@@ -15,9 +15,11 @@ export default function LandingPage() {
     { name: "Home", id: "/" },
     { name: "About", id: "/#about" },
     { name: "Products", id: "/#products" },
+    { name: "Shop", id: "/shop" },
     { name: "Testimonials", id: "/#testimonials" },
+    { name: "Blog", id: "/blog" },
     { name: "FAQ", id: "/#faq" },
-    { name: "Contact", id: "/#contact" },
+    { name: "Contact", id: "/#contact" }
   ];
 
   const footerColumns = [

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

@@ -75,17 +75,28 @@ function ProductPageContent({ params }: ProductPageProps) {
     }, [cartItems, checkout, getCheckoutItems]);
     
     const navbarProps = {
-        navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }],
+        navItems: [
+            { name: "Home", id: "/" },
+            { name: "About", id: "/#about" },
+            { name: "Products", id: "/#products" },
+            { name: "Shop", id: "/shop" },
+            { name: "Testimonials", id: "/#testimonials" },
+            { name: "Blog", id: "/blog" },
+            { name: "FAQ", id: "/#faq" },
+            { name: "Contact", id: "/#contact" }
+        ],
         brandName: "Balala",        className: "py-4 px-6",        navItemClassName: "text-foreground hover:text-primary-cta",        buttonClassName: "bg-primary-cta text-primary-cta-text",        buttonTextClassName: "font-semibold"
     };
 
+    const footerColumns = [
+        { title: "Shop", items: [{ label: "Bouquets", href: "/#products" }, { label: "Seasonal", href: "/#products" }, { label: "Our Shop", href: "/shop" }] },
+        { title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] },
+        { title: "Resources", items: [{ label: "Blog", href: "/blog" }] },
+        { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
+    ];
+
     const footerProps = {
-        columns: [
-            { title: "Shop", items: [{ label: "Bouquets", href: "/#products" }, { label: "Seasonal", href: "/#products" }, { label: "Our Shop", href: "/shop" }] },
-            { title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] },
-            { title: "Resources", items: [{ label: "Blog", href: "/blog" }] },
-            { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
-        ],
+        columns: footerColumns,
         bottomLeftText: "© 2024 Balala Flowers Studio. All rights reserved.",        bottomRightText: "Crafted with passion by Balala",        columnTitleClassName: "text-foreground",        columnItemClassName: "text-foreground hover:text-primary-cta",        bottomLeftTextClassName: "text-foreground",        bottomRightTextClassName: "text-foreground",        dividerClassName: "bg-accent"
     };
 

src/app/shop/page.tsx

@@ -40,17 +40,28 @@ function ShopPageContent() {
     }, [cartItems, checkout, getCheckoutItems]);
 
     const navbarProps = {
-        navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Blog", id: "/blog" }],
+        navItems: [
+            { name: "Home", id: "/" },
+            { name: "About", id: "/#about" },
+            { name: "Products", id: "/#products" },
+            { name: "Shop", id: "/shop" },
+            { name: "Testimonials", id: "/#testimonials" },
+            { name: "Blog", id: "/blog" },
+            { name: "FAQ", id: "/#faq" },
+            { name: "Contact", id: "/#contact" }
+        ],
         brandName: "Balala",        className: "py-4 px-6",        navItemClassName: "text-foreground hover:text-primary-cta",        buttonClassName: "bg-primary-cta text-primary-cta-text",        buttonTextClassName: "font-semibold"
     };
 
+    const footerColumns = [
+        { title: "Shop", items: [{ label: "Bouquets", href: "/#products" }, { label: "Seasonal", href: "/#products" }, { label: "Our Shop", href: "/shop" }] },
+        { title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] },
+        { title: "Resources", items: [{ label: "Blog", href: "/blog" }] },
+        { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
+    ];
+
     const footerProps = {
-        columns: [
-            { title: "Shop", items: [{ label: "Bouquets", href: "/#products" }, { label: "Seasonal", href: "/#products" }, { label: "Our Shop", href: "/shop" }] },
-            { title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }] },
-            { title: "Resources", items: [{ label: "Blog", href: "/blog" }] },
-            { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
-        ],
+        columns: footerColumns,
         bottomLeftText: "© 2024 Balala Flowers Studio. All rights reserved.",        bottomRightText: "Crafted with passion by Balala",        columnTitleClassName: "text-foreground",        columnItemClassName: "text-foreground hover:text-primary-cta",        bottomLeftTextClassName: "text-foreground",        bottomRightTextClassName: "text-foreground",        dividerClassName: "bg-accent"
     };
 

src/app/styles/variables.css

@@ -2,23 +2,23 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f7f6f7;;
-  --card: #ffffff;;
-  --foreground: #25190c;;
-  --primary-cta: #ff6207;;
-  --secondary-cta: #ffffff;;
-  --accent: #ffce93;;
-  --background-accent: #e8cfa8;; */
+  /* --background: #060000;;
+  --card: #1d0d0d;;
+  --foreground: #ffe6e6;;
+  --primary-cta: #ff3d4a;;
+  --secondary-cta: #1f0a0a;;
+  --accent: #7b2d2d;;
+  --background-accent: #b8111f;; */
 
-  --background: #f7f6f7;;
-  --card: #ffffff;;
-  --foreground: #25190c;;
-  --primary-cta: #ff6207;;
-  --primary-cta-text: #f7f6f7;;
-  --secondary-cta: #ffffff;;
-  --secondary-cta-text: #25190c;;
-  --accent: #ffce93;;
-  --background-accent: #e8cfa8;;
+  --background: #060000;;
+  --card: #1d0d0d;;
+  --foreground: #ffe6e6;;
+  --primary-cta: #ff3d4a;;
+  --primary-cta-text: #060000;;
+  --secondary-cta: #1f0a0a;;
+  --secondary-cta-text: #ffe6e6;;
+  --accent: #7b2d2d;;
+  --background-accent: #b8111f;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);