bender/435ad0ce-bdab-4486-9406-b71721ff2add
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 #2.
This commit is contained in:
bender
2026-02-20 10:35:36 +00:00
parent 1b74f3cd44 c6783bdc99
commit 2ba9094903
6 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/blog/page.tsx
View File

@@ -29,7 +29,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';

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

@@ -85,11 +85,10 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" }, { name: "Contact", id: "contact" }
{ name: "Shop", id: "/shop" }
]} ]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }} button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/> />
@@ -158,11 +157,10 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" }, { name: "Contact", id: "contact" }
{ name: "Shop", id: "/shop" }
]} ]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }} button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/> />
@@ -238,11 +236,10 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" }, { name: "Contact", id: "contact" }
{ name: "Shop", id: "/shop" }
]} ]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }} button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/> />

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

@@ -35,11 +35,10 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" }, { name: "Contact", id: "contact" }
{ name: "Shop", id: "/shop" }
]} ]}
button={{ text: "Cart", onClick: () => console.log("cart") }} button={{ text: "Cart", onClick: () => console.log("cart") }}
/> />
@@ -107,11 +106,10 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Brew Haven" brandName="Brew Haven"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "hero" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Menu", id: "products" }, { name: "Menu", id: "products" },
{ name: "Contact", id: "contact" }, { name: "Contact", id: "contact" }
{ name: "Shop", id: "/shop" }
]} ]}
button={{ text: "Cart", onClick: () => console.log("cart") }} button={{ text: "Cart", onClick: () => console.log("cart") }}
/> />

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

@@ -2,21 +2,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #ffffff;; /* --background: #0a0a0a;;
--card: #f9f9f9;; --card: #1a1a1a;;
--foreground: #000f06e6;; --foreground: #fffffae6;;
--primary-cta: #0a7039;; --primary-cta: #fde047;;
--secondary-cta: #f9f9f9;; --secondary-cta: #1a1a1a;;
--accent: #e2e2e2;; --accent: #737373;;
--background-accent: #c4c4c4;; */ --background-accent: #737373;; */
--background: #ffffff;; --background: #0a0a0a;;
--card: #f9f9f9;; --card: #1a1a1a;;
--foreground: #000f06e6;; --foreground: #fffffae6;;
--primary-cta: #0a7039;; --primary-cta: #fde047;;
--secondary-cta: #f9f9f9;; --secondary-cta: #1a1a1a;;
--accent: #e2e2e2;; --accent: #737373;;
--background-accent: #c4c4c4;; --background-accent: #737373;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);