Merge version_3 into main

Merge version_3 into main

src/app/globals.css

@@ -4,13 +4,13 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  --background: #000802;;
-  --card: #0b1a0b;;
-  --foreground: #e6ffe6;;
-  --primary-cta: #62f58e;;
-  --secondary-cta: #07170b;;
-  --accent: #7ff09d;;
-  --background-accent: #2c6541;;
+  --background: #fffef5;
+  --card: #fdfdf0;
+  --foreground: #1a1a00;
+  --primary-cta: #ffcf40;
+  --secondary-cta: #ffffff;
+  --accent: #facc15;
+  --background-accent: #ffbf00;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -495,7 +495,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-merriweather), sans-serif;
+  font-family: var(--font-inter-tight), sans-serif;
   position: relative;
   min-height: 100vh;
   overscroll-behavior: none;
@@ -508,5 +508,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-merriweather), sans-serif;
+  font-family: var(--font-inter-tight), sans-serif;
 }

src/app/page.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
-import HeroLogoCarousel from '@/components/sections/hero/HeroLogoCarousel';
-import MediaAbout from '@/components/sections/about/MediaAbout';
+import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import TextAbout from '@/components/sections/about/TextAbout';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
 import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
@@ -38,47 +38,17 @@ export default function LandingPage() {
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroLogoCarousel
-          logoText="Brew Haven"
+        <HeroBillboard
+          title="Welcome to Brew Haven"
           description="Discover the finest specialty coffee crafted by passionate baristas. From ethically sourced single-origin beans to perfectly pulled espresso shots, we bring the world's best coffee to your cup."
-          mediaItems={[
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403059564-mmpwvbzu.jpg",
-              imageAlt: "Espresso shot with rich crema"
-            },
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403060798-jyic1c5u.jpg",
-              imageAlt: "Skilled barista crafting latte art"
-            },
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403062193-iks0i5de.jpg",
-              imageAlt: "Premium roasted coffee beans"
-            },
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403063260-gbejq1uv.jpg",
-              imageAlt: "Welcoming coffee shop interior"
-            },
-            {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403065127-bjqo0yj5.jpg",
-              imageAlt: "Perfect latte with beautiful foam art"
-            }
-          ]}
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403059564-mmpwvbzu.jpg"
+          imageAlt="Espresso shot with rich crema"
         />
       </div>
 
       <div id="about" data-section="about">
-        <MediaAbout
-          title="Our Story"
-          description="Founded in 2015, Brew Haven started as a passion project by two coffee enthusiasts who wanted to create a space where coffee quality meets community warmth. We partner directly with farmers across Ethiopia, Colombia, and Kenya to bring you the freshest, most responsibly sourced beans. Every cup tells a story of craftsmanship and dedication."
-          tag="About Us"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403071360-8wwq35xg.jpg"
-          imageAlt="Coffee shop interior with customers"
-          buttons={[
-            {
-              text: "Explore Our Beans",
-              href: "#menu"
-            }
-          ]}
+        <TextAbout
+          title="Hey man, it's us"
           useInvertedBackground="noInvert"
         />
       </div>
@@ -214,7 +184,6 @@ export default function LandingPage() {
             "https://webuild-dev.s3.eu-north-1.amazonaws.com/gallery/uploaded-1766403089735-q78a1ozs.jpg"
           ]}
           speed={40}
-          showCard={true}
         />
       </div>