Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -1,4 +1,4 @@
-"use client"
+"use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -10,6 +10,7 @@ import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCar
 import FaqBase from '@/components/sections/faq/FaqBase';
 import ContactText from '@/components/sections/contact/ContactText';
 import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import { Leaf, Droplet, Recycle, Shield } from 'lucide-react';
 
 export default function LandingPage() {
   return (

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

@@ -90,8 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                                 {"name":"About","id":"about"},
                                 {"name":"Ingredients","id":"features"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
+                                {"name":"Contact","id":"contact"}
-                                {"name":"Shop","id":"/shop"}
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -139,8 +138,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                                 {"name":"About","id":"about"},
                                 {"name":"Ingredients","id":"features"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
+                                {"name":"Contact","id":"contact"}
-                                {"name":"Shop","id":"/shop"}
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -195,8 +193,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                             {"name":"About","id":"about"},
                             {"name":"Ingredients","id":"features"},
                             {"name":"Reviews","id":"testimonials"},
-                            {"name":"Contact","id":"contact"},
+                            {"name":"Contact","id":"contact"}
-                            {"name":"Shop","id":"/shop"}
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />

src/app/shop/page.tsx

@@ -40,8 +40,7 @@ export default function ShopPage() {
                                 {"name":"About","id":"about"},
                                 {"name":"Ingredients","id":"features"},
                                 {"name":"Reviews","id":"testimonials"},
-                                {"name":"Contact","id":"contact"},
+                                {"name":"Contact","id":"contact"}
-                                {"name":"Shop","id":"/shop"}
                             ]}
                             button={{ text: "Cart", onClick: () => console.log("cart") }}
                         />
@@ -88,8 +87,7 @@ export default function ShopPage() {
                             {"name":"About","id":"about"},
                             {"name":"Ingredients","id":"features"},
                             {"name":"Reviews","id":"testimonials"},
-                            {"name":"Contact","id":"contact"},
+                            {"name":"Contact","id":"contact"}
-                            {"name":"Shop","id":"/shop"}
                         ]}
                         button={{ text: "Cart", onClick: () => console.log("cart") }}
                     />

src/app/styles/variables.css

@@ -2,21 +2,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #faf8f5;;
+  /* --background: #fafffb;;
-  --card: #f5f1ed;;
+  --card: #f7fffa;;
-  --foreground: #2b2520;;
+  --foreground: #001a0a;;
-  --primary-cta: #8b7d6b;;
+  --primary-cta: #0a7039;;
-  --secondary-cta: #f5f1ed;;
+  --secondary-cta: #ffffff;;
-  --accent: #d4cfc8;;
+  --accent: #a8d9be;;
-  --background-accent: #c4b9ad;; */
+  --background-accent: #6bbf8e;; */
 
-  --background: #faf8f5;;
+  --background: #fafffb;;
-  --card: #f5f1ed;;
+  --card: #f7fffa;;
-  --foreground: #2b2520;;
+  --foreground: #001a0a;;
-  --primary-cta: #8b7d6b;;
+  --primary-cta: #0a7039;;
-  --secondary-cta: #f5f1ed;;
+  --secondary-cta: #ffffff;;
-  --accent: #d4cfc8;;
+  --accent: #a8d9be;;
-  --background-accent: #c4b9ad;;
+  --background-accent: #6bbf8e;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);