bender/d85c2ef0-8599-4b22-9fa4-55010b6ec496
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 7 commits from version_1 into main 2026-02-22 02:09:04 +00:00
Conversation 0 Commits 7 Files Changed 7 +67 -102
7 changed files with 67 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/about/page.tsx
View File

@@ -6,10 +6,9 @@ import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
import FaqSplitText from '@/components/sections/faq/FaqSplitText';
import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import Link from 'next/link';
export default function AboutPage() {
const navItems = [{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"}];
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
@@ -35,7 +34,7 @@ export default function AboutPage() {
<FeatureCardSeven
features={[
{ id: 1, title: "Family Roots", description: "Moys began as a family dream, bringing generations of Cantonese recipes to Columbus.", imageSrc: "https://img.b2bpic.net/free-photo/talking-employees_1098-18069.jpg" },
{ id: 2, title: "Community Focused", description: "We are proud to be a cornerstone for the OSU community and local families, offering a place to gather and share a meal.", imageSrc: "https://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg?_wi=2" },
{ id: 2, title: "Community Focused", description: "We are proud to be a cornerstone for the OSU community and local families, offering a place to gather and share a meal.", imageSrc: "https://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg" },
]}
animationType="slide-up"
title="Our Story: A Tradition of Hospitality"
@@ -75,8 +74,8 @@ export default function AboutPage() {
<div id="hospitality-reviews" data-section="hospitality-reviews">
<TestimonialCardSixteen
testimonials={[
{ id: "1", name: "Jennifer L.", role: "First-time visitor", company: "Columbus", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg?_wi=3" },
{ id: "2", name: "David C.", role: "Regular", company: "OSU Faculty", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg?_wi=3" }
{ id: "1", name: "Jennifer L.", role: "First-time visitor", company: "Columbus", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg" },
{ id: "2", name: "David C.", role: "Regular", company: "OSU Faculty", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg" }
]}
kpiItems={[
{ value: "“Felt like family”", label: "Warm Welcome" },

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

@@ -15,6 +15,7 @@ import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
@@ -30,45 +31,40 @@ export default function BlogPage() {
headingFontWeight="medium"
>
<ReactLenis root>
{/* NAVBAR: Using NavbarStyleApple as required */}
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "/menu" },
{ name: "Peking Duck", id: "/peking-duck" },
{ name: "About", id: "/about" },
{ name: "Visit", id: "/visit" },
{ name: "Order", id: "/order" },
]}
brandName="Moys Chinese Restaurant"
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={navItems}
brandName="Moys Chinese Restaurant"
/>
</div>
{/* POSTS LOGIC: Preserved exactly as is */}
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
/* BLOG SECTION: Using BlogCardOne with generated props, except for 'posts' */
<BlogCardOne
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
<div id="blog-posts" data-section="blog-posts">
<BlogCardOne
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
{/* FOOTER: Using FooterLogoReveal as required */}
<FooterLogoReveal
logoText="Moys Chinese Restaurant"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
className="bg-ink-black"
linkClassName="text-porcelain-cream/80 hover:text-warm-gold"
/>
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="Moys Chinese Restaurant"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
className="bg-ink-black"
linkClassName="text-porcelain-cream/80 hover:text-warm-gold"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

28
src/app/layout.tsx
View File

@@ -4,40 +4,26 @@ import { Inter } from "next/font/google";
import "./globals.css";
const lora = Lora({
variable: "--font-lora",
subsets: ["latin"],
variable: "--font-lora", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine",
description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.",
robots: {
title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine", description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.", robots: {
index: true,
follow: true,
},
openGraph: {
title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine",
description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.",
url: "/",
siteName: "Moys Chinese Restaurant",
images: [
title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine", description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.", url: "/", siteName: "Moys Chinese Restaurant", images: [
{
url: "https://img.b2bpic.net/free-photo/view-delicious-dish-food_23-2150777691.jpg",
alt: "Lacquered Peking duck being sliced with warm steam",
},
url: "https://img.b2bpic.net/free-photo/view-delicious-dish-food_23-2150777691.jpg", alt: "Lacquered Peking duck being sliced with warm steam"},
],
type: "website",
},
type: "website"},
twitter: {
card: "summary_large_image",
title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine",
description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.",
images: ["https://img.b2bpic.net/free-photo/view-delicious-dish-food_23-2150777691.jpg"],
card: "summary_large_image", title: "Moys Chinese Restaurant - Authentic Cantonese Cuisine", description: "Experience authentic Cantonese comfort at Moys Chinese Restaurant near OSU. Famous for Peking Duck dinners and handmade egg rolls, we offer a cozy atmosphere and warm hospitality. Reserve your table or explore our menu.", images: ["https://img.b2bpic.net/free-photo/view-delicious-dish-food_23-2150777691.jpg"],
},
};

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

@@ -6,10 +6,9 @@ import ProductCardOne from '@/components/sections/product/ProductCardOne';
import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import Link from 'next/link';
export default function MenuPage() {
const navItems = [{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"}];
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
@@ -34,10 +33,10 @@ export default function MenuPage() {
<div id="full-menu" data-section="full-menu">
<ProductCardOne
products={[
{ id: "1", name: "Peking Duck Dinner (Four Courses)", price: "An experience worth gathering for.", imageSrc: "https://img.b2bpic.net/free-photo/side-view-traditional-asian-food-peking-duck-with-cucumbers-sauce-plate_141793-11572.jpg?_wi=2" },
{ id: "2", name: "Handmade Egg Rolls", price: "Freshly made, golden-crisp, famously addictive.", imageSrc: "https://img.b2bpic.net/free-photo/spring-rolls_74190-3539.jpg?_wi=2" },
{ id: "3", name: "Spicy Shrimp Lo Mein", price: "Never dry. Balanced heat. Comfort you can taste.", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-noodles-with-vegetables-chicken-with-chopsticks-spices_23-2148377428.jpg?_wi=2" },
{ id: "4", name: "Sesame Chicken (Moys Style)", price: "More chicken than breading, with our signature sesame sauce.", imageSrc: "https://img.b2bpic.net/free-photo/salad-with-lettuce-meat-sesame-seeds-sauce_141793-935.jpg?_wi=2" }
{ id: "1", name: "Peking Duck Dinner (Four Courses)", price: "An experience worth gathering for.", imageSrc: "https://img.b2bpic.net/free-photo/side-view-traditional-asian-food-peking-duck-with-cucumbers-sauce-plate_141793-11572.jpg" },
{ id: "2", name: "Handmade Egg Rolls", price: "Freshly made, golden-crisp, famously addictive.", imageSrc: "https://img.b2bpic.net/free-photo/spring-rolls_74190-3539.jpg" },
{ id: "3", name: "Spicy Shrimp Lo Mein", price: "Never dry. Balanced heat. Comfort you can taste.", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-noodles-with-vegetables-chicken-with-chopsticks-spices_23-2148377428.jpg" },
{ id: "4", name: "Sesame Chicken (Moys Style)", price: "More chicken than breading, with our signature sesame sauce.", imageSrc: "https://img.b2bpic.net/free-photo/salad-with-lettuce-meat-sesame-seeds-sauce_141793-935.jpg" }
]}
gridVariant="four-items-2x2-equal-grid"
animationType="slide-up"
@@ -55,8 +54,8 @@ export default function MenuPage() {
<div id="food-reviews" data-section="food-reviews">
<TestimonialCardSixteen
testimonials={[
{ id: "1", name: "Michael B.", role: "Food Critic", company: "Local Magazine", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg?_wi=4" },
{ id: "2", name: "Samantha G.", role: "Student", company: "Ohio State University", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg?_wi=4" }
{ id: "1", name: "Michael B.", role: "Food Critic", company: "Local Magazine", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg" },
{ id: "2", name: "Samantha G.", role: "Student", company: "Ohio State University", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg" }
]}
kpiItems={[
{ value: "“Best Peking Duck in Ohio”", label: "Signature Dish" },
@@ -77,7 +76,7 @@ export default function MenuPage() {
<div id="cooking-philosophy" data-section="cooking-philosophy">
<FeatureCardSeven
features={[
{ id: 1, title: "Fresh Ingredients", description: "We source the freshest local ingredients daily to ensure quality and flavor.", imageSrc: "https://img.b2bpic.net/free-vector/colorful-food-icons_1284-723.jpg?_wi=2" },
{ id: 1, title: "Fresh Ingredients", description: "We source the freshest local ingredients daily to ensure quality and flavor.", imageSrc: "https://img.b2bpic.net/free-vector/colorful-food-icons_1284-723.jpg" },
{ id: 2, title: "Traditional Techniques", description: "Our chefs use time-honored Cantonese cooking methods passed down through generations.", imageSrc: "https://img.b2bpic.net/free-photo/cutlery-icon_1160-84.jpg" }
]}
animationType="blur-reveal"

23
src/app/page.tsx
View File

@@ -7,10 +7,9 @@ import TestimonialCardSixteen from '@/components/sections/testimonial/Testimonia
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import Link from 'next/link';
export default function HomePage() {
const navItems = [{"name":"Menu","id":"/menu"},{"name":"About","id":"/about"}];
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
@@ -54,10 +53,10 @@ export default function HomePage() {
<div id="signature-spotlight" data-section="signature-spotlight">
<ProductCardOne
products={[
{ id: "1", name: "Peking Duck Dinner (Four Courses)", price: "An experience worth gathering for.", imageSrc: "https://img.b2bpic.net/free-photo/side-view-traditional-asian-food-peking-duck-with-cucumbers-sauce-plate_141793-11572.jpg?_wi=1" },
{ id: "2", name: "Handmade Egg Rolls", price: "Freshly made, golden-crisp, famously addictive.", imageSrc: "https://img.b2bpic.net/free-photo/spring-rolls_74190-3539.jpg?_wi=1" },
{ id: "3", name: "Spicy Shrimp Lo Mein", price: "Never dry. Balanced heat. Comfort you can taste.", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-noodles-with-vegetables-chicken-with-chopsticks-spices_23-2148377428.jpg?_wi=1" },
{ id: "4", name: "Sesame Chicken (Moys Style)", price: "More chicken than breading, with our signature sesame sauce.", imageSrc: "https://img.b2bpic.net/free-photo/salad-with-lettuce-meat-sesame-seeds-sauce_141793-935.jpg?_wi=1" }
{ id: "1", name: "Peking Duck Dinner (Four Courses)", price: "An experience worth gathering for.", imageSrc: "https://img.b2bpic.net/free-photo/side-view-traditional-asian-food-peking-duck-with-cucumbers-sauce-plate_141793-11572.jpg" },
{ id: "2", name: "Handmade Egg Rolls", price: "Freshly made, golden-crisp, famously addictive.", imageSrc: "https://img.b2bpic.net/free-photo/spring-rolls_74190-3539.jpg" },
{ id: "3", name: "Spicy Shrimp Lo Mein", price: "Never dry. Balanced heat. Comfort you can taste.", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-noodles-with-vegetables-chicken-with-chopsticks-spices_23-2148377428.jpg" },
{ id: "4", name: "Sesame Chicken (Moys Style)", price: "More chicken than breading, with our signature sesame sauce.", imageSrc: "https://img.b2bpic.net/free-photo/salad-with-lettuce-meat-sesame-seeds-sauce_141793-935.jpg" }
]}
gridVariant="four-items-2x2-equal-grid"
animationType="slide-up"
@@ -76,10 +75,10 @@ export default function HomePage() {
<div id="social-proof" data-section="social-proof">
<TestimonialCardSixteen
testimonials={[
{ id: "1", name: "A Happy Guest", role: "Local Foodie", company: "Columbus", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg?_wi=1" },
{ id: "2", name: "A Local Critic", role: "Dining Expert", company: "OSU Community", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg?_wi=1" },
{ id: "3", name: "A Loyal Customer", role: "Family Patron", company: "Ohio", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg?_wi=2" },
{ id: "4", name: "Another Reviewer", role: "Visitor", company: "Ohio", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg?_wi=2" }
{ id: "1", name: "A Happy Guest", role: "Local Foodie", company: "Columbus", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg" },
{ id: "2", name: "A Local Critic", role: "Dining Expert", company: "OSU Community", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg" },
{ id: "3", name: "A Loyal Customer", role: "Family Patron", company: "Ohio", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/enthusiastic-young-businesswoman-asian-girl-showing-her-business-raising-hands-up-smiling-standi_1258-124859.jpg" },
{ id: "4", name: "Another Reviewer", role: "Visitor", company: "Ohio", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/two-asian-male-friends-sitting-table-bar-with-mugs-beer-snacks-chatting_1098-20574.jpg" }
]}
kpiItems={[
{ value: "“Best restaurant experience”", label: "Wonderful service" },
@@ -106,8 +105,8 @@ export default function HomePage() {
<div id="cozy-atmosphere" data-section="cozy-atmosphere">
<FeatureCardSeven
features={[
{ id: 1, title: "Limited seating", description: "Our intimate space ensures a calm, cozy dining experience.", imageSrc: "https://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg?_wi=1" },
{ id: 2, title: "Made fresh", description: "Every dish is prepared fresh, just for you, ensuring authentic flavors.", imageSrc: "https://img.b2bpic.net/free-vector/colorful-food-icons_1284-723.jpg?_wi=1" },
{ id: 1, title: "Limited seating", description: "Our intimate space ensures a calm, cozy dining experience.", imageSrc: "https://img.b2bpic.net/free-photo/rustic-chandelier-made-bulbs-ropes-dining-table-vintage-kitchen_181624-9173.jpg" },
{ id: 2, title: "Made fresh", description: "Every dish is prepared fresh, just for you, ensuring authentic flavors.", imageSrc: "https://img.b2bpic.net/free-vector/colorful-food-icons_1284-723.jpg" },
{ id: 3, title: "Warm hospitality", description: "Our owners make every guest feel right at home, like family.", imageSrc: "https://img.b2bpic.net/free-vector/handshake-circles-set_78370-9465.jpg" }
]}
animationType="slide-up"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -74,6 +74,8 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
defaultButtonVariant="elastic-effect"
@@ -88,19 +90,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "/menu" },
{ name: "Peking Duck", id: "/peking-duck" },
{ name: "About", id: "/about" },
{ name: "Visit", id: "/visit" },
{ name: "Order", id: "/order" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Moys Chinese Restaurant"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense } from "react";
import ReactLenis from "lenis/react";
@@ -17,6 +17,8 @@ function ShopPageContent() {
filters,
} = useProductCatalog({ basePath: "/shop" });
const navItems = [{ name: "Home", id: "/" }, { name: "Menu", id: "/menu" }, { name: "About", id: "/about" }];
return (
<ThemeProvider
defaultButtonVariant="elastic-effect"
@@ -31,19 +33,10 @@ function ShopPageContent() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "/menu" },
{ name: "Peking Duck", id: "/peking-duck" },
{ name: "About", id: "/about" },
{ name: "Visit", id: "/visit" },
{ name: "Order", id: "/order" },
{ name: "Shop", id: "/shop" }
]}
navItems={navItems}
brandName="Moys Chinese Restaurant"
button={{ text: "Cart", onClick: () => console.log("Cart state not available on this page.") }}
/>
</div>