Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-06 23:25:56 +00:00
2 changed files with 40 additions and 42 deletions

View File

@@ -1,47 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Montserrat } 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 montserrat = Montserrat({
variable: "--font-montserrat", subsets: ["latin"],
});
const inter = Inter({ variable: "--font-inter", subsets: ["latin"] });
export const metadata: Metadata = {
title: "Heating & Cooling Services Belleville | Rosebush HVAC", description: "Professional HVAC repair, installation, and maintenance in Belleville, Ontario. 24/7 emergency service, honest pricing, certified technicians. Call (613) 967-0768.", keywords: "HVAC Belleville, furnace repair, air conditioning installation, heating cooling services, emergency HVAC", openGraph: {
title: "Rosebush Heating & Cooling | Belleville HVAC Services", description: "Reliable heating and cooling solutions for Belleville homes and businesses. Expert technicians, 20+ years experience.", siteName: "Rosebush Heating & Cooling Ltd", type: "website"},
robots: {
index: true,
follow: true,
},
};
title: "Rosebush HVAC Services - Belleville", description: "Professional heating and cooling solutions in Belleville, Ontario. 24/7 emergency service, expert technicians, and honest pricing."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${montserrat.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={`${inter.variable} font-sans`}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1409,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
@@ -8,8 +8,8 @@ import TextAbout from '@/components/sections/about/TextAbout';
import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { Zap, Wrench, Award, TrendingUp, MessageSquare, Phone } from "lucide-react";
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import { Zap, Wrench, Award, TrendingUp, MessageSquare, Phone, Mail, MapPin, Clock } from "lucide-react";
export default function LandingPage() {
return (
@@ -180,12 +180,38 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoReveal
<FooterBaseCard
logoText="Rosebush"
leftLink={{ text: "Privacy Policy", href: "#" }}
rightLink={{ text: "Contact", href: "tel:(613)967-0768" }}
columns={[
{
title: "Services", items: [
{ label: "HVAC Repair", href: "#services" },
{ label: "AC Installation", href: "#services" },
{ label: "Furnace Service", href: "#services" },
{ label: "Maintenance Plans", href: "#services" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Our Team", href: "#about" },
{ label: "Contact", href: "#contact" }
]
},
{
title: "Contact Info", items: [
{ label: "(613) 967-0768", href: "tel:(613)967-0768" },
{ label: "Belleville, Ontario", href: "#" },
{ label: "24/7 Emergency", href: "tel:(613)967-0768" },
{ label: "info@rosebush.ca", href: "mailto:info@rosebush.ca" }
]
}
]}
copyrightText="© 2025 Rosebush HVAC Services. All rights reserved."
onPrivacyClick={() => console.log('Privacy clicked')}
/>
</div>
</ThemeProvider>
);
}
}