bender/354e60f0-efa6-486f-bbd4-71f22c6f2a88
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-03-10 07:05:15 +00:00
Conversation 0 Commits 4 Files Changed 4 +66 -184
4 changed files with 66 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/app/about/page.tsx
View File

@@ -15,7 +15,7 @@ export default function AboutPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="noise"
background="circleGradient"
cardStyle="gradient-mesh"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="glass"
@@ -32,9 +32,7 @@ export default function AboutPage() {
{ name: "Contact", id: "contact" },
]}
button={{
text: "Call Now",
href: "tel:0401022777",
}}
text: "Call Now", href: "tel:0401022777"}}
/>
</div>
@@ -42,20 +40,14 @@ export default function AboutPage() {
<InlineImageSplitTextAbout
heading={[
{
type: "text",
content: "A Family Business Built on",
},
type: "text", content: "A Family Business Built on"},
{
type: "text",
content: "Trust and Honesty",
},
type: "text", content: "Trust and Honesty"},
]}
useInvertedBackground={false}
buttons={[
{
text: "Learn More",
href: "/about",
},
text: "Learn More", href: "/about"},
]}
buttonAnimation="slide-up"
/>
@@ -66,32 +58,16 @@ export default function AboutPage() {
features={[
{
id: 1,
title: "Logbook Servicing",
description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly.",
imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg?_wi=3",
imageAlt: "car service maintenance logbook checklist",
},
title: "Logbook Servicing", description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly.", imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg", imageAlt: "car service maintenance logbook checklist"},
{
id: 2,
title: "Brake Repairs",
description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance.",
imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg?_wi=3",
imageAlt: "brake pad replacement automotive repair",
},
title: "Brake Repairs", description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance.", imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg", imageAlt: "brake pad replacement automotive repair"},
{
id: 3,
title: "Air Conditioning",
description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round.",
imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg?_wi=3",
imageAlt: "air conditioning refill automotive service",
},
title: "Air Conditioning", description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round.", imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg", imageAlt: "air conditioning refill automotive service"},
{
id: 4,
title: "General Repairs",
description: "Expert diagnosis and repair of mechanical issues, from minor fixes to major overhauls.",
imageSrc: "http://img.b2bpic.net/free-photo/car-repairmen-using-laptop-while-doing-car-engine-diagnostic-auto-repair-shop_637285-4273.jpg?_wi=2",
imageAlt: "mechanical engine repair automotive workshop",
},
title: "General Repairs", description: "Expert diagnosis and repair of mechanical issues, from minor fixes to major overhauls.", imageSrc: "http://img.b2bpic.net/free-photo/car-repairmen-using-laptop-while-doing-car-engine-diagnostic-auto-repair-shop_637285-4273.jpg", imageAlt: "mechanical engine repair automotive workshop"},
]}
title="Our Services"
description="Comprehensive automotive repair and maintenance services for all vehicle types"
@@ -100,11 +76,9 @@ export default function AboutPage() {
useInvertedBackground={false}
buttons={[
{
text: "View All Services",
},
text: "View All Services"},
]}
buttonAnimation="slide-up"
mediaAnimation="slide-up"
/>
</div>
@@ -112,13 +86,9 @@ export default function AboutPage() {
<FooterLogoReveal
logoText="DJ and Sons"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Terms of Service",
href: "#",
}}
text: "Terms of Service", href: "#"}}
/>
</div>
</ThemeProvider>

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

@@ -15,7 +15,7 @@ export default function ContactPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="noise"
background="circleGradient"
cardStyle="gradient-mesh"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="glass"
@@ -32,9 +32,7 @@ export default function ContactPage() {
]}
brandName="DJ and Sons"
button={{
text: "Call Now",
href: "tel:0401022777",
}}
text: "Call Now", href: "tel:0401022777"}}
/>
</div>
@@ -44,16 +42,12 @@ export default function ContactPage() {
animationType="entrance-slide"
buttons={[
{
text: "Call 0401 022 777",
href: "tel:0401022777",
},
text: "Call 0401 022 777", href: "tel:0401022777"},
{
text: "Book Service",
},
text: "Book Service"},
]}
background={{
variant: "noise",
}}
variant: "plain"}}
useInvertedBackground={false}
/>
</div>
@@ -62,13 +56,9 @@ export default function ContactPage() {
<FooterLogoReveal
logoText="DJ and Sons"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Terms of Service",
href: "#",
}}
text: "Terms of Service", href: "#"}}
/>
</div>
</ThemeProvider>

116
src/app/page.tsx
View File

@@ -29,7 +29,7 @@ export default function HomePage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="noise"
background="circleGradient"
cardStyle="gradient-mesh"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="glass"
@@ -41,9 +41,7 @@ export default function HomePage() {
brandName="DJ and Sons"
navItems={navItems}
button={{
text: "Call Now",
href: "tel:0401022777",
}}
text: "Call Now", href: "tel:0401022777"}}
/>
</div>
@@ -54,17 +52,13 @@ export default function HomePage() {
description="Your trusted local mechanic in Para Hills West. Honest advice, fair pricing, and quality workmanship from a family-run automotive workshop."
buttons={[
{
text: "Call Now",
href: "tel:0401022777",
},
text: "Call Now", href: "tel:0401022777"},
{
text: "Book a Service",
},
text: "Book a Service"},
]}
buttonAnimation="slide-up"
background={{
variant: "noise",
}}
variant: "plain"}}
imageSrc="http://img.b2bpic.net/free-photo/repairmen-fix-car-together_482257-102916.jpg"
imageAlt="Professional automotive workshop"
frameStyle="card"
@@ -77,23 +71,14 @@ export default function HomePage() {
<MetricCardThree
metrics={[
{
id: "1",
icon: Star,
title: "Rating",
value: "4.9/5",
},
id: "1", icon: Star,
title: "Rating", value: "4.9/5"},
{
id: "2",
icon: Users,
title: "Happy Customers",
value: "94+",
},
id: "2", icon: Users,
title: "Happy Customers", value: "94+"},
{
id: "3",
icon: Award,
title: "Years Experience",
value: "15+",
},
id: "3", icon: Award,
title: "Years Experience", value: "15+"},
]}
title="Trusted by Northern Adelaide"
description="Join hundreds of satisfied customers who rely on DJ and Sons for honest, reliable service"
@@ -109,23 +94,14 @@ export default function HomePage() {
<FeatureCardSix
features={[
{
id: "1",
title: "Logbook Servicing",
description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly.",
imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg?_wi=1",
},
id: 1,
title: "Logbook Servicing", description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly.", imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg"},
{
id: "2",
title: "Brake Repairs",
description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance.",
imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg?_wi=1",
},
id: 2,
title: "Brake Repairs", description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance.", imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg"},
{
id: "3",
title: "Air Conditioning",
description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round.",
imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg?_wi=1",
},
id: 3,
title: "Air Conditioning", description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round.", imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg"},
]}
title="Our Services"
description="Comprehensive automotive repair and maintenance services for all vehicle types"
@@ -134,9 +110,7 @@ export default function HomePage() {
useInvertedBackground={false}
buttons={[
{
text: "View All Services",
href: "/services",
},
text: "View All Services", href: "/services"},
]}
buttonAnimation="slide-up"
/>
@@ -147,20 +121,14 @@ export default function HomePage() {
<InlineImageSplitTextAbout
heading={[
{
type: "text",
content: "A Family Business Built on",
},
type: "text", content: "A Family Business Built on"},
{
type: "text",
content: "Trust and Honesty",
},
type: "text", content: "Trust and Honesty"},
]}
useInvertedBackground={false}
buttons={[
{
text: "Learn More",
href: "/services",
},
text: "Learn More", href: "/services"},
]}
buttonAnimation="slide-up"
/>
@@ -175,13 +143,7 @@ export default function HomePage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Para Hills",
"Salisbury",
"Ingle Farm",
"Pooraka",
"Modbury",
"Mawson Lakes",
]}
"Para Hills", "Salisbury", "Ingle Farm", "Pooraka", "Modbury", "Mawson Lakes"]}
speed={40}
showCard={true}
/>
@@ -195,21 +157,13 @@ export default function HomePage() {
author="Local Vehicle Owner"
avatars={[
{
src: "http://img.b2bpic.net/free-photo/salesman-car-showroom_1303-13625.jpg",
alt: "Customer 1",
},
src: "http://img.b2bpic.net/free-photo/salesman-car-showroom_1303-13625.jpg", alt: "Customer 1"},
{
src: "http://img.b2bpic.net/free-photo/my-big-dream-is-working-big-company_329181-11421.jpg",
alt: "Customer 2",
},
src: "http://img.b2bpic.net/free-photo/my-big-dream-is-working-big-company_329181-11421.jpg", alt: "Customer 2"},
{
src: "http://img.b2bpic.net/free-photo/man-with-thumb-up_1368-6368.jpg",
alt: "Customer 3",
},
src: "http://img.b2bpic.net/free-photo/man-with-thumb-up_1368-6368.jpg", alt: "Customer 3"},
{
src: "http://img.b2bpic.net/free-photo/front-view-woman-looking-camera-office_23-2148218515.jpg",
alt: "Customer 4",
},
src: "http://img.b2bpic.net/free-photo/front-view-woman-looking-camera-office_23-2148218515.jpg", alt: "Customer 4"},
]}
useInvertedBackground={false}
ratingAnimation="slide-up"
@@ -224,16 +178,12 @@ export default function HomePage() {
animationType="entrance-slide"
buttons={[
{
text: "Call 0401 022 777",
href: "tel:0401022777",
},
text: "Call 0401 022 777", href: "tel:0401022777"},
{
text: "Book Service",
},
text: "Book Service"},
]}
background={{
variant: "noise",
}}
variant: "plain"}}
useInvertedBackground={false}
/>
</div>
@@ -243,13 +193,9 @@ export default function HomePage() {
<FooterLogoReveal
logoText="DJ and Sons"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Terms of Service",
href: "#",
}}
text: "Terms of Service", href: "#"}}
/>
</div>
</ThemeProvider>

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

@@ -23,7 +23,7 @@ export default function ServicesPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="noise"
background="circleGradient"
cardStyle="gradient-mesh"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="glass"
@@ -35,9 +35,7 @@ export default function ServicesPage() {
brandName="DJ and Sons"
navItems={navItems}
button={{
text: "Call Now",
href: "tel:0401022777",
}}
text: "Call Now", href: "tel:0401022777"}}
/>
</div>
@@ -46,29 +44,17 @@ export default function ServicesPage() {
<FeatureCardSix
features={[
{
id: "1",
title: "Logbook Servicing",
description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly and preserving warranty coverage.",
imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg?_wi=2",
},
id: 1,
title: "Logbook Servicing", description: "Dealer-standard servicing without dealership prices. Regular maintenance to keep your vehicle running smoothly and preserving warranty coverage.", imageSrc: "http://img.b2bpic.net/free-photo/serious-businessman-manager-stands-front-modern-silver-colored-car-with-paper-documents-hands_146671-16506.jpg"},
{
id: "2",
title: "Brake Repairs",
description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance. We use quality parts and expert diagnostics.",
imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg?_wi=2",
},
id: 2,
title: "Brake Repairs", description: "Professional brake inspections, pad replacements, and rotor servicing for safety and performance. We use quality parts and expert diagnostics.", imageSrc: "http://img.b2bpic.net/free-photo/male-mechanics-working-together-car-shop_23-2150376986.jpg"},
{
id: "3",
title: "Air Conditioning",
description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round. We service all vehicle makes and models.",
imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg?_wi=2",
},
id: 3,
title: "Air Conditioning", description: "AC regassing, diagnostics, and repairs to keep your cabin comfortable year-round. We service all vehicle makes and models.", imageSrc: "http://img.b2bpic.net/free-photo/mechanic-showing-customer-problem-with-car_1170-1368.jpg"},
{
id: "4",
title: "General Repairs",
description: "Expert diagnosis and repair of mechanical issues, from minor fixes to major overhauls. Transparent pricing and honest recommendations always.",
imageSrc: "http://img.b2bpic.net/free-photo/car-repairmen-using-laptop-while-doing-car-engine-diagnostic-auto-repair-shop_637285-4273.jpg?_wi=1",
},
id: 4,
title: "General Repairs", description: "Expert diagnosis and repair of mechanical issues, from minor fixes to major overhauls. Transparent pricing and honest recommendations always.", imageSrc: "http://img.b2bpic.net/free-photo/car-repairmen-using-laptop-while-doing-car-engine-diagnostic-auto-repair-shop_637285-4273.jpg"},
]}
title="Our Services"
description="Comprehensive automotive repair and maintenance services for all vehicle types. From routine maintenance to complex repairs, we handle it all with professionalism and integrity."
@@ -77,9 +63,7 @@ export default function ServicesPage() {
useInvertedBackground={false}
buttons={[
{
text: "Book a Service",
href: "tel:0401022777",
},
text: "Book a Service", href: "tel:0401022777"},
]}
buttonAnimation="slide-up"
/>
@@ -92,16 +76,12 @@ export default function ServicesPage() {
animationType="entrance-slide"
buttons={[
{
text: "Call 0401 022 777",
href: "tel:0401022777",
},
text: "Call 0401 022 777", href: "tel:0401022777"},
{
text: "Book Service",
},
text: "Book Service"},
]}
background={{
variant: "noise",
}}
variant: "plain"}}
useInvertedBackground={false}
/>
</div>
@@ -111,13 +91,9 @@ export default function ServicesPage() {
<FooterLogoReveal
logoText="DJ and Sons"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Terms of Service",
href: "#",
}}
text: "Terms of Service", href: "#"}}
/>
</div>
</ThemeProvider>