Update src/app/page.tsx

Merge version_14 into main

src/app/about/page.tsx

@@ -3,8 +3,8 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TeamCardSix from '@/components/sections/team/TeamCardSix';
 import { MapPin, Users } from "lucide-react";
 
@@ -24,18 +24,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
       navItems={[
-        {
-          name: "Home",          id: "/"},
-        {
-          name: "Services",          id: "/services"},
-        {
-          name: "How It Works",          id: "/how-it-works"},
-        {
-          name: "About",          id: "/about"},
-        {
-          name: "Contact",          id: "/contact"},
+        { name: "Home", id: "/" },
+        { name: "Services", id: "/services" },
+        { name: "How It Works", id: "/how-it-works" },
+        { name: "About", id: "/about" },
+        { name: "Contact", id: "/contact" },
       ]}
       brandName="Nicks 2 Interlock"
     />
@@ -87,23 +82,16 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
+      <FooterBaseCard
+      logoText="Nicks 2 Interlock"
+      copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
       columns={[
-        {
-          items: [
-            {
-              label: "Home",              href: "/"},
-            {
-              label: "Services",              href: "/services"},
-            {
-              label: "Contact",              href: "/contact"},
-          ],
-        },
+        { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Contact", href: "/contact" }] },
+        { title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
       ]}
-      logoText="Nicks 2 Interlock Services"
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/contact/page.tsx

@@ -3,8 +3,8 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
 
 export default function LandingPage() {
@@ -23,18 +23,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
       navItems={[
-        {
-          name: "Home",          id: "/"},
-        {
-          name: "Services",          id: "/services"},
-        {
-          name: "How It Works",          id: "/how-it-works"},
-        {
-          name: "About",          id: "/about"},
-        {
-          name: "Contact",          id: "/contact"},
+        { name: "Home", id: "/" },
+        { name: "Services", id: "/services" },
+        { name: "How It Works", id: "/how-it-works" },
+        { name: "About", id: "/about" },
+        { name: "Contact", id: "/contact" },
       ]}
       brandName="Nicks 2 Interlock"
     />
@@ -84,23 +79,16 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
+      <FooterBaseCard
+      logoText="Nicks 2 Interlock"
+      copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
       columns={[
-        {
-          items: [
-            {
-              label: "Home",              href: "/"},
-            {
-              label: "Services",              href: "/services"},
-            {
-              label: "Contact",              href: "/contact"},
-          ],
-        },
+        { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Contact", href: "/contact" }] },
+        { title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
       ]}
-      logoText="Nicks 2 Interlock Services"
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/how-it-works/page.tsx

@@ -2,9 +2,9 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TimelineProcessFlow from '@/components/cardStack/layouts/timelines/TimelineProcessFlow';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import { Zap, FileCheck, CheckCircle2, Wrench } from "lucide-react";
 
 export default function HowItWorksPage() {
@@ -23,7 +23,7 @@ export default function HowItWorksPage() {
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
-            <NavbarLayoutFloatingOverlay
+            <NavbarStyleApple
             navItems={[
               { name: "Home", id: "/" },
               { name: "Services", id: "/services" },
@@ -51,12 +51,16 @@ export default function HowItWorksPage() {
         </div>
 
         <div id="footer" data-section="footer">
-            <FooterLogoEmphasis
-            columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
+            <FooterBaseCard
             logoText="Nicks 2 Interlock"
+            copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
+            columns={[
+              { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
+              { title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
+            ]}
             />
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -3,11 +3,11 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroSplitDoubleCarousel from '@/components/sections/hero/HeroSplitDoubleCarousel';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import { Award, CheckCircle, Heart, ShieldCheck } from "lucide-react";
 
@@ -27,7 +27,7 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
       navItems={[
         { name: "Home", id: "/" },
         { name: "Services", id: "/services" },
@@ -91,14 +91,20 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqSplitText
+      <FaqBase
+      title="Frequently Asked Questions"
+      description="Everything you need to know about our ignition interlock installation, calibration, and compliance services in Colorado."
+      faqsAnimation="blur-reveal"
+      textboxLayout="split"
       useInvertedBackground={true}
       faqs={[
-        { id: "f1", title: "What is an ignition interlock device?", content: "It is a breath-test device connected to your vehicle's ignition system." },
-        { id: "f2", title: "How often do I need calibration?", content: "Regular calibration is required to ensure accuracy." },
+        { id: "f1", title: "What exactly is an ignition interlock device (IID)?", content: "An Ignition Interlock Device is a breath alcohol monitoring system installed in your vehicle. It prevents the engine from starting if alcohol is detected in your breath sample, ensuring full compliance with state requirements during your restricted driving period." },
+        { id: "f2", title: "How often do I need to visit for calibration and data downloads?", content: "Standard Colorado regulations typically require IID monitoring visits every 30 to 60 days. During these appointments, our certified technicians download data from the device to confirm compliance with your program and ensure the hardware is functioning optimally." },
+        { id: "f3", title: "Can I get a same-day installation appointment?", content: "We strive to accommodate your schedule whenever possible. Depending on our current service volume and your vehicle model, same-day appointments are often available at our Longmont facility. We recommend calling us early in the morning to check our real-time availability." },
+        { id: "f4", title: "Is the device complicated or difficult to operate?", content: "Not at all. We provide comprehensive hands-on training during your installation appointment to ensure you feel confident and comfortable. Our team demonstrates how to perform the breath tests correctly and explains all audio and visual alerts clearly, so you'll be well-prepared for everyday use." },
+        { id: "f5", title: "What happens if I fail a breath test while driving?", content: "The device is designed to detect alcohol and record all attempts. If a breath test is failed, it will log the event, preventing the vehicle from starting and potentially alerting state monitoring authorities. We strongly advise strictly avoiding all alcohol use when operating a vehicle equipped with an IID to maintain your program status." },
+        { id: "f6", title: "Will the installation cause any permanent damage to my car?", content: "Absolutely not. Our professional technicians are experts in modern automotive electronics. We use non-invasive, industry-standard installation techniques that maintain the integrity of your vehicle's ignition and electrical systems, ensuring everything functions exactly as the manufacturer intended." }
       ]}
-      sideTitle="Answers to Your Questions"
-      faqsAnimation="blur-reveal"
     />
   </div>
 
@@ -116,9 +122,13 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
-      columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
+      <FooterBaseCard
       logoText="Nicks 2 Interlock"
+      copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
+      columns={[
+        { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
+        { title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
+      ]}
     />
   </div>
       </ReactLenis>

src/app/services/page.tsx

@@ -2,8 +2,8 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
 export default function ServicesPage() {
@@ -22,7 +22,7 @@ export default function ServicesPage() {
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
-            <NavbarLayoutFloatingOverlay
+            <NavbarStyleApple
             navItems={[
               { name: "Home", id: "/" },
               { name: "Services", id: "/services" },
@@ -49,9 +49,13 @@ export default function ServicesPage() {
         </div>
 
         <div id="footer" data-section="footer">
-            <FooterLogoEmphasis
-            columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
+            <FooterBaseCard
             logoText="Nicks 2 Interlock"
+            copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
+            columns={[
+              { title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
+              { title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
+            ]}
             />
         </div>
       </ReactLenis>