Merge version_10 into main

Update src/app/page.tsx
2026-05-11 16:37:51 +00:00 · 2026-05-11 16:37:48 +00:00 · 2026-05-11 16:37:23 +00:00 · 2026-05-11 16:37:20 +00:00 · 2026-05-11 16:37:20 +00:00 · 2026-05-11 16:36:49 +00:00
5 changed files with 131 additions and 105 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,9 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Manrope } from "next/font/google";
+import { DM_Sans } from "next/font/google";
+import { Montserrat } from "next/font/google";
+import { Public_Sans } from "next/font/google";



@@ -21,8 +24,12 @@ export const metadata: Metadata = {
  },
 };

-const manrope = Manrope({
-  variable: "--font-manrope",
+
+
+
+
+const publicSans = Public_Sans({
+  variable: "--font-public-sans",
  subsets: ["latin"],
 });

@@ -34,7 +41,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${manrope.variable} antialiased`}>
+        <body className={`${publicSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -4,13 +4,13 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import ContactText from '@/components/sections/contact/ContactText';
 import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
-import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
 import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import HeroSplit from '@/components/sections/hero/HeroSplit';
-import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
+import SplitAbout from '@/components/sections/about/SplitAbout';
 import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import { Leaf, Award, Users } from 'lucide-react';

 export default function LandingPage() {
  return (
@@ -30,14 +30,10 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarStyleApple
      navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "About",          id: "about"},
-        {
-          name: "Services",          id: "features"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "hero" },
+        { name: "About", id: "about" },
+        { name: "Services", id: "/services" },
+        { name: "Contact", id: "contact" },
      ]}
      brandName="Ohio Green Pros"
    />
@@ -45,15 +41,12 @@ export default function LandingPage() {

  <div id="hero" data-section="hero">
      <HeroSplit
-      background={{
-        variant: "gradient-bars"}}
+      background={{ variant: "gradient-bars" }}
      title="Your Trusted Landscaping & Snow Removal Experts in Ohio"
      description="From spring yard cleanup to emergency winter snow removal, we keep your property pristine year-round."
      buttons={[
-        {
-          text: "Get a Free Quote",          href: "#contact"},
-        {
-          text: "Our Services",          href: "#features"},
+        { text: "Get a Free Quote", href: "#contact" },
+        { text: "Our Services", href: "/services" },
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/man-with-rake-cleaning-leaves-looking-camera_259150-58542.jpg"
      imageAlt="Landscaping professional in action"
@@ -62,38 +55,20 @@ export default function LandingPage() {
  </div>

  <div id="about" data-section="about">
-      <InlineImageSplitTextAbout
-      useInvertedBackground={true}
-      heading={[
-        {
-          type: "text",          content: "Professional Landscaping Since 2010"},
-        {
-          type: "image",          src: "http://img.b2bpic.net/free-photo/someone-trimming-bushes-with-garden-scissors_1157-37101.jpg",          alt: "Our professional landscaping crew"},
-      ]}
-      buttons={[
-        {
-          text: "Learn More",          href: "#contact"},
-      ]}
-    />
-  </div>
-
-  <div id="features" data-section="features">
-      <FeatureCardOne
-      animationType="slide-up"
-      textboxLayout="default"
-      gridVariant="three-columns-all-equal-width"
-      useInvertedBackground={false}
-      features={[
-        {
-          title: "Spring & Fall Yard Cleanup",          description: "Leaf removal, mulching, pruning, and seasonal debris clearing.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516670956-rv3b4i3h.png",          imageAlt: "Yard Cleanup"},
-        {
-          title: "Emergency Snow Removal",          description: "Fast-response plowing and salting for driveways and sidewalks.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516679514-6d058bc9.png",          imageAlt: "Snow Removal"},
-        {
-          title: "Lawn Maintenance",          description: "Regular mowing, edging, and nutrient treatment for a vibrant lawn.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516696700-4e0klpju.png",          imageAlt: "Lawn Maintenance"},
-      ]}
-      title="Our Specialized Services"
-      description="Premium seasonal maintenance solutions tailored for Ohio climates."
-    />
+      <SplitAbout
+        title="Professional Landscaping Since 2010"
+        description="We are dedicated to providing top-tier landscaping and maintenance services across Ohio, ensuring your property looks its best in every season."
+        imageSrc="http://img.b2bpic.net/free-photo/someone-trimming-bushes-with-garden-scissors_1157-37101.jpg"
+        imagePosition="right"
+        textboxLayout="default"
+        useInvertedBackground={true}
+        bulletPoints={[
+            { title: "Expert Care", description: "Certified professionals for every project.", icon: Leaf },
+            { title: "Proven Track Record", description: "15+ years of dedicated service.", icon: Award },
+            { title: "Community Focused", description: "Trusted by local families and businesses.", icon: Users }
+        ]}
+        buttons={[{ text: "Learn More", href: "#contact" }]}
+      />
  </div>

  <div id="metrics" data-section="metrics">
@@ -102,12 +77,9 @@ export default function LandingPage() {
      textboxLayout="default"
      useInvertedBackground={true}
      metrics={[
-        {
-          id: "1",          value: "15+",          title: "Years Experience",          description: "Serving the Ohio community.",          imageSrc: "http://img.b2bpic.net/free-photo/male-feet-lawn-rake-near-leaves_259150-58539.jpg"},
-        {
-          id: "2",          value: "2k+",          title: "Properties Cleared",          description: "Successfully cleared yards.",          imageSrc: "http://img.b2bpic.net/free-photo/road-way-snow-weather_1150-11181.jpg"},
-        {
-          id: "3",          value: "98%",          title: "Customer Retention",          description: "Satisfied long-term partners.",          imageSrc: "http://img.b2bpic.net/free-photo/pile-dry-autumn-leaves-grass-lawn-with-plastic-leaf-rake-sunny-day-close-up-leaf-rake_7502-10271.jpg"},
+        { id: "1", value: "15+", title: "Years Experience", description: "Serving the Ohio community.", imageSrc: "http://img.b2bpic.net/free-photo/male-feet-lawn-rake-near-leaves_259150-58539.jpg" },
+        { id: "2", value: "2k+", title: "Properties Cleared", description: "Successfully cleared yards.", imageSrc: "http://img.b2bpic.net/free-photo/road-way-snow-weather_1150-11181.jpg" },
+        { id: "3", value: "98%", title: "Customer Retention", description: "Satisfied long-term partners.", imageSrc: "http://img.b2bpic.net/free-photo/pile-dry-autumn-leaves-grass-lawn-with-plastic-leaf-rake-sunny-day-close-up-leaf-rake_7502-10271.jpg" },
      ]}
      title="Our Impact in Numbers"
      description="Proven results for residential properties."
@@ -120,16 +92,11 @@ export default function LandingPage() {
      textboxLayout="default"
      useInvertedBackground={false}
      testimonials={[
-        {
-          id: "1",          name: "John Doe",          role: "Homeowner",          testimonial: "Excellent service. My yard has never looked better.",          imageSrc: "http://img.b2bpic.net/free-photo/confident-hispanic-expert-explaining-his-idea_1262-16155.jpg"},
-        {
-          id: "2",          name: "Jane Smith",          role: "Homeowner",          testimonial: "Fast and reliable snow removal. Saved my morning routine.",          imageSrc: "http://img.b2bpic.net/free-photo/man-woman-holding-blanket_23-2148231823.jpg"},
-        {
-          id: "3",          name: "Robert Brown",          role: "Property Manager",          testimonial: "The cleanup team was incredibly thorough.",          imageSrc: "http://img.b2bpic.net/free-photo/friends-going-hiking-winter_23-2150198236.jpg"},
-        {
-          id: "4",          name: "Emily Davis",          role: "Homeowner",          testimonial: "Consistent, professional, and fair pricing.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-goodlooking-bearded-gardener-with-garden-tools-smiling-standing-trees-shadow-crossing-hands-looking-camera-with-relaxed-face-expression_176420-55230.jpg"},
-        {
-          id: "5",          name: "Michael Wilson",          role: "Homeowner",          testimonial: "Highly recommended for seasonal maintenance.",          imageSrc: "http://img.b2bpic.net/free-photo/happy-inspired-female-florist-standing-greenhouse-holding-potted-plant-looking-purple-flowers-smiling-professional-portrait-copy-space-gardening-job-botany-concept_74855-12858.jpg"},
+        { id: "1", name: "John Doe", role: "Homeowner", testimonial: "Excellent service. My yard has never looked better.", imageSrc: "http://img.b2bpic.net/free-photo/confident-hispanic-expert-explaining-his-idea_1262-16155.jpg" },
+        { id: "2", name: "Jane Smith", role: "Homeowner", testimonial: "Fast and reliable snow removal. Saved my morning routine.", imageSrc: "http://img.b2bpic.net/free-photo/man-woman-holding-blanket_23-2148231823.jpg" },
+        { id: "3", name: "Robert Brown", role: "Property Manager", testimonial: "The cleanup team was incredibly thorough.", imageSrc: "http://img.b2bpic.net/free-photo/friends-going-hiking-winter_23-2150198236.jpg" },
+        { id: "4", name: "Emily Davis", role: "Homeowner", testimonial: "Consistent, professional, and fair pricing.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-goodlooking-bearded-gardener-with-garden-tools-smiling-standing-trees-shadow-crossing-hands-looking-camera-with-relaxed-face-expression_176420-55230.jpg" },
+        { id: "5", name: "Michael Wilson", role: "Homeowner", testimonial: "Highly recommended for seasonal maintenance.", imageSrc: "http://img.b2bpic.net/free-photo/happy-inspired-female-florist-standing-greenhouse-holding-potted-plant-looking-purple-flowers-smiling-professional-portrait-copy-space-gardening-job-botany-concept_74855-12858.jpg" },
      ]}
      title="What Homeowners Say"
      description="Trusted by hundreds across the region."
@@ -141,12 +108,9 @@ export default function LandingPage() {
      textboxLayout="split-description"
      useInvertedBackground={true}
      faqs={[
-        {
-          id: "1",          title: "Do you offer free quotes?",          content: "Yes, we provide no-obligation free quotes for all projects."},
-        {
-          id: "2",          title: "How does snow removal work?",          content: "We arrive within 24 hours of snowfall accumulation."},
-        {
-          id: "3",          title: "Do you operate year-round?",          content: "Yes, we handle lawn care in summer and snow removal in winter."},
+        { id: "1", title: "Do you offer free quotes?", content: "Yes, we provide no-obligation free quotes for all projects." },
+        { id: "2", title: "How does snow removal work?", content: "We arrive within 24 hours of snowfall accumulation." },
+        { id: "3", title: "Do you operate year-round?", content: "Yes, we handle lawn care in summer and snow removal in winter." },
      ]}
      imageSrc="http://img.b2bpic.net/free-photo/close-up-hands-holding-smartphone_23-2148683725.jpg"
      mediaAnimation="slide-up"
@@ -159,12 +123,10 @@ export default function LandingPage() {
  <div id="contact" data-section="contact">
      <ContactText
      useInvertedBackground={false}
-      background={{
-        variant: "rotated-rays-animated"}}
+      background={{ variant: "rotated-rays-animated" }}
      text="Ready to get started? Contact us today for a free consultation or a quote."
      buttons={[
-        {
-          text: "Contact Us Now",          href: "mailto:info@ohiogreenpros.com"},
+        { text: "Contact Us Now", href: "mailto:info@ohiogreenpros.com" },
      ]}
    />
  </div>
@@ -173,22 +135,8 @@ export default function LandingPage() {
      <FooterBaseReveal
      logoText="Ohio Green Pros"
      columns={[
-        {
-          title: "Company",          items: [
-            {
-              label: "About Us",              href: "#about"},
-            {
-              label: "Services",              href: "#features"},
-          ],
-        },
-        {
-          title: "Legal",          items: [
-            {
-              label: "Privacy Policy",              href: "#"},
-            {
-              label: "Terms of Service",              href: "#"},
-          ],
-        },
+        { title: "Company", items: [{ label: "About Us", href: "#about" }, { label: "Services", href: "/services" }] },
+        { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
      ]}
      copyrightText="© 2024 Ohio Green Pros. All rights reserved."
    />
@@ -196,4 +144,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -0,0 +1,71 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+
+export default function ServicesPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="shift-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="largeSmall"
+        background="circleGradient"
+        cardStyle="gradient-radial"
+        primaryButtonStyle="radial-glow"
+        secondaryButtonStyle="layered"
+        headingFontWeight="medium"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/#about" },
+              { name: "Services", id: "/services" },
+              { name: "Contact", id: "/#contact" },
+            ]}
+            brandName="Ohio Green Pros"
+          />
+        </div>
+
+        <div id="services" data-section="features" className="pt-24">
+          <FeatureCardOne
+            animationType="slide-up"
+            textboxLayout="default"
+            gridVariant="three-columns-all-equal-width"
+            useInvertedBackground={false}
+            features={[
+              {
+                title: "Spring & Fall Yard Cleanup",                description: "Leaf removal, mulching, pruning, and seasonal debris clearing.",                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516670956-rv3b4i3h.png",                imageAlt: "Yard Cleanup"
+              },
+              {
+                title: "Emergency Snow Removal",                description: "Fast-response plowing and salting for driveways and sidewalks.",                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516679514-6d058bc9.png",                imageAlt: "Snow Removal"
+              },
+              {
+                title: "Lawn Maintenance",                description: "Regular mowing, edging, and nutrient treatment for a vibrant lawn.",                imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DIXHmTGT1RD6BIu8pJQeplufOA/uploaded-1778516696700-4e0klpju.png",                imageAlt: "Lawn Maintenance"
+              },
+            ]}
+            title="Our Specialized Services"
+            description="Premium seasonal maintenance solutions tailored for Ohio climates."
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoText="Ohio Green Pros"
+            columns={[
+              { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Services", href: "/services" }] },
+              { title: "Legal", items: [{ label: "Privacy Policy", href: "#" }, { label: "Terms of Service", href: "#" }] },
+            ]}
+            copyrightText="© 2024 Ohio Green Pros. All rights reserved."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-public-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-manrope), sans-serif;
+  font-family: var(--font-public-sans), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #0a0a0a;
-  --card: #1a1a1a;
-  --foreground: #fff5f5e6;
-  --primary-cta: #ff7a7a;
-  --primary-cta-text: #0a0a0a;
-  --secondary-cta: #1a1a1a;
-  --secondary-cta-text: #fff5f5e6;
-  --accent: #737373;
-  --background-accent: #737373;
+  --background: #f7f6f7;
+  --card: #ffffff;
+  --foreground: #0c1325;
+  --primary-cta: #0b07ff;
+  --primary-cta-text: #f7f6f7;
+  --secondary-cta: #ffffff;
+  --secondary-cta-text: #0c1325;
+  --accent: #93b7ff;
+  --background-accent: #a8bae8;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	669eafa352	Merge version_10 into main Merge version_10 into main	2026-05-11 16:37:51 +00:00
bender	fe92298694	Update src/app/page.tsx	2026-05-11 16:37:48 +00:00
bender	8285bb943f	Merge version_10 into main Merge version_10 into main	2026-05-11 16:37:23 +00:00
bender	d247e3131b	Update src/app/services/page.tsx	2026-05-11 16:37:20 +00:00
bender	7ddc5da0ce	Update src/app/page.tsx	2026-05-11 16:37:20 +00:00
bender	ecd4e33bc8	Merge version_9 into main Merge version_9 into main	2026-05-11 16:36:49 +00:00
bender	6ca81169d2	Update theme fonts	2026-05-11 16:36:43 +00:00
bender	40bab9ff8d	Update theme fonts	2026-05-11 16:36:42 +00:00
bender	eeed050aba	Merge version_9 into main Merge version_9 into main	2026-05-11 16:36:25 +00:00
bender	9c5a47cc7b	Update theme fonts	2026-05-11 16:36:22 +00:00
bender	8c6e222943	Update theme fonts	2026-05-11 16:36:22 +00:00
bender	eb5852aed1	Merge version_9 into main Merge version_9 into main	2026-05-11 16:36:09 +00:00
bender	2b61c9f097	Update theme fonts	2026-05-11 16:36:06 +00:00
bender	d420fd0c08	Update theme fonts	2026-05-11 16:36:05 +00:00
bender	384953ac46	Merge version_9 into main Merge version_9 into main	2026-05-11 16:35:56 +00:00
bender	1a9c8753b2	Update theme fonts	2026-05-11 16:35:53 +00:00
bender	599ce67542	Update theme fonts	2026-05-11 16:35:53 +00:00
bender	9f9fc034c7	Merge version_9 into main Merge version_9 into main	2026-05-11 16:35:23 +00:00
bender	24d10420cb	Update theme colors	2026-05-11 16:35:20 +00:00
bender	30a9f760cc	Merge version_8 into main Merge version_8 into main	2026-05-11 16:34:59 +00:00
bender	8dd68867c3	Update theme colors	2026-05-11 16:34:56 +00:00
bender	c74571773e	Merge version_7 into main Merge version_7 into main	2026-05-11 16:34:40 +00:00
bender	d86b5ef0f1	Update theme colors	2026-05-11 16:34:37 +00:00
bender	51ebcc07e7	Merge version_6 into main Merge version_6 into main	2026-05-11 16:34:27 +00:00
bender	8298213cdf	Update theme colors	2026-05-11 16:34:24 +00:00
bender	9eb4397e30	Merge version_5 into main Merge version_5 into main	2026-05-11 16:34:11 +00:00
bender	f4b5d2ece2	Update theme colors	2026-05-11 16:34:08 +00:00
bender	c1a0445576	Merge version_4 into main Merge version_4 into main	2026-05-11 16:32:18 +00:00
bender	6eb20ae101	Add src/app/services/page.tsx	2026-05-11 16:32:15 +00:00
bender	3e25a9ce2e	Update src/app/page.tsx	2026-05-11 16:32:14 +00:00
bender	f1c1b20689	Merge version_3 into main Merge version_3 into main	2026-05-11 16:29:06 +00:00
bender	745344a2f1	Merge version_3 into main Merge version_3 into main	2026-05-11 16:28:36 +00:00