Merge version_3 into main #5

Merged
bender merged 3 commits from version_3 into main 2026-03-10 11:23:21 +00:00
3 changed files with 27 additions and 23 deletions

View File

@@ -30,7 +30,7 @@ export default function ContactPage() {
{ name: "About", id: "#about" },
{ name: "Contact", id: "/contact" },
]}
button={{ text: "Order Online", href: "order" }}
button={{ text: "Order Online", href: "/contact" }}
brandName="Leavity"
/>
</div>
@@ -55,8 +55,8 @@ export default function ContactPage() {
rating={5}
ratingText="Loved by Salt Lake City"
buttons={[
{ text: "Order Online", href: "#contact" },
{ text: "Call Us", href: "#contact" },
{ text: "Order Online", href: "/contact" },
{ text: "Call Us", href: "/contact" },
]}
buttonAnimation="slide-up"
/>
@@ -131,4 +131,4 @@ export default function ContactPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -72,7 +72,8 @@ export default function MenuPage() {
{ name: "Contact", id: "/contact" },
]}
button={{
text: "Order Online", href: "order"}}
text: "Order Online", href: "/contact"
}}
/>
</div>
@@ -132,7 +133,8 @@ export default function MenuPage() {
{menuCategories[activeTab as keyof typeof menuCategories].map((item, idx) => (
<div
key={idx}
className="p-6 rounded-lg bg-card border border-accent/20 hover:border-accent/50 transition-all hover:shadow-md hover:scale-105 duration-300"
className="p-6 rounded-lg bg-card border border-accent/20 hover:border-accent/50 transition-all hover:shadow-md hover:scale-105 duration-300 cursor-pointer"
onClick={() => console.log(`Clicked: ${item.name}`)}
>
<div className="flex justify-between items-start mb-2">
<h3 className="text-lg font-bold text-foreground">{item.name}</h3>
@@ -195,4 +197,4 @@ export default function MenuPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -55,13 +55,14 @@ export default function HomePage() {
<NavbarStyleCentered
brandName="Leavity"
navItems={[
{ name: "Home", id: "home" },
{ name: "Menu", id: "menu" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Home", id: "/" },
{ name: "Menu", id: "/menu" },
{ name: "About", id: "#about" },
{ name: "Contact", id: "/contact" },
]}
button={{
text: "Order Online", href: "order"}}
text: "Order Online", href: "/contact"
}}
/>
</div>
@@ -85,8 +86,8 @@ export default function HomePage() {
rating={5}
ratingText="Loved by Salt Lake City"
buttons={[
{ text: "View Menu", href: "#menu" },
{ text: "Order Online", href: "#contact" },
{ text: "View Menu", href: "/menu" },
{ text: "Order Online", href: "/contact" },
]}
buttonAnimation="slide-up"
/>
@@ -104,17 +105,17 @@ export default function HomePage() {
title: "Slow Fermented Sourdough", description:
"Fermented for over 20 hours to create rich flavor, perfect texture, and exceptional digestibility.", imageSrc:
"http://img.b2bpic.net/free-photo/man-putting-tomato-white-tablecloth-with-bread-slices-eggs-garlic-gloves-around_114579-2649.jpg", imageAlt: "20-hour slow fermented sourdough process", buttonIcon: ArrowRight,
buttonHref: "#menu"},
buttonHref: "/menu"},
{
title: "Craft Coffee", description:
"Every cup brewed with precision using high-quality beans roasted with intention and care.", imageSrc:
"http://img.b2bpic.net/free-photo/front-view-man-making-coffee_23-2150354568.jpg", imageAlt: "Specialty coffee preparation and pour-over brewing", buttonIcon: ArrowRight,
buttonHref: "#menu"},
buttonHref: "/menu"},
{
title: "Handcrafted Daily", description:
"Each loaf and pastry made fresh every morning by skilled artisans dedicated to the craft.", imageSrc:
"http://img.b2bpic.net/free-photo/donuts-bagels-crackers-bakery-products-belarusian-food-products_132075-13054.jpg?_wi=1", imageAlt: "Daily handcrafted breads and pastries", buttonIcon: ArrowRight,
buttonHref: "#menu"},
buttonHref: "/menu"},
]}
textboxLayout="default"
useInvertedBackground={false}
@@ -154,7 +155,8 @@ export default function HomePage() {
{menuData[activeTab as keyof typeof menuData].map((item, idx) => (
<div
key={idx}
className="p-6 rounded-lg bg-card border border-accent/20 hover:border-accent/50 transition-all hover:shadow-md"
className="p-6 rounded-lg bg-card border border-accent/20 hover:border-accent/50 transition-all hover:shadow-md cursor-pointer"
onClick={() => console.log(`Clicked: ${item.name}`)}
>
<h3 className="text-lg font-bold text-foreground mb-2">
{item.name}
@@ -269,9 +271,9 @@ export default function HomePage() {
columns={[
{
title: "Shop", items: [
{ label: "Menu", href: "#menu" },
{ label: "Order Online", href: "#contact" },
{ label: "Catering", href: "#contact" },
{ label: "Menu", href: "/menu" },
{ label: "Order Online", href: "/contact" },
{ label: "Catering", href: "/contact" },
],
},
{
@@ -283,7 +285,7 @@ export default function HomePage() {
},
{
title: "Connect", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Privacy Policy", href: "#" },
],
@@ -293,4 +295,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}