bender/71ca50e6-4ed5-4201-91d2-015e6f9a0c6c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-22 15:58:48 +00:00
Conversation 0 Commits 4 Files Changed 4 +30 -44
4 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,14 +28,14 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
{ name: "Menu", id: "/#menu" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Brew Haven"
button={{ text: "Order Online", href: "#contact" }}
button={{ text: "Order Online", href: "/#contact" }}
className="py-4 px-6 md:px-10 lg:px-16"
buttonClassName="px-5 py-2"
buttonTextClassName="text-sm font-medium"
@@ -62,19 +62,19 @@ export default function BlogPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=3"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{
title: "Brew Haven", items: [
{ label: "Home", href: "#hero" },
{ label: "Menu", href: "#menu" },
{ label: "About Us", href: "#about" },
{ label: "Home", href: "/#hero" },
{ label: "Menu", href: "/#menu" },
{ label: "About Us", href: "/#about" },
],
},
{
title: "Connect", items: [
{ label: "Contact", href: "#contact" },
{ label: "Contact", href: "/#contact" },
{ label: "Feedback", href: "#" },
],
},

17
src/app/page.tsx
View File

@@ -51,13 +51,13 @@ export default function LandingPage() {
{ text: "View Our Menu", href: "#menu" },
{ text: "Find Us", href: "#contact" },
]}
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with barista making coffee"
textPosition="bottom-left"
showDimOverlay={true}
showBlur={true}
tagAnimation="entrance-slide"
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
className="min-h-[70vh] md:min-h-[85vh]"
textBoxClassName="text-foreground"
titleClassName="text-4xl md:text-5xl lg:text-6xl"
@@ -79,7 +79,7 @@ export default function LandingPage() {
imageAlt="Barista pouring latte art"
useInvertedBackground={true}
tagAnimation="entrance-slide"
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
titleClassName="text-4xl md:text-5xl lg:text-6xl"
descriptionClassName="text-lg md:text-xl"
textBoxClassName="text-foreground"
@@ -106,9 +106,6 @@ export default function LandingPage() {
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
titleClassName="text-4xl md:text-5xl"
descriptionClassName="text-lg"
tagClassName="text-sm"
/>
</div>
@@ -127,9 +124,6 @@ export default function LandingPage() {
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
titleClassName="text-4xl md:text-5xl"
descriptionClassName="text-lg"
tagClassName="text-sm"
/>
</div>
@@ -148,9 +142,6 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={true}
animationType="smooth"
titleClassName="text-4xl md:text-5xl"
descriptionClassName="text-lg"
tagClassName="text-sm"
/>
</div>
@@ -178,7 +169,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },

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

@@ -104,16 +104,15 @@ function ProductPageContent({ params }: ProductPageProps) {
</main>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=6"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Brew Haven", items: [{ label: "Home", href: "/#hero" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Brew Haven"
copyrightText="© 2024 Brew Haven. All rights reserved."
useInvertedBackground={false}
mediaClassName="mask-fade-top-long"
columnTitleClassName="text-foreground"
columnItemClassName="text-foreground/80"
@@ -162,16 +161,15 @@ function ProductPageContent({ params }: ProductPageProps) {
</main>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=7"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Brew Haven", items: [{ label: "Home", href: "/#hero" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Brew Haven"
copyrightText="© 2024 Brew Haven. All rights reserved."
useInvertedBackground={false}
mediaClassName="mask-fade-top-long"
columnTitleClassName="text-foreground"
columnItemClassName="text-foreground/80"
@@ -244,16 +242,15 @@ function ProductPageContent({ params }: ProductPageProps) {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=8"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Brew Haven", items: [{ label: "Home", href: "/#hero" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Brew Haven"
copyrightText="© 2024 Brew Haven. All rights reserved."
useInvertedBackground={false}
mediaClassName="mask-fade-top-long"
columnTitleClassName="text-foreground"
columnItemClassName="text-foreground/80"

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

@@ -71,16 +71,15 @@ function ShopPageContent() {
</main>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=4"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Brew Haven", items: [{ label: "Home", href: "/#hero" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Brew Haven"
copyrightText="© 2024 Brew Haven. All rights reserved."
useInvertedBackground={false}
mediaClassName="mask-fade-top-long"
columnTitleClassName="text-foreground"
columnItemClassName="text-foreground/80"
@@ -143,16 +142,15 @@ function ShopPageContent() {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2329.jpg"
imageAlt="Cozy coffee shop interior with warm lighting"
columns={[
{ title: "Brew Haven", items: [{ label: "Home", href: "#hero" }, { label: "Menu", href: "#menu" }, { label: "About Us", href: "#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Brew Haven", items: [{ label: "Home", href: "/#hero" }, { label: "Menu", href: "/#menu" }, { label: "About Us", href: "/#about" }] },
{ title: "Connect", items: [{ label: "Contact", href: "/#contact" }, { label: "Feedback", href: "#" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] }
]}
logoText="Brew Haven"
copyrightText="© 2024 Brew Haven. All rights reserved."
useInvertedBackground={false}
mediaClassName="mask-fade-top-long"
columnTitleClassName="text-foreground"
columnItemClassName="text-foreground/80"