bender/b8bc9616-7956-4f42-a446-9ba87cd7af37
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 3 commits from version_2 into main 2026-03-29 13:16:52 +00:00
Conversation 0 Commits 3 Files Changed 3 +19 -13
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBase from '@/components/sections/footer/FooterBase';
import { TextSplitAbout } from '@/components/sections/about/TextSplitAbout';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
export default function EventsPage() {
return (
@@ -26,9 +26,8 @@ export default function EventsPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Events", id: "/events" },
{ name: "Menu", id: "/#menu" },
{ name: "Visit", id: "/#visit" },
{ name: "Shop", id: "/#shop" }
{ name: "Menu", id: "/menu" },
{ name: "Story", id: "/story" }
]}
brandName="HANDS+ROSE"
/>
@@ -37,7 +36,7 @@ export default function EventsPage() {
<div style={{ minHeight: "60vh", display: "flex", alignItems: "center", padding: "4rem 0" }}>
<TextSplitAbout
title="Upcoming Events"
description={["Join us for community gatherings, worship nights, and special coffee tastings held right here in the sanctuary.", "Keep an eye on this space for our latest schedule updates." ]}
description="Join us for community gatherings, worship nights, and special coffee tastings held right here in the sanctuary. Keep an eye on this space for our latest schedule updates."
useInvertedBackground={false}
/>
</div>
@@ -45,8 +44,7 @@ export default function EventsPage() {
<div id="footer" data-section="footer">
<FooterBase
columns={[
{ title: "Explore", items: [{ label: "Menu", href: "/#menu" }, { label: "Story", href: "#" }, { label: "Visit", href: "/#visit" }] },
{ title: "Community", items: [{ label: "Events", href: "/events" }, { label: "Upperroom", href: "#" }, { label: "Shop", href: "/#shop" }] }
{ title: "Explore", items: [{ label: "Menu", href: "/menu" }, { label: "Story", href: "/story" }, { label: "Events", href: "/events" }] }
]}
logoText="HANDS+ROSE"
copyrightText="© 2025 HANDS+ROSE COFFEE"

10
src/app/menu/page.tsx
View File

@@ -8,9 +8,11 @@ import FooterBase from '@/components/sections/footer/FooterBase';
export default function MenuPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Story", id: "/story" }, { name: "Visit", id: "/visit" }, { name: "Shop", id: "/shop" }]} brandName="HANDS+ROSE" />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Story", id: "/story" }]} brandName="HANDS+ROSE" />
</div>
<ProductCardFour
animationType="slide-up"
textboxLayout="default"
@@ -24,7 +26,9 @@ export default function MenuPage() {
title="Signature Drinks"
description="Creative, seasonal, and crafted for stillness."
/>
<FooterBase columns={[{ title: "Explore", items: [{ label: "Menu", href: "/menu" }, { label: "Story", href: "/story" }, { label: "Visit", href: "/visit" }] }, { title: "Community", items: [{ label: "Events", href: "#" }, { label: "Upperroom", href: "#" }, { label: "Shop", href: "/shop" }] }]} />
<div id="footer" data-section="footer">
<FooterBase columns={[{ title: "Explore", items: [{ label: "Menu", href: "/menu" }, { label: "Story", href: "/story" }] }]} />
</div>
</ReactLenis>
</ThemeProvider>
);

10
src/app/story/page.tsx
View File

@@ -8,9 +8,11 @@ import FooterBase from '@/components/sections/footer/FooterBase';
export default function StoryPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Story", id: "/story" }, { name: "Visit", id: "/visit" }, { name: "Shop", id: "/shop" }]} brandName="HANDS+ROSE" />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "Story", id: "/story" }]} brandName="HANDS+ROSE" />
</div>
<SplitAbout
textboxLayout="split"
useInvertedBackground={false}
@@ -24,7 +26,9 @@ export default function StoryPage() {
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BcYbS8v4l7y4Itr4rowFin1yZu/a-quiet-peaceful-sanctuary-space-featuri-1774789968460-82a3f557.png"
mediaAnimation="slide-up"
/>
<FooterBase columns={[{ title: "Explore", items: [{ label: "Menu", href: "/menu" }, { label: "Story", href: "/story" }, { label: "Visit", href: "/visit" }] }, { title: "Community", items: [{ label: "Events", href: "#" }, { label: "Upperroom", href: "#" }, { label: "Shop", href: "/shop" }] }]} />
<div id="footer" data-section="footer">
<FooterBase columns={[{ title: "Explore", items: [{ label: "Menu", href: "/menu" }, { label: "Story", href: "/story" }] }]} />
</div>
</ReactLenis>
</ThemeProvider>
);