Merge version_2 into main

Update src/app/styles/base.css
2026-04-09 12:19:05 +00:00 · 2026-04-09 12:19:02 +00:00 · 2026-04-09 12:19:02 +00:00 · 2026-04-09 12:19:01 +00:00 · 2026-04-09 08:34:37 +00:00
3 changed files with 37 additions and 140 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 { Montserrat } from "next/font/google";
+import { Libre_Baskerville } from "next/font/google";



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

-const montserrat = Montserrat({
-  variable: "--font-montserrat",
-  subsets: ["latin"],
-});
-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+
+const libreBaskerville = Libre_Baskerville({
+  variable: "--font-libre-baskerville",  subsets: ["latin"],
+  weight: ["400", "700"],
 });

 export default function RootLayout({
@@ -38,7 +36,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${montserrat.variable} ${inter.variable} antialiased`}>
+        <body className={`${libreBaskerville.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,25 +30,15 @@ export default function LandingPage() {
      <NavbarStyleFullscreen
      navItems={[
        {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
        {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
        {
-          name: "Menu",
-          id: "products",
-        },
+          name: "Menu",          id: "products"},
        {
-          name: "Testimonials",
-          id: "testimonials",
-        },
+          name: "Testimonials",          id: "testimonials"},
        {
-          name: "Visit",
-          id: "contact",
-        },
+          name: "Visit",          id: "contact"},
      ]}
      brandName="ZZ Coffee Shop"
    />
@@ -57,15 +47,12 @@ export default function LandingPage() {
  <div id="hero" data-section="hero">
      <HeroBillboardScroll
      background={{
-        variant: "sparkles-gradient",
-      }}
+        variant: "sparkles-gradient"}}
      title="Your Daily Brew in the Heart of Idaho Falls"
      description="ZZ Coffee Shop brings handcrafted, artisanal coffee experiences to our community. Warm vibes, fresh roasts, and friendly smiles await you."
      buttons={[
        {
-          text: "Explore Our Menu",
-          href: "#products",
-        },
+          text: "Explore Our Menu",          href: "#products"},
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/teen-girls-writing-notebooks-cafe_23-2147860799.jpg?_wi=1"
      imageAlt="Artisanal coffee shop atmosphere in Idaho Falls"
@@ -93,59 +80,23 @@ export default function LandingPage() {
      useInvertedBackground={false}
      products={[
        {
-          id: "p1",
-          brand: "Signature",
-          name: "House Espresso",
-          price: "$3.50",
-          rating: 5,
-          reviewCount: "120",
-          imageSrc: "http://img.b2bpic.net/free-photo/hot-caramel-macchiato_1339-6102.jpg?_wi=1",
-        },
+          id: "p1",          brand: "Signature",          name: "House Espresso",          price: "$3.50",          rating: 5,
+          reviewCount: "120",          imageSrc: "http://img.b2bpic.net/free-photo/hot-caramel-macchiato_1339-6102.jpg?_wi=1"},
        {
-          id: "p2",
-          brand: "Signature",
-          name: "Vanilla Latte",
-          price: "$4.50",
-          rating: 5,
-          reviewCount: "85",
-          imageSrc: "http://img.b2bpic.net/free-photo/adding-coffee-glass-water_176474-120135.jpg?_wi=1",
-        },
+          id: "p2",          brand: "Signature",          name: "Vanilla Latte",          price: "$4.50",          rating: 5,
+          reviewCount: "85",          imageSrc: "http://img.b2bpic.net/free-photo/adding-coffee-glass-water_176474-120135.jpg?_wi=1"},
        {
-          id: "p3",
-          brand: "Premium",
-          name: "Cold Brew",
-          price: "$4.00",
-          rating: 4,
-          reviewCount: "95",
-          imageSrc: "http://img.b2bpic.net/free-photo/tasty-steamy-cup-coffee-with-wooden-table-coffee-shop-wooden-card-sculpture_1268-20256.jpg?_wi=1",
-        },
+          id: "p3",          brand: "Premium",          name: "Cold Brew",          price: "$4.00",          rating: 4,
+          reviewCount: "95",          imageSrc: "http://img.b2bpic.net/free-photo/tasty-steamy-cup-coffee-with-wooden-table-coffee-shop-wooden-card-sculpture_1268-20256.jpg?_wi=1"},
        {
-          id: "p4",
-          brand: "Signature",
-          name: "Mocha Bliss",
-          price: "$5.00",
-          rating: 5,
-          reviewCount: "70",
-          imageSrc: "http://img.b2bpic.net/free-photo/view-3d-coffee-cup_23-2151083718.jpg",
-        },
+          id: "p4",          brand: "Signature",          name: "Mocha Bliss",          price: "$5.00",          rating: 5,
+          reviewCount: "70",          imageSrc: "http://img.b2bpic.net/free-photo/view-3d-coffee-cup_23-2151083718.jpg"},
        {
-          id: "p5",
-          brand: "Premium",
-          name: "Caramel Macchiato",
-          price: "$4.75",
-          rating: 4,
-          reviewCount: "65",
-          imageSrc: "http://img.b2bpic.net/free-photo/aroma-background-love-house-taste_1232-3951.jpg",
-        },
+          id: "p5",          brand: "Premium",          name: "Caramel Macchiato",          price: "$4.75",          rating: 4,
+          reviewCount: "65",          imageSrc: "http://img.b2bpic.net/free-photo/aroma-background-love-house-taste_1232-3951.jpg"},
        {
-          id: "p6",
-          brand: "Signature",
-          name: "Americano",
-          price: "$3.00",
-          rating: 4,
-          reviewCount: "50",
-          imageSrc: "http://img.b2bpic.net/free-photo/hands-holding-sack-coffee-beans_23-2148180251.jpg",
-        },
+          id: "p6",          brand: "Signature",          name: "Americano",          price: "$3.00",          rating: 4,
+          reviewCount: "50",          imageSrc: "http://img.b2bpic.net/free-photo/hands-holding-sack-coffee-beans_23-2148180251.jpg"},
      ]}
      title="Our Signature Brews"
      description="Explore our curated selection of coffees and signature drinks, handcrafted with passion."
@@ -158,60 +109,15 @@ export default function LandingPage() {
      useInvertedBackground={true}
      testimonials={[
        {
-          id: "t1",
-          name: "Sarah J.",
-          date: "Oct 2024",
-          title: "Best in Town",
-          quote: "The coffee here is unparalleled. ZZ Coffee is my daily go-to!",
-          tag: "Regular",
-          avatarSrc: "http://img.b2bpic.net/free-photo/attractive-cheerful-girl-cozy-sweater-with-coffee-go-happily-looking-camera-yellow-background_574295-3844.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/teen-girls-writing-notebooks-cafe_23-2147860799.jpg?_wi=2",
-          imageAlt: "artisanal coffee shop atmosphere",
-        },
+          id: "t1",          name: "Sarah J.",          date: "Oct 2024",          title: "Best in Town",          quote: "The coffee here is unparalleled. ZZ Coffee is my daily go-to!",          tag: "Regular",          avatarSrc: "http://img.b2bpic.net/free-photo/attractive-cheerful-girl-cozy-sweater-with-coffee-go-happily-looking-camera-yellow-background_574295-3844.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/teen-girls-writing-notebooks-cafe_23-2147860799.jpg?_wi=2",          imageAlt: "artisanal coffee shop atmosphere"},
        {
-          id: "t2",
-          name: "Mike R.",
-          date: "Sep 2024",
-          title: "Cozy Vibe",
-          quote: "Great atmosphere for studying or hanging out with friends. Love it!",
-          tag: "Customer",
-          avatarSrc: "http://img.b2bpic.net/free-photo/teenager-doing-homework-cafe_23-2147860803.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-spoon-holding-coffee_23-2148892827.jpg?_wi=2",
-          imageAlt: "roasted coffee beans closeup",
-        },
+          id: "t2",          name: "Mike R.",          date: "Sep 2024",          title: "Cozy Vibe",          quote: "Great atmosphere for studying or hanging out with friends. Love it!",          tag: "Customer",          avatarSrc: "http://img.b2bpic.net/free-photo/teenager-doing-homework-cafe_23-2147860803.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-spoon-holding-coffee_23-2148892827.jpg?_wi=2",          imageAlt: "roasted coffee beans closeup"},
        {
-          id: "t3",
-          name: "Linda M.",
-          date: "Aug 2024",
-          title: "Amazing Coffee",
-          quote: "I’ve traveled everywhere and this is easily one of the best roasts I've ever had.",
-          tag: "Coffee Lover",
-          avatarSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-happy-young-man-relaxing-coffee-shop-spending-time-cafe-listening_1258-245399.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/hot-caramel-macchiato_1339-6102.jpg?_wi=2",
-          imageAlt: "flat white coffee close up",
-        },
+          id: "t3",          name: "Linda M.",          date: "Aug 2024",          title: "Amazing Coffee",          quote: "I’ve traveled everywhere and this is easily one of the best roasts I've ever had.",          tag: "Coffee Lover",          avatarSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-happy-young-man-relaxing-coffee-shop-spending-time-cafe-listening_1258-245399.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/hot-caramel-macchiato_1339-6102.jpg?_wi=2",          imageAlt: "flat white coffee close up"},
        {
-          id: "t4",
-          name: "Jason D.",
-          date: "Jul 2024",
-          title: "Friendly Staff",
-          quote: "The team at ZZ Coffee is always so kind and welcoming. Makes my morning!",
-          tag: "Regular",
-          avatarSrc: "http://img.b2bpic.net/free-photo/low-angle-friends-meeting-restaurant_23-2148395335.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/adding-coffee-glass-water_176474-120135.jpg?_wi=2",
-          imageAlt: "cold brew coffee refreshing",
-        },
+          id: "t4",          name: "Jason D.",          date: "Jul 2024",          title: "Friendly Staff",          quote: "The team at ZZ Coffee is always so kind and welcoming. Makes my morning!",          tag: "Regular",          avatarSrc: "http://img.b2bpic.net/free-photo/low-angle-friends-meeting-restaurant_23-2148395335.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/adding-coffee-glass-water_176474-120135.jpg?_wi=2",          imageAlt: "cold brew coffee refreshing"},
        {
-          id: "t5",
-          name: "Emily K.",
-          date: "Jun 2024",
-          title: "Quality Brews",
-          quote: "Top quality espresso and great location. Highly recommended!",
-          tag: "Visitor",
-          avatarSrc: "http://img.b2bpic.net/free-photo/beauty-book-tenderness-cute-chair_1150-1189.jpg",
-          imageSrc: "http://img.b2bpic.net/free-photo/tasty-steamy-cup-coffee-with-wooden-table-coffee-shop-wooden-card-sculpture_1268-20256.jpg?_wi=2",
-          imageAlt: "cappuccino with latte art",
-        },
+          id: "t5",          name: "Emily K.",          date: "Jun 2024",          title: "Quality Brews",          quote: "Top quality espresso and great location. Highly recommended!",          tag: "Visitor",          avatarSrc: "http://img.b2bpic.net/free-photo/beauty-book-tenderness-cute-chair_1150-1189.jpg",          imageSrc: "http://img.b2bpic.net/free-photo/tasty-steamy-cup-coffee-with-wooden-table-coffee-shop-wooden-card-sculpture_1268-20256.jpg?_wi=2",          imageAlt: "cappuccino with latte art"},
      ]}
      title="What Our Neighbors Say"
      description="We love serving our local community. Here’s what our regulars have to say about us."
@@ -222,14 +128,11 @@ export default function LandingPage() {
      <ContactText
      useInvertedBackground={false}
      background={{
-        variant: "gradient-bars",
-      }}
+        variant: "gradient-bars"}}
      text="Visit ZZ Coffee Shop in Idaho Falls and taste the difference. We can't wait to welcome you!"
      buttons={[
        {
-          text: "Get Directions",
-          href: "#",
-        },
+          text: "Get Directions",          href: "#"},
      ]}
    />
  </div>
@@ -241,18 +144,14 @@ export default function LandingPage() {
      socialLinks={[
        {
          icon: Instagram,
-          href: "#",
-          ariaLabel: "Instagram",
-        },
+          href: "#",          ariaLabel: "Instagram"},
        {
          icon: Facebook,
-          href: "#",
-          ariaLabel: "Facebook",
-        },
+          href: "#",          ariaLabel: "Facebook"},
      ]}
    />
  </div>
      </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-libre-baskerville), serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-montserrat), sans-serif;
+  font-family: var(--font-libre-baskerville), serif;
 }
Author	SHA1	Message	Date
bender	0562e1e25d	Merge version_2 into main Merge version_2 into main	2026-04-09 12:19:05 +00:00
bender	f0b40ff1f7	Update src/app/styles/base.css	2026-04-09 12:19:02 +00:00
bender	de14a6c007	Update src/app/page.tsx	2026-04-09 12:19:02 +00:00
bender	a1452263c6	Update src/app/layout.tsx	2026-04-09 12:19:01 +00:00
bender	d4d89eb0d1	Merge version_1 into main Merge version_1 into main	2026-04-09 08:34:37 +00:00