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 #2

Merged
bender merged 6 commits from version_2 into main 2026-02-20 10:35:37 +00:00
Conversation 0 Commits 6 Files Changed 6 +31 -36
6 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
src/app/layout.tsx
View File

@@ -1402,4 +1402,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
@@ -194,4 +194,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

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

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

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

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

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