Merge version_2 into main

Update src/app/page.tsx
2026-04-08 02:49:35 +00:00 · 2026-04-08 02:49:32 +00:00 · 2026-04-08 02:47:34 +00:00 · 2026-04-08 02:47:31 +00:00 · 2026-04-08 02:46:40 +00:00 · 2026-04-08 02:46:37 +00:00
3 changed files with 57 additions and 163 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,7 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Mulish } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -19,8 +20,13 @@ export const metadata: Metadata = {
  },
 };

-const mulish = Mulish({
-  variable: "--font-mulish",
+
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});
+const inter = Inter({
+  variable: "--font-inter",
  subsets: ["latin"],
 });

@@ -32,7 +38,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${mulish.variable} antialiased`}>
+        <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
          
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -29,21 +29,13 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
        {
-          name: "Menu",
-          id: "menu",
-        },
+          name: "Menu",          id: "menu"},
        {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
        {
-          name: "Reviews",
-          id: "reviews",
-        },
+          name: "Reviews",          id: "reviews"},
      ]}
      brandName="Kuma"
    />
@@ -53,37 +45,20 @@ export default function LandingPage() {
      <HeroCarouselLogo
      logoText="Kuma"
      description="Authentic Hong Kong waffles filled with creative scoops & gourmet toppings in San Antonio."
-      buttons={[
-        {
-          text: "Order Online",
-          href: "#contact",
-        },
-      ]}
+      buttons={[]}
      slides={[
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/pretty-girl-enjoying-something-sweet_23-2148238369.jpg?_wi=1",
-          imageAlt: "Bubble Waffle Ice Cream",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774819310021-1c4oylg1.png",          imageAlt: "Bubble Waffle Ice Cream"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/glass-cup-sweet-milkshake-with-whipped-cream-sprinkles-high-quality-photo_114579-88004.jpg?_wi=1",
-          imageAlt: "Gourmet Ice Cream Scoop",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774850323072-feaged35.jpg",          imageAlt: "Gourmet Ice Cream Scoop"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/pineapple-smoothie-cafe_1339-3577.jpg?_wi=1",
-          imageAlt: "Hong Kong Milk Tea",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774849572346-6xwlrfg0.jpg",          imageAlt: "Hong Kong Milk Tea"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-takoyaki-japanese-cuisine_53876-42540.jpg?_wi=1",
-          imageAlt: "Takoyaki Snack",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1775614922245-f8f0xqfp.webp",          imageAlt: "Takoyaki Snack"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/stylish-attractive-smiling-woman-retro-vintage-50-s-cafe-pink-color-sitting-table_285396-10361.jpg?_wi=1",
-          imageAlt: "Cozy Shop Vibe",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774849890323-djog3jai.jpg",          imageAlt: "Cozy Shop Vibe"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/arab-man-wear-black-jeans-jacket-eyeglasses-cafe-drink-coffee-bar-with-book-stylish-fashionable-arabian-model-guy_627829-982.jpg?_wi=1",
-          imageAlt: "Ice Cream Parlor Interior",
-        },
+          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774850323072-feaged35.jpg",          imageAlt: "Ice Cream Parlor Interior"},
      ]}
    />
  </div>
@@ -93,9 +68,7 @@ export default function LandingPage() {
      useInvertedBackground={false}
      title="A Taste of Hong Kong"
      description={[
-        "Located in Shaenfield Ranch Center, Kuma brings a unique twist to your dessert experience. Our signature Hong Kong egg waffles are freshly made and paired with premium, creatively flavored ice cream scoops.",
-        "Whether you are looking for a quick treat, a unique dessert experience, or a refreshing milk tea, we invite you to visit us in San Antonio for a taste of something truly special.",
-      ]}
+        "Located in Shaenfield Ranch Center, Kuma brings a unique twist to your dessert experience. Our signature Hong Kong egg waffles are freshly made and paired with premium, creatively flavored ice cream scoops.",        "Whether you are looking for a quick treat, a unique dessert experience, or a refreshing milk tea, we invite you to visit us in San Antonio for a taste of something truly special."]}
    />
  </div>

@@ -107,59 +80,23 @@ export default function LandingPage() {
      useInvertedBackground={false}
      products={[
        {
-          id: "1",
-          brand: "Signature",
-          name: "Original Egg Waffle Ice Cream",
-          price: "$8.50",
-          rating: 5,
-          reviewCount: "890",
-          imageSrc: "http://img.b2bpic.net/free-photo/pretty-girl-enjoying-something-sweet_23-2148238369.jpg?_wi=2",
-        },
+          id: "1",          brand: "Signature",          name: "Original Egg Waffle Ice Cream",          price: "$8.50",          rating: 5,
+          reviewCount: "890",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1775614922245-f8f0xqfp.webp"},
        {
-          id: "2",
-          brand: "Drink",
-          name: "Hong Kong Classic Milk Tea",
-          price: "$5.00",
-          rating: 4,
-          reviewCount: "450",
-          imageSrc: "http://img.b2bpic.net/free-photo/pineapple-smoothie-cafe_1339-3577.jpg?_wi=2",
-        },
+          id: "2",          brand: "Drink",          name: "Hong Kong Classic Milk Tea",          price: "$5.00",          rating: 4,
+          reviewCount: "450",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BamKc70HhvuNBzs6fq5RAvHQ1W/uploaded-1774849384838-zptaapgo.jpg"},
        {
-          id: "3",
-          brand: "Popular",
-          name: "Strawberry Cheesecake Scoop",
-          price: "$6.00",
-          rating: 5,
-          reviewCount: "320",
-          imageSrc: "http://img.b2bpic.net/free-photo/glass-cup-sweet-milkshake-with-whipped-cream-sprinkles-high-quality-photo_114579-88004.jpg?_wi=2",
-        },
+          id: "3",          brand: "Popular",          name: "Strawberry Cheesecake Scoop",          price: "$6.00",          rating: 5,
+          reviewCount: "320",          imageSrc: "http://img.b2bpic.net/free-photo/glass-cup-sweet-milkshake-with-whipped-cream-sprinkles-high-quality-photo_114579-88004.jpg?_wi=2"},
        {
-          id: "4",
-          brand: "Drink",
-          name: "Vietnamese Coffee Ice Cream",
-          price: "$6.50",
-          rating: 4,
-          reviewCount: "180",
-          imageSrc: "http://img.b2bpic.net/free-photo/arab-man-wear-black-jeans-jacket-eyeglasses-cafe-drink-coffee-bar-with-book-stylish-fashionable-arabian-model-guy_627829-982.jpg?_wi=2",
-        },
+          id: "4",          brand: "Drink",          name: "Vietnamese Coffee Ice Cream",          price: "$6.50",          rating: 4,
+          reviewCount: "180",          imageSrc: "http://img.b2bpic.net/free-photo/arab-man-wear-black-jeans-jacket-eyeglasses-cafe-drink-coffee-bar-with-book-stylish-fashionable-arabian-model-guy_627829-982.jpg?_wi=2"},
        {
-          id: "5",
-          brand: "Appetizer",
-          name: "Takoyaki Snack",
-          price: "$7.00",
-          rating: 5,
-          reviewCount: "210",
-          imageSrc: "http://img.b2bpic.net/free-photo/closeup-takoyaki-japanese-cuisine_53876-42540.jpg?_wi=2",
-        },
+          id: "5",          brand: "Appetizer",          name: "Takoyaki Snack",          price: "$7.00",          rating: 5,
+          reviewCount: "210",          imageSrc: "http://img.b2bpic.net/free-photo/closeup-takoyaki-japanese-cuisine_53876-42540.jpg?_wi=2"},
        {
-          id: "6",
-          brand: "Signature",
-          name: "Cookies & Cream Waffle",
-          price: "$9.00",
-          rating: 5,
-          reviewCount: "560",
-          imageSrc: "http://img.b2bpic.net/free-photo/stylish-attractive-smiling-woman-retro-vintage-50-s-cafe-pink-color-sitting-table_285396-10361.jpg?_wi=2",
-        },
+          id: "6",          brand: "Signature",          name: "Cookies & Cream Waffle",          price: "$9.00",          rating: 5,
+          reviewCount: "560",          imageSrc: "http://img.b2bpic.net/free-photo/stylish-attractive-smiling-woman-retro-vintage-50-s-cafe-pink-color-sitting-table_285396-10361.jpg?_wi=2"},
      ]}
      title="Our Popular Treats"
      description="Indulge in our most loved creations, from crisp egg waffles to refreshing teas."
@@ -173,67 +110,31 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "1",
-          name: "Kirk Beachum",
-          role: "Local Guide",
-          company: "Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-girl-making-soap-balloons_23-2148672413.jpg",
-        },
+          id: "1",          name: "Kirk Beachum",          role: "Local Guide",          company: "Customer",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-girl-making-soap-balloons_23-2148672413.jpg"},
        {
-          id: "2",
-          name: "Alicia Warthen",
-          role: "Dessert Enthusiast",
-          company: "Customer",
-          rating: 4,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-holding-delicious-ice-cream_23-2150696620.jpg",
-        },
+          id: "2",          name: "Alicia Warthen",          role: "Dessert Enthusiast",          company: "Customer",          rating: 4,
+          imageSrc: "http://img.b2bpic.net/free-photo/front-view-man-holding-delicious-ice-cream_23-2150696620.jpg"},
        {
-          id: "3",
-          name: "Jessica Campa",
-          role: "Local Guide",
-          company: "Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-food-lover-eating_23-2149255939.jpg",
-        },
+          id: "3",          name: "Jessica Campa",          role: "Local Guide",          company: "Customer",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/close-up-food-lover-eating_23-2149255939.jpg"},
        {
-          id: "4",
-          name: "Sarah Johnson",
-          role: "Parent",
-          company: "Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-cute-couple-with-pink-ice-cream_23-2148311199.jpg",
-        },
+          id: "4",          name: "Sarah Johnson",          role: "Parent",          company: "Customer",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-cute-couple-with-pink-ice-cream_23-2148311199.jpg"},
        {
-          id: "5",
-          name: "Michael Chen",
-          role: "Foodie",
-          company: "Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/good-looking-positive-brunette-asian-female-model-smiles-positively-dressed-fashionable-clothes-poses-with-yummy-appetizing-sweet-desserts-against-pink-wall-enjoy-ice-cream-cotton-candy_273609-49980.jpg",
-        },
+          id: "5",          name: "Michael Chen",          role: "Foodie",          company: "Customer",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/good-looking-positive-brunette-asian-female-model-smiles-positively-dressed-fashionable-clothes-poses-with-yummy-appetizing-sweet-desserts-against-pink-wall-enjoy-ice-cream-cotton-candy_273609-49980.jpg"},
        {
-          id: "6",
-          name: "David Kim",
-          role: "Regular",
-          company: "Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/pakhlava-shekerbura-presented-vintage-platter-tea-setup_140725-4128.jpg",
-        },
+          id: "6",          name: "David Kim",          role: "Regular",          company: "Customer",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/pakhlava-shekerbura-presented-vintage-platter-tea-setup_140725-4128.jpg"},
      ]}
      kpiItems={[
        {
-          value: "1.4k+",
-          label: "Reviews",
-        },
+          value: "1.4k+",          label: "Reviews"},
        {
-          value: "4.5",
-          label: "Rating",
-        },
+          value: "4.5",          label: "Rating"},
        {
-          value: "100%",
-          label: "Satisfaction",
-        },
+          value: "100%",          label: "Satisfaction"},
      ]}
      title="Loved by Our Customers"
      description="Join over 1,400 satisfied dessert lovers who enjoy our quality ice cream and crispy waffles."
@@ -244,8 +145,7 @@ export default function LandingPage() {
      <ContactCenter
      useInvertedBackground={false}
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      tag="Contact"
      title="Visit Us Today!"
      description="Located in Shaenfield Ranch Center. We are closed Tuesdays, but open for you the rest of the week."
@@ -258,33 +158,21 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "7915 W Loop 1604 N Ste 120",
-              href: "#",
-            },
+              label: "7915 W Loop 1604 N Ste 120",              href: "#"},
            {
-              label: "San Antonio, TX 78254",
-              href: "#",
-            },
+              label: "San Antonio, TX 78254",              href: "#"},
            {
-              label: "(210) 999-5829",
-              href: "tel:2109995829",
-            },
+              label: "(210) 999-5829",              href: "tel:2109995829"},
          ],
        },
        {
          items: [
            {
-              label: "Menu",
-              href: "#menu",
-            },
+              label: "Menu",              href: "#menu"},
            {
-              label: "About",
-              href: "#about",
-            },
+              label: "About",              href: "#about"},
            {
-              label: "Reviews",
-              href: "#reviews",
-            },
+              label: "Reviews",              href: "#reviews"},
          ],
        },
      ]}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-mulish), sans-serif;
+  font-family: var(--font-inter), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-mulish), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
 }
Author	SHA1	Message	Date
bender	e1042e9cb2	Merge version_2 into main Merge version_2 into main	2026-04-08 02:49:35 +00:00
bender	e942448213	Update src/app/page.tsx	2026-04-08 02:49:32 +00:00
bender	0a9e40df48	Merge version_2 into main Merge version_2 into main	2026-04-08 02:47:34 +00:00
bender	c6427e1942	Update src/app/page.tsx	2026-04-08 02:47:31 +00:00
bender	4958cc6686	Merge version_2 into main Merge version_2 into main	2026-04-08 02:46:40 +00:00
bender	c6e15af42c	Update src/app/page.tsx	2026-04-08 02:46:37 +00:00
bender	21a18b5bc5	Merge version_2 into main Merge version_2 into main	2026-04-08 02:45:50 +00:00
bender	6bf0abf427	Update src/app/page.tsx	2026-04-08 02:45:44 +00:00
bender	86c6f13977	Merge version_2 into main Merge version_2 into main	2026-04-08 02:44:37 +00:00
bender	7002cf6cf8	Update src/app/page.tsx	2026-04-08 02:44:34 +00:00
bender	7806d1d44d	Merge version_2 into main Merge version_2 into main	2026-04-08 02:42:07 +00:00
bender	9d5cfbdbca	Update theme fonts	2026-04-08 02:42:04 +00:00
bender	32610be816	Update theme fonts	2026-04-08 02:42:04 +00:00
bender	0c0db4c568	Merge version_2 into main Merge version_2 into main	2026-04-08 02:41:03 +00:00
bender	145af1e4ca	Update src/app/page.tsx	2026-04-08 02:41:00 +00:00
bender	66d6c5eed8	Merge version_2 into main Merge version_2 into main	2026-04-08 02:40:51 +00:00
bender	3d47a65259	Update src/app/page.tsx	2026-04-08 02:40:48 +00:00
bender	d8b63e5698	Merge version_2 into main Merge version_2 into main	2026-04-08 02:23:34 +00:00
bender	01113e39d7	Update src/app/page.tsx	2026-04-08 02:23:31 +00:00
bender	c24fa55b70	Merge version_2 into main Merge version_2 into main	2026-04-08 02:18:35 +00:00
bender	208d94cac3	Update src/app/page.tsx	2026-04-08 02:18:29 +00:00
bender	347ca27b7b	Merge version_1 into main Merge version_1 into main	2026-04-07 04:10:38 +00:00
bender	adf4f749cf	Merge version_1 into main Merge version_1 into main	2026-04-07 04:00:51 +00:00