Merge version_6 into main #11

Merged
bender merged 2 commits from version_6 into main 2026-03-03 23:42:11 +00:00
2 changed files with 10 additions and 34 deletions

View File

@@ -1,46 +1,22 @@
import type { Metadata } from "next";
import { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "./styles/variables.css";
import "./styles/base.css";
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville", subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "MJ Airconditioning | HVAC Services Melbourne | 5-Star Rated", description: "Expert air conditioning & heating services in Eastern & South Eastern Melbourne. 15+ years experience. Same-day repairs. Licensed & ARC certified. Call 0411 966 361 for free quote.", keywords: "air conditioning, heating, HVAC, Melbourne, repairs, installation, split system, ducted heating", openGraph: {
title: "MJ Airconditioning | HVAC Services Melbourne", description: "Trusted HVAC specialists serving Eastern & South Eastern Melbourne with 15+ years experience and 5-star customer ratings.", siteName: "MJ Airconditioning", type: "website"
},
twitter: {
card: "summary_large_image", title: "MJ Airconditioning | HVAC Services Melbourne", description: "Expert air conditioning & heating repairs and installation. Same-day service available."
},
robots: {
index: true,
follow: true,
},
};
title: "MJ Airconditioning", description: "Expert Air Conditioning & Heating Solutions"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${libreBaskerville.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1408,7 +1384,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -29,7 +29,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="MJ Airconditioning"
brandName=""
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
@@ -40,6 +40,7 @@ export default function LandingPage() {
button={{
text: "Get Free Quote", href: "#contact"
}}
logoImageSrc="/logo.png"
/>
</div>