bender/90f8a4cc-8278-41da-a484-0fd3ede1ca04
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_6 into main #14

Merged
bender merged 5 commits from version_6 into main 2026-04-20 17:49:53 +00:00
Conversation 0 Commits 5 Files Changed 5 +69 -90
5 changed files with 69 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/about/page.tsx
View File

@@ -1,44 +1,14 @@
"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";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import MediaAbout from "@/components/sections/about/MediaAbout";
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: "Get Quote", href: "/#contact" }}
/>
<div id="about" className="min-h-screen pt-40">
<InlineImageSplitTextAbout
useInvertedBackground={false}
heading={[
{ type: "text", content: "Your Committed Local Cleaning Experts" },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
return (
<ThemeProvider>
<NavbarLayoutFloatingInline navItems={[{name: "About Us", id: "/about"}, {name: "Pricing", id: "/pricing"}, {name: "Contact", id: "/contact"}, {name: "Social Media", id: "/social-media"}]} brandName="NextGenBinCleaning" />
<MediaAbout title="About Our Founders" description="NextGenBinCleaning was started by middle school students with a passion for clean bins and a better Louisville community." />
</ThemeProvider>
);
}

14
src/app/contact/page.tsx Normal file
View File

@@ -0,0 +1,14 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import ContactCTA from "@/components/sections/contact/ContactCTA";
export default function ContactPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingInline navItems={[{name: "About Us", id: "/about"}, {name: "Pricing", id: "/pricing"}, {name: "Contact", id: "/contact"}, {name: "Social Media", id: "/social-media"}]} brandName="NextGenBinCleaning" />
<ContactCTA tag="Get in Touch" title="Contact Us" description="Call us at 330-581-5104 or 330-265-5048 to book your service today." buttons={[{text: "Call Now", href: "tel:3305815104"}]} />
</ThemeProvider>
);
}

58
src/app/page.tsx
View File

@@ -1,10 +1,7 @@
"use client";
import ReactLenis from "lenis/react";
import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
import FeatureCardThree from "@/components/sections/feature/featureCardThree/FeatureCardThree";
import FeatureCardThree_2 from "@/components/sections/feature/featureCardThree/FeatureCardThree";
import HeroCarouselLogo from "@/components/sections/hero/HeroCarouselLogo";
import FooterMedia from "@/components/sections/footer/FooterMedia";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -29,71 +26,28 @@ export default function TrashCleaningPage() {
navItems={[
{ name: "About Us", id: "/about" },
{ name: "Pricing", id: "/pricing" },
{ name: "Social Media", id: "social" },
{ name: "Contact", id: "/contact" },
{ name: "Social Media", id: "/social-media" },
]}
brandName="NextGenBinCleaning"
button={{ text: "330-581-5104 | 330-265-5048", href: "tel:3305815104" }}
/>
<HeroCarouselLogo
logoText="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" },
{ 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
className="pt-40"
useInvertedBackground={false}
heading={[
{ type: "text", content: "Reliable Bin Cleaning for Louisville" }
]}
/>
<FeatureCardThree
tag="Our Plans"
tagIcon={Sparkles}
title="NextGen BinCleaning"
description="Choose the plan that works for you."
textboxLayout="default"
animationType="slide-up"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
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?_wi=1", 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"
}
]}
/>
<FeatureCardThree_2
tag="Social"
tagIcon={Instagram}
title="Social Media"
description="Connect with us on our social platforms."
textboxLayout="default"
animationType="slide-up"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
features={[
{
title: "Facebook", description: "Follow our latest cleaning results!", imageSrc: "http://img.b2bpic.net/free-photo/3d-facebook-logo-with-colorful-elements_23-2152000293.jpg", imageAlt: "Facebook"
},
{
title: "Instagram", description: "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"
}
]}
/>
<FooterMedia
logoText="NextGenBinCleaning"
copyrightText="© 2025 NextGenBinCleaning | Louisville, OH"
columns={[
{ title: "Navigation", items: [{ label: "About Us", href: "/about" }, { label: "Pricing", href: "#pricing" }] }
{ title: "Navigation", items: [{ label: "About Us", href: "/about" }, { label: "Pricing", href: "/pricing" }, { label: "Contact", href: "/contact" }, { label: "Social Media", href: "/social-media" }] }
]}
imageSrc="http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg?_wi=2"
/>

25
src/app/pricing/page.tsx Normal file
View File

@@ -0,0 +1,25 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import PricingCardEight from "@/components/sections/pricing/PricingCardEight";
import { Trash2 } from "lucide-react";
export default function PricingPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingInline navItems={[{name: "About Us", id: "/about"}, {name: "Pricing", id: "/pricing"}, {name: "Contact", id: "/contact"}, {name: "Social Media", id: "/social-media"}]} brandName="NextGenBinCleaning" />
<PricingCardEight
title="Our Pricing"
animationType="slide-up"
useInvertedBackground={false}
textboxLayout="default"
plans={[
{ id: "one-time", badge: "One-Time Cleaning", badgeIcon: Trash2, price: "$15 - $25", subtitle: "Quick and thorough", buttons: [{text: "Select"}], features: ["Eco-friendly", "Sanitized bin"] },
{ id: "monthly", badge: "Monthly Plan", price: "$30 - $35/mo", subtitle: "Best for ongoing cleanliness", buttons: [{text: "Subscribe"}], features: ["Regular visits", "Discounted rate"] }
]}
className="bg-green-500"
/>
</ThemeProvider>
);
}

16
src/app/social-media/page.tsx Normal file
View File

@@ -0,0 +1,16 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
import TextAnimation from "@/components/text/TextAnimation";
export default function SocialMediaPage() {
return (
<ThemeProvider>
<NavbarLayoutFloatingInline navItems={[{name: "About Us", id: "/about"}, {name: "Pricing", id: "/pricing"}, {name: "Contact", id: "/contact"}, {name: "Social Media", id: "/social-media"}]} brandName="NextGenBinCleaning" />
<div className="py-20 text-center">
<TextAnimation title="SOCIAL MEDIA" variant="words-trigger" className="text-8xl font-black" />
</div>
</ThemeProvider>
);
}