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_1
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

13 Commits
version_1 ... 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
bender
fec5ee9af5 Update src/app/styles/variables.css 2026-02-25 00:19:26 +00:00
bender
d5fa4d12f6 Update src/app/shop/page.tsx 2026-02-25 00:19:25 +00:00
bender
280da3310e Update src/app/shop/[id]/page.tsx 2026-02-25 00:19:24 +00:00
bender
b136c42372 Update src/app/page.tsx 2026-02-25 00:19:23 +00:00
bender
694f8416bb Update src/app/layout.tsx 2026-02-25 00:19:22 +00:00
bender
eb94c1ba42 Update src/app/blog/page.tsx 2026-02-25 00:19:21 +00:00
bender
835d81afc1 Merge version_1 into main 
Merge version_1 into main
 2026-02-25 00:15:46 +00:00
6 changed files with 67 additions and 58 deletions
Expand all files Collapse all files

6
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" }
]
},
{
@@ -101,4 +103,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

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

10
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" }
]
},
{
@@ -257,4 +259,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -93,12 +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":"Shop","id":"/shop"}
{ 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) }}
/>
@@ -111,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":"#"}]}
]}
@@ -143,12 +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":"Shop","id":"/shop"}
{ 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) }}
/>
@@ -169,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":"#"}]}
]}
@@ -200,12 +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":"Shop","id":"/shop"}
{ 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) }}
/>
@@ -251,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":"#"}]}
]}
@@ -262,4 +265,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -36,12 +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":"Shop","id":"/shop"}
{ 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") }}
/>
@@ -54,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":"#"}]}
]}
@@ -85,12 +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":"Shop","id":"/shop"}
{ 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") }}
/>
@@ -111,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":"#"}]}
]}
@@ -130,4 +132,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

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

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--secondary-cta: #ffffff;;
--accent: #c68a62;;
--background-accent: #c68a62;; */
/* --background: #1a0d0d;;
--card: #2e1a1a;;
--foreground: #f4d9c7;;
--primary-cta: #c9a876;;
--secondary-cta: #2e1a1a;;
--accent: #d4a574;;
--background-accent: #8b6f47;; */
--background: #e3deea;;
--card: #ffffff;;
--foreground: #27231f;;
--primary-cta: #27231f;;
--background: #1a0d0d;;
--card: #2e1a1a;;
--foreground: #f4d9c7;;
--primary-cta: #c9a876;;
--primary-cta-text: #e3deea;;
--secondary-cta: #ffffff;;
--secondary-cta: #2e1a1a;;
--secondary-cta-text: #27231f;;
--accent: #c68a62;;
--background-accent: #c68a62;;
--accent: #d4a574;;
--background-accent: #8b6f47;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);