Merge version_5 into main

Update src/app/services/page.tsx
2026-05-30 04:37:07 +00:00 · 2026-05-30 04:37:04 +00:00 · 2026-05-30 04:37:04 +00:00 · 2026-05-30 04:37:04 +00:00 · 2026-05-30 04:37:03 +00:00 · 2026-05-30 04:35:06 +00:00
4 changed files with 245 additions and 23 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -29,17 +29,17 @@ export default function AboutPage() {
              {
                name: "About Us",                id: "/about"},
              {
-                name: "Services",                id: "/#services"},
+                name: "Services",                id: "/services"},
              {
                name: "Portfolio",                id: "/#portfolio"},
              {
                name: "Testimonials",                id: "/#testimonials"},
              {
-                name: "Contact",                id: "/#contact"},
+                name: "Contact",                id: "/contact"},
            ]}
            brandName="Lombard Landscaping by Morris LDC"
            button={{
-              text: "Get a Free Quote",              href: "/#contact"}}
+              text: "Get a Free Quote",              href: "/contact"}}
            animateOnLoad={true}
          />
        </div>
@@ -53,7 +53,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 +65,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"},
                ],
@@ -89,9 +89,9 @@ export default function AboutPage() {
              {
                title: "Connect",                items: [
                  {
-                    label: "Contact Us",                    href: "/#contact"},
+                    label: "Contact Us",                    href: "/contact"},
                  {
-                    label: "Get a Quote",                    href: "/#contact"},
+                    label: "Get a Quote",                    href: "/contact"},
                ],
              },
            ]}
@@ -102,4 +102,4 @@ export default function AboutPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -0,0 +1,104 @@
+"use client";
+
+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';
+
+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",                id: "/contact"}
+            ]}
+            brandName="Lombard Landscaping by Morris LDC"
+            button={{
+              text: "Get a Free Quote",              href: "/contact"}}
+            animateOnLoad={true}
+          />
+        </div>
+
+        <div id="contact-content" data-section="contact-content">
+          <ContactText
+            useInvertedBackground={false}
+            background={{
+              variant: "downward-rays-animated"}}
+            text="Ready to Transform Your Landscape? Contact Us!"
+            buttons={[
+              {
+                text: "Call Us Today",                href: "tel:+16306616168"
+              }
+            ]}
+          />
+        </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>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -38,17 +38,17 @@ export default function LandingPage() {
        {
          name: "About Us",          id: "/about"},
        {
-          name: "Services",          id: "/#services"},
+          name: "Services",          id: "/services"},
        {
          name: "Portfolio",          id: "/#portfolio"},
        {
          name: "Testimonials",          id: "/#testimonials"},
        {
-          name: "Contact",          id: "/#contact"},
+          name: "Contact",          id: "/contact"},
      ]}
      brandName="Lombard Landscaping by Morris LDC"
      button={{
-        text: "Get a Free Quote",        href: "/#contact"}}
+        text: "Get a Free Quote",        href: "/contact"}}
      animateOnLoad={true}
    />
  </div>
@@ -61,7 +61,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"},
        {
          text: "View Our Portfolio",          href: "/#portfolio"},
      ]}
@@ -242,9 +242,7 @@ export default function LandingPage() {
      text="Ready to Transform Your Landscape?"
      buttons={[
        {
-          text: "Get Your Free Consultation",          href: "/#contact"},
-        {
-          text: "Call Us Today",          href: "tel:+1234567890"},
+          text: "Call Us Today",          href: "tel:+16306616168"},
      ]}
    />
  </div>
@@ -255,11 +253,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"},
          ],
@@ -279,9 +277,9 @@ export default function LandingPage() {
        {
          title: "Connect",          items: [
            {
-              label: "Contact Us",              href: "/#contact"},
+              label: "Contact Us",              href: "/contact"},
            {
-              label: "Get a Quote",              href: "/#contact"},
+              label: "Get a Quote",              href: "/contact"},
          ],
        },
      ]}
@@ -292,4 +290,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -0,0 +1,120 @@
+"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"},
+              {
+                name: "Contact",                id: "/contact"},
+            ]}
+            brandName="Lombard Landscaping by Morris LDC"
+            button={{
+              text: "Get a Free Quote",              href: "/contact"}}
+            animateOnLoad={true}
+          />
+        </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"},
+                ],
+              },
+              {
+                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>
+  );
+}
Author	SHA1	Message	Date
bender	920586f4d2	Merge version_5 into main Merge version_5 into main	2026-05-30 04:37:07 +00:00
bender	ad975e94cb	Update src/app/services/page.tsx	2026-05-30 04:37:04 +00:00
bender	8ced86018b	Update src/app/page.tsx	2026-05-30 04:37:04 +00:00
bender	c335a3811c	Add src/app/contact/page.tsx	2026-05-30 04:37:04 +00:00
bender	6666e9c708	Update src/app/about/page.tsx	2026-05-30 04:37:03 +00:00
bender	1b5bca474b	Update src/app/services/page.tsx	2026-05-30 04:35:06 +00:00
bender	cc051d7601	Update src/app/page.tsx	2026-05-30 04:35:05 +00:00
bender	0236dbd34e	Update src/app/about/page.tsx	2026-05-30 04:35:05 +00:00
bender	9b888a4d02	Merge version_4 into main Merge version_4 into main	2026-05-30 04:32:58 +00:00
bender	86a46052e2	Add src/app/services/page.tsx	2026-05-30 04:32:52 +00:00
bender	49f09b4231	Update src/app/page.tsx	2026-05-30 04:32:52 +00:00
bender	222e151b73	Update src/app/about/page.tsx	2026-05-30 04:32:52 +00:00
bender	2a6f99f7fb	Merge version_2 into main Merge version_2 into main	2026-05-30 04:22:05 +00:00
bender	8609cd8e3f	Merge version_2 into main Merge version_2 into main	2026-05-30 04:21:41 +00:00