Update src/app/faq/page.tsx

Merge version_2 into main

src/app/about/page.tsx

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterBase from '@/components/sections/footer/FooterBase';
 import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import SplitAbout from '@/components/sections/about/SplitAbout';
 import TeamCardFive from '@/components/sections/team/TeamCardFive';
 import { Clock, Smile, Hammer } from "lucide-react";
@@ -25,50 +25,27 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingInline
+      <NavbarStyleApple
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "/"},
-          id: "hero",
-
-        },
         {
-          name: "Why Us",
+          name: "About Us",          id: "/about"},
-          id: "about",
-
-        },
         {
-          name: "Services",
+          name: "Why Choose Us",          id: "/why-us"},
-          id: "features",
-
-        },
         {
-          name: "Gallery",
+          name: "Services",          id: "/services"},
-          id: "gallery",
-
-        },
         {
-          name: "Reviews",
+          name: "Gallery",          id: "/gallery"},
-          id: "testimonials",
-
-        },
         {
-          name: "FAQ",
+          name: "Reviews",          id: "/reviews"},
-          id: "faq",
-
-        },
         {
-          name: "Contact",
+          name: "FAQ",          id: "/faq"},
-          id: "contact",
+        {
-
+          name: "Contact",          id: "/#contact"},
-        },
       ]}
       brandName="Doral Plumbing Co."
-      button={{
+
-        text: "Call Us Today!",
-        href: "tel:786-977-5727",
-      }}
-      animateOnLoad={true}
     />
   </div>
 
@@ -81,25 +58,17 @@ export default function LandingPage() {
       description="Doral Plumbing Co. has been serving the Miami area with unparalleled plumbing expertise for over 20 years. Our mission is to provide reliable, efficient, and affordable plumbing solutions, ensuring the comfort and safety of your home or business."
       buttons={[
         {
-          text: "Schedule a Service",
+          text: "Schedule a Service",          href: "/#contact"},
-          href: "/contact",
-        },
       ]}
       bulletPoints={[
         {
-          title: "Experienced Professionals",
+          title: "Experienced Professionals",          description: "Our team consists of certified and highly experienced plumbers dedicated to quality workmanship.",          icon: Hammer,
-          description: "Our team consists of certified and highly experienced plumbers dedicated to quality workmanship.",
-          icon: Hammer,
         },
         {
-          title: "Customer Satisfaction",
+          title: "Customer Satisfaction",          description: "We prioritize clear communication and exceptional service, ensuring your peace of mind with every job.",          icon: Smile,
-          description: "We prioritize clear communication and exceptional service, ensuring your peace of mind with every job.",
-          icon: Smile,
         },
         {
-          title: "24/7 Emergency Service",
+          title: "24/7 Emergency Service",          description: "Ready to assist you anytime, day or night, for urgent plumbing needs with prompt response.",          icon: Clock,
-          description: "Ready to assist you anytime, day or night, for urgent plumbing needs with prompt response.",
-          icon: Clock,
         },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/plumber-repair-experienced-attentive-middleaged-man-examining-bottom-kitchen-sink_259150-58266.jpg"
@@ -114,17 +83,11 @@ export default function LandingPage() {
       description="We take pride in our service quality and the trust our community places in us. Our commitment to excellence is reflected in every project we undertake, big or small."
       metrics={[
         {
-          value: "20+",
+          value: "20+",          title: "Years in Business"},
-          title: "Years in Business",
-        },
         {
-          value: "10K+",
+          value: "10K+",          title: "Happy Customers"},
-          title: "Happy Customers",
-        },
         {
-          value: "4.8",
+          value: "4.8",          title: "Star Rating"},
-          title: "Star Rating",
-        },
       ]}
       tag="Our Impact"
       imageSrc="http://img.b2bpic.net/free-photo/tools-materials-sanitary-works_93675-131721.jpg"
@@ -140,29 +103,13 @@ export default function LandingPage() {
       useInvertedBackground={false}
       team={[
         {
-          id: "1",
+          id: "1",          name: "John Doe",          role: "Lead Plumber",          imageSrc: "http://img.b2bpic.net/free-photo/happy-young-man-dressed-grey-t-shirt-isolated_171337-7641.jpg"},
-          name: "John Doe",
-          role: "Lead Plumber",
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-young-man-dressed-grey-t-shirt-isolated_171337-7641.jpg",
-        },
         {
-          id: "2",
+          id: "2",          name: "Jane Smith",          role: "Senior Technician",          imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-woman-taking-selfie-photo-winking_1262-18343.jpg"},
-          name: "Jane Smith",
-          role: "Senior Technician",
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-woman-taking-selfie-photo-winking_1262-18343.jpg",
-        },
         {
-          id: "3",
+          id: "3",          name: "Robert Johnson",          role: "Master Plumber",          imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-man-wearing-casual-black-tshirt-standing-isolated-red-background-looking-away-side-with-smile-face-natural-expression-laughing-confident_839833-32367.jpg"},
-          name: "Robert Johnson",
-          role: "Master Plumber",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-handsome-man-wearing-casual-black-tshirt-standing-isolated-red-background-looking-away-side-with-smile-face-natural-expression-laughing-confident_839833-32367.jpg",
-        },
         {
-          id: "4",
+          id: "4",          name: "Emily White",          role: "Apprentice Plumber",          imageSrc: "http://img.b2bpic.net/free-photo/happy-man-with-joyful-expression-has-perfect-smile-white-teeth-laughs-something-funny_273609-17078.jpg"},
-          name: "Emily White",
-          role: "Apprentice Plumber",
-          imageSrc: "http://img.b2bpic.net/free-photo/happy-man-with-joyful-expression-has-perfect-smile-white-teeth-laughs-something-funny_273609-17078.jpg",
-        },
       ]}
       title="Meet Our Expert Plumbing Team"
       description="Our dedicated professionals are the heart of Doral Plumbing Co., bringing years of experience and a passion for problem-solving to every task."
@@ -174,66 +121,41 @@ export default function LandingPage() {
       <FooterBase
       columns={[
         {
-          title: "Services",
+          title: "Services",          items: [
-          items: [
             {
-              label: "Faucet Repair",
+              label: "Faucet Repair",              href: "/services"},
-              href: "/services#faucet",
-            },
             {
-              label: "Water Heater",
+              label: "Water Heater",              href: "/services"},
-              href: "/services#waterheater",
-            },
             {
-              label: "Pipe Repair",
+              label: "Pipe Repair",              href: "/services"},
-              href: "/services#piperepair",
-            },
             {
-              label: "Drain Cleaning",
+              label: "Drain Cleaning",              href: "/services"},
-              href: "/services#draincleaning",
-            },
           ],
         },
         {
-          title: "Company",
+          title: "Company",          items: [
-          items: [
             {
-              label: "About Us",
+              label: "About Us",              href: "/about"},
-              href: "/about",
-            },
             {
-              label: "Our Work",
+              label: "Why Choose Us",              href: "/why-us"},
-              href: "/gallery",
-            },
             {
-              label: "Reviews",
+              label: "Our Work",              href: "/gallery"},
-              href: "/reviews",
-            },
             {
-              label: "FAQs",
+              label: "Reviews",              href: "/reviews"},
-              href: "/faq",
-            },
             {
-              label: "Contact",
+              label: "FAQs",              href: "/faq"},
-              href: "/contact",
+            {
-            },
+              label: "Contact Us",              href: "/#contact"},
           ],
         },
         {
-          title: "Contact",
+          title: "Contact",          items: [
-          items: [
             {
-              label: "(305) 123-4567",
+              label: "(786) 977-5727",              href: "tel:786-977-5727"},
-              href: "tel:+13051234567",
-            },
             {
-              label: "info@doralplumbing.com",
+              label: "info@doralplumbing.com",              href: "mailto:info@doralplumbing.com"},
-              href: "mailto:info@doralplumbing.com",
-            },
             {
-              label: "123 Main St, Doral, FL",
+              label: "123 Main St, Doral, FL",              href: "#"},
-              href: "#",
-            },
           ],
         },
       ]}

src/app/faq/page.tsx

@@ -2,7 +2,7 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 
@@ -22,21 +22,19 @@ export default function FaqPage() {
     >
       <ReactLenis root>
         <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
+          <NavbarStyleApple
             navItems={[
               { name: "Home", id: "/" },
-              { name: "Why Us", id: "/why-us" },
+              { name: "About Us", id: "/about" },
+              { name: "Why Choose Us", id: "/why-us" },
               { name: "Services", id: "/services" },
               { name: "Gallery", id: "/gallery" },
               { name: "Reviews", id: "/reviews" },
               { name: "FAQ", id: "/faq" },
-              { name: "Contact", id: "/contact" }
+              { name: "Contact", id: "/#contact" }
             ]}
             brandName="Doral Plumbing Co."
-            button={{
+
-              text: "Call Us Today!",              href: "tel:786-977-5727"
-            }}
-            animateOnLoad={true}
           />
         </div>
 
@@ -77,18 +75,20 @@ export default function FaqPage() {
             columns={[
               {
                 title: "Services",                items: [
-                  { label: "Faucet Repair", href: "/services#faucet" },
+                  { label: "Faucet Repair", href: "/services" },
-                  { label: "Water Heaters", href: "/services#water-heaters" },
+                  { label: "Water Heaters", href: "/services" },
-                  { label: "Pipe Repair", href: "/services#pipes" },
+                  { label: "Pipe Repair", href: "/services" },
-                  { label: "Drain Cleaning", href: "/services#drains" }
+                  { label: "Drain Cleaning", href: "/services" }
                 ]
               },
               {
                 title: "Company",                items: [
                   { label: "About Us", href: "/about" },
+                  { label: "Why Choose Us", href: "/why-us" },
                   { label: "Our Work", href: "/gallery" },
                   { label: "Reviews", href: "/reviews" },
-                  { label: "Contact", href: "/contact" }
+                  { label: "FAQs", href: "/faq" },
+                  { label: "Contact Us", href: "/#contact" }
                 ]
               },
               {