Update src/app/rock-and-gravel/page.tsx

Merge version_20 into main

src/app/hedge-trimming/page.tsx

@@ -15,11 +15,9 @@ export default function HedgeTrimmingPage() {
           <NavbarLayoutFloatingInline
             navItems={[
               { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Care", id: "/tree-removal-trimming" },
-              { name: "Tree Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+              { name: "Services", id: "/" },
+              { name: "Why Us", id: "/" },
+              { name: "Reviews", id: "/" }
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
@@ -40,15 +38,15 @@ export default function HedgeTrimmingPage() {
             textboxLayout="default"
             useInvertedBackground={false}
             features={[
-              { id: 1, title: "Shaping", description: "Detailed shaping for a polished look.", imageSrc: "https://images.unsplash.com/photo-1598440947619-2c35fd95604d?w=800" },
-              { id: 2, title: "Height Reduction", description: "Controlled cutting for growth management.", imageSrc: "https://images.unsplash.com/photo-1589476993168-f52b36a21908?w=800" }
+              { id: 1, title: "Shaping", description: "Detailed shaping for a polished look.", imageSrc: "https://images.unsplash.com/photo-1598440947619-2c35fd95604d?w=800&_wi=1" },
+              { id: 2, title: "Height Reduction", description: "Controlled cutting for growth management.", imageSrc: "https://images.unsplash.com/photo-1589476993168-f52b36a21908?w=800&_wi=1" }
             ]}
           />
         </div>
         <div id="footer" data-section="footer">
-          <FooterCard />
+          <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
         </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/irrigation/page.tsx

@@ -14,44 +14,34 @@ export default function IrrigationPage() {
         borderRadius="pill"
         contentWidth="compact"
         sizing="mediumLargeSizeMediumTitles"
-        background="noiseDiagonalGradient"
-        cardStyle="gradient-bordered"
-        primaryButtonStyle="shadow"
+        background="circleGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="gradient"
         secondaryButtonStyle="glass"
-        headingFontWeight="bold"
+        headingFontWeight="normal"
     >
       <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
-            navItems={[
-              { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Care", id: "/tree-removal-trimming" },
-              { name: "Tree Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
-            ]}
-            brandName="Ryan Brothers"
-            button={{ text: "Get A Quote", href: "tel:4803279024" }}
-          />
-        </div>
-        <div id="home" data-section="home">
-          <HeroLogoBillboard
-            logoText="Irrigation Repair & Installation"
-            description="Comprehensive irrigation services to keep your landscape thriving. From system repairs to custom installations, we ensure your water usage is efficient and your plants stay hydrated."
-            buttons={[{ text: "Get a Free Quote", href: "tel:4803279024" }]}
-            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683217001-qyt5vvru.png?_wi=2"
-            imageAlt="Irrigation maintenance"
-            background={{ variant: "plain" }}
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterCard
-            logoText="Ryan Brothers Lawn & Landscape"
-            copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
-          />
-        </div>
+        <NavbarLayoutFloatingInline
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Services", id: "/#services" },
+            { name: "Irrigation", id: "/irrigation" },
+            { name: "Rock & Gravel", id: "/rock-and-gravel" },
+          ]}
+          brandName="Ryan Brothers"
+          button={{ text: "Contact", href: "tel:4803279024" }}
+        />
+        <HeroLogoBillboard
+          logoText="Irrigation Services"
+          description="We provide comprehensive irrigation repair, maintenance, and installation to ensure your landscape remains lush and water-efficient all year round."
+          buttons={[{ text: "Get A Free Estimate", href: "tel:4803279024" }]}
+          background={{ variant: "plain" }}
+        />
+        <FooterCard
+          logoText="Ryan Brothers Lawn & Landscape"
+          copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
+        />
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -29,14 +29,12 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingInline
       navItems={[
-        { name: "Home", id: "home" },
-        { name: "Services", id: "services" },
-        { name: "Tree Care", id: "/tree-removal-trimming" },
-        { name: "Tree Removal", id: "/tree-removal-trimming" },
+        { name: "Home", id: "/" },
+        { name: "Services", id: "/#services" },
         { name: "Irrigation", id: "/irrigation" },
-        { name: "Rock & Gravel", id: "/rock-gravel" },
-        { name: "Why Us", id: "why-us" },
-        { name: "Reviews", id: "reviews" },
+        { name: "Rock & Gravel", id: "/rock-and-gravel" },
+        { name: "Why Us", id: "/#why-us" },
+        { name: "Reviews", id: "/#reviews" },
       ]}
       brandName="Ryan Brothers"
       button={{ text: "Get A Quote", href: "tel:4803279024" }}
@@ -46,12 +44,12 @@ export default function LandingPage() {
   <div id="home" data-section="home">
       <HeroLogoBillboard
       logoText="Professional Lawn & Landscaping"
-      description="Ryan Brothers Lawn & Landscape delivers efficient, high-quality lawn care and landscaping for East Valley homeowners who want their property looking sharp—without the hassle."
+      description="Ryan Brothers Lawn & Landscape is a family driven service dedicated to delivering clean, reliable, and high-quality maintenance. We combine professional workmanship with a personal touch, serving residential and commercial properties throughout the community with integrity, consistency, and pride."
       buttons={[
         { text: "Request a Free Quote", href: "tel:4803279024" },
         { text: "Call Now", href: "tel:4803279024" },
       ]}
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683172804-an6fhagl.png"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775057266123-d83jg5bo.png"
       imageAlt="Professional lawn service"
       mediaAnimation="slide-up"
       background={{ variant: "plain" }}
@@ -63,9 +61,10 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       features={[
-        { id: 1, title: "Lawn Maintenance", description: "Weekly, bi-weekly & monthly mowing, edging, trimming, blowing & more.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774756198244-5vkzgw2u.png", imageAlt: "Lawn mowing service" },
-        { id: 2, title: "Irrigation Repair & Installation", description: "Professional irrigation system repair, troubleshooting, and custom installation to keep your landscape lush and healthy.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683217001-qyt5vvru.png?_wi=1", imageAlt: "Irrigation services" },
-        { id: 3, title: "Rock & Gravel Installation & Removal", description: "Transform your yard with professional rock and gravel services, including new installations and total removal.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683236779-lfs0cx8c.png?_wi=1", imageAlt: "Rock installation" },
+        { id: 1, title: "Lawn Maintenance", description: "Weekly, bi-weekly & monthly mowing, edging, trimming, blowing & more.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775057118800-uyvjzg87.png", imageAlt: "Lawn mowing service" },
+        { id: 2, title: "Irrigation Repair & Installation", description: "Professional irrigation system repair, troubleshooting, and custom installation.", buttons: [{ text: "View Details", href: "/irrigation" }], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775234863417-0ibz0t9t.png?_wi=1", imageAlt: "Irrigation services" },
+        { id: 3, title: "Rock & Gravel Installation & Removal", description: "Transform your yard with professional rock and gravel services.", buttons: [{ text: "View Details", href: "/rock-and-gravel" }], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683236779-lfs0cx8c.png?_wi=1", imageAlt: "Rock installation" },
+        { id: 4, title: "Tree Care & Removal", description: "Safe, professional tree trimming, removal, and maintenance to protect your home.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775234863417-0ibz0t9t.png?_wi=2", imageAlt: "Tree care service" },
       ]}
       title="Our Services"
       description="Clean, sharp, and consistent results for every property we serve."
@@ -93,10 +92,10 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         { id: "t1", title: "Great Results", quote: "My lawn has never looked better. Highly recommend the Ryan Brothers team!", name: "Sarah Miller", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683259302-to7hsomj.png" },
-        { id: "t2", title: "Very Reliable", quote: "They show up on time every time. Efficient and very professional.", name: "David Thompson", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/woman-making-massage-his-man_23-2148231869.jpg" },
-        { id: "t3", title: "Excellent Service", quote: "Attention to detail is unmatched. My yard is finally usable again.", name: "Emily Johnson", role: "HOA Member", imageSrc: "http://img.b2bpic.net/free-photo/boy-taking-pictures-his-sister_23-2147636705.jpg" },
-        { id: "t4", title: "Highly Professional", quote: "They treated my property with care. I love the recurring schedule.", name: "Mark Stevens", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/smiley-couple-receiving-keys-their-new-home-from-realtor_23-2148895469.jpg" },
-        { id: "t5", title: "Best in the Valley", quote: "A truly professional team that goes above and beyond every week.", name: "Jessica Reed", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/happy-young-woman-feeling-carefree-walking-green-park-playing-ukulele-singing-along_1258-200627.jpg?_wi=2" },
+        { id: "t2", title: "Very Reliable", quote: "They show up on time every time. Efficient and very professional.", name: "David Thompson", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774840747162-bs3qvg9d.png" },
+        { id: "t3", title: "Excellent Service", quote: "Attention to detail is unmatched. My yard is finally usable again.", name: "Emily Johnson", role: "HOA Member", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774840768645-n1apiwhb.png" },
+        { id: "t4", title: "Highly Professional", quote: "They treated my property with care. I love the recurring schedule.", name: "Mark Stevens", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774841515733-94z2uagh.png" },
+        { id: "t5", title: "Best in the Valley", quote: "A truly professional team that goes above and beyond every week.", name: "Jessica Reed", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774841501548-thlcce9g.png" },
       ]}
       title="What Clients Say"
       description="Why 50+ local East Valley homeowners trust us with their yards."
@@ -129,4 +128,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/rock-and-gravel/page.tsx

@@ -0,0 +1,47 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
+import FooterCard from '@/components/sections/footer/FooterCard';
+
+export default function RockAndGravelPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="mediumLargeSizeMediumTitles"
+        background="circleGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="gradient"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Services", id: "/#services" },
+            { name: "Irrigation", id: "/irrigation" },
+            { name: "Rock & Gravel", id: "/rock-and-gravel" },
+          ]}
+          brandName="Ryan Brothers"
+          button={{ text: "Contact", href: "tel:4803279024" }}
+        />
+        <HeroLogoBillboard
+          logoText="Rock & Gravel Services"
+          description="Upgrade your yard with professional rock and gravel installation, or clear space with our efficient removal services. We handle the heavy lifting for your landscape project."
+          buttons={[{ text: "Get A Free Estimate", href: "tel:4803279024" }]}
+          background={{ variant: "plain" }}
+        />
+        <FooterCard
+          logoText="Ryan Brothers Lawn & Landscape"
+          copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
+        />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/rock-gravel/page.tsx

@@ -3,8 +3,8 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import FooterCard from '@/components/sections/footer/FooterCard';
+import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
 export default function RockGravelPage() {
   return (
@@ -21,37 +21,28 @@ export default function RockGravelPage() {
         headingFontWeight="bold"
     >
       <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
+        <NavbarLayoutFloatingInline
             navItems={[
-              { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Care", id: "/tree-removal-trimming" },
-              { name: "Tree Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+                { name: "Home", id: "/" },
+                { name: "Services", id: "/" },
+                { name: "Why Us", id: "/" },
+                { name: "Reviews", id: "/" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
-          />
-        </div>
-        <div id="home" data-section="home">
-          <HeroLogoBillboard
-            logoText="Rock & Gravel Installation & Removal"
-            description="Transform your landscape aesthetics with our professional rock and gravel services. Whether you need a fresh new install or complete removal of old materials, we handle the heavy lifting."
-            buttons={[{ text: "Get a Free Quote", href: "tel:4803279024" }]}
-            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683236779-lfs0cx8c.png?_wi=2"
-            imageAlt="Rock installation service"
-            background={{ variant: "plain" }}
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterCard
-            logoText="Ryan Brothers Lawn & Landscape"
-            copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
-          />
-        </div>
+        />
+        <FeatureCardSix
+            title="Rock & Gravel Services"
+            description="Transform your curb appeal with our expert rock installation and site prep services."
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+                { id: 1, title: "New Installation", description: "High quality rock and gravel installation for any landscape design.", imageSrc: "https://images.unsplash.com/photo-1596402206176-46473d501867?w=800" },
+                { id: 2, title: "Removal & Refresh", description: "Full removal of old gravel or refreshing your existing look.", imageSrc: "https://images.unsplash.com/photo-1589476993168-f52b36a21908?w=800&_wi=2" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/tree-removal-trimming/page.tsx

@@ -3,52 +3,46 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterCard from '@/components/sections/footer/FooterCard';
+import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
-export default function TreeCarePage() {
+export default function TreeRemovalPage() {
   return (
-    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="mediumLargeSizeMediumTitles"
+        background="noiseDiagonalGradient"
+        cardStyle="gradient-bordered"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="bold"
+    >
       <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
+        <NavbarLayoutFloatingInline
             navItems={[
-              { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Care", id: "/tree-removal-trimming" },
-              { name: "Tree Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+                { name: "Home", id: "/" },
+                { name: "Services", id: "/" },
+                { name: "Why Us", id: "/" },
+                { name: "Reviews", id: "/" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
-          />
-        </div>
-        <div id="home" data-section="home">
-          <HeroLogoBillboard
-            logoText="Professional Tree Services"
-            description="Safe removal and expert pruning to maintain the safety and aesthetic appeal of your trees."
-            buttons={[{ text: "Get A Quote", href: "tel:4803279024" }]}
-            background={{ variant: "plain" }}
-          />
-        </div>
-        <div id="services" data-section="services">
-          <FeatureCardSix
-            title="Tree Maintenance & Safety"
-            description="Protect your property with certified tree care."
+        />
+        <FeatureCardSix
+            title="Tree Care & Removal"
+            description="Expert tree services to maintain safety, health, and beauty of your landscape."
             textboxLayout="default"
             useInvertedBackground={false}
             features={[
-              { id: 1, title: "Tree Trimming", description: "Promoting healthy growth and clearance.", imageSrc: "https://images.unsplash.com/photo-1590486803833-1c3dc47d3763?w=800" },
-              { id: 2, title: "Tree Removal", description: "Safe, professional removal of hazardous or unwanted trees.", imageSrc: "https://images.unsplash.com/photo-1542601906990-b4d3fb778b09?w=800" }
+                { id: 1, title: "Tree Trimming", description: "Precision trimming to improve tree health and structure.", imageSrc: "https://images.unsplash.com/photo-1598440947619-2c35fd95604d?w=800&_wi=2" },
+                { id: 2, title: "Tree Removal", description: "Safe and efficient removal for dangerous or unwanted trees.", imageSrc: "https://images.unsplash.com/photo-1589476993168-f52b36a21908?w=800&_wi=3" }
             ]}
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterCard />
-        </div>
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}