Merge version_2 into main

Update theme fonts
2026-04-25 22:54:01 +00:00 · 2026-04-25 22:53:55 +00:00 · 2026-04-25 22:53:54 +00:00 · 2026-04-25 22:52:26 +00:00 · 2026-04-25 22:52:23 +00:00
3 changed files with 52 additions and 177 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Public_Sans } from "next/font/google";
+import { Roboto } from "next/font/google";



@@ -21,13 +22,11 @@ export const metadata: Metadata = {
  },
 };

-const publicSans = Public_Sans({
-  variable: "--font-public-sans",
-  subsets: ["latin"],
-});
-const inter = Inter({
-  variable: "--font-inter",
+
+const roboto = Roboto({
+  variable: "--font-roboto",
  subsets: ["latin"],
+  weight: ["100", "300", "400", "500", "700", "900"],
 });

 export default function RootLayout({
@@ -38,7 +37,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${publicSans.variable} ${inter.variable} antialiased`}>
+        <body className={`${roboto.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -32,21 +32,13 @@ export default function LandingPage() {
      <NavbarStyleApple
      navItems={[
        {
-          name: "Menu",
-          id: "#menu",
-        },
+          name: "Menu",          id: "#menu"},
        {
-          name: "About",
-          id: "#about",
-        },
+          name: "About",          id: "#about"},
        {
-          name: "Reviews",
-          id: "#reviews",
-        },
+          name: "Reviews",          id: "#reviews"},
        {
-          name: "Find Us",
-          id: "#contact",
-        },
+          name: "Find Us",          id: "#contact"},
      ]}
      brandName="Merkava"
    />
@@ -55,75 +47,48 @@ export default function LandingPage() {
  <div id="hero" data-section="hero">
      <HeroSplitKpi
      background={{
-        variant: "gradient-bars",
-      }}
-      title="Coffee at the Skatepark"
+        variant: "gradient-bars"}}
+      title="Fuel Your Skate Session"
      description="The perfect brew for your session. Enjoy artisanal coffee and freshly baked treats in the most energetic spot in town."
      kpis={[
        {
-          value: "4.9★",
-          label: "Rating",
-        },
+          value: "4.9★",          label: "Rating"},
        {
-          value: "500+",
-          label: "Daily Cups",
-        },
+          value: "500+",          label: "Daily Cups"},
        {
-          value: "20+",
-          label: "Varieties",
-        },
+          value: "20+",          label: "Varieties"},
      ]}
      enableKpiAnimation={true}
      imageSrc="http://img.b2bpic.net/free-photo/interior-modern-cafe-with-sofas-chairs-tables_169016-34786.jpg"
      mediaAnimation="slide-up"
      avatars={[
        {
-          src: "http://img.b2bpic.net/free-photo/small-coffee-shop-items-arrangement_23-2149434608.jpg",
-          alt: "Small coffee shop items arrangement",
-        },
+          src: "http://img.b2bpic.net/free-photo/small-coffee-shop-items-arrangement_23-2149434608.jpg",          alt: "Small coffee shop items arrangement"},
        {
-          src: "http://img.b2bpic.net/free-photo/boy-having-coffee-restaurant_23-2148172665.jpg",
-          alt: "Boy having coffee in a restaurant",
-        },
+          src: "http://img.b2bpic.net/free-photo/boy-having-coffee-restaurant_23-2148172665.jpg",          alt: "Boy having coffee in a restaurant"},
        {
-          src: "http://img.b2bpic.net/free-photo/empty-wood-chair_1339-6717.jpg",
-          alt: "empty wood chair",
-        },
+          src: "http://img.b2bpic.net/free-photo/empty-wood-chair_1339-6717.jpg",          alt: "empty wood chair"},
        {
-          src: "http://img.b2bpic.net/free-photo/rustic-restaurant-furniture-restaurant_53876-16490.jpg",
-          alt: "Rustic restaurant furniture in restaurant",
-        },
+          src: "http://img.b2bpic.net/free-photo/rustic-restaurant-furniture-restaurant_53876-16490.jpg",          alt: "Rustic restaurant furniture in restaurant"},
        {
-          src: "http://img.b2bpic.net/free-photo/trendy-hipster-woman-is-posing-photographer-with-her-longboard-near-cafe_613910-3198.jpg",
-          alt: "Trendy hipster woman is posing for photographer with her longboard near cafe.",
-        },
+          src: "http://img.b2bpic.net/free-photo/trendy-hipster-woman-is-posing-photographer-with-her-longboard-near-cafe_613910-3198.jpg",          alt: "Trendy hipster woman is posing for photographer with her longboard near cafe."},
      ]}
      avatarText="Loved by the local skate community"
      marqueeItems={[
        {
-          type: "text-icon",
-          text: "Freshly Brewed",
-          icon: Coffee,
+          type: "text-icon",          text: "Freshly Brewed",          icon: Coffee,
        },
        {
-          type: "text-icon",
-          text: "House-Made Treats",
-          icon: Cookie,
+          type: "text-icon",          text: "House-Made Treats",          icon: Cookie,
        },
        {
-          type: "text-icon",
-          text: "Skate-Friendly",
-          icon: Activity,
+          type: "text-icon",          text: "Skate-Friendly",          icon: Activity,
        },
        {
-          type: "text-icon",
-          text: "Local Vibes",
-          icon: MapPin,
+          type: "text-icon",          text: "Local Vibes",          icon: MapPin,
        },
        {
-          type: "text-icon",
-          text: "Open Daily",
-          icon: Clock,
+          type: "text-icon",          text: "Open Daily",          icon: Clock,
        },
      ]}
    />
@@ -135,9 +100,7 @@ export default function LandingPage() {
      title="Welcome to Merkava"
      buttons={[
        {
-          text: "Learn Our Story",
-          href: "#about",
-        },
+          text: "Learn Our Story",          href: "#about"},
      ]}
    />
  </div>
@@ -150,41 +113,17 @@ export default function LandingPage() {
      useInvertedBackground={false}
      products={[
        {
-          id: "p1",
-          name: "Signature Latte",
-          price: "$4.50",
-          imageSrc: "http://img.b2bpic.net/free-photo/healthy-breakfast-with-croissant-backed-cookies-milk-muesli-citrus-fruit-wooden-tray_23-2147956827.jpg",
-        },
+          id: "p1",          name: "Signature Latte",          price: "$4.50",          imageSrc: "http://img.b2bpic.net/free-photo/healthy-breakfast-with-croissant-backed-cookies-milk-muesli-citrus-fruit-wooden-tray_23-2147956827.jpg"},
        {
-          id: "p2",
-          name: "Cold Brew",
-          price: "$5.00",
-          imageSrc: "http://img.b2bpic.net/free-photo/freshly-baked-muffins-metal-molds-closeups-bakery_169016-25375.jpg",
-        },
+          id: "p2",          name: "Cold Brew",          price: "$5.00",          imageSrc: "http://img.b2bpic.net/free-photo/freshly-baked-muffins-metal-molds-closeups-bakery_169016-25375.jpg"},
        {
-          id: "p3",
-          name: "Double Brownie",
-          price: "$3.50",
-          imageSrc: "http://img.b2bpic.net/free-photo/chocolate-muffins-with-cherry_661915-251.jpg",
-        },
+          id: "p3",          name: "Double Brownie",          price: "$3.50",          imageSrc: "http://img.b2bpic.net/free-photo/chocolate-muffins-with-cherry_661915-251.jpg"},
        {
-          id: "p4",
-          name: "Blueberry Muffin",
-          price: "$3.00",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-delicious-chocolate-muffin_23-2148549929.jpg",
-        },
+          id: "p4",          name: "Blueberry Muffin",          price: "$3.00",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-view-delicious-chocolate-muffin_23-2148549929.jpg"},
        {
-          id: "p5",
-          name: "Espresso Shot",
-          price: "$2.50",
-          imageSrc: "http://img.b2bpic.net/free-photo/chocolate-brownies-cake_74190-7069.jpg",
-        },
+          id: "p5",          name: "Espresso Shot",          price: "$2.50",          imageSrc: "http://img.b2bpic.net/free-photo/chocolate-brownies-cake_74190-7069.jpg"},
        {
-          id: "p6",
-          name: "Ice Tea Refresher",
-          price: "$4.00",
-          imageSrc: "http://img.b2bpic.net/free-photo/cropped-image-lot-bread-table_171337-16157.jpg",
-        },
+          id: "p6",          name: "Ice Tea Refresher",          price: "$4.00",          imageSrc: "http://img.b2bpic.net/free-photo/cropped-image-lot-bread-table_171337-16157.jpg"},
      ]}
      title="Our Daily Menu"
      description="Delicious coffee and house-made snacks, fresh daily."
@@ -198,26 +137,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      metrics={[
        {
-          id: "m1",
-          value: "100%",
-          title: "Friendly Service",
-          description: "Always smiling",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-happy-friends-with-coffee-cups_23-2149455291.jpg",
-        },
+          id: "m1",          value: "100%",          title: "Friendly Service",          description: "Always smiling",          imageSrc: "http://img.b2bpic.net/free-photo/side-view-happy-friends-with-coffee-cups_23-2149455291.jpg"},
        {
-          id: "m2",
-          value: "20+",
-          title: "Drinks Variety",
-          description: "Something for everyone",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-synthetic-leather-jacket-taking-photo-his-girlfriend-outdoors_23-2149448407.jpg",
-        },
+          id: "m2",          value: "20+",          title: "Drinks Variety",          description: "Something for everyone",          imageSrc: "http://img.b2bpic.net/free-photo/man-synthetic-leather-jacket-taking-photo-his-girlfriend-outdoors_23-2149448407.jpg"},
        {
-          id: "m3",
-          value: "4",
-          title: "Daily Promotions",
-          description: "Always a bonus",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-empty-cafeteria_181624-29282.jpg",
-        },
+          id: "m3",          value: "4",          title: "Daily Promotions",          description: "Always a bonus",          imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-empty-cafeteria_181624-29282.jpg"},
      ]}
      title="Why We're Loved"
      description="More than just a coffee spot, we are a community."
@@ -230,45 +154,15 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "1",
-          name: "Sarah J.",
-          role: "Local Skater",
-          quote: "Lovely coffee spot at the skatepark with an impressive variety of drinks to choose from.",
-          title: "Excellent!",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-drinking-hot-chocolate-cafe_23-2149944067.jpg",
-        },
+          id: "1",          name: "Sarah J.",          role: "Local Skater",          quote: "Lovely coffee spot at the skatepark with an impressive variety of drinks to choose from.",          title: "Excellent!",          imageSrc: "http://img.b2bpic.net/free-photo/woman-drinking-hot-chocolate-cafe_23-2149944067.jpg"},
        {
-          id: "2",
-          name: "Michael R.",
-          role: "Visitor",
-          quote: "They offer a tasty selection of muffins and brownies, perfect to pair with your coffee.",
-          title: "Delicious Treats",
-          imageSrc: "http://img.b2bpic.net/free-photo/mature-man-with-sustainable-mobility-skateboard_23-2149129305.jpg",
-        },
+          id: "2",          name: "Michael R.",          role: "Visitor",          quote: "They offer a tasty selection of muffins and brownies, perfect to pair with your coffee.",          title: "Delicious Treats",          imageSrc: "http://img.b2bpic.net/free-photo/mature-man-with-sustainable-mobility-skateboard_23-2149129305.jpg"},
        {
-          id: "3",
-          name: "Emily D.",
-          role: "Regular",
-          quote: "The service is friendly and efficient, making every visit enjoyable.",
-          title: "Great Staff",
-          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-sitting-chair_23-2150170385.jpg",
-        },
+          id: "3",          name: "Emily D.",          role: "Regular",          quote: "The service is friendly and efficient, making every visit enjoyable.",          title: "Great Staff",          imageSrc: "http://img.b2bpic.net/free-photo/side-view-man-sitting-chair_23-2150170385.jpg"},
        {
-          id: "4",
-          name: "David K.",
-          role: "Daily Patron",
-          quote: "Their great promotions are an added bonus that keeps you coming back.",
-          title: "Best Deals",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-friends-with-smartphone_23-2150233614.jpg",
-        },
+          id: "4",          name: "David K.",          role: "Daily Patron",          quote: "Their great promotions are an added bonus that keeps you coming back.",          title: "Best Deals",          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-friends-with-smartphone_23-2150233614.jpg"},
        {
-          id: "5",
-          name: "Anna P.",
-          role: "Student",
-          quote: "The perfect place to relax while watching the skaters.",
-          title: "Hidden Gem",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-holding-white-idea-board-looking-her-coffee_114579-92469.jpg",
-        },
+          id: "5",          name: "Anna P.",          role: "Student",          quote: "The perfect place to relax while watching the skaters.",          title: "Hidden Gem",          imageSrc: "http://img.b2bpic.net/free-photo/vertical-photo-young-lady-holding-white-idea-board-looking-her-coffee_114579-92469.jpg"},
      ]}
      title="What They Say"
      description="Loved by locals and skaters alike."
@@ -281,20 +175,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      faqs={[
        {
-          id: "q1",
-          title: "Are there vegan options?",
-          content: "Yes, we offer several dairy-free milk alternatives and occasional vegan baked goods.",
-        },
+          id: "q1",          title: "Are there vegan options?",          content: "Yes, we offer several dairy-free milk alternatives and occasional vegan baked goods."},
        {
-          id: "q2",
-          title: "Do you have Wi-Fi?",
-          content: "We offer free high-speed Wi-Fi for all our customers.",
-        },
+          id: "q2",          title: "Do you have Wi-Fi?",          content: "We offer free high-speed Wi-Fi for all our customers."},
        {
-          id: "q3",
-          title: "Is the shop open on weekends?",
-          content: "We are open seven days a week, including all weekends and holidays.",
-        },
+          id: "q3",          title: "Is the shop open on weekends?",          content: "We are open seven days a week, including all weekends and holidays."},
      ]}
      title="Common Questions"
      description="Here's what folks often ask about us."
@@ -306,8 +191,7 @@ export default function LandingPage() {
      <ContactText
      useInvertedBackground={false}
      background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
      text="Visit us today at the local skatepark for your caffeine boost!"
    />
  </div>
@@ -317,25 +201,17 @@ export default function LandingPage() {
      logoText="Merkava Coffee"
      columns={[
        {
-          title: "Company",
-          items: [
+          title: "Company",          items: [
            {
-              label: "About Us",
-              href: "#about",
-            },
+              label: "About Us",              href: "#about"},
            {
-              label: "Menu",
-              href: "#menu",
-            },
+              label: "Menu",              href: "#menu"},
          ],
        },
        {
-          title: "Legal",
-          items: [
+          title: "Legal",          items: [
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
          ],
        },
      ]}
@@ -344,4 +220,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- 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-inter), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-public-sans), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
 }
Author	SHA1	Message	Date
bender	587d358991	Merge version_2 into main Merge version_2 into main	2026-04-25 22:54:01 +00:00
bender	47b2863781	Update theme fonts	2026-04-25 22:53:55 +00:00
bender	1d7870c4da	Update theme fonts	2026-04-25 22:53:54 +00:00
bender	a61c73835e	Merge version_2 into main Merge version_2 into main	2026-04-25 22:52:26 +00:00
bender	c2dd8e60f4	Update src/app/page.tsx	2026-04-25 22:52:23 +00:00