Merge version_3 into main

Merge version_3 into main

src/app/page.tsx

@@ -3,10 +3,10 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import ContactSplit from '@/components/sections/contact/ContactSplit';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
+import ContactCenter from '@/components/sections/contact/ContactCenter';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroSplitDualMedia from '@/components/sections/hero/HeroSplitDualMedia';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
@@ -127,9 +127,7 @@ export default function LandingPage() {
         </div>
 
         <div id="faq" data-section="faq">
-          <FaqDouble
-            textboxLayout="default"
-            useInvertedBackground={false}
+          <FaqBase
             faqs={[
               { id: "f1", title: "Do you deliver?", content: "No, we offer dine-in and takeout service only." },
               { id: "f2", title: "What are your hours?", content: "We close fairly early at 8 PM, so plan your dinner visit accordingly!" }
@@ -137,31 +135,33 @@ export default function LandingPage() {
             title="Common Questions"
             description="Find everything you need to know about your next visit."
             faqsAnimation="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            showCard={true}
           />
         </div>
 
         <div id="contact" data-section="contact">
-          <ContactSplit
-            useInvertedBackground={false}
-            background={{ variant: "plain" }}
+          <ContactCenter
             tag="Contact"
             title="Visit Us Today!"
             description="Swing by for the best pizza in Ogden. We're open until 8 PM."
-            mediaAnimation="slide-up"
-            mediaPosition="right"
-            inputPlaceholder="Your email for updates"
+            useInvertedBackground={false}
             buttonText="Get Notified"
+            background={{ variant: "plain" }}
           />
         </div>
 
         <div id="footer" data-section="footer">
-          <FooterLogoReveal
+          <FooterBaseCard
             logoText="Tony's Pizza Ogden"
-            leftLink={{ text: "Terms of Service", href: "#" }}
-            rightLink={{ text: "Privacy Policy", href: "#" }}
+            columns={[
+              { title: "Menu", items: [{ label: "Pizzas", href: "#" }, { label: "Pasta", href: "#" }] },
+              { title: "Legal", items: [{ label: "Terms", href: "#" }, { label: "Privacy", href: "#" }] }
+            ]}
           />
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}