bender/f6a5e937-c693-4663-a496-0396117b8d02
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #3

Merged
bender merged 4 commits from version_3 into main 2026-02-20 10:52:29 +00:00
Conversation 0 Commits 4 Files Changed 4 +40 -25
4 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Experience", id: "testimonials" },

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

@@ -85,8 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Experience","id":"testimonials"},
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -131,8 +134,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Experience","id":"testimonials"},
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -184,8 +190,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Experience","id":"testimonials"},
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -35,8 +35,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Experience","id":"testimonials"},
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -80,8 +83,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Experience","id":"testimonials"},
{"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: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffffae6;;
--primary-cta: #fde047;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
/* --background: #fbfaff;;
--card: #f7f5ff;;
--foreground: #0f0022;;
--primary-cta: #8b5cf6;;
--secondary-cta: #ffffff;;
--accent: #d8cef5;;
--background-accent: #c4a8f9;; */
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffffae6;;
--primary-cta: #fde047;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;;
--background: #fbfaff;;
--card: #f7f5ff;;
--foreground: #0f0022;;
--primary-cta: #8b5cf6;;
--secondary-cta: #ffffff;;
--accent: #d8cef5;;
--background-accent: #c4a8f9;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);