bender/4e4e6bc2-8f20-4aeb-b47d-bf7fcf03d808
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #1.
This commit is contained in:
bender
2026-02-17 12:01:31 +00:00
parent b948c8a851 9c18d7e72f
commit c1a4cd19af
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/page.tsx
View File

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

9
src/app/shop/[id]/page.tsx
View File

@@ -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":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
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":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
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":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

6
src/app/shop/page.tsx
View File

@@ -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":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
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":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>

28
src/app/styles/variables.css
View File

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