Merge version_23 into main

Merge version_23 into main

src/app/hedge-trimming/page.tsx

@@ -15,10 +15,7 @@ export default function HedgeTrimmingPage() {
           <NavbarLayoutFloatingInline
             navItems={[
               { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
+              { name: "Services", id: "/#services" },
-              { name: "Tree Care & 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" }}
@@ -39,13 +36,13 @@ 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: 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" }
+              { 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

@@ -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 FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 
 export default function IrrigationPage() {
   return (
@@ -14,35 +14,31 @@ export default function IrrigationPage() {
         borderRadius="pill"
         contentWidth="compact"
         sizing="mediumLargeSizeMediumTitles"
-        background="noiseDiagonalGradient"
+        background="circleGradient"
-        cardStyle="gradient-bordered"
+        cardStyle="glass-elevated"
-        primaryButtonStyle="shadow"
+        primaryButtonStyle="gradient"
         secondaryButtonStyle="glass"
-        headingFontWeight="bold"
+        headingFontWeight="normal"
     >
       <ReactLenis root>
         <NavbarLayoutFloatingInline
-            navItems={[
+          navItems={[
-                { name: "Home", id: "/" },
+            { name: "Home", id: "/" },
-                { name: "Tree Care & Removal", id: "/tree-removal-trimming" },
+            { name: "Services", id: "/#services" },
-                { name: "Irrigation", id: "/irrigation" },
+          ]}
-                { name: "Rock & Gravel", id: "/rock-gravel" },
+          brandName="Ryan Brothers"
-            ]}
+          button={{ text: "Contact", href: "tel:4803279024" }}
-            brandName="Ryan Brothers"
-            button={{ text: "Get A Quote", href: "tel:4803279024" }}
         />
-        <FeatureCardMedia
+        <HeroLogoBillboard
-            title="Irrigation Services"
+          logoText="Irrigation Services"
-            description="Keep your landscape green with our professional irrigation installation and repair services."
+          description="We provide comprehensive irrigation repair, maintenance, and installation to ensure your landscape remains lush and water-efficient all year round."
-            animationType="slide-up"
+          buttons={[{ text: "Get A Free Estimate", href: "tel:4803279024" }]}
-            textboxLayout="default"
+          background={{ variant: "plain" }}
-            useInvertedBackground={false}
+        />
-            features={[
+        <FooterCard
-                { id: "1", title: "System Installation", description: "Efficient drip and sprinkler system installation.", tag: "Service" },
+          logoText="Ryan Brothers Lawn & Landscape"
-                { id: "2", title: "Repairs & Maintenance", description: "Fixing leaks, broken heads, and optimizing timers.", tag: "Service" }
+          copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
-            ]}
         />
-        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
       </ReactLenis>
     </ThemeProvider>
   );

src/app/page.tsx

@@ -29,13 +29,10 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingInline
       navItems={[
-        { name: "Home", id: "home" },
+        { name: "Home", id: "/" },
-        { name: "Services", id: "services" },
+        { name: "Services", id: "/#services" },
-        { name: "Tree Care & Removal", id: "/tree-removal-trimming" },
+        { name: "Why Us", id: "/#why-us" },
-        { name: "Irrigation", id: "/irrigation" },
+        { name: "Reviews", id: "/#reviews" },
-        { name: "Rock & Gravel", id: "/rock-gravel" },
-        { name: "Why Us", id: "why-us" },
-        { name: "Reviews", id: "reviews" },
       ]}
       brandName="Ryan Brothers"
       button={{ text: "Get A Quote", href: "tel:4803279024" }}
@@ -45,7 +42,7 @@ 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" },
@@ -63,9 +60,9 @@ export default function LandingPage() {
       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-1775057118800-uyvjzg87.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: 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, 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: 3, title: "Rock & Gravel Installation", 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 and enhance your landscape.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683217001-qyt5vvru.png?_wi=1", imageAlt: "Tree care service" },
+        { id: 4, title: "Tree Care & Removal", description: "Safe, professional tree trimming, removal, and maintenance to protect your home.", buttons: [{ text: "View Details", href: "/tree-removal-trimming" }], 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."
@@ -129,4 +126,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

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

@@ -0,0 +1,45 @@
+"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" },
+          ]}
+          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

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterCard from '@/components/sections/footer/FooterCard';
-import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
 export default function RockGravelPage() {
   return (
@@ -24,22 +24,21 @@ export default function RockGravelPage() {
         <NavbarLayoutFloatingInline
             navItems={[
                 { name: "Home", id: "/" },
-                { name: "Tree Care & Removal", id: "/tree-removal-trimming" },
+                { name: "Services", id: "/" },
-                { name: "Irrigation", id: "/irrigation" },
+                { name: "Why Us", id: "/" },
-                { name: "Rock & Gravel", id: "/rock-gravel" },
+                { name: "Reviews", id: "/" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
         />
-        <FeatureCardMedia
+        <FeatureCardSix
             title="Rock & Gravel Services"
             description="Transform your curb appeal with our expert rock installation and site prep services."
-            animationType="slide-up"
             textboxLayout="default"
             useInvertedBackground={false}
             features={[
-                { id: "1", title: "New Installation", description: "High quality rock and gravel installation for any landscape design.", tag: "Service" },
+                { 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.", tag: "Service" }
+                { 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" />

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

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import FooterCard from '@/components/sections/footer/FooterCard';
-import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
 export default function TreeRemovalPage() {
   return (
@@ -24,22 +24,19 @@ export default function TreeRemovalPage() {
         <NavbarLayoutFloatingInline
             navItems={[
                 { name: "Home", id: "/" },
-                { name: "Tree Care & Removal", id: "/tree-removal-trimming" },
+                { name: "Services", id: "/#services" },
-                { name: "Irrigation", id: "/irrigation" },
-                { name: "Rock & Gravel", id: "/rock-gravel" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
         />
-        <FeatureCardMedia
+        <FeatureCardSix
             title="Tree Care & Removal"
             description="Expert tree services to maintain safety, health, and beauty of your landscape."
-            animationType="slide-up"
             textboxLayout="default"
             useInvertedBackground={false}
             features={[
-                { id: "1", title: "Tree Trimming", description: "Precision trimming to improve tree health and structure.", tag: "Service" },
+                { 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.", tag: "Service" }
+                { 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" }
             ]}
         />
         <FooterCard logoText="Ryan Brothers Lawn & Landscape" />