bender/64ef258f-7124-407b-8b73-d3d677315f55
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 5 commits from version_2 into main 2026-02-25 10:15:47 +00:00
Conversation 0 Commits 5 Files Changed 5 +22 -22
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ export default function BlogPage() {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" }
{ name: "Blog", id: "/blog" }
]}
brandName="Brew Haven"
button={{ text: "Order Now", href: "#product" }}
@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/page.tsx
View File

@@ -32,7 +32,7 @@ export default function LandingPage() {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" }
{ name: "Blog", id: "/blog" }
]}
brandName="Brew Haven"
button={{

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

@@ -96,7 +96,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="Brew Haven"
@@ -162,7 +162,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="Brew Haven"
@@ -235,7 +235,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="Brew Haven"

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

@@ -39,7 +39,7 @@ function ShopPageContent() {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="Brew Haven"
@@ -104,7 +104,7 @@ function ShopPageContent() {
{ name: "Menu", id: "features" },
{ name: "About", id: "about" },
{ name: "Locations", id: "contact" },
{ name: "Blog", id: "blog" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" }
]}
brandName="Brew Haven"

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #efebe5;;
--card: #f7f2ea;;
--foreground: #000000;;
--primary-cta: #000000;;
--secondary-cta: #ffffff;;
--accent: #ffffff;;
--background-accent: #e1b875;; */
/* --background: #1a1400;;
--card: #2d2111;;
--foreground: #f5ede0;;
--primary-cta: #f4ca26;;
--secondary-cta: #2d2111;;
--accent: #f4ca26;;
--background-accent: #e8daa8;; */
--background: #efebe5;;
--card: #f7f2ea;;
--foreground: #000000;;
--primary-cta: #000000;;
--background: #1a1400;;
--card: #2d2111;;
--foreground: #f5ede0;;
--primary-cta: #f4ca26;;
--primary-cta-text: #efebe5;;
--secondary-cta: #ffffff;;
--secondary-cta: #2d2111;;
--secondary-cta-text: #000000;;
--accent: #ffffff;;
--background-accent: #e1b875;;
--accent: #f4ca26;;
--background-accent: #e8daa8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);