bender/77e0c02a-9fce-4b1f-9f68-a64d784f132d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #5

Merged
bender merged 4 commits from version_3 into main 2026-03-10 20:38:39 +00:00
Conversation 0 Commits 4 Files Changed 4 +65 -208
4 changed files with 65 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/contact/page.tsx
View File

@@ -17,8 +17,7 @@ export default function ContactPage() {
const footerColumns = [
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Bathroom Remodeling", href: "/services" },
{ label: "Kitchen Remodeling", href: "/services" },
{ label: "Whole Home Renovations", href: "/services" },
@@ -27,8 +26,7 @@ export default function ContactPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Process", href: "/" },
{ label: "Project Gallery", href: "/gallery" },
@@ -37,8 +35,7 @@ export default function ContactPage() {
],
},
{
title: "Contact",
items: [
title: "Contact", items: [
{ label: "Phone: (360) 513-7022", href: "tel:3605137022" },
{ label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684", href: "#" },
{ label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
@@ -46,8 +43,7 @@ export default function ContactPage() {
],
},
{
title: "Service Areas",
items: [
title: "Service Areas", items: [
{ label: "Vancouver, WA", href: "#" },
{ label: "Camas, WA", href: "#" },
{ label: "Battle Ground, WA", href: "#" },
@@ -76,9 +72,7 @@ export default function ContactPage() {
brandName="Haagen"
navItems={navItems}
button={{
text: "Get Free Estimate",
href: "/contact",
}}
text: "Get Free Estimate", href: "/contact"}}
animateOnLoad={true}
/>
</div>
@@ -88,18 +82,13 @@ export default function ContactPage() {
text="Ready to transform your home? Get your free estimate today and experience the Haagen difference—expert craftsmanship combined with exceptional communication."
animationType="entrance-slide"
background={{
variant: "radial-gradient",
}}
variant: "radial-gradient"}}
useInvertedBackground={false}
buttons={[
{
text: "Get Free Estimate",
href: "/contact",
},
text: "Get Free Estimate", href: "/contact"},
{
text: "Call Now (360) 513-7022",
href: "tel:3605137022",
},
text: "Call Now (360) 513-7022", href: "tel:3605137022"},
]}
/>
</div>

114
src/app/gallery/page.tsx
View File

@@ -20,8 +20,7 @@ export default function GalleryPage() {
const footerColumns = [
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Bathroom Remodeling", href: "/services" },
{ label: "Kitchen Remodeling", href: "/services" },
{ label: "Whole Home Renovations", href: "/services" },
@@ -30,8 +29,7 @@ export default function GalleryPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Process", href: "/" },
{ label: "Project Gallery", href: "/gallery" },
@@ -40,20 +38,16 @@ export default function GalleryPage() {
],
},
{
title: "Contact",
items: [
title: "Contact", items: [
{ label: "Phone: (360) 513-7022", href: "tel:3605137022" },
{
label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",
href: "#",
},
label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684", href: "#"},
{ label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
{ label: "Saturday-Sunday: Closed", href: "#" },
],
},
{
title: "Service Areas",
items: [
title: "Service Areas", items: [
{ label: "Vancouver, WA", href: "#" },
{ label: "Camas, WA", href: "#" },
{ label: "Battle Ground, WA", href: "#" },
@@ -95,77 +89,35 @@ export default function GalleryPage() {
tagAnimation="slide-up"
features={[
{
id: "project-1",
title: "Luxury Bathroom Remodel",
descriptions: [
"Complete bathroom transformation with marble tiles and spa shower",
"Custom vanity with heated floors and glass enclosure",
"Project completed in 8 weeks with daily client communication",
],
id: "project-1", title: "Luxury Bathroom Remodel", descriptions: [
"Complete bathroom transformation with marble tiles and spa shower", "Custom vanity with heated floors and glass enclosure", "Project completed in 8 weeks with daily client communication"],
imageSrc:
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=5",
imageAlt: "Luxury bathroom remodel with marble tiles",
},
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=5", imageAlt: "Luxury bathroom remodel with marble tiles"},
{
id: "project-2",
title: "Modern Kitchen Renovation",
descriptions: [
"Open concept kitchen with white cabinetry and quartz counters",
"Professional-grade appliances and custom backsplash",
"Enhanced workflow and entertainment space for family",
],
id: "project-2", title: "Modern Kitchen Renovation", descriptions: [
"Open concept kitchen with white cabinetry and quartz counters", "Professional-grade appliances and custom backsplash", "Enhanced workflow and entertainment space for family"],
imageSrc:
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=5",
imageAlt: "Modern kitchen with white cabinets",
},
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=5", imageAlt: "Modern kitchen with white cabinets"},
{
id: "project-3",
title: "Whole Home Renovation",
descriptions: [
"Multi-room renovation including kitchen, bathrooms, and flooring",
"Complete interior transformation with fresh design aesthetic",
"Project completed on schedule with exceptional attention to detail",
],
id: "project-3", title: "Whole Home Renovation", descriptions: [
"Multi-room renovation including kitchen, bathrooms, and flooring", "Complete interior transformation with fresh design aesthetic", "Project completed on schedule with exceptional attention to detail"],
imageSrc:
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=5",
imageAlt: "Whole home renovation project",
},
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=5", imageAlt: "Whole home renovation project"},
{
id: "project-4",
title: "Master Bath Ensuite",
descriptions: [
"Spa-inspired ensuite with double vanity and walk-in shower",
"Heated floors, radiant ceiling, and premium fixtures",
"Luxury finishes creating the perfect retreat space",
],
id: "project-4", title: "Master Bath Ensuite", descriptions: [
"Spa-inspired ensuite with double vanity and walk-in shower", "Heated floors, radiant ceiling, and premium fixtures", "Luxury finishes creating the perfect retreat space"],
imageSrc:
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=6",
imageAlt: "Luxury master bathroom ensuite",
},
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=6", imageAlt: "Luxury master bathroom ensuite"},
{
id: "project-5",
title: "Guest Bathroom Remodel",
descriptions: [
"Contemporary guest bath with sleek finishes and storage",
"Custom tile work and modern fixtures throughout",
"Professional design creating elegant and functional space",
],
id: "project-5", title: "Guest Bathroom Remodel", descriptions: [
"Contemporary guest bath with sleek finishes and storage", "Custom tile work and modern fixtures throughout", "Professional design creating elegant and functional space"],
imageSrc:
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=6",
imageAlt: "Guest bathroom renovation",
},
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=6", imageAlt: "Guest bathroom renovation"},
{
id: "project-6",
title: "Kitchen & Dining Remodel",
descriptions: [
"Expanded kitchen with island and updated appliances",
"Seamless connection to dining and living areas",
"Transformation creating flow and gathering space",
],
id: "project-6", title: "Kitchen & Dining Remodel", descriptions: [
"Expanded kitchen with island and updated appliances", "Seamless connection to dining and living areas", "Transformation creating flow and gathering space"],
imageSrc:
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=6",
imageAlt: "Kitchen and dining area renovation",
},
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=6", imageAlt: "Kitchen and dining area renovation"},
]}
gridVariant="bento-grid"
animationType="slide-up"
@@ -186,25 +138,9 @@ export default function GalleryPage() {
tagIcon={Award}
tagAnimation="slide-up"
names={[
"Home Depot",
"Lowe's",
"Kohler",
"Tile Shop",
"Sherwin Williams",
"Benjamin Moore",
"Andersen Windows",
"Armstrong Flooring",
]}
"Home Depot", "Lowe's", "Kohler", "Tile Shop", "Sherwin Williams", "Benjamin Moore", "Andersen Windows", "Armstrong Flooring"]}
logos={[
"http://img.b2bpic.net/free-vector/set-labour-day-badges-flat-style_23-2147797798.jpg",
"http://img.b2bpic.net/free-vector/flat-design-labor-day-badge-collection_23-2148600233.jpg",
"http://img.b2bpic.net/free-vector/gradient-modern-plumbing-logo_742173-6831.jpg",
"http://img.b2bpic.net/free-vector/geometrical-abstract-logos_1025-425.jpg",
"http://img.b2bpic.net/free-vector/pack-six-labor-day-badges-flat-design_23-2147655483.jpg",
"http://img.b2bpic.net/free-vector/gradient-paint-gun-logo-template_23-2149990493.jpg",
"http://img.b2bpic.net/free-vector/standard-stamp-design-collection_23-2149812642.jpg",
"http://img.b2bpic.net/free-vector/furniture-logo-concept_23-2148628554.jpg",
]}
"http://img.b2bpic.net/free-vector/set-labour-day-badges-flat-style_23-2147797798.jpg", "http://img.b2bpic.net/free-vector/flat-design-labor-day-badge-collection_23-2148600233.jpg", "http://img.b2bpic.net/free-vector/gradient-modern-plumbing-logo_742173-6831.jpg", "http://img.b2bpic.net/free-vector/geometrical-abstract-logos_1025-425.jpg", "http://img.b2bpic.net/free-vector/pack-six-labor-day-badges-flat-design_23-2147655483.jpg", "http://img.b2bpic.net/free-vector/gradient-paint-gun-logo-template_23-2149990493.jpg", "http://img.b2bpic.net/free-vector/standard-stamp-design-collection_23-2149812642.jpg", "http://img.b2bpic.net/free-vector/furniture-logo-concept_23-2148628554.jpg"]}
textboxLayout="default"
useInvertedBackground={false}
showCard={true}

2
src/app/page.tsx
View File

@@ -274,4 +274,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -27,8 +27,7 @@ export default function ServicesPage() {
const footerColumns = [
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Bathroom Remodeling", href: "/services" },
{ label: "Kitchen Remodeling", href: "/services" },
{ label: "Whole Home Renovations", href: "/services" },
@@ -37,8 +36,7 @@ export default function ServicesPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Process", href: "/" },
{ label: "Project Gallery", href: "/gallery" },
@@ -47,20 +45,16 @@ export default function ServicesPage() {
],
},
{
title: "Contact",
items: [
title: "Contact", items: [
{ label: "Phone: (360) 513-7022", href: "tel:3605137022" },
{
label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684",
href: "#",
},
label: "Address: 821 NE 162nd Ave, Vancouver, WA 98684", href: "#"},
{ label: "Mon-Fri: 6:00 AM - 9:00 PM", href: "#" },
{ label: "Saturday-Sunday: Closed", href: "#" },
],
},
{
title: "Service Areas",
items: [
title: "Service Areas", items: [
{ label: "Vancouver, WA", href: "#" },
{ label: "Camas, WA", href: "#" },
{ label: "Battle Ground, WA", href: "#" },
@@ -102,77 +96,35 @@ export default function ServicesPage() {
tagAnimation="slide-up"
features={[
{
id: "bathroom-remodel",
title: "Bathroom Remodeling",
descriptions: [
"Complete bathroom transformations from concept to completion",
"Luxury tile shower installations with premium finishes",
"Modern vanities, fixtures, and spa-like amenities",
],
id: "bathroom-remodel", title: "Bathroom Remodeling", descriptions: [
"Complete bathroom transformations from concept to completion", "Luxury tile shower installations with premium finishes", "Modern vanities, fixtures, and spa-like amenities"],
imageSrc:
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=3",
imageAlt: "beautiful bathroom renovation modern design",
},
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=3", imageAlt: "beautiful bathroom renovation modern design"},
{
id: "kitchen-remodel",
title: "Kitchen Remodeling",
descriptions: [
"Custom kitchen designs that blend style and function",
"High-end cabinetry, countertops, and backsplash installations",
"Professional appliance integration and layouts",
],
id: "kitchen-remodel", title: "Kitchen Remodeling", descriptions: [
"Custom kitchen designs that blend style and function", "High-end cabinetry, countertops, and backsplash installations", "Professional appliance integration and layouts"],
imageSrc:
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=3",
imageAlt: "luxury kitchen remodeling white cabinets",
},
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=3", imageAlt: "luxury kitchen remodeling white cabinets"},
{
id: "whole-home",
title: "Whole Home Renovations",
descriptions: [
"Comprehensive home remodeling projects with detailed planning",
"Multi-room coordination with seamless execution",
"Complete transformation from concept to move-in ready",
],
id: "whole-home", title: "Whole Home Renovations", descriptions: [
"Comprehensive home remodeling projects with detailed planning", "Multi-room coordination with seamless execution", "Complete transformation from concept to move-in ready"],
imageSrc:
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=3",
imageAlt: "whole home renovation before after",
},
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=3", imageAlt: "whole home renovation before after"},
{
id: "tile-flooring",
title: "Tile & Flooring",
descriptions: [
"Expert tile installation for showers, bathrooms, and kitchens",
"Luxury flooring options including hardwood and custom tiles",
"Meticulous attention to detail in every installation",
],
id: "tile-flooring", title: "Tile & Flooring", descriptions: [
"Expert tile installation for showers, bathrooms, and kitchens", "Luxury flooring options including hardwood and custom tiles", "Meticulous attention to detail in every installation"],
imageSrc:
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=4",
imageAlt: "Professional tile and flooring installation",
},
"http://img.b2bpic.net/free-photo/modern-bathroom-with-blue-tile-glass-shower_23-2151995356.jpg?_wi=4", imageAlt: "Professional tile and flooring installation"},
{
id: "water-damage",
title: "Water Damage Restoration",
descriptions: [
"Emergency water damage assessment and restoration",
"Complete water mitigation and repair services",
"Prevention strategies to protect your home",
],
id: "water-damage", title: "Water Damage Restoration", descriptions: [
"Emergency water damage assessment and restoration", "Complete water mitigation and repair services", "Prevention strategies to protect your home"],
imageSrc:
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=4",
imageAlt: "Water damage restoration services",
},
"http://img.b2bpic.net/free-photo/tiler-working-renovation-apartment_23-2149278642.jpg?_wi=4", imageAlt: "Water damage restoration services"},
{
id: "drywall-repair",
title: "Drywall & Interior Repair",
descriptions: [
"Professional drywall repair and finishing",
"Custom wall solutions and texture options",
"Paint and final finishes for pristine results",
],
id: "drywall-repair", title: "Drywall & Interior Repair", descriptions: [
"Professional drywall repair and finishing", "Custom wall solutions and texture options", "Paint and final finishes for pristine results"],
imageSrc:
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=4",
imageAlt: "Drywall repair and interior finishing",
},
"http://img.b2bpic.net/free-photo/open-kitchen-drawer-with-dishes-inside-everyday-organization_169016-71087.jpg?_wi=4", imageAlt: "Drywall repair and interior finishing"},
]}
gridVariant="two-columns-alternating-heights"
animationType="slide-up"
@@ -204,42 +156,22 @@ export default function ServicesPage() {
tagAnimation="slide-up"
metrics={[
{
id: "1",
value: "1",
title: "Consultation",
description: "Initial meeting to understand your vision and needs",
icon: MessageSquare,
id: "1", value: "1", title: "Consultation", description: "Initial meeting to understand your vision and needs", icon: MessageSquare,
},
{
id: "2",
value: "2",
title: "Detailed Estimate",
description:
"Comprehensive quote with transparent pricing breakdown",
icon: FileText,
id: "2", value: "2", title: "Detailed Estimate", description:
"Comprehensive quote with transparent pricing breakdown", icon: FileText,
},
{
id: "3",
value: "3",
title: "Project Planning",
description:
"Detailed timeline with daily communication protocols",
icon: Calendar,
id: "3", value: "3", title: "Project Planning", description:
"Detailed timeline with daily communication protocols", icon: Calendar,
},
{
id: "4",
value: "4",
title: "Construction",
description:
"Expert execution with constant updates and quality checks",
icon: Hammer,
id: "4", value: "4", title: "Construction", description:
"Expert execution with constant updates and quality checks", icon: Hammer,
},
{
id: "5",
value: "5",
title: "Final Walkthrough",
description: "Complete inspection ensuring every detail is perfect",
icon: CheckCircle,
id: "5", value: "5", title: "Final Walkthrough", description: "Complete inspection ensuring every detail is perfect", icon: CheckCircle,
},
]}
gridVariant="uniform-all-items-equal"