bender/2a6024d6-4779-4fb9-8203-a0e6b6ee9205
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-04-13 07:34:05 +00:00
Conversation 0 Commits 2 Files Changed 2 +38 -141
2 changed files with 38 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/app/contact/page.tsx
View File

@@ -27,26 +27,11 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{
name: "Home",
id: "/",
},
{
name: "About",
id: "/about",
},
{
name: "Menu",
id: "/menu",
},
{
name: "Workshops",
id: "/workshops",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Menu", id: "/menu" },
{ name: "Workshops", id: "/workshops" },
{ name: "Contact", id: "/contact" },
]}
brandName="Sisters Garden & Cafe"
/>
@@ -56,18 +41,11 @@ export default function LandingPage() {
<ContactText
useInvertedBackground={false}
background={{
variant: "canvas-reveal",
}}
variant: "canvas-reveal"}}
text="Visit us at Km.13 Bangna-Trad. We're open Saturday 09:00 - 18:00."
buttons={[
{
text: "Call Now",
href: "tel:+66000000000",
},
{
text: "Get Directions",
href: "https://maps.google.com",
},
{ text: "Call Now", href: "tel:+66000000000" },
{ text: "Get Directions", href: "https://maps.google.com" },
]}
/>
</div>
@@ -78,12 +56,7 @@ export default function LandingPage() {
title="Visit Guidelines"
sections={[
{
heading: "Getting Here",
content: {
type: "paragraph",
text: "Located at Km.13 Bangna-Trad.",
},
},
heading: "Getting Here", content: "Located at Km.13 Bangna-Trad."},
]}
/>
</div>
@@ -103,35 +76,21 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBase
logoText="Sisters Garden & Cafe"
columns={[
{
title: "Menu",
items: [
{
label: "Coffee",
href: "/menu",
},
{
label: "Workshops",
href: "/workshops",
},
title: "Menu", items: [
{ label: "Coffee", href: "/menu" },
{ label: "Workshops", href: "/workshops" },
],
},
{
title: "Company",
items: [
{
label: "About Us",
href: "/about",
},
{
label: "Contact",
href: "/contact",
},
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Contact", href: "/contact" },
],
},
]}
logoText="Sisters Garden & Cafe"
/>
</div>
</ReactLenis>

106
src/app/workshops/page.tsx
View File

@@ -26,26 +26,11 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{
name: "Home",
id: "/",
},
{
name: "About",
id: "/about",
},
{
name: "Menu",
id: "/menu",
},
{
name: "Workshops",
id: "/workshops",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Menu", id: "/menu" },
{ name: "Workshops", id: "/workshops" },
{ name: "Contact", id: "/contact" },
]}
brandName="Sisters Garden & Cafe"
/>
@@ -58,34 +43,16 @@ export default function LandingPage() {
useInvertedBackground={false}
features={[
{
id: "f1",
label: "Beginner",
title: "Intro to Clay",
items: [
"Handbuilding techniques",
"Glazing basics",
"Keep your art",
],
id: "f1", label: "Beginner", title: "Intro to Clay", items: [
"Handbuilding techniques", "Glazing basics", "Keep your art"],
},
{
id: "f2",
label: "Intermediate",
title: "Wheel Throwing",
items: [
"Centering clay",
"Forming bowls",
"Advanced trimming",
],
id: "f2", label: "Intermediate", title: "Wheel Throwing", items: [
"Centering clay", "Forming bowls", "Advanced trimming"],
},
{
id: "f3",
label: "Creative",
title: "Pottery Painting",
items: [
"Fun design patterns",
"Colorful glazing",
"Fun for kids",
],
id: "f3", label: "Creative", title: "Pottery Painting", items: [
"Fun design patterns", "Colorful glazing", "Fun for kids"],
},
]}
title="Pottery & Creativity"
@@ -102,19 +69,10 @@ export default function LandingPage() {
description="Meet our pottery masters."
groups={[
{
id: "g1",
groupTitle: "Art Experts",
members: [
id: "g1", groupTitle: "Art Experts", members: [
{
id: "m1",
title: "Lead Instructor",
subtitle: "Ceramic Expert",
detail: "Years of experience in clay.",
imageSrc: "http://img.b2bpic.net/free-photo/curly-girl-is-shaping-vase_8353-10808.jpg",
},
id: "m1", title: "Lead Instructor", subtitle: "Ceramic Expert", detail: "Years of experience in clay.", imageSrc: "http://img.b2bpic.net/free-photo/curly-girl-is-shaping-vase_8353-10808.jpg"},
],
imageSrc: "http://img.b2bpic.net/free-photo/gorgeous-brunette-girl-sitting-table-cafe-with-cup-coffee-drink_627829-10595.jpg?_wi=2",
imageAlt: "Curly girl is shaping a vase",
},
]}
/>
@@ -130,50 +88,30 @@ export default function LandingPage() {
description="Grow your skills with us."
features={[
{
title: "Hands-on Learning",
description: "Direct studio time.",
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-clay-pot_23-2148944917.jpg",
},
title: "Hands-on Learning", description: "Direct studio time.", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-clay-pot_23-2148944917.jpg"},
{
title: "Community Atmosphere",
description: "Meet fellow creators.",
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-clay-pot_23-2148944905.jpg",
},
title: "Community Atmosphere", description: "Meet fellow creators.", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-painting-clay-pot_23-2148944905.jpg"},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBase
logoText="Sisters Garden & Cafe"
columns={[
{
title: "Menu",
items: [
{
label: "Coffee",
href: "/menu",
},
{
label: "Workshops",
href: "/workshops",
},
title: "Menu", items: [
{ label: "Coffee", href: "/menu" },
{ label: "Workshops", href: "/workshops" },
],
},
{
title: "Company",
items: [
{
label: "About Us",
href: "/about",
},
{
label: "Contact",
href: "/contact",
},
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Contact", href: "/contact" },
],
},
]}
logoText="Sisters Garden & Cafe"
/>
</div>
</ReactLenis>