Merge version_17 into main

2026-03-30 03:12:38 +00:00
parent e60684143d a3e3bfffc7
commit e32928246b
4 changed files with 68 additions and 85 deletions
--- a/src/app/irrigation/page.tsx
+++ b/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 (
@@ -21,35 +21,28 @@ export default function IrrigationPage() {
        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 & Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+                { name: "Home", id: "/" },
+                { 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" }}
-          />
-        </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>
+        />
+        <FeatureCardMedia
+            title="Irrigation Services"
+            description="Keep your landscape green with our professional irrigation installation and repair services."
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+                { id: "1", title: "System Installation", description: "Efficient drip and sprinkler system installation.", tag: "Service" },
+                { id: "2", title: "Repairs & Maintenance", description: "Fixing leaks, broken heads, and optimizing timers.", tag: "Service" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
      </ReactLenis>
    </ThemeProvider>
  );
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -65,6 +65,7 @@ export default function LandingPage() {
        { 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: 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" },
      ]}
      title="Our Services"
      description="Clean, sharp, and consistent results for every property we serve."
@@ -128,4 +129,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/rock-gravel/page.tsx
+++ b/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 FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';

 export default function RockGravelPage() {
  return (
@@ -21,35 +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 & Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+                { name: "Home", id: "/" },
+                { 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" }}
-          />
-        </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>
+        />
+        <FeatureCardMedia
+            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: "2", title: "Removal & Refresh", description: "Full removal of old gravel or refreshing your existing look.", tag: "Service" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
      </ReactLenis>
    </ThemeProvider>
  );
--- a/src/app/tree-removal-trimming/page.tsx
+++ b/src/app/tree-removal-trimming/page.tsx
@@ -3,50 +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 FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';

-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 & Removal", id: "/tree-removal-trimming" },
-              { name: "Irrigation", id: "/irrigation" },
-              { name: "Rock & Gravel", id: "/rock-gravel" }
+                { name: "Home", id: "/" },
+                { 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" }}
-          />
-        </div>
-        <div id="home" data-section="home">
-          <HeroLogoBillboard
-            logoText="Professional Tree Services"
-            description="Comprehensive tree care, including expert pruning, maintenance, and safe removal to keep your property safe and beautiful."
-            buttons={[{ text: "Get A Quote", href: "tel:4803279024" }]}
-            background={{ variant: "plain" }}
-          />
-        </div>
-        <div id="services" data-section="services">
-          <FeatureCardSix
-            title="Our Tree Services"
-            description="Precision care for every tree on your property."
+        />
+        <FeatureCardMedia
+            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: "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.", tag: "Service" },
+                { id: "2", title: "Tree Removal", description: "Safe and efficient removal for dangerous or unwanted trees.", tag: "Service" }
            ]}
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterCard />
-        </div>
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
      </ReactLenis>
    </ThemeProvider>
  );