bender/d4c041ff-95fb-4c48-b5f4-eb6b824150ad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 5 commits from version_2 into main 2026-02-21 14:10:51 +00:00
Conversation 0 Commits 5 Files Changed 5 +70 -1427
5 changed files with 70 additions and 1427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,12 +30,14 @@ export default function BlogPage() {
brandName="Bakteria"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Brew Process", id: "process" },
{ name: "Contact", id: "contact" }
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Order Now", href: "contact" }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>

1390
src/app/layout.tsx
View File

File diff suppressed because it is too large Load Diff

16
src/app/page.tsx
View File

@@ -29,14 +29,16 @@ export default function LandingPage() {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Brew Process", id: "process" },
{ name: "Contact", id: "contact" }
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{
text: "Order Now", href: "contact"
text: "Order Now", href: "/#contact"
}}
/>
</div>
@@ -191,4 +193,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -86,14 +86,15 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Brew Process","id":"process"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -134,14 +135,15 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Brew Process","id":"process"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -189,14 +191,15 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Brew Process","id":"process"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
<div id="productDetailCard" data-section="productDetailCard">
@@ -249,4 +252,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -36,14 +36,15 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Brew Process","id":"process"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -83,14 +84,15 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Bakteria"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Brew Process","id":"process"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Menu", id: "/#menu" },
{ name: "Brew Process", id: "/#process" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
button={{ text: "Order Now", href: "/#contact" }}
/>
</div>
<div id="productCatalog" data-section="productCatalog">
@@ -118,4 +120,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}