bender/d412c6d1-4fd7-4ed5-ba58-6c73e1a86b34
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #5

Merged
bender merged 3 commits from version_2 into main 2026-03-04 16:55:55 +00:00
Conversation 0 Commits 3 Files Changed 3 +23 -72
3 changed files with 23 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/app/layout.tsx
View File

@@ -1,64 +1,22 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Dumpster Rental Bakersfield, CA | Same-Day Delivery | NEXT ROLLOUT",
description: "Fast & reliable dumpster rentals in Bakersfield, CA. Same-day delivery, upfront pricing, 5-star service for residential & commercial projects. Call (661) 390-0579.",
keywords: "dumpster rental bakersfield, roll off dumpster, construction dumpster rental, concrete dumpster, same day dumpster rental, commercial dumpster rental bakersfield",
openGraph: {
title: "Dumpster Rental Bakersfield, CA | Same-Day Service",
description: "Fast, reliable dumpster rentals with upfront pricing. 5-star rated local service. Call today for same-day delivery!",
url: "https://nextrolloutserv.com",
siteName: "NEXT ROLLOUT SERVICES",
type: "website",
images: [
{
url: "http://img.b2bpic.net/free-photo/person-s-hand-holding-plastic-crate-supermarket_23-2148209752.jpg",
alt: "Professional dumpster rental service",
},
],
},
twitter: {
card: "summary_large_image",
title: "Dumpster Rentals in Bakersfield, CA",
description: "Same-day delivery, transparent pricing, 5-star service. Call (661) 390-0579",
images: ["http://img.b2bpic.net/free-photo/person-s-hand-holding-plastic-crate-supermarket_23-2148209752.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "NEXT ROLLOUT - Dumpster Rental Services Bakersfield, CA", description: "Fast & reliable dumpster rentals in Bakersfield, CA. Same-day delivery, upfront pricing, 5-star service. Latino-owned & LGBTQ+ friendly."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1426,7 +1384,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

24
src/app/page.tsx
View File

@@ -15,10 +15,10 @@ import Link from "next/link";
export default function HomePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Sizes", id: "/dumpster-sizes" },
{ name: "Services", id: "/services" },
{ name: "Reviews", id: "/reviews" },
{ name: "Contact", id: "/contact" },
{ name: "Sizes", id: "#dumpster-sizes" },
{ name: "Services", id: "#why-choose-us" },
{ name: "Reviews", id: "#testimonials" },
{ name: "Contact", id: "#contact" },
];
return (
@@ -36,13 +36,7 @@ export default function HomePage() {
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Sizes", id: "/dumpster-sizes" },
{ name: "Services", id: "/services" },
{ name: "Reviews", id: "/reviews" },
{ name: "Contact", id: "/contact" },
]}
navItems={navItems}
brandName="NEXT ROLLOUT"
bottomLeftText="Latino-Owned & LGBTQ+ Friendly"
bottomRightText="(661) 390-0579"
@@ -244,8 +238,8 @@ export default function HomePage() {
columns={[
{
title: "Services", items: [
{ label: "Residential Rentals", href: "#services" },
{ label: "Commercial Services", href: "#services" },
{ label: "Residential Rentals", href: "#why-choose-us" },
{ label: "Commercial Services", href: "#why-choose-us" },
{ label: "Dumpster Sizes", href: "#dumpster-sizes" },
{ label: "Pricing", href: "#dumpster-sizes" },
],
@@ -253,7 +247,7 @@ export default function HomePage() {
{
title: "Company", items: [
{ label: "About Us", href: "#" },
{ label: "Reviews", href: "#reviews" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Service Areas", href: "#" },
{ label: "Contact", href: "#contact" },
],
@@ -273,4 +267,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

14
src/app/styles/variables.css
View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f5f5f5;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #1c1c1c;
--background: #ffffff;
--card: #f9f9f9;
--foreground: #000f06e6;
--primary-cta: #0a7039;
--primary-cta-text: #f5f5f5;
--secondary-cta: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #1c1c1c;
--accent: #6139e6;
--background-accent: #b3a8e8;
--accent: #0a7039;
--background-accent: #c4e8d0;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);