bender/b6f74d7f-705a-410d-a4a7-d9dceeed0a8c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-07 18:19:01 +00:00
Conversation 0 Commits 2 Files Changed 2 +12 -50
2 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/app/layout.tsx
View File

@@ -1,57 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { DM_Sans } 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 dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
});
import "./styles/variables.css";
import "./styles/base.css";
export const metadata: Metadata = {
title: "Professional Window Cleaning | Erik's Window Washing", description: "Professional residential window cleaning in Worcester County, MA. Streak-free results, local service, satisfaction guaranteed. Free quotes available.", keywords: "window cleaning, window washing, professional window cleaner, Worcester MA, residential window cleaning", metadataBase: new URL("https://erikswindowwashing.com"),
alternates: {
canonical: "https://erikswindowwashing.com"},
openGraph: {
title: "Erik's Window Washing - Professional Window Cleaning", description: "Crystal-clear windows for your home. Locally owned, streak-free results, hassle-free service.", url: "https://erikswindowwashing.com", siteName: "Erik's Window Washing", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/city-square_1359-559.jpg", alt: "Professional window cleaning results"},
],
},
twitter: {
card: "summary_large_image", title: "Professional Window Cleaning Service", description: "Sparkling clean windows for your Worcester County home. Local, reliable, streak-free.", images: ["http://img.b2bpic.net/free-photo/city-square_1359-559.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "Erik's Window Washing", description: "Professional window cleaning services in Worcester County, MA"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1419,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

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

@@ -13,12 +13,12 @@
--background: #f5f5f5;
--card: #ffffff;
--foreground: #1c1c1c;
--primary-cta: #1c1c1c;
--primary-cta: #1877F2;
--primary-cta-text: #f5f5f5;
--secondary-cta: #ffffff;
--secondary-cta-text: #1c1c1c;
--accent: #e63946;
--background-accent: #e8bea8;
--accent: #1877F2;
--background-accent: #1877F2;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);