Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #5.
This commit is contained in:
2026-05-09 14:20:03 +00:00
2 changed files with 6 additions and 6 deletions

View File

@@ -2,9 +2,9 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react"; import ReactLenis from "lenis/react";
import LegalSection from '@/components/sections/legal/LegalSection';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import TextAbout from '@/components/sections/about/TextAbout'; import TextAbout from '@/components/sections/about/TextAbout';
import LegalSection from '@/components/sections/legal/LegalSection';
export default function AboutPage() { export default function AboutPage() {
return ( return (
@@ -48,9 +48,9 @@ export default function AboutPage() {
sections={[ sections={[
{ {
heading: "Founding Principles", content: { heading: "Founding Principles", content: {
text: "Founded in 2024 to bring the art of Japanese coffee culture to the world stage." type: "paragraph", text: "Founded in 2024 to bring the art of Japanese coffee culture to the world stage."
} }
}, }
]} ]}
/> />
</div> </div>

View File

@@ -47,10 +47,10 @@ export default function GalleryPage() {
id: "g1", groupTitle: "Leadership", members: [ id: "g1", groupTitle: "Leadership", members: [
{ {
id: "m1", title: "Head Barista", subtitle: "Kenji Sato", detail: "10 years experience", imageSrc: "http://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2333.jpg" id: "m1", title: "Head Barista", subtitle: "Kenji Sato", detail: "10 years experience", imageSrc: "http://img.b2bpic.net/free-photo/barista-work-coffee-shop_158595-2333.jpg"
}, }
], ],
imageSrc: "http://img.b2bpic.net/free-photo/preparing-sake-japanese-beverage_23-2150158621.jpg", imageAlt: "Barista at work in a coffee shop" imageSrc: "http://img.b2bpic.net/free-photo/preparing-sake-japanese-beverage_23-2150158621.jpg", imageAlt: "Barista at work in a coffee shop"
}, }
]} ]}
/> />
</div> </div>
@@ -70,7 +70,7 @@ export default function GalleryPage() {
{ {
icon: Lightbulb, icon: Lightbulb,
title: "Lighting", description: "Soft amber glow for intimacy" title: "Lighting", description: "Soft amber glow for intimacy"
}, }
]} ]}
/> />
</div> </div>