Switch to version 15: modified src/app/services/page.tsx

Merge version_16 into main

src/app/about/page.tsx

@@ -24,23 +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"},
-              {
-                name: "Contact",                id: "/#contact"},
             ]}
             brandName="Lombard Landscaping by Morris LDC"
-            button={{
-              text: "Get a Free Quote",              href: "/#contact"}}
             animateOnLoad={true}
+            button={{ text: "Contact Us", href: "/contact" }}
           />
         </div>
 
@@ -53,7 +46,7 @@ export default function AboutPage() {
             imageAlt="Lombard Landscaping team working in a garden"
             buttons={[
               {
-                text: "Contact Us",                href: "/#contact", 
+                text: "Contact Us",                href: "/contact"
               },
             ]}
           />
@@ -65,11 +58,11 @@ export default function AboutPage() {
               {
                 title: "Services",                items: [
                   {
-                    label: "Design & Planning",                    href: "/#services"},
+                    label: "Design & Planning",                    href: "/services"},
                   {
-                    label: "Installation",                    href: "/#services"},
+                    label: "Installation",                    href: "/services"},
                   {
-                    label: "Maintenance",                    href: "/#services"},
+                    label: "Maintenance",                    href: "/services"},
                   {
                     label: "Outdoor Living",                    href: "/#portfolio"},
                 ],
@@ -86,14 +79,6 @@ export default function AboutPage() {
                     label: "FAQ",                    href: "/#faq"},
                 ],
               },
-              {
-                title: "Connect",                items: [
-                  {
-                    label: "Contact Us",                    href: "/#contact"},
-                  {
-                    label: "Get a Quote",                    href: "/#contact"},
-                ],
-              },
             ]}
             bottomLeftText="© 2024 Lombard Landscaping by Morris LDC. All rights reserved."
             bottomRightText="Crafted with passion for nature."
@@ -102,4 +87,4 @@ export default function AboutPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/contact/page.tsx

@@ -0,0 +1,93 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import ButtonShiftHover from '@/components/button/ButtonShiftHover/ButtonShiftHover';
+
+export default function ContactPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="expand-hover"
+      defaultTextAnimation="background-highlight"
+      borderRadius="soft"
+      contentWidth="mediumLarge"
+      sizing="medium"
+      background="aurora"
+      cardStyle="inset"
+      primaryButtonStyle="flat"
+      secondaryButtonStyle="layered"
+      headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingInline
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About Us", id: "/about" },
+              { name: "Services", id: "/services" },
+              { name: "Portfolio", id: "/#portfolio" },
+              { name: "Testimonials", id: "/#testimonials" },
+              { name: "Contact Us", id: "/contact" }
+            ]}
+            brandName="Lombard Landscaping by Morris LDC"
+            button={{ text: "Contact Us", href: "/contact" }}
+            animateOnLoad={true}
+          />
+        </div>
+
+        <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">
+            <h1 className="text-4xl md:text-5xl font-bold mb-8">Contact Us Directly</h1>
+            <p className="text-lg md:text-xl mb-8 max-w-2xl">For immediate assistance, please call us.</p>
+            <ButtonShiftHover
+                text="Call 630-661-6168"
+                href="tel:630-661-6168"
+                className="max-w-xs px-8 py-4 text-xl"
+            />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              {
+                title: "Services",                items: [
+                  {
+                    label: "Design & Planning",                    href: "/services"},
+                  {
+                    label: "Installation",                    href: "/services"},
+                  {
+                    label: "Maintenance",                    href: "/services"},
+                  {
+                    label: "Outdoor Living",                    href: "/#portfolio"},
+                ],
+              },
+              {
+                title: "Company",                items: [
+                  {
+                    label: "About Us",                    href: "/about"},
+                  {
+                    label: "Portfolio",                    href: "/#portfolio"},
+                  {
+                    label: "Testimonials",                    href: "/#testimonials"},
+                  {
+                    label: "FAQ",                    href: "/#faq"},
+                ],
+              },
+              {
+                title: "Connect",                items: [
+                  {
+                    label: "Contact Us",                    href: "/contact"},
+                  {
+                    label: "Get a Quote",                    href: "/contact"},
+                ],
+              },
+            ]}
+            bottomLeftText="© 2024 Lombard Landscaping by Morris LDC. All rights reserved."
+            bottomRightText="Crafted with passion for nature."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -2,7 +2,7 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
+
 import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
 import FooterSimple from '@/components/sections/footer/FooterSimple';
@@ -33,23 +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"},
-        {
-          name: "Contact",          id: "/#contact"},
       ]}
       brandName="Lombard Landscaping by Morris LDC"
-      button={{
-        text: "Get a Free Quote",        href: "/#contact"}}
       animateOnLoad={true}
+      button={{ text: "Contact Us", href: "/contact" }} // Updated href
     />
   </div>
 
@@ -61,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: "/#contact"},
+          text: "Get a Free Consultation",          href: "/contact"}, // Changed to /contact
         {
           text: "View Our Portfolio",          href: "/#portfolio"},
       ]}
@@ -234,20 +227,7 @@ export default function LandingPage() {
     />
   </div>
 
-  <div id="contact" data-section="contact">
+  
-      <ContactText
-      useInvertedBackground={false}
-      background={{
-        variant: "downward-rays-animated"}}
-      text="Ready to Transform Your Landscape?"
-      buttons={[
-        {
-          text: "Get Your Free Consultation",          href: "/#contact"},
-        {
-          text: "Call Us Today",          href: "tel:+1234567890"},
-      ]}
-    />
-  </div>
 
   <div id="footer" data-section="footer">
       <FooterSimple
@@ -255,11 +235,11 @@ export default function LandingPage() {
         {
           title: "Services",          items: [
             {
-              label: "Design & Planning",              href: "/#services"},
+              label: "Design & Planning",              href: "/services"},
             {
-              label: "Installation",              href: "/#services"},
+              label: "Installation",              href: "/services"},
             {
-              label: "Maintenance",              href: "/#services"},
+              label: "Maintenance",              href: "/services"},
             {
               label: "Outdoor Living",              href: "/#portfolio"},
           ],
@@ -276,14 +256,6 @@ export default function LandingPage() {
               label: "FAQ",              href: "/#faq"},
           ],
         },
-        {
-          title: "Connect",          items: [
-            {
-              label: "Contact Us",              href: "/#contact"},
-            {
-              label: "Get a Quote",              href: "/#contact"},
-          ],
-        },
       ]}
       bottomLeftText="© 2024 Lombard Landscaping by Morris LDC. All rights reserved."
       bottomRightText="Crafted with passion for nature."
@@ -292,4 +264,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/services/page.tsx

@@ -0,0 +1,109 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
+
+export default function ServicesPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="background-highlight"
+        borderRadius="soft"
+        contentWidth="mediumLarge"
+        sizing="medium"
+        background="aurora"
+        cardStyle="inset"
+        primaryButtonStyle="flat"
+        secondaryButtonStyle="layered"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingInline
+            navItems={[
+              {
+                name: "Home",                id: "/"},
+              {
+                name: "About Us",                id: "/about"},
+              {
+                name: "Services",                id: "/services"},
+              {
+                name: "Portfolio",                id: "/#portfolio"},
+              {
+                name: "Testimonials",                id: "/#testimonials"},
+            ]}
+            brandName="Lombard Landscaping by Morris LDC"
+            animateOnLoad={true}
+            button={{ text: "Contact Us", href: "/" }}
+          />
+        </div>
+
+        <div id="services-content" data-section="services-content">
+          <FeatureCardSeven
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            title="Our Comprehensive Lawn Care Services"
+            description="Lombard Landscaping by Morris LDC offers a full range of professional lawn care and landscaping solutions to keep your property beautiful and healthy all year round."
+            features={[
+              {
+                title: "Expert Lawn Mowing & Edging",                description: "Precise lawn mowing, detailed edging, and thorough blowing to give your lawn a pristine, manicured look every time.",                imageSrc: "http://img.b2bpic.net/free-photo/gardener-mowing-lawn-with-mower_23-2149176465.jpg",                imageAlt: "Lawn mower cutting grass"
+              },
+              {
+                title: "Fertilization & Weed Control",                description: "Customized fertilization programs and effective weed control treatments to ensure a lush, green, and weed-free lawn.",                imageSrc: "http://img.b2bpic.net/free-photo/gardener-fertilizing-lawn_23-2149176472.jpg",                imageAlt: "Person applying fertilizer to a lawn"
+              },
+              {
+                title: "Aeration & Overseeding",                description: "Improve soil health and turf density with professional aeration and overseeding services for a thicker, more resilient lawn.",                imageSrc: "http://img.b2bpic.net/free-photo/male-hand-holding-soil-with-young-plant_23-2149176483.jpg",                imageAlt: "Close-up of aerated lawn with new grass seeds"
+              },
+              {
+                title: "Seasonal Clean-Up",                description: "Comprehensive spring and fall clean-up services, including leaf removal, debris clearing, and bed preparation.",                imageSrc: "http://img.b2bpic.net/free-photo/gardener-raking-leaves-autumn_23-2149176470.jpg",                imageAlt: "Gardener raking leaves"
+              },
+              {
+                title: "Shrub & Hedge Trimming",                description: "Expert trimming and shaping of shrubs and hedges to maintain their health, appearance, and desired form.",                imageSrc: "http://img.b2bpic.net/free-photo/gardener-trimming-hedges_23-2149176469.jpg",                imageAlt: "Gardener trimming a hedge"
+              },
+              {
+                title: "Mulching & Edging Garden Beds",                description: "Enhance the beauty of your garden beds with fresh mulch and crisp edging, suppressing weeds and retaining moisture.",                imageSrc: "http://img.b2bpic.net/free-photo/gardener-mulching-flower-bed_23-2149176475.jpg",                imageAlt: "Garden bed with fresh mulch"
+              },
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterSimple
+            columns={[
+              {
+                title: "Services",                items: [
+                  {
+                    label: "Design & Planning",                    href: "/services"},
+                  {
+                    label: "Installation",                    href: "/services"},
+                  {
+                    label: "Maintenance",                    href: "/services"},
+                  {
+                    label: "Outdoor Living",                    href: "/#portfolio"},
+                ],
+              },
+              {
+                title: "Company",                items: [
+                  {
+                    label: "About Us",                    href: "/about"},
+                  {
+                    label: "Portfolio",                    href: "/#portfolio"},
+                  {
+                    label: "Testimonials",                    href: "/#testimonials"},
+                  {
+                    label: "FAQ",                    href: "/#faq"},
+                ],
+              },
+            ]}
+            bottomLeftText="© 2024 Lombard Landscaping by Morris LDC. All rights reserved."
+            bottomRightText="Crafted with passion for nature."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}