Merge version_2 into main

Merge version_2 into main

src/app/our-story/page.tsx

@@ -0,0 +1,74 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import FooterCard from '@/components/sections/footer/FooterCard';
+import { Facebook, Instagram, Star } from "lucide-react";
+
+export const metadata = {
+  title: 'Our Story | Buzz Menifee Coffee',
+  description: 'Learn about the journey and passion behind Buzz Menifee Coffee, from our humble beginnings to becoming a beloved local spot.',
+};
+
+export default function OurStoryPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="directional-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="soft"
+        contentWidth="mediumSmall"
+        sizing="medium"
+        background="noiseDiagonalGradient"
+        cardStyle="glass-depth"
+        primaryButtonStyle="flat"
+        secondaryButtonStyle="layered"
+        headingFontWeight="extrabold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleFullscreen
+            navItems={[
+              { name: "Home", id: "/#hero" },
+              { name: "About Us", id: "/our-story" },
+              { name: "Our Menu", id: "/#menu" },
+              { name: "Testimonials", id: "/#testimonials" },
+              { name: "FAQ", id: "/#faq" },
+              { name: "Contact", id: "/#contact" },
+            ]}
+            logoSrc="http://img.b2bpic.net/free-vector/pack-retro-coffee-badges_23-2147604813.jpg"
+            logoAlt="Buzz Menifee Coffee logo"
+            brandName="Buzz Menifee Coffee"
+          />
+        </div>
+
+        <div id="our-story-main" data-section="our-story-main">
+          <InlineImageSplitTextAbout
+            useInvertedBackground={false}
+            heading={[
+              { type: "text", content: "The Journey of Buzz Menifee Coffee" },
+              { type: "image", src: "http://img.b2bpic.net/free-photo/view-coffee-beans-dark-background_23-2147754665.jpg", alt: "Coffee beans roasting" },
+              { type: "text", content: "Buzz Menifee Coffee began with a simple dream: to create a community hub where exceptional coffee and genuine connections thrive. Our founders, avid coffee enthusiasts, embarked on a quest to master the art of coffee making, from sourcing the finest beans globally to perfecting the roasting process right here in Menifee. Every cup tells a story of dedication, craftsmanship, and a deep love for the bean. We believe coffee is more than just a beverage; it's an experience, a ritual that brings people together and brightens their day. Join us as we continue to write our story, one delicious brew at a time."},
+            ]}
+            buttons={[
+              { text: "Meet Our Team", href: "#" }, // Placeholder for a future team section
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterCard
+            logoText="Buzz Menifee Coffee"
+            copyrightText="© 2024 Buzz Menifee Coffee. All rights reserved."
+            socialLinks={[
+              { icon: Facebook, href: "https://facebook.com/buzzmenifeecoffee", ariaLabel: "Facebook" },
+              { icon: Instagram, href: "https://instagram.com/buzzmenifeecoffee", ariaLabel: "Instagram" },
+              { icon: Star, href: "https://yelp.com/biz/buzz-menifee-coffee", ariaLabel: "Yelp" },
+            ]}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -35,7 +35,7 @@ export default function LandingPage() {
         {
           name: "Home",          id: "#hero"},
         {
-          name: "About Us",          id: "#about"},
+          name: "About Us",          id: "/our-story"},
         {
           name: "Our Menu",          id: "#menu"},
         {
@@ -116,7 +116,7 @@ export default function LandingPage() {
       ]}
       buttons={[
         {
-          text: "Our Story",          href: "#"},
+          text: "Our Story",          href: "/our-story"},
       ]}
     />
   </div>
@@ -294,4 +294,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}