Merge version_2 into main #5

Merged
bender merged 3 commits from version_2 into main 2026-03-05 01:33:00 +00:00
3 changed files with 33 additions and 107 deletions

View File

@@ -11,7 +11,6 @@ export default function AboutPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Portfolio", id: "portfolio" },
{ name: "About", id: "about" }
];
@@ -19,8 +18,7 @@ export default function AboutPage() {
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Our Services", href: "services" },
{ label: "Portfolio", href: "portfolio" }
{ label: "Our Services", href: "services" }
]
},
{
@@ -40,16 +38,16 @@ export default function AboutPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="large"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -87,4 +85,4 @@ export default function AboutPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -1,65 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Source_Sans_3 } 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"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3",
subsets: ["latin"]
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "RoofStrippers - 20+ Years Professional Roofing in Fort Worth",
description: "Family-owned roofing company in Fort Worth, Texas. Expert roof installation, repair, and maintenance since 2000+. Free estimates available.",
keywords: "roofing Fort Worth, roof repair, roof installation, professional roofers, family business",
metadataBase: new URL("https://roofstrippers.com"),
alternates: {
canonical: "https://roofstrippers.com"
},
openGraph: {
title: "RoofStrippers - Professional Roofing Services",
description: "Quality roofing solutions you can trust. 20+ years serving Fort Worth homeowners.",
siteName: "RoofStrippers",
type: "website"
},
twitter: {
card: "summary_large_image",
title: "RoofStrippers - Quality Roofing in Fort Worth"
},
robots: {
index: true,
follow: true
}
};
title: "RoofStrippers - Fort Worth Roofing Services", description: "Family-owned roofing company in Fort Worth offering roof installation, repair, and maintenance services with over 20 years of experience."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${sourceSans3.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1427,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

View File

@@ -7,7 +7,6 @@ import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloating
import HeroSplit from "@/components/sections/hero/HeroSplit";
import MetricSplitMediaAbout from "@/components/sections/about/MetricSplitMediaAbout";
import FeatureCardTwentyThree from "@/components/sections/feature/FeatureCardTwentyThree";
import ProductCardOne from "@/components/sections/product/ProductCardOne";
import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
import FooterBase from "@/components/sections/footer/FooterBase";
@@ -16,7 +15,6 @@ export default function HomePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Portfolio", id: "portfolio" },
{ name: "About", id: "about" }
];
@@ -24,8 +22,7 @@ export default function HomePage() {
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Our Services", href: "services" },
{ label: "Portfolio", href: "portfolio" }
{ label: "Our Services", href: "services" }
]
},
{
@@ -45,16 +42,16 @@ export default function HomePage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="extrabold"
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="large"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
@@ -69,12 +66,12 @@ export default function HomePage() {
<HeroSplit
title="Quality Roofing You Can Trust"
description="Family-owned and operated for over 20 years. RoofStrippers delivers exceptional roofing solutions in Fort Worth with proven craftsmanship and unbeatable customer service."
background={{ variant: "plain" }}
background={{ variant: "aurora" }}
tag="20+ Years of Excellence"
tagIcon={Shield}
buttons={[
{ text: "Get Free Estimate", href: "contact" },
{ text: "View Our Work", href: "portfolio" }
{ text: "View Our Work", href: "services" }
]}
imageSrc="http://img.b2bpic.net/free-photo/long-shot-men-working-roof_23-2149343673.jpg"
imageAlt="Professional roofing team at work"
@@ -126,29 +123,6 @@ export default function HomePage() {
/>
</div>
<div id="portfolio" data-section="portfolio">
<ProductCardOne
title="Our Portfolio"
description="See the quality and care we bring to every roofing project in Fort Worth"
tag="Showcase"
products={[
{
id: "1", name: "Residential Roof Replacement", price: "2024 Project", imageSrc: "http://img.b2bpic.net/free-photo/man-walking-roof_1321-1041.jpg", imageAlt: "Residential roof replacement project"
},
{
id: "2", name: "Storm Damage Repair", price: "2024 Project", imageSrc: "http://img.b2bpic.net/free-photo/carpenter-man-working-low-view_23-2148748785.jpg", imageAlt: "Storm damage repair and restoration"
},
{
id: "3", name: "Commercial Roofing", price: "2024 Project", imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-wearing-protection-helmet-outdoors_23-2149343635.jpg", imageAlt: "Commercial roofing installation"
}
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
<div id="testimonials" data-section="testimonials">
<TestimonialCardFifteen
testimonial="RoofStrippers exceeded all our expectations. The team was professional, respectful of our home, and delivered exceptional results. We highly recommend them to any Fort Worth homeowner."
@@ -197,4 +171,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}