Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -3,9 +3,9 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FaqBase from '@/components/sections/faq/FaqBase';
+import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroLogo from '@/components/sections/hero/HeroLogo';
 import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
@@ -139,13 +139,14 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqBase
+      <FaqDouble
       textboxLayout="default"
       useInvertedBackground={false}
       faqs={[
         { id: "f1", title: "Are you open?", content: "Yes, we are open! We welcome locals and visitors daily." },
         { id: "f2", title: "What are your hours?", content: "Generally 7:00 AM until late. Check our latest updates for seasonal changes." },
         { id: "f3", title: "Do you serve food?", content: "Yes, we offer a range of pub meals and snacks all day." },
+        { id: "f4", title: "Is there parking?", content: "Street parking is available right in front of the bar." },
       ]}
       title="Common Questions"
       description="Everything you need to know about Star Bar."
@@ -165,13 +166,15 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterBase
       logoText="Star Bar"
-      leftLink={{ text: "© 2024 Star Bar", href: "#" }}
-      rightLink={{ text: "300 Spring St, Pueblo, CO", href: "https://maps.google.com" }}
+      columns={[
+          { title: "Quick Links", items: [{ label: "Menu", href: "#products" }, { label: "Contact", href: "#contact" }] },
+          { title: "Info", items: [{ label: "300 Spring St, Pueblo", href: "#" }] }
+      ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}