bender/5f757ebf-1f28-4e96-b2f7-4635c21f5bf4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

6 Commits
version_2 ... main

Author SHA1 Message Date
bender
dd4f19ff25 Merge version_3 into main 
Merge version_3 into main
 2026-02-25 00:24:07 +00:00
bender
321da70bff Update src/app/shop/page.tsx 2026-02-25 00:24:02 +00:00
bender
e989ee893a Update src/app/shop/[id]/page.tsx 2026-02-25 00:24:02 +00:00
bender
f94a409d4b Update src/app/page.tsx 2026-02-25 00:24:01 +00:00
bender
5c0d4721aa Update src/app/blog/page.tsx 2026-02-25 00:24:00 +00:00
bender
ef430c60e0 Merge version_2 into main 
Merge version_2 into main
 2026-02-25 00:19:30 +00:00
4 changed files with 48 additions and 34 deletions
Expand all files Collapse all files

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

@@ -32,6 +32,8 @@ export default function BlogPage() {
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Order Now", href: "#contact" }}
@@ -74,7 +76,7 @@ export default function BlogPage() {
{ label: "About Us", href: "#about" },
{ label: "Our Team", href: "#" },
{ label: "Sustainability", href: "#" },
{ label: "Blog", href: "#" }
{ label: "Blog", href: "/blog" }
]
},
{

8
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -30,10 +30,12 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{
@@ -232,7 +234,7 @@ export default function LandingPage() {
{ label: "About Us", href: "#about" },
{ label: "Our Team", href: "#" },
{ label: "Sustainability", href: "#" },
{ label: "Blog", href: "#" }
{ label: "Blog", href: "/blog" }
]
},
{

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

@@ -93,11 +93,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"}
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -110,7 +112,7 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="Brew Haven"
columns={[
{"title":"Menu","items":[{"label":"Coffee Drinks","href":"#products"},{"label":"Pastries","href":"#"},{"label":"Seasonal Specials","href":"#"},{"label":"Gift Cards","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"/blog"}]},
{"title":"Connect","items":[{"label":"Contact Us","href":"#contact"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
{"title":"Visit","items":[{"label":"Hours","href":"#"},{"label":"Location","href":"#"},{"label":"Parking Info","href":"#"},{"label":"Directions","href":"#"}]}
]}
@@ -142,11 +144,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"}
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -167,7 +171,7 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="Brew Haven"
columns={[
{"title":"Menu","items":[{"label":"Coffee Drinks","href":"#products"},{"label":"Pastries","href":"#"},{"label":"Seasonal Specials","href":"#"},{"label":"Gift Cards","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"/blog"}]},
{"title":"Connect","items":[{"label":"Contact Us","href":"#contact"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
{"title":"Visit","items":[{"label":"Hours","href":"#"},{"label":"Location","href":"#"},{"label":"Parking Info","href":"#"},{"label":"Directions","href":"#"}]}
]}
@@ -198,11 +202,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"}
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -248,7 +254,7 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="Brew Haven"
columns={[
{"title":"Menu","items":[{"label":"Coffee Drinks","href":"#products"},{"label":"Pastries","href":"#"},{"label":"Seasonal Specials","href":"#"},{"label":"Gift Cards","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"/blog"}]},
{"title":"Connect","items":[{"label":"Contact Us","href":"#contact"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
{"title":"Visit","items":[{"label":"Hours","href":"#"},{"label":"Location","href":"#"},{"label":"Parking Info","href":"#"},{"label":"Directions","href":"#"}]}
]}

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

@@ -36,11 +36,13 @@ function ShopPageContent() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"}
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -53,7 +55,7 @@ function ShopPageContent() {
logoText="Brew Haven"
columns={[
{"title":"Menu","items":[{"label":"Coffee Drinks","href":"#products"},{"label":"Pastries","href":"#"},{"label":"Seasonal Specials","href":"#"},{"label":"Gift Cards","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"/blog"}]},
{"title":"Connect","items":[{"label":"Contact Us","href":"#contact"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
{"title":"Visit","items":[{"label":"Hours","href":"#"},{"label":"Location","href":"#"},{"label":"Parking Info","href":"#"},{"label":"Directions","href":"#"}]}
]}
@@ -84,11 +86,13 @@ function ShopPageContent() {
<NavbarLayoutFloatingOverlay
brandName="Brew Haven"
navItems={[
{"name":"Home","id":"/"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Reviews","id":"testimonials"},
{"name":"Contact","id":"contact"}
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Reviews", id: "testimonials" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -109,7 +113,7 @@ function ShopPageContent() {
logoText="Brew Haven"
columns={[
{"title":"Menu","items":[{"label":"Coffee Drinks","href":"#products"},{"label":"Pastries","href":"#"},{"label":"Seasonal Specials","href":"#"},{"label":"Gift Cards","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"#"}]},
{"title":"Company","items":[{"label":"About Us","href":"#about"},{"label":"Our Team","href":"#"},{"label":"Sustainability","href":"#"},{"label":"Blog","href":"/blog"}]},
{"title":"Connect","items":[{"label":"Contact Us","href":"#contact"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Facebook","href":"https://facebook.com"},{"label":"Twitter","href":"https://twitter.com"}]},
{"title":"Visit","items":[{"label":"Hours","href":"#"},{"label":"Location","href":"#"},{"label":"Parking Info","href":"#"},{"label":"Directions","href":"#"}]}
]}