Merge version_3 into main #2

Merged
bender merged 2 commits from version_3 into main 2026-04-20 17:40:31 +00:00
2 changed files with 71 additions and 29 deletions

43
src/app/about/page.tsx Normal file
View File

@@ -0,0 +1,43 @@
"use client";
import ReactLenis from "lenis/react";
import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
export default function AboutPage() {
return (
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="solid"
primaryButtonStyle="shadow"
secondaryButtonStyle="solid"
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ name: "Pricing", id: "/pricing" },
{ name: "Social Media", id: "/social" },
]}
brandName="NextGenBinCleaning"
button={{ text: "330-581-5104 | 330-265-5048", href: "tel:3305815104" }}
/>
<div id="about" className="min-h-screen pt-40">
<InlineImageSplitTextAbout
heading={[
{ type: "text", content: "About NextGenBinCleaning" },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}

View File

@@ -1,17 +1,14 @@
"use client";
import ReactLenis from "lenis/react";
import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
import HeroCarouselLogo from "@/components/sections/hero/HeroBillboardScroll";
import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
import FeatureCardOne from "@/components/sections/feature/FeatureCardOne";
import FeatureCardNine from "@/components/sections/feature/FeatureCardNine";
import FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
import FooterCard from "@/components/sections/footer/FooterCard";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Sparkles, Phone, Users, Instagram, Facebook } from "lucide-react";
import { Sparkles, Instagram, Facebook } from "lucide-react";
export default function TrashCleaningPage() {
return (
@@ -30,7 +27,7 @@ export default function TrashCleaningPage() {
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "About Us", id: "about" },
{ name: "About Us", id: "/about" },
{ name: "Pricing", id: "pricing" },
{ name: "Social Media", id: "social" },
]}
@@ -38,26 +35,26 @@ export default function TrashCleaningPage() {
button={{ text: "330-581-5104 | 330-265-5048", href: "tel:3305815104" }}
/>
<HeroCarouselLogo
logoText="Welcome to NextGenBinCleaning"
title="Welcome to NextGenBinCleaning"
description="We keep your bins sanitized, smelling fresh, and spotless with our eco-friendly professional cleaning services in Louisville, Ohio."
buttons={[
{ text: "View Pricing", href: "#pricing" },
{ text: "Contact Us", href: "#contact" },
]}
slides={[
{ imageSrc: "http://img.b2bpic.net/free-photo/top-view-environment-concept_23-2148472378.jpg", imageAlt: "Grassy dirt trail background with soapy cleaning process" }
]}
showDimOverlay={true}
/>
<InlineImageSplitTextAbout
id="about"
className="pt-40"
heading={[
{ type: "text", content: "Me and my friend Jordan are in middle school and this is " },
{ type: "text", content: "NextGenBinCleaning " },
{ type: "text", content: "we are in the Louisville, Ohio area." }
]}
background={{ variant: "sparkles-gradient" }}
imageSrc="http://img.b2bpic.net/free-photo/top-view-environment-concept_23-2148472378.jpg"
imageAlt="Grassy dirt trail background with soapy cleaning process"
/>
<div id="about">
<InlineImageSplitTextAbout
className="pt-40"
heading={[
{ type: "text", content: "Me and my friend Jordan are in middle school and this is " },
{ type: "text", content: "NextGenBinCleaning " },
{ type: "text", content: "we are in the Louisville, Ohio area." }
]}
/>
</div>
<FeatureCardOne
id="pricing"
tag="Our Plans"
@@ -69,10 +66,12 @@ export default function TrashCleaningPage() {
gridVariant="uniform-all-items-equal"
features={[
{
title: "One Time Service", description: "1 bin: $15 | 2 bins: $25", imageSrc: "http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg", imageAlt: "One time bin service"
id: "one-time", title: "One Time Service", descriptions: ["1 bin: $15 | 2 bins: $25"],
imageSrc: "http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg", imageAlt: "One time bin service"
},
{
title: "Monthly Service", description: "1 bin: $30/mo | 2 bins: $35/mo", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-using-dry-shampoo_23-2150704974.jpg", imageAlt: "Monthly bin service"
id: "monthly", title: "Monthly Service", descriptions: ["1 bin: $30/mo | 2 bins: $35/mo"],
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-using-dry-shampoo_23-2150704974.jpg", imageAlt: "Monthly bin service"
}
]}
/>
@@ -84,24 +83,24 @@ export default function TrashCleaningPage() {
description="Connect with us on our social platforms."
textboxLayout="default"
animationType="slide-up"
faqsAnimation="slide-up"
features={[
{
id: "fb", title: "Facebook", description: "Follow our latest cleaning results!", tag: "Facebook", imageSrc: "http://img.b2bpic.net/free-photo/3d-facebook-logo-with-colorful-elements_23-2152000293.jpg", imageAlt: "Facebook"
id: "fb", title: "Facebook", descriptions: ["Follow our latest cleaning results!"],
imageSrc: "http://img.b2bpic.net/free-photo/3d-facebook-logo-with-colorful-elements_23-2152000293.jpg", imageAlt: "Facebook"
},
{
id: "ig", title: "Instagram", description: "See the shine on every bin we clean!", tag: "Instagram", imageSrc: "http://img.b2bpic.net/free-photo/branding-strategy-marketing-business-graphic-design_53876-125554.jpg", imageAlt: "Instagram"
id: "ig", title: "Instagram", descriptions: ["See the shine on every bin we clean!"],
imageSrc: "http://img.b2bpic.net/free-photo/branding-strategy-marketing-business-graphic-design_53876-125554.jpg", imageAlt: "Instagram"
}
]}
/>
<FooterCard
logoText="NextGenBinCleaning"
copyrightText="© 2025 NextGenBinCleaning | Louisville, OH"
socialLinks={[
{ icon: Instagram, href: "#", ariaLabel: "Instagram" },
{ icon: Facebook, href: "#", ariaLabel: "Facebook" },
]}
columns={[]}
/>
</ReactLenis>
</ThemeProvider>
);
}
}