Merge version_8 into main

Update src/app/page.tsx
2026-02-28 07:27:36 +00:00 · 2026-02-28 07:27:31 +00:00 · 2026-02-28 07:26:00 +00:00 · 2026-02-28 07:25:56 +00:00 · 2026-02-28 07:25:10 +00:00 · 2026-02-28 07:25:05 +00:00
6 changed files with 141 additions and 52 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -29,7 +29,7 @@ export default function BlogPage() {
                        brandName="Baan Mu"
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "Menu", id: "products" },
+                            { name: "Menu", id: "/menu" },
                            { name: "About", id: "about" },
                            { name: "Reviews", id: "testimonial" },
                            { name: "Contact", id: "contact" }
@@ -67,4 +67,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,53 +1,22 @@
 import type { Metadata } from "next";
-import { Montserrat } from "next/font/google";
 import { Inter } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import "./styles/variables.css";
+import "./styles/base.css";

-const montserrat = Montserrat({
-  variable: "--font-montserrat",  subsets: ["latin"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
-});
+const inter = Inter({ subsets: ["latin"] });

 export const metadata: Metadata = {
-  title: "Baan Mu - Authentic Thai Restaurant in San Francisco",  description: "Discover authentic Thai cuisine at Baan Mu in San Francisco. Fresh ingredients, traditional recipes, and warm hospitality. Reserve your table today.",  keywords: "thai restaurant San Francisco, authentic thai food, pad thai, green curry, thai cuisine, fine dining",  metadataBase: new URL("https://baanmu.com"),
-  alternates: {
-    canonical: "https://baanmu.com"
-  },
-  openGraph: {
-    title: "Baan Mu - Authentic Thai Restaurant in San Francisco",    description: "Experience bold flavors and warm hospitality at Baan Mu. The best Thai restaurant in San Francisco with traditional recipes and fresh ingredients.",    url: "https://baanmu.com",    siteName: "Baan Mu",    type: "website",    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/medium-fried-pieces-meat-fried-onions_140725-3560.jpg",        alt: "Baan Mu Restaurant"
-      }
-    ]
-  },
-  twitter: {
-    card: "summary_large_image",    title: "Baan Mu - Authentic Thai Restaurant in San Francisco",    description: "Experience authentic Thai cuisine in the heart of San Francisco. Discover our signature dishes and warm hospitality.",    images: ["http://img.b2bpic.net/free-photo/medium-fried-pieces-meat-fried-onions_140725-3560.jpg"]
-  },
-  robots: {
-    index: true,
-    follow: true
-  }
-};
+  title: "Baan Mu - Authentic Thai Cuisine",  description: "Discover authentic Thai cuisine at Baan Mu in San Francisco"};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${montserrat.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={inter.className}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1415,7 +1384,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -0,0 +1,109 @@
+"use client";
+
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import ProductCardOne from '@/components/sections/product/ProductCardOne';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import { ChefHat } from "lucide-react";
+
+export default function MenuPage() {
+  const menuItems = [
+    {
+      id: "1",      name: "Pad Thai",      price: "$16.95",      imageSrc: "http://img.b2bpic.net/free-photo/stir-noodles-fry-green-chinese_1203-5877.jpg?_wi=2",      imageAlt: "Pad Thai - Stir-fried noodles"
+    },
+    {
+      id: "2",      name: "Green Curry",      price: "$18.95",      imageSrc: "http://img.b2bpic.net/free-photo/curry-pork-spicy_1388-222.jpg?_wi=2",      imageAlt: "Green Curry with chicken"
+    },
+    {
+      id: "3",      name: "Tom Yum Soup",      price: "$14.95",      imageSrc: "http://img.b2bpic.net/free-photo/tom-yum-kung-thai-hot-spicy-soup-shrimp-with-lemon-grass-lemon-galangal-chilli-wooden-table-thailand-food_1150-21062.jpg?_wi=2",      imageAlt: "Tom Yum - Hot and sour soup"
+    },
+    {
+      id: "4",      name: "Pad Krapow Moo",      price: "$17.95",      imageSrc: "http://img.b2bpic.net/free-photo/stir-fried-meat-with-basil-leaves-thai-food_1203-5877.jpg",      imageAlt: "Pad Krapow Moo - Basil pork stir-fry"
+    },
+    {
+      id: "5",      name: "Massaman Curry",      price: "$19.95",      imageSrc: "http://img.b2bpic.net/free-photo/thai-massaman-curry-with-beef-peanuts_1203-5877.jpg",      imageAlt: "Massaman Curry - Rich and aromatic"
+    },
+    {
+      id: "6",      name: "Pad See Ew",      price: "$16.95",      imageSrc: "http://img.b2bpic.net/free-photo/dark-soy-noodles-thai-stir-fry_1203-5877.jpg",      imageAlt: "Pad See Ew - Dark soy noodles"
+    },
+    {
+      id: "7",      name: "Larb Gai",      price: "$15.95",      imageSrc: "http://img.b2bpic.net/free-photo/spicy-minced-chicken-salad_1203-5877.jpg",      imageAlt: "Larb Gai - Spicy minced chicken"
+    },
+    {
+      id: "8",      name: "Satay Skewers",      price: "$12.95",      imageSrc: "http://img.b2bpic.net/free-photo/grilled-meat-skewers-peanut-sauce_1203-5877.jpg",      imageAlt: "Satay Skewers - Grilled with peanut sauce"
+    },
+    {
+      id: "9",      name: "Spring Rolls",      price: "$8.95",      imageSrc: "http://img.b2bpic.net/free-photo/crispy-spring-rolls-sweet-sauce_1203-5877.jpg",      imageAlt: "Spring Rolls - Crispy appetizer"
+    },
+    {
+      id: "10",      name: "Green Papaya Salad",      price: "$13.95",      imageSrc: "http://img.b2bpic.net/free-photo/som-tam-green-papaya-salad_1203-5877.jpg",      imageAlt: "Green Papaya Salad - Som Tam"
+    },
+    {
+      id: "11",      name: "Mango Sticky Rice",      price: "$9.95",      imageSrc: "http://img.b2bpic.net/free-photo/mango-sticky-rice-dessert_1203-5877.jpg",      imageAlt: "Mango Sticky Rice - Thai dessert"
+    },
+    {
+      id: "12",      name: "Thai Iced Tea",      price: "$5.95",      imageSrc: "http://img.b2bpic.net/free-photo/thai-iced-tea-traditional_1203-5877.jpg",      imageAlt: "Thai Iced Tea - Refreshing beverage"
+    }
+  ];
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="icon-arrow"
+      defaultTextAnimation="background-highlight"
+      borderRadius="soft"
+      contentWidth="medium"
+      sizing="mediumLarge"
+      background="floatingGradient"
+      cardStyle="glass-elevated"
+      primaryButtonStyle="shadow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="semibold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingInline
+            brandName="Baan Mu"
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Menu", id: "/menu" },
+              { name: "About", id: "about" },
+              { name: "Reviews", id: "testimonial" },
+              { name: "Contact", id: "contact" }
+            ]}
+            button={{
+              text: "Reserve Now",              href: "https://www.opentable.com"
+            }}
+          />
+        </div>
+
+        <div id="menu" data-section="menu">
+          <ProductCardOne
+            title="Full Menu"
+            description="Explore our complete selection of authentic Thai dishes, from traditional favorites to signature creations. Each item is carefully prepared with fresh ingredients and authentic techniques."
+            tag="Chef's Selection"
+            tagIcon={ChefHat}
+            tagAnimation="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            products={menuItems}
+            gridVariant="four-items-2x2-equal-grid"
+            animationType="slide-up"
+            buttons={[
+              { text: "Reserve a Table", href: "https://www.opentable.com" }
+            ]}
+            buttonAnimation="slide-up"
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterLogoReveal
+            logoText="Baan Mu"
+            leftLink={{ text: "Privacy Policy", href: "#" }}
+            rightLink={{ text: "Contact Us", href: "mailto:hello@baanmu.com" }}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -11,7 +11,7 @@ import FeatureCardSixteen from '@/components/sections/feature/FeatureCardSixteen
 import ContactText from '@/components/sections/contact/ContactText';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Sparkles, Heart, ChefHat } from "lucide-react";
+import { Sparkles, Heart, ChefHat, Users } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -31,7 +31,7 @@ export default function LandingPage() {
        <NavbarLayoutFloatingInline
          brandName="Baan Mu"
          navItems={[
-            { name: "Menu", id: "products" },
+            { name: "Menu", id: "/menu" },
            { name: "About", id: "about" },
            { name: "Reviews", id: "testimonial" },
            { name: "Contact", id: "contact" }
@@ -55,9 +55,16 @@ export default function LandingPage() {
          mediaAnimation="blur-reveal"
          buttons={[
            { text: "Reserve a Table", href: "https://www.opentable.com" },
-            { text: "View Menu", href: "#products" }
+            { text: "View Menu", href: "/menu" }
          ]}
          buttonAnimation="slide-up"
+          marqueeItems={[
+            {
+              type: "text-icon",              icon: Users,
+              text: "Trusted by over 2000 customers"
+            }
+          ]}
+          showMarqueeCard={true}
        />
      </div>

@@ -86,19 +93,19 @@ export default function LandingPage() {
          useInvertedBackground={false}
          products={[
            {
-              id: "1",              name: "Pad Thai",              price: "$16.95",              imageSrc: "http://img.b2bpic.net/free-photo/stir-noodles-fry-green-chinese_1203-5877.jpg",              imageAlt: "Pad Thai - Stir-fried noodles"
+              id: "1",              name: "Pad Thai",              price: "$16.95",              imageSrc: "http://img.b2bpic.net/free-photo/stir-noodles-fry-green-chinese_1203-5877.jpg?_wi=1",              imageAlt: "Pad Thai - Stir-fried noodles"
            },
            {
-              id: "2",              name: "Green Curry",              price: "$18.95",              imageSrc: "http://img.b2bpic.net/free-photo/curry-pork-spicy_1388-222.jpg",              imageAlt: "Green Curry with chicken"
+              id: "2",              name: "Green Curry",              price: "$18.95",              imageSrc: "http://img.b2bpic.net/free-photo/curry-pork-spicy_1388-222.jpg?_wi=1",              imageAlt: "Green Curry with chicken"
            },
            {
-              id: "3",              name: "Tom Yum Soup",              price: "$14.95",              imageSrc: "http://img.b2bpic.net/free-photo/tom-yum-kung-thai-hot-spicy-soup-shrimp-with-lemon-grass-lemon-galangal-chilli-wooden-table-thailand-food_1150-21062.jpg",              imageAlt: "Tom Yum - Hot and sour soup"
+              id: "3",              name: "Tom Yum Soup",              price: "$14.95",              imageSrc: "http://img.b2bpic.net/free-photo/tom-yum-kung-thai-hot-spicy-soup-shrimp-with-lemon-grass-lemon-galangal-chilli-wooden-table-thailand-food_1150-21062.jpg?_wi=1",              imageAlt: "Tom Yum - Hot and sour soup"
            }
          ]}
          gridVariant="three-columns-all-equal-width"
          animationType="slide-up"
          buttons={[
-            { text: "View Full Menu", href: "#" }
+            { text: "View Full Menu", href: "/menu" }
          ]}
          buttonAnimation="slide-up"
        />
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -94,6 +94,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                        brandName="Baan Mu"
                        navItems={[
                            {"name":"Home","id":"/"},
+                            {"name":"Menu","id":"/menu"},
                            {"name":"Shop","id":"/shop"}
                        ]}
                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -134,6 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                            brandName="Baan Mu"
                            navItems={[
                                {"name":"Home","id":"/"},
+                                {"name":"Menu","id":"/menu"},
                                {"name":"Shop","id":"/shop"}
                            ]}
                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -181,6 +183,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                    brandName="Baan Mu"
                    navItems={[
                        {"name":"Home","id":"/"},
+                        {"name":"Menu","id":"/menu"},
                        {"name":"Shop","id":"/shop"}
                    ]}
                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -232,4 +235,4 @@ function ProductPageContent({ params }: ProductPageProps) {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -37,6 +37,7 @@ function ShopPageContent() {
                        brandName="Baan Mu"
                        navItems={[
                            {"name":"Home","id":"/"},
+                            {"name":"Menu","id":"/menu"},
                            {"name":"Shop","id":"/shop"}
                        ]}
                        button={{ text: "Cart", onClick: () => console.log("cart") }}
@@ -76,6 +77,7 @@ function ShopPageContent() {
                    brandName="Baan Mu"
                    navItems={[
                        {"name":"Home","id":"/"},
+                        {"name":"Menu","id":"/menu"},
                        {"name":"Shop","id":"/shop"}
                    ]}
                    button={{ text: "Cart", onClick: () => console.log("cart") }}
@@ -110,4 +112,4 @@ export default function ShopPage() {
            <ShopPageContent />
        </Suspense>
    );
-}
+}
Author	SHA1	Message	Date
bender	770daaa27c	Merge version_8 into main Merge version_8 into main	2026-02-28 07:27:36 +00:00
bender	2aa9fa6f85	Update src/app/page.tsx	2026-02-28 07:27:31 +00:00
bender	5fda2d3fef	Merge version_8 into main Merge version_8 into main	2026-02-28 07:26:00 +00:00
bender	d980828de9	Update src/app/page.tsx	2026-02-28 07:25:56 +00:00
bender	eae4aad4d2	Merge version_7 into main Merge version_7 into main	2026-02-28 07:25:10 +00:00
bender	a0a51cdd95	Update src/app/page.tsx	2026-02-28 07:25:05 +00:00
bender	e03d042c45	Update src/app/menu/page.tsx	2026-02-28 07:25:05 +00:00
bender	012fd9b227	Merge version_7 into main Merge version_7 into main	2026-02-28 07:24:25 +00:00
bender	2fe29e15c4	Update src/app/shop/page.tsx	2026-02-28 07:24:21 +00:00
bender	42d92ee84f	Update src/app/shop/[id]/page.tsx	2026-02-28 07:24:20 +00:00
bender	4019a354d5	Update src/app/page.tsx	2026-02-28 07:24:19 +00:00
bender	57bcfd5767	Update src/app/menu/page.tsx	2026-02-28 07:24:19 +00:00
bender	f553f73a85	Update src/app/layout.tsx	2026-02-28 07:24:18 +00:00
bender	80b191598b	Update src/app/blog/page.tsx	2026-02-28 07:24:17 +00:00
bender	f2f9edb973	Update src/app/shop/page.tsx	2026-02-28 07:22:06 +00:00
bender	2c315fc62e	Update src/app/shop/[id]/page.tsx	2026-02-28 07:22:05 +00:00
bender	4a912b8ab1	Update src/app/page.tsx	2026-02-28 07:22:04 +00:00
bender	e52b6d22c3	Update src/app/blog/page.tsx	2026-02-28 07:22:04 +00:00
bender	227c7da0d1	Update src/app/page.tsx	2026-02-28 07:21:57 +00:00
bender	c47eaecc55	Update src/app/menu/page.tsx	2026-02-28 07:21:57 +00:00
bender	87315ea325	Update src/app/layout.tsx	2026-02-28 07:21:56 +00:00
bender	d6f69a3f17	Update src/app/menu/page.tsx	2026-02-28 07:21:48 +00:00
bender	7c6cc552fe	Update src/app/page.tsx	2026-02-28 07:21:24 +00:00
bender	c1f705e08b	Update src/app/menu/page.tsx	2026-02-28 07:21:23 +00:00
bender	fc04a4a7f8	Update src/app/layout.tsx	2026-02-28 07:21:22 +00:00
bender	9080a8aeaf	Merge version_6 into main Merge version_6 into main	2026-02-28 07:19:16 +00:00
bender	308e897742	Update src/app/menu/page.tsx	2026-02-28 07:19:11 +00:00
bender	6eb66ab19e	Update src/app/layout.tsx	2026-02-28 07:19:10 +00:00
bender	2c2b9dda22	Update src/app/menu/page.tsx	2026-02-28 07:04:14 +00:00
bender	ca3a419dfa	Update src/app/shop/page.tsx	2026-02-28 07:04:08 +00:00
bender	d412b4ff32	Update src/app/shop/[id]/page.tsx	2026-02-28 07:04:07 +00:00
bender	e4f87fbecc	Update src/app/page.tsx	2026-02-28 07:04:06 +00:00
bender	4b252e98e1	Update src/app/blog/page.tsx	2026-02-28 07:04:05 +00:00
bender	d5c72a2d29	Update src/app/shop/page.tsx	2026-02-28 07:03:56 +00:00
bender	6d5596463c	Update src/app/shop/[id]/page.tsx	2026-02-28 07:03:55 +00:00
bender	68d17896f6	Update src/app/page.tsx	2026-02-28 07:03:55 +00:00
bender	9e86db3742	Update src/app/blog/page.tsx	2026-02-28 07:03:54 +00:00
bender	89d6ad8ef1	Update src/app/page.tsx	2026-02-28 07:03:25 +00:00
bender	41b8337236	Update src/app/menu/page.tsx	2026-02-28 07:03:24 +00:00
bender	da4c5a8c28	Update src/app/layout.tsx	2026-02-28 07:03:23 +00:00
bender	8d0a9b6649	Update src/app/menu/page.tsx	2026-02-28 07:03:11 +00:00
bender	185a15e194	Merge version_5 into main Merge version_5 into main	2026-02-28 06:57:13 +00:00
bender	70ae6de928	Update src/app/page.tsx	2026-02-28 06:57:09 +00:00
bender	bf3865c405	Update src/app/menu/page.tsx	2026-02-28 06:57:08 +00:00
bender	96fe286842	Update src/app/layout.tsx	2026-02-28 06:57:07 +00:00
bender	52ca21bcfb	Merge version_4 into main Merge version_4 into main	2026-02-28 06:49:14 +00:00
bender	fe915489ab	Update src/app/menu/page.tsx	2026-02-28 06:49:10 +00:00
bender	87acfa593e	Merge version_3 into main Merge version_3 into main	2026-02-28 06:46:58 +00:00
bender	3d28f7a71c	Update src/app/page.tsx	2026-02-28 06:46:54 +00:00
bender	99a799e740	Update src/app/menu/page.tsx	2026-02-28 06:46:53 +00:00
bender	1dd170b2ac	Merge version_3 into main Merge version_3 into main	2026-02-28 06:46:13 +00:00
bender	44fb889f9e	Update src/app/shop/page.tsx	2026-02-28 06:46:09 +00:00
bender	51db06e73a	Update src/app/shop/[id]/page.tsx	2026-02-28 06:46:08 +00:00
bender	f47f445871	Update src/app/page.tsx	2026-02-28 06:46:07 +00:00
bender	88a061fccb	Add src/app/menu/page.tsx	2026-02-28 06:46:07 +00:00
bender	ba73b942f4	Update src/app/layout.tsx	2026-02-28 06:46:06 +00:00
bender	9e8349bd55	Update src/app/blog/page.tsx	2026-02-28 06:46:05 +00:00
bender	b71344c38a	Merge version_2 into main Merge version_2 into main	2026-02-28 06:38:33 +00:00