Update src/app/page.tsx

Merge version_13 into main

src/app/about/page.tsx

@@ -24,20 +24,16 @@ export default function AboutPage() {
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingInline
             navItems={[
-              {
+              { name: "Home", id: "/" },
-                name: "Home",                id: "/"},
+              { name: "About Us", id: "/about" },
-              {
+              { name: "Services", id: "/services" },
-                name: "About Us",                id: "/about"},
+              { name: "Portfolio", id: "/#portfolio" },
-              {
+              { name: "Testimonials", id: "/#testimonials" },
-                name: "Services",                id: "/services"},
+              { name: "Contact Us", id: "/contact" }
-              {
-                name: "Portfolio",                id: "/#portfolio"},
-              {
-                name: "Testimonials",                id: "/#testimonials"},
             ]}
             brandName="Lombard Landscaping by Morris LDC"
             animateOnLoad={true}
-            button={{ text: "Contact Us", href: "/" }}
+            button={{ text: "Contact Us", href: "/contact" }}
           />
         </div>
 
@@ -50,7 +46,7 @@ export default function AboutPage() {
             imageAlt="Lombard Landscaping team working in a garden"
             buttons={[
               {
-                text: "Contact Us",                href: "/"
+                text: "Contact Us",                href: "/contact"
               },
             ]}
           />

src/app/contact/page.tsx

@@ -3,8 +3,8 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import ContactText from '@/components/sections/contact/ContactText';
 import FooterSimple from '@/components/sections/footer/FooterSimple';
+import ButtonShiftHover from '@/components/button/ButtonShiftHover/ButtonShiftHover';
 
 export default function ContactPage() {
   return (
@@ -24,38 +24,27 @@ export default function ContactPage() {
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingInline
             navItems={[
-              {
+              { name: "Home", id: "/" },
-                name: "Home",                id: "/"},
+              { name: "About Us", id: "/about" },
-              {
+              { name: "Services", id: "/services" },
-                name: "About Us",                id: "/about"},
+              { name: "Portfolio", id: "/#portfolio" },
-              {
+              { name: "Testimonials", id: "/#testimonials" },
-                name: "Services",                id: "/services"},
+              { name: "Contact Us", id: "/contact" }
-              {
-                name: "Portfolio",                id: "/#portfolio"},
-              {
-                name: "Testimonials",                id: "/#testimonials"},
-              {
-                name: "Contact",                id: "/contact"}
             ]}
             brandName="Lombard Landscaping by Morris LDC"
-            button={{
+            button={{ text: "Contact Us", href: "/contact" }}
-              text: "Get a Free Quote",              href: "/contact"}}
             animateOnLoad={true}
           />
         </div>
 
-        <div id="contact-content" data-section="contact-content">
+        <div id="contact-content" data-section="contact-content" className="flex flex-col items-center justify-center min-h-[50vh] text-center px-4 py-16">
-          <ContactText
+            <h1 className="text-4xl md:text-5xl font-bold mb-8">Contact Us Directly</h1>
-            useInvertedBackground={false}
+            <p className="text-lg md:text-xl mb-8 max-w-2xl">For immediate assistance, please call us.</p>
-            background={{
+            <ButtonShiftHover
-              variant: "downward-rays-animated"}}
+                text="Call 630-661-6168"
-            text="Ready to Transform Your Landscape? Contact Us!"
+                href="tel:630-661-6168"
-            buttons={[
+                className="max-w-xs px-8 py-4 text-xl"
-              {
+            />
-                text: "Call for a Free Consultation",                href: "tel:630-661-6168"
-              }
-            ]}
-          />
         </div>
 
         <div id="footer" data-section="footer">

src/app/page.tsx

@@ -33,20 +33,16 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingInline
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",          id: "/"},
+        { name: "About Us", id: "/about" },
-        {
+        { name: "Services", id: "/services" },
-          name: "About Us",          id: "/about"},
+        { name: "Portfolio", id: "/#portfolio" },
-        {
+        { name: "Testimonials", id: "/#testimonials" },
-          name: "Services",          id: "/services"},
+        { name: "Contact Us", id: "/contact" } // Added
-        {
-          name: "Portfolio",          id: "/#portfolio"},
-        {
-          name: "Testimonials",          id: "/#testimonials"},
       ]}
       brandName="Lombard Landscaping by Morris LDC"
       animateOnLoad={true}
-      button={{ text: "Contact Us", href: "/" }}
+      button={{ text: "Contact Us", href: "/contact" }} // Updated href
     />
   </div>
 
@@ -58,7 +54,7 @@ export default function LandingPage() {
       description="Creating breathtaking landscapes and outdoor living spaces tailored to your vision and lifestyle. Experience unparalleled beauty and functionality."
       buttons={[
         {
-          text: "Get a Free Consultation",          href: "/"},
+          text: "Get a Free Consultation",          href: "/contact"}, // Changed to /contact
         {
           text: "View Our Portfolio",          href: "/#portfolio"},
       ]}