bender/2cfc8850-a71f-49be-97b2-9ef53591c0a8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 3 commits from version_2 into main 2026-03-05 22:54:06 +00:00
Conversation 0 Commits 3 Files Changed 3 +46 -84
3 changed files with 46 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/app/layout.tsx
View File

@@ -1,75 +1,22 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Lato } 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 halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const lato = Lato({
variable: "--font-lato",
subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Reliable Plumbing & Heating Services | Westernish | Vancouver",
description: "Licensed plumbing and heating professionals serving Vancouver and Lower Mainland. Fast response, fair pricing, 4.8★ rating. Call (604) 368-5243 today.",
keywords: "plumber Vancouver, plumbing services, heating services, emergency plumber, hot water tank, furnace repair, HVAC",
metadataBase: new URL("https://westernishplumbing.com"),
alternates: {
canonical: "https://westernishplumbing.com",
},
openGraph: {
title: "Reliable Plumbing & Heating Services | Westernish",
description: "Fast, professional plumbing and heating services in Vancouver. Licensed, insured, trusted by 1000+ homeowners.",
url: "https://westernishplumbing.com",
siteName: "Westernish Plumbing & Heating",
type: "website",
images: [
{
url: "http://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg",
alt: "Professional plumber providing quality service",
},
],
},
twitter: {
card: "summary_large_image",
title: "Reliable Plumbing & Heating Services | Westernish",
description: "Fast, professional, trusted plumbing and heating services in Vancouver and Lower Mainland.",
images: ["http://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "Westernish Plumbing & Heating", description: "Licensed and insured plumbing professionals serving Vancouver and the Lower Mainland."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${lato.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1437,7 +1384,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

42
src/app/page.tsx
View File

@@ -38,7 +38,8 @@ export default function HomePage() {
brandName="Westernish Plumbing"
navItems={navItems}
button={{
text: "Call Now", href: "tel:(604)368-5243"}}
text: "Call Now", href: "tel:(604)368-5243"
}}
className="fixed top-4 left-4 right-4 z-50"
/>
</div>
@@ -50,7 +51,8 @@ export default function HomePage() {
background={{ variant: "downward-rays-static" }}
avatars={[
{
src: "http://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg", alt: "Professional plumber at work"},
src: "https://images.unsplash.com/photo-1558618666-fcd25c85cd64?w=400&h=400&fit=crop", alt: "Professional plumber at work"
},
]}
avatarText="Trusted by 1000+ Homeowners"
buttons={[
@@ -85,7 +87,8 @@ export default function HomePage() {
features={[
{
id: "1", title: "Plumbing Services", description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=1"},
imageSrc: "https://images.unsplash.com/photo-1585479542326-5ac408f4ae4f?w=600&h=400&fit=crop"
},
items: [
{ icon: Droplets, text: "Leak Repairs" },
{ icon: Wrench, text: "Pipe Installation" },
@@ -96,7 +99,8 @@ export default function HomePage() {
},
{
id: "2", title: "Hot Water Tank Services", description: "Professional installation, replacement, and repair of hot water tanks and tankless systems to keep your home comfortable.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg?_wi=1"},
imageSrc: "https://images.unsplash.com/photo-1621905251538-48416bd8575a?w=600&h=400&fit=crop"
},
items: [
{ icon: Zap, text: "Installation" },
{ icon: RefreshCw, text: "Replacement" },
@@ -107,7 +111,8 @@ export default function HomePage() {
},
{
id: "3", title: "Heating Services", description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg?_wi=1"},
imageSrc: "https://images.unsplash.com/photo-1581092918056-0c4c3acd3789?w=600&h=400&fit=crop"
},
items: [
{ icon: Flame, text: "Furnace Installation" },
{ icon: Wrench, text: "Boiler Repair" },
@@ -118,7 +123,8 @@ export default function HomePage() {
},
{
id: "4", title: "Gas Services & Emergency", description: "Safe gas line installation, appliance hookups, and emergency plumbing response when you need it most.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/male-worker-operating-machinery-factory_107420-96043.jpg"},
imageSrc: "https://images.unsplash.com/photo-1558618666-fcd25c85cd64?w=600&h=400&fit=crop"
},
items: [
{ icon: Zap, text: "Gas Line Install" },
{ icon: Flame, text: "Appliance Hookups" },
@@ -157,22 +163,28 @@ export default function HomePage() {
testimonials={[
{
id: "1", name: "Sarah Johnson", role: "Homeowner", company: "Vancouver, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=1", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
{
id: "2", name: "Michael Chen", role: "Property Manager", company: "Richmond, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=2", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
{
id: "3", name: "Emily Rodriguez", role: "Business Owner", company: "Burnaby, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=3", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
{
id: "4", name: "David Kim", role: "Homeowner", company: "Surrey, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=4", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
{
id: "5", name: "Jennifer Martinez", role: "Office Manager", company: "Coquitlam, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=5", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
{
id: "6", name: "Robert Thompson", role: "Homeowner", company: "Langley, BC", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg?_wi=6", imageAlt: "customer portrait professional headshot person"},
imageAlt: "Customer review"
},
]}
gridVariant="uniform-all-items-equal"
animationType="slide-up"
@@ -190,7 +202,7 @@ export default function HomePage() {
tagIcon={PhoneCall}
background={{ variant: "sparkles-gradient" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=2"
imageSrc="https://images.unsplash.com/photo-1585479542326-5ac408f4ae4f?w=600&h=400&fit=crop"
mediaAnimation="slide-up"
mediaPosition="right"
inputPlaceholder="Enter your email"
@@ -202,7 +214,7 @@ export default function HomePage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg?_wi=1"
imageSrc="https://images.unsplash.com/photo-1558618666-fcd25c85cd64?w=800&h=400&fit=crop"
imageAlt="Plumbing and heating services"
logoText="Westernish Plumbing & Heating"
columns={[
@@ -237,4 +249,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

16
src/app/services/page.tsx
View File

@@ -35,7 +35,8 @@ export default function ServicesPage() {
brandName="Westernish Plumbing"
navItems={navItems}
button={{
text: "Call Now", href: "tel:(604)368-5243"}}
text: "Call Now", href: "tel:(604)368-5243"
}}
className="fixed top-4 left-4 right-4 z-50"
/>
</div>
@@ -48,7 +49,8 @@ export default function ServicesPage() {
features={[
{
id: "1", title: "Plumbing Services", description: "From leak repairs to complete pipe installations, our licensed plumbers handle all your plumbing needs with precision and care. We diagnose problems quickly and provide lasting solutions.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/woman-fixing-kitchen-sink_53876-139620.jpg?_wi=3"},
imageSrc: "https://images.unsplash.com/photo-1585479542326-5ac408f4ae4f?w=600&h=400&fit=crop"
},
items: [
{ icon: Droplets, text: "Leak Repairs" },
{ icon: Wrench, text: "Pipe Installation" },
@@ -59,7 +61,8 @@ export default function ServicesPage() {
},
{
id: "2", title: "Hot Water Tank Services", description: "Professional installation, replacement, and repair of hot water tanks and tankless systems. We help you choose the right system for your home and budget.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/service-man-adjusting-house-heating-system_1303-26529.jpg?_wi=2"},
imageSrc: "https://images.unsplash.com/photo-1621905251538-48416bd8575a?w=600&h=400&fit=crop"
},
items: [
{ icon: Zap, text: "Installation" },
{ icon: RefreshCw, text: "Replacement" },
@@ -70,7 +73,8 @@ export default function ServicesPage() {
},
{
id: "3", title: "Heating Services", description: "Keep your home warm all winter with our expert furnace and boiler installation, repair, and maintenance services. Emergency heating repairs available 24/7.", media: {
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-nurse-giving-scan-patient_23-2149341551.jpg?_wi=2"},
imageSrc: "https://images.unsplash.com/photo-1581092918056-0c4c3acd3789?w=600&h=400&fit=crop"
},
items: [
{ icon: Flame, text: "Furnace Installation" },
{ icon: Wrench, text: "Boiler Repair" },
@@ -104,7 +108,7 @@ export default function ServicesPage() {
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/weathered-rusty-refrigeration-rack-factory_181624-56923.jpg?_wi=2"
imageSrc="https://images.unsplash.com/photo-1558618666-fcd25c85cd64?w=800&h=400&fit=crop"
imageAlt="Plumbing and heating services"
logoText="Westernish Plumbing & Heating"
columns={[
@@ -139,4 +143,4 @@ export default function ServicesPage() {
</div>
</ThemeProvider>
);
}
}