Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -2,9 +2,9 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
 import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
@@ -31,21 +31,13 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "hero"},
-          id: "hero",
-        },
         {
-          name: "Services",
+          name: "Services",          id: "services"},
-          id: "services",
-        },
         {
-          name: "About",
+          name: "About",          id: "about"},
-          id: "about",
-        },
         {
-          name: "Contact",
+          name: "Contact",          id: "contact"},
-          id: "contact",
-        },
       ]}
       brandName="JM Property"
     />
@@ -54,45 +46,28 @@ export default function LandingPage() {
   <div id="hero" data-section="hero">
       <HeroBillboardCarousel
       background={{
-        variant: "gradient-bars",
+        variant: "gradient-bars"}}
-      }}
       title="Barrie’s Trusted Property Maintenance & Landscaping Experts"
       description="Proudly serving Simcoe County with reliable lawn care, snow removal & landscaping."
       buttons={[
         {
-          text: "Call (705) 817-4410",
+          text: "Call (705) 817-4410",          href: "tel:7058174410"},
-          href: "tel:7058174410",
-        },
         {
-          text: "Get a Free Quote",
+          text: "Get a Free Quote",          href: "#contact"},
-          href: "#contact",
-        },
       ]}
       mediaItems={[
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=1",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=1",          imageAlt: "Professional landscaping in Barrie"},
-          imageAlt: "Professional landscaping in Barrie",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=2",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=2",          imageAlt: "Lawn care results"},
-          imageAlt: "Lawn care results",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=3",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=3",          imageAlt: "Seasonal cleanup"},
-          imageAlt: "Seasonal cleanup",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=4",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=4",          imageAlt: "Snow removal services"},
-          imageAlt: "Snow removal services",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=5",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=5",          imageAlt: "Fencing projects"},
-          imageAlt: "Fencing projects",
-        },
         {
-          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=6",
+          imageSrc: "http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=6",          imageAlt: "Hardscaping detail"},
-          imageAlt: "Hardscaping detail",
-        },
       ]}
     />
   </div>
@@ -105,44 +80,28 @@ export default function LandingPage() {
       features={[
         {
           icon: Leaf,
-          title: "Landscaping",
+          title: "Landscaping",          description: "Beautiful garden design and installation."},
-          description: "Beautiful garden design and installation.",
-        },
         {
           icon: Star,
-          title: "Lawn Care",
+          title: "Lawn Care",          description: "Weekly mowing, edging, and fertilization."},
-          description: "Weekly mowing, edging, and fertilization.",
-        },
         {
           icon: Shield,
-          title: "Fencing",
+          title: "Fencing",          description: "Wood, chain-link, and decorative builds."},
-          description: "Wood, chain-link, and decorative builds.",
-        },
         {
           icon: Wrench,
-          title: "Hardscaping",
+          title: "Hardscaping",          description: "Patios, walkways, and interlocking design."},
-          description: "Patios, walkways, and interlocking design.",
-        },
         {
           icon: Leaf,
-          title: "Tree Care",
+          title: "Tree Care",          description: "Pruning, trimming, and removal."},
-          description: "Pruning, trimming, and removal.",
-        },
         {
           icon: Home,
-          title: "Grounds Maintenance",
+          title: "Grounds Maintenance",          description: "Full site upkeep for commercial and residential."},
-          description: "Full site upkeep for commercial and residential.",
-        },
         {
           icon: Snowflake,
-          title: "Snow Removal",
+          title: "Snow Removal",          description: "24/7 monitoring for lots and driveways."},
-          description: "24/7 monitoring for lots and driveways.",
-        },
         {
           icon: Leaf,
-          title: "Spring / Fall Cleanup",
+          title: "Spring / Fall Cleanup",          description: "Seasonal yard debris management."},
-          description: "Seasonal yard debris management.",
-        },
       ]}
       title="Our Services"
       description="Comprehensive property solutions tailored for Simcoe County."
@@ -157,17 +116,11 @@ export default function LandingPage() {
       description="Locally owned and operated in Barrie, we bring integrity-driven service to every project. Fully insured and committed to delivering professional results."
       bulletPoints={[
         {
-          title: "Fast Response",
+          title: "Fast Response",          description: "We prioritize communication."},
-          description: "We prioritize communication.",
-        },
         {
-          title: "24/7 Winter Service",
+          title: "24/7 Winter Service",          description: "We are there when you need us."},
-          description: "We are there when you need us.",
-        },
         {
-          title: "Local Experts",
+          title: "Local Experts",          description: "Serving Simcoe County for years."},
-          description: "Serving Simcoe County for years.",
-        },
       ]}
       mediaAnimation="slide-up"
       imageSrc="http://img.b2bpic.net/free-photo/lush-tropical-garden_1385-762.jpg?_wi=7"
@@ -183,23 +136,11 @@ export default function LandingPage() {
       useInvertedBackground={true}
       products={[
         {
-          id: "p1",
+          id: "p1",          name: "Patio Renovation",          price: "Custom",          imageSrc: "http://img.b2bpic.net/free-photo/woman-hitting-wheel-with-hammer_23-2147671876.jpg"},
-          name: "Patio Renovation",
-          price: "Custom",
-          imageSrc: "http://img.b2bpic.net/free-photo/woman-hitting-wheel-with-hammer_23-2147671876.jpg",
-        },
         {
-          id: "p2",
+          id: "p2",          name: "Lawn Restoration",          price: "Custom",          imageSrc: "http://img.b2bpic.net/free-photo/aerial-shot-roof-building-with-cars-green-plants_181624-20963.jpg"},
-          name: "Lawn Restoration",
-          price: "Custom",
-          imageSrc: "http://img.b2bpic.net/free-photo/aerial-shot-roof-building-with-cars-green-plants_181624-20963.jpg",
-        },
         {
-          id: "p3",
+          id: "p3",          name: "Commercial Snow Clearing",          price: "Seasonal",          imageSrc: "http://img.b2bpic.net/free-photo/railway-covered-with-smooth-white-snow_181624-12340.jpg"},
-          name: "Commercial Snow Clearing",
-          price: "Seasonal",
-          imageSrc: "http://img.b2bpic.net/free-photo/railway-covered-with-smooth-white-snow_181624-12340.jpg",
-        },
       ]}
       title="Recent Projects"
       description="See the results of our dedication."
@@ -211,30 +152,15 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "t1",
+          id: "t1",          name: "James Sherrer",          imageSrc: "http://img.b2bpic.net/free-photo/life-home-with-couple-relaxin-together_23-2149129080.jpg"},
-          name: "James Sherrer",
-          imageSrc: "http://img.b2bpic.net/free-photo/life-home-with-couple-relaxin-together_23-2149129080.jpg",
-        },
         {
-          id: "t2",
+          id: "t2",          name: "Sean Barber",          imageSrc: "http://img.b2bpic.net/free-photo/outdoors-portrait-young-good-looking-caucasian-bearded-man-blue-shirt-gloves-smiling-camera-holding-pot-with-flower-hands-working-garden_176420-19923.jpg"},
-          name: "Sean Barber",
-          imageSrc: "http://img.b2bpic.net/free-photo/outdoors-portrait-young-good-looking-caucasian-bearded-man-blue-shirt-gloves-smiling-camera-holding-pot-with-flower-hands-working-garden_176420-19923.jpg",
-        },
         {
-          id: "t3",
+          id: "t3",          name: "Sarah Miller",          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-couple-living-farmhouse_23-2150621710.jpg"},
-          name: "Sarah Miller",
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-couple-living-farmhouse_23-2150621710.jpg",
-        },
         {
-          id: "t4",
+          id: "t4",          name: "David Wilson",          imageSrc: "http://img.b2bpic.net/free-photo/best-team-whole-company_329181-15141.jpg?_wi=1"},
-          name: "David Wilson",
-          imageSrc: "http://img.b2bpic.net/free-photo/best-team-whole-company_329181-15141.jpg?_wi=1",
-        },
         {
-          id: "t5",
+          id: "t5",          name: "Emily Watson",          imageSrc: "http://img.b2bpic.net/free-photo/best-team-whole-company_329181-15141.jpg?_wi=2"},
-          name: "Emily Watson",
-          imageSrc: "http://img.b2bpic.net/free-photo/best-team-whole-company_329181-15141.jpg?_wi=2",
-        },
       ]}
       cardTitle="Client Feedback"
       cardAnimation="slide-up"
@@ -243,68 +169,40 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCTA
+      <ContactSplitForm
-      useInvertedBackground={true}
-      background={{
-        variant: "plain",
-      }}
-      tag="Let’s Talk"
       title="Ready to Transform Your Property?"
-      description="Call us today at (705) 817-4410 or request a free quote online."
+      description="Reach out to us for a personalized estimate or maintenance plan for your Simcoe County property."
-      buttons={[
+      inputs={[
-        {
+        { name: "name", type: "text", placeholder: "Full Name", required: true },
-          text: "Call Now",
+        { name: "email", type: "email", placeholder: "Email Address", required: true }
-          href: "tel:7058174410",
-        },
-        {
-          text: "Request Quote",
-          href: "mailto:jmlandscapingandproperty@gmail.com",
-        },
       ]}
+      textarea={{ name: "message", placeholder: "How can we help?", required: true }}
+      useInvertedBackground={true}
+      buttonText="Send Request"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
+      <FooterSimple
       columns={[
         {
-          items: [
+          title: "Company",          items: [
-            {
+            { label: "Services", href: "#services" },
-              label: "Services",
+            { label: "About Us", href: "#about" },
-              href: "#services",
+            { label: "Contact", href: "#contact" }
-            },
+          ]
-            {
-              label: "About Us",
-              href: "#about",
-            },
-            {
-              label: "Contact",
-              href: "#contact",
-            },
-          ],
         },
         {
-          items: [
+          title: "Service Areas",          items: [
-            {
+            { label: "Barrie" },
-              label: "Barrie",
+            { label: "Innisfil" },
-              href: "#",
+            { label: "Oro-Medonte" },
-            },
+            { label: "Springwater" }
-            {
+          ]
-              label: "Innisfil",
+        }
-              href: "#",
-            },
-            {
-              label: "Oro-Medonte",
-              href: "#",
-            },
-            {
-              label: "Springwater",
-              href: "#",
-            },
-          ],
-        },
       ]}
-      logoText="JM Property Maintenance"
+      bottomLeftText="© 2024 JM Property Maintenance"
+      bottomRightText="Insured & Professional"
     />
   </div>
       </ReactLenis>