16 Commits

Author SHA1 Message Date
39fae5c28d Update src/app/styles/variables.css 2026-02-24 11:47:15 +00:00
7f6b4e2295 Update src/app/shop/page.tsx 2026-02-24 11:47:14 +00:00
47f260b4c2 Update src/app/shop/[id]/page.tsx 2026-02-24 11:47:13 +00:00
e7de8f5228 Update src/app/page.tsx 2026-02-24 11:47:12 +00:00
f1f467346d Update src/app/layout.tsx 2026-02-24 11:47:12 +00:00
d85d2e39d5 Update src/app/blog/page.tsx 2026-02-24 11:47:11 +00:00
56000785d9 Merge version_3 into main
Merge version_3 into main
2026-02-24 11:30:59 +00:00
d87ca2b631 Update src/app/page.tsx 2026-02-24 11:30:54 +00:00
f88a5bf093 Merge version_2 into main
Merge version_2 into main
2026-02-24 11:18:12 +00:00
ed3afe1574 Update src/app/styles/variables.css 2026-02-24 11:18:07 +00:00
224df80da8 Update src/app/shop/page.tsx 2026-02-24 11:18:06 +00:00
f44edb1452 Update src/app/shop/[id]/page.tsx 2026-02-24 11:18:06 +00:00
7cdb3f0e8b Update src/app/blog/page.tsx 2026-02-24 11:18:04 +00:00
6489e898a9 Merge version_1 into main
Merge version_1 into main
2026-02-24 11:15:17 +00:00
e4bfa1957e Merge version_1 into main
Merge version_1 into main
2026-02-24 11:14:32 +00:00
5221899590 Merge version_1 into main
Merge version_1 into main
2026-02-24 11:10:27 +00:00
6 changed files with 29 additions and 34 deletions

View File

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Testimonials", id: "testimonials" },

View File

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

View File

@@ -45,7 +45,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroBillboardGallery
title="Crafted Coffee, Community Connection"
title="Yo Yo"
description="Experience premium specialty coffee in an inviting space designed for authentic connections and exceptional taste."
tag="Welcome to Brew & Co"
tagIcon={Coffee}
@@ -274,4 +274,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -88,16 +88,15 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -136,16 +135,15 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -191,16 +189,15 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -255,4 +252,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -33,16 +33,15 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -80,16 +79,15 @@ function ShopPageContent() {
headingFontWeight="normal"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Brew & Co"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"products"},
{"name":"Testimonials","id":"testimonials"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -127,4 +125,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

View File

@@ -4,21 +4,21 @@
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--foreground: #251a0c;;
--primary-cta: #f4c408;;
--secondary-cta: #ffffff;;
--accent: #93c7ff;;
--background-accent: #a8cde8;; */
--accent: #f4ca26;;
--background-accent: #e8daa8;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--foreground: #251a0c;;
--primary-cta: #f4c408;;
--primary-cta-text: #f7f6f7;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #0c1325;;
--accent: #93c7ff;;
--background-accent: #a8cde8;;
--accent: #f4ca26;;
--background-accent: #e8daa8;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);