bender/15b1b1f3-4ed2-4432-ba6d-283f57542dd9
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-04-16 17:42:29 +00:00
Conversation 0 Commits 4 Files Changed 4 +76 -317
4 changed files with 76 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import TextAbout from '@/components/sections/about/TextAbout';
export default function LandingPage() {
export default function ContactPage() {
return (
<ThemeProvider
defaultButtonVariant="directional-hover"
@@ -25,37 +25,21 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Services",
id: "/services",
},
{
name: "About",
id: "/about",
},
{
name: "Now Hiring",
id: "/hiring",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Now Hiring", id: "/hiring" },
{ name: "Contact", id: "/contact" },
]}
brandName="DSkinner Painter and Decorator"
button={{ text: "Get a Quote", href: "/contact" }}
/>
</div>
<div id="contact" data-section="contact">
<ContactCenter
useInvertedBackground={false}
background={{
variant: "plain",
}}
background={{ variant: "plain" }}
tag="Contact"
title="Get a Free Quote"
description="Send a message and I'll get back to you shortly."
@@ -72,17 +56,11 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="DSkinner Decor"
leftLink={{
text: "Terms of Service",
href: "#",
}}
rightLink={{
text: "Privacy Policy",
href: "#",
}}
leftLink={{ text: "Terms of Service", href: "#" }}
rightLink={{ text: "Privacy Policy", href: "#" }}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

51
src/app/hiring/page.tsx
View File

@@ -7,7 +7,7 @@ import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import TextAbout from '@/components/sections/about/TextAbout';
export default function LandingPage() {
export default function HiringPage() {
return (
<ThemeProvider
defaultButtonVariant="directional-hover"
@@ -25,28 +25,14 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Services",
id: "/services",
},
{
name: "About",
id: "/about",
},
{
name: "Now Hiring",
id: "/hiring",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Now Hiring", id: "/hiring" },
{ name: "Contact", id: "/contact" },
]}
brandName="DSkinner Painter and Decorator"
button={{ text: "Get a Quote", href: "/contact" }}
/>
</div>
@@ -67,35 +53,22 @@ export default function LandingPage() {
<div id="contact" data-section="contact">
<ContactCTA
useInvertedBackground={false}
background={{
variant: "plain",
}}
background={{ variant: "plain" }}
tag="Apply"
title="Submit your application"
description="Join our growing team today."
buttons={[
{
text: "Apply Now",
href: "/contact",
},
]}
buttons={[{ text: "Apply Now", href: "/contact" }]}
/>
</div>
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="DSkinner Decor"
leftLink={{
text: "Terms of Service",
href: "#",
}}
rightLink={{
text: "Privacy Policy",
href: "#",
}}
leftLink={{ text: "Terms of Service", href: "#" }}
rightLink={{ text: "Privacy Policy", href: "#" }}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

214
src/app/page.tsx
View File

@@ -27,137 +27,46 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Services",
id: "/services",
},
{
name: "About",
id: "/about",
},
{
name: "Now Hiring",
id: "/hiring",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Now Hiring", id: "/hiring" },
{ name: "Contact", id: "/contact" },
]}
brandName="DSkinner Painter and Decorator"
button={{ text: "Get a Quote", href: "/contact" }}
/>
</div>
<div id="hero" data-section="hero">
<HeroSplitDoubleCarousel
background={{
variant: "plain",
}}
background={{ variant: "plain" }}
title="Professional Painting & Decorating Services You Can Trust"
description="High-quality workmanship from an experienced local painter and decorator serving Dundee and surrounding areas."
leftCarouselItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/3d-render-modern-architectural-interior_1048-5614.jpg?_wi=1",
imageAlt: "freshly painted wall interior bright",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/human-hands-working-it-yourself-project_23-2151509470.jpg?_wi=1",
imageAlt: "exterior house painting work",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/vintage-wood-wall-text-background_1249-465.jpg?_wi=1",
imageAlt: "expert wallpaper installation room",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/room-interior-renovation-indoor-paint_53876-81.jpg",
imageAlt: "freshly painted wall interior bright",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/young-foreman-standing-from-back-orange-work-clothes-yellow-hardhat-using-painting-roller-new-apartment-work_574295-1560.jpg",
imageAlt: "exterior house painting work",
},
{ imageSrc: "http://img.b2bpic.net/free-photo/3d-render-modern-architectural-interior_1048-5614.jpg", imageAlt: "freshly painted wall interior bright" },
{ imageSrc: "http://img.b2bpic.net/free-photo/human-hands-working-it-yourself-project_23-2151509470.jpg", imageAlt: "exterior house painting work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/vintage-wood-wall-text-background_1249-465.jpg", imageAlt: "expert wallpaper installation room" },
{ imageSrc: "http://img.b2bpic.net/free-photo/room-interior-renovation-indoor-paint_53876-81.jpg", imageAlt: "freshly painted wall interior bright" },
{ imageSrc: "http://img.b2bpic.net/free-photo/young-foreman-standing-from-back-orange-work-clothes-yellow-hardhat-using-painting-roller-new-apartment-work_574295-1560.jpg", imageAlt: "exterior house painting work" },
]}
rightCarouselItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/back-view-female-construction-worker-with-helmet-paint-roller_23-2148813404.jpg",
imageAlt: "exterior house painting work",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/engineers-front-wall_23-2147704183.jpg",
imageAlt: "expert wallpaper installation room",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/roller-brush-wall-with-blue-paint-apartment-redecoration-home-construction-while-renovating-improving-repair-decorating_482257-3606.jpg",
imageAlt: "freshly painted wall interior bright",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/shallow-focus-shot-hand-holding-blue-pint-brush-with-park_181624-21647.jpg",
imageAlt: "exterior house painting work",
},
{
imageSrc: "http://img.b2bpic.net/free-photo/woman-driving-screw-into-wall_1398-1378.jpg",
imageAlt: "expert wallpaper installation room",
},
]}
buttons={[
{
text: "Get a Free Quote",
href: "/contact",
},
{
text: "Now Hiring",
href: "/hiring",
},
{ imageSrc: "http://img.b2bpic.net/free-photo/back-view-female-construction-worker-with-helmet-paint-roller_23-2148813404.jpg", imageAlt: "exterior house painting work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/engineers-front-wall_23-2147704183.jpg", imageAlt: "expert wallpaper installation room" },
{ imageSrc: "http://img.b2bpic.net/free-photo/roller-brush-wall-with-blue-paint-apartment-redecoration-home-construction-while-renovating-improving-repair-decorating_482257-3606.jpg", imageAlt: "freshly painted wall interior bright" },
{ imageSrc: "http://img.b2bpic.net/free-photo/shallow-focus-shot-hand-holding-blue-pint-brush-with-park_181624-21647.jpg", imageAlt: "exterior house painting work" },
{ imageSrc: "http://img.b2bpic.net/free-photo/woman-driving-screw-into-wall_1398-1378.jpg", imageAlt: "expert wallpaper installation room" },
]}
buttons={[{ text: "Get a Free Quote", href: "/contact" }, { text: "Now Hiring", href: "/hiring" }]}
avatars={[
{
src: "http://img.b2bpic.net/free-photo/man-with-helmet-sitting-with-arms-crossed_23-2148923128.jpg",
alt: "Man with helmet sitting with arms crossed",
},
{
src: "http://img.b2bpic.net/free-photo/contemplated-male-carpenter-wearing-safety-glasses-standing-with-her-arms-crossed_23-2147944879.jpg",
alt: "Contemplated male carpenter wearing safety glasses standing with her arms crossed",
},
{
src: "http://img.b2bpic.net/free-photo/male-bus-driver-posing-portrait_23-2151582561.jpg",
alt: "Male bus driver posing portrait",
},
{
src: "http://img.b2bpic.net/free-photo/portrait-handsome-hipster-guy-dressed-jeans-jacket-posing-with-crossed-arms-isolated-dark-background_613910-21322.jpg",
alt: "Portrait of a handsome hipster guy dressed in jeans jacket posing with crossed arms",
},
{
src: "http://img.b2bpic.net/free-photo/two-students-smiling-happy-painting-sitting-table-art-school_839833-9696.jpg",
alt: "Two students smiling happy painting sitting on the table at art school",
},
{ src: "http://img.b2bpic.net/free-photo/man-with-helmet-sitting-with-arms-crossed_23-2148923128.jpg", alt: "Man with helmet" },
{ src: "http://img.b2bpic.net/free-photo/contemplated-male-carpenter-wearing-safety-glasses-standing-with-her-arms-crossed_23-2147944879.jpg", alt: "Carpenter" },
{ src: "http://img.b2bpic.net/free-photo/male-bus-driver-posing-portrait_23-2151582561.jpg", alt: "Driver" },
{ src: "http://img.b2bpic.net/free-photo/portrait-handsome-hipster-guy-dressed-jeans-jacket-posing-with-crossed-arms-isolated-dark-background_613910-21322.jpg", alt: "Hipster" },
{ src: "http://img.b2bpic.net/free-photo/two-students-smiling-happy-painting-sitting-table-art-school_839833-9696.jpg", alt: "Student" },
]}
avatarText="Trusted by 500+ happy homeowners in Dundee"
marqueeItems={[
{
type: "text",
text: "Quality Workmanship",
},
{
type: "text",
text: "Fully Insured",
},
{
type: "text",
text: "Local Expert",
},
{
type: "text",
text: "Reliable Service",
},
{
type: "text",
text: "Free Estimates",
},
]}
marqueeItems={[{ type: "text", text: "Quality Workmanship" }, { type: "text", text: "Fully Insured" }, { type: "text", text: "Local Expert" }, { type: "text", text: "Reliable Service" }, { type: "text", text: "Free Estimates" }]}
/>
</div>
@@ -165,12 +74,7 @@ export default function LandingPage() {
<TextAbout
useInvertedBackground={true}
title="Trusted Service in Dundee"
buttons={[
{
text: "Get a Free Quote",
href: "/contact",
},
]}
buttons={[{ text: "Get a Free Quote", href: "/contact" }]}
/>
</div>
@@ -188,46 +92,11 @@ export default function LandingPage() {
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
testimonials={[
{
id: "1",
name: "John D.",
role: "Client",
company: "Dundee",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/male-worker-with-arms-crossed-standing-factory_107420-96042.jpg",
},
{
id: "2",
name: "Sarah M.",
role: "Client",
company: "Dundee",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/woman-makes-repairs-home_1398-5140.jpg",
},
{
id: "3",
name: "Mike P.",
role: "Client",
company: "Broughty Ferry",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/country-music-interpret-singing-outdoors_23-2149498450.jpg",
},
{
id: "4",
name: "Jane S.",
role: "Client",
company: "Dundee",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/business-woman-smiling-with-top-hat-thumbs-up_1187-1549.jpg",
},
{
id: "5",
name: "Dave W.",
role: "Client",
company: "Monifieth",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-afro-american-woman_23-2148332136.jpg",
},
{ id: "1", name: "John D.", role: "Client", company: "Dundee", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/male-worker-with-arms-crossed-standing-factory_107420-96042.jpg" },
{ id: "2", name: "Sarah M.", role: "Client", company: "Dundee", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-makes-repairs-home_1398-5140.jpg" },
{ id: "3", name: "Mike P.", role: "Client", company: "Broughty Ferry", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/country-music-interpret-singing-outdoors_23-2149498450.jpg" },
{ id: "4", name: "Jane S.", role: "Client", company: "Dundee", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/business-woman-smiling-with-top-hat-thumbs-up_1187-1549.jpg" },
{ id: "5", name: "Dave W.", role: "Client", company: "Monifieth", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/portrait-beautiful-afro-american-woman_23-2148332136.jpg" },
]}
title="Customer Reviews"
description="See what our happy customers say."
@@ -237,35 +106,22 @@ export default function LandingPage() {
<div id="contact" data-section="contact">
<ContactCTA
useInvertedBackground={false}
background={{
variant: "plain",
}}
background={{ variant: "plain" }}
tag="Ready to Start?"
title="Let's renovate your space together."
description="Contact us today for a professional consultation and a fair, honest quote."
buttons={[
{
text: "Get in Touch",
href: "/contact",
},
]}
buttons={[{ text: "Get in Touch", href: "/contact" }]}
/>
</div>
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="DSkinner Decor"
leftLink={{
text: "Terms of Service",
href: "#",
}}
rightLink={{
text: "Privacy Policy",
href: "#",
}}
leftLink={{ text: "Terms of Service", href: "#" }}
rightLink={{ text: "Privacy Policy", href: "#" }}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -8,7 +8,7 @@ import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import TextAbout from '@/components/sections/about/TextAbout';
export default function LandingPage() {
export default function ServicesPage() {
return (
<ThemeProvider
defaultButtonVariant="directional-hover"
@@ -26,28 +26,14 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Services",
id: "/services",
},
{
name: "About",
id: "/about",
},
{
name: "Now Hiring",
id: "/hiring",
},
{
name: "Contact",
id: "/contact",
},
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Now Hiring", id: "/hiring" },
{ name: "Contact", id: "/contact" },
]}
brandName="DSkinner Painter and Decorator"
button={{ text: "Get a Quote", href: "/contact" }}
/>
</div>
@@ -58,40 +44,19 @@ export default function LandingPage() {
useInvertedBackground={false}
features={[
{
title: "Interior Painting",
description: "Clean, smooth, professional interior painting for walls, ceilings, woodwork, and more. High-quality materials used for a long-lasting finish.",
media: {
imageSrc: "http://img.b2bpic.net/free-photo/assortment-painting-items-with-yellow-paint_23-2149580018.jpg",
imageAlt: "freshly painted wall interior bright",
},
title: "Interior Painting", description: "Clean, smooth, professional interior painting for walls, ceilings, woodwork, and more.", media: { imageSrc: "http://img.b2bpic.net/free-photo/assortment-painting-items-with-yellow-paint_23-2149580018.jpg", imageAlt: "paint tools" },
items: [],
reverse: false,
imageSrc: "http://img.b2bpic.net/free-photo/3d-render-modern-architectural-interior_1048-5614.jpg?_wi=2",
imageAlt: "freshly painted wall interior bright",
reverse: false
},
{
title: "Exterior Painting",
description: "Durable, weather-resistant exterior painting that protects and enhances your property. Suitable for homes, garages, fences, and commercial buildings.",
media: {
imageSrc: "http://img.b2bpic.net/free-photo/little-bird-balcony_23-2148106914.jpg",
imageAlt: "exterior house painting work",
},
title: "Exterior Painting", description: "Durable, weather-resistant exterior painting that protects and enhances your property.", media: { imageSrc: "http://img.b2bpic.net/free-photo/little-bird-balcony_23-2148106914.jpg", imageAlt: "exterior work" },
items: [],
reverse: true,
imageSrc: "http://img.b2bpic.net/free-photo/human-hands-working-it-yourself-project_23-2151509470.jpg?_wi=2",
imageAlt: "freshly painted wall interior bright",
reverse: true
},
{
title: "Wallpapering",
description: "Expert wallpaper installation, including feature walls and full rooms. Perfect alignment, clean edges, and a flawless finish.",
media: {
imageSrc: "http://img.b2bpic.net/free-photo/glowing-antique-lamp-brightens-old-brick-wall-generated-by-ai_188544-27636.jpg",
imageAlt: "expert wallpaper installation room",
},
title: "Wallpapering", description: "Expert wallpaper installation, including feature walls and full rooms.", media: { imageSrc: "http://img.b2bpic.net/free-photo/glowing-antique-lamp-brightens-old-brick-wall-generated-by-ai_188544-27636.jpg", imageAlt: "wallpaper" },
items: [],
reverse: false,
imageSrc: "http://img.b2bpic.net/free-photo/vintage-wood-wall-text-background_1249-465.jpg?_wi=2",
imageAlt: "freshly painted wall interior bright",
reverse: false
},
]}
title="Professional Services"
@@ -109,35 +74,22 @@ export default function LandingPage() {
<div id="contact" data-section="contact">
<ContactCTA
useInvertedBackground={false}
background={{
variant: "plain",
}}
background={{ variant: "plain" }}
tag="Inquiry"
title="Need a specific service?"
description="Ask about our specialized techniques."
buttons={[
{
text: "Contact",
href: "/contact",
},
]}
buttons={[{ text: "Contact", href: "/contact" }]}
/>
</div>
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="DSkinner Decor"
leftLink={{
text: "Terms of Service",
href: "#",
}}
rightLink={{
text: "Privacy Policy",
href: "#",
}}
leftLink={{ text: "Terms of Service", href: "#" }}
rightLink={{ text: "Privacy Policy", href: "#" }}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}