bender/c9f7b1ef-8f8e-42ad-a149-88883af97a0a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 5 commits from version_2 into main 2026-02-24 23:48:12 +00:00
Conversation 0 Commits 5 Files Changed 5 +18 -23
5 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ export default function BlogPage() {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -94,4 +94,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

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

6
src/app/page.tsx
View File

@@ -28,7 +28,7 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{name: "Home", id: "home"},
{name: "Home", id: "/"},
{name: "About", id: "about"},
{name: "Menu", id: "menu"},
{name: "Testimonials", id: "testimonials"},
@@ -180,7 +180,7 @@ export default function LandingPage() {
columns={[
{
items: [
{label: "Home", href: "home"},
{label: "Home", href: "/"},
{label: "About", href: "about"},
{label: "Menu", href: "menu"}
]
@@ -211,4 +211,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -96,8 +96,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="BrewHaven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -112,7 +111,7 @@ function ProductPageContent({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -168,8 +167,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="BrewHaven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -192,7 +190,7 @@ function ProductPageContent({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -247,8 +245,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="BrewHaven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -296,7 +293,7 @@ function ProductPageContent({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -328,4 +325,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -39,8 +39,7 @@ function ShopPageContent() {
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="BrewHaven"
button={{ text: "Cart", onClick: () => console.log("cart") }}
@@ -55,7 +54,7 @@ function ShopPageContent() {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -110,8 +109,7 @@ function ShopPageContent() {
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="BrewHaven"
button={{ text: "Cart", onClick: () => console.log("cart") }}
@@ -134,7 +132,7 @@ function ShopPageContent() {
columns={[
{
items: [
{ label: "Home", href: "home" },
{ label: "Home", href: "/" },
{ label: "About", href: "about" },
{ label: "Menu", href: "menu" }
]
@@ -174,4 +172,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}