bender/4fc0844c-d81b-422b-ad64-ead9b03e0754
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-03-05 07:17:19 +00:00
Conversation 0 Commits 3 Files Changed 3 +55 -28
3 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/layout.tsx
View File

@@ -22,11 +22,13 @@ const nunitoSans = Nunito_Sans({
export const metadata: Metadata = {
title: "Caroline's Hair & Beauty | Premier Salon Johannesburg", description: "Women-owned LGBTQ+ friendly salon in Mondeor, Johannesburg. Expert hair cutting, styling, coloring & beauty treatments. Book your appointment today.", keywords: "hair salon, hair cutting, styling, coloring, beauty treatments, Johannesburg, Mondeor, women-owned, LGBTQ+ friendly", metadataBase: new URL("https://carolineshairdbeauty.co.za"),
alternates: {
canonical: "https://carolineshairdbeauty.co.za"},
canonical: "https://carolineshairdbeauty.co.za"
},
openGraph: {
title: "Caroline's Hair & Beauty | Premier Salon Johannesburg", description: "Experience premium hair and beauty services at our women-owned, LGBTQ+ friendly salon in Mondeor, Johannesburg.", url: "https://carolineshairdbeauty.co.za", siteName: "Caroline's Hair & Beauty", type: "website", images: [
{
url: "https://carolineshairdbeauty.co.za/og-image.jpg", alt: "Caroline's Hair & Beauty Salon"},
url: "https://carolineshairdbeauty.co.za/og-image.jpg", alt: "Caroline's Hair & Beauty Salon"
},
],
},
twitter: {

75
src/app/page.tsx
View File

@@ -35,7 +35,8 @@ export default function LandingPage() {
{ name: "Contact", id: "contact" },
]}
button={{
text: "Book Appointment", href: "#contact"}}
text: "Book Appointment", href: "#contact"
}}
animateOnLoad={true}
/>
</div>
@@ -53,17 +54,23 @@ export default function LandingPage() {
background={{ variant: "plain" }}
carouselItems={[
{
id: "1", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-girl-salon-hairdresser_23-2147769872.jpg", imageAlt: "hair salon professional styling blonde hair beauty treatment"},
id: "1", imageSrc: "http://img.b2bpic.net/free-photo/cheerful-girl-salon-hairdresser_23-2147769872.jpg", imageAlt: "hair salon professional styling blonde hair beauty treatment"
},
{
id: "2", imageSrc: "http://img.b2bpic.net/free-photo/illuminated-couch-armchair_1203-771.jpg?_wi=1", imageAlt: "modern salon interior relaxing spa beauty salon professional space"},
id: "2", imageSrc: "http://img.b2bpic.net/free-photo/illuminated-couch-armchair_1203-771.jpg?_wi=1", imageAlt: "modern salon interior relaxing spa beauty salon professional space"
},
{
id: "3", imageSrc: "http://img.b2bpic.net/free-photo/blurred-hairdresser-cutting-hair-customer_23-2147778767.jpg?_wi=1", imageAlt: "hair cutting professional barber scissors styling haircut"},
id: "3", imageSrc: "http://img.b2bpic.net/free-photo/blurred-hairdresser-cutting-hair-customer_23-2147778767.jpg?_wi=1", imageAlt: "hair cutting professional barber scissors styling haircut"
},
{
id: "4", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-hair-salon_23-2150668446.jpg?_wi=1", imageAlt: "hair coloring dye application color treatment salon coloring"},
id: "4", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-hair-salon_23-2150668446.jpg?_wi=1", imageAlt: "hair coloring dye application color treatment salon coloring"
},
{
id: "5", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg?_wi=1", imageAlt: "beauty treatment facial care spa treatment wellness"},
id: "5", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg?_wi=1", imageAlt: "beauty treatment facial care spa treatment wellness"
},
{
id: "6", imageSrc: "http://img.b2bpic.net/free-photo/illuminated-couch-armchair_1203-771.jpg?_wi=2", imageAlt: "modern salon interior relaxing spa beauty salon professional space"},
id: "6", imageSrc: "http://img.b2bpic.net/free-photo/illuminated-couch-armchair_1203-771.jpg?_wi=2", imageAlt: "modern salon interior relaxing spa beauty salon professional space"
},
]}
autoPlay={true}
autoPlayInterval={4000}
@@ -89,13 +96,16 @@ export default function LandingPage() {
features={[
{
id: "1", title: "Hair Cutting & Styling", author: "Specialty: Shina's Expert Touch", description: "Experience precision cutting and professional styling that transforms your look. Our stylists, including renowned specialist Shina, deliver cuts and styles that enhance your natural beauty and personal style.", tags: ["Precision", "Expert"],
imageSrc: "http://img.b2bpic.net/free-photo/blurred-hairdresser-cutting-hair-customer_23-2147778767.jpg?_wi=2", imageAlt: "Professional hair cutting service"},
imageSrc: "http://img.b2bpic.net/free-photo/blurred-hairdresser-cutting-hair-customer_23-2147778767.jpg?_wi=2", imageAlt: "Professional hair cutting service"
},
{
id: "2", title: "Premium Hair Coloring", author: "Full-Service Color Treatments", description: "Achieve your dream color with our professional coloring services. From vibrant fashion colors to natural tones, we use premium products and techniques to ensure stunning, healthy-looking results.", tags: ["Color", "Premium"],
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-hair-salon_23-2150668446.jpg?_wi=2", imageAlt: "Professional hair coloring treatment"},
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-hair-salon_23-2150668446.jpg?_wi=2", imageAlt: "Professional hair coloring treatment"
},
{
id: "3", title: "Beauty Treatments", author: "Holistic Beauty Solutions", description: "Enhance your natural beauty with our specialized beauty treatments. From facials to makeup and more, our beauty experts create personalized treatments for the ultimate pampering experience.", tags: ["Beauty", "Wellness"],
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg?_wi=2", imageAlt: "Professional beauty treatment"},
imageSrc: "http://img.b2bpic.net/free-photo/high-angle-view-beautiful-woman-having-head-massage-beauty-treatment-spa_637285-2192.jpg?_wi=2", imageAlt: "Professional beauty treatment"
},
]}
animationType="slide-up"
textboxLayout="default"
@@ -110,13 +120,17 @@ export default function LandingPage() {
author="Sarah M., Johannesburg"
avatars={[
{
src: "http://img.b2bpic.net/free-photo/woman-showing-ok-sign_23-2148990150.jpg", alt: "Sarah M."},
src: "http://img.b2bpic.net/free-photo/woman-showing-ok-sign_23-2148990150.jpg", alt: "Sarah M."
},
{
src: "http://img.b2bpic.net/free-photo/smiling-beautiful-middle-aged-business-woman_1262-3085.jpg", alt: "Client testimonial"},
src: "http://img.b2bpic.net/free-photo/smiling-beautiful-middle-aged-business-woman_1262-3085.jpg", alt: "Client testimonial"
},
{
src: "http://img.b2bpic.net/free-photo/young-woman-smiling_1187-3773.jpg", alt: "Client testimonial"},
src: "http://img.b2bpic.net/free-photo/young-woman-smiling_1187-3773.jpg", alt: "Client testimonial"
},
{
src: "http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg", alt: "Client testimonial"},
src: "http://img.b2bpic.net/free-photo/front-view-cute-girl-looking-away_23-2148436134.jpg", alt: "Client testimonial"
},
]}
ratingAnimation="slide-up"
avatarsAnimation="slide-up"
@@ -128,9 +142,11 @@ export default function LandingPage() {
<TeamCardFive
team={[
{
id: "1", name: "Shina", role: "Lead Stylist & Color Specialist", imageSrc: "http://img.b2bpic.net/free-photo/two-hairstylers-posing-standing-modern-spacy-beaty-salon_651396-986.jpg?_wi=1", imageAlt: "Shina, our renowned lead stylist"},
id: "1", name: "Shina", role: "Lead Stylist & Color Specialist", imageSrc: "http://img.b2bpic.net/free-photo/two-hairstylers-posing-standing-modern-spacy-beaty-salon_651396-986.jpg?_wi=1", imageAlt: "Shina, our renowned lead stylist"
},
{
id: "2", name: "Beauty Team", role: "Licensed Beauty Specialists", imageSrc: "http://img.b2bpic.net/free-photo/two-hairstylers-posing-standing-modern-spacy-beaty-salon_651396-986.jpg?_wi=2", imageAlt: "Our professional beauty specialists"},
id: "2", name: "Beauty Team", role: "Licensed Beauty Specialists", imageSrc: "http://img.b2bpic.net/free-photo/two-hairstylers-posing-standing-modern-spacy-beaty-salon_651396-986.jpg?_wi=2", imageAlt: "Our professional beauty specialists"
},
]}
animationType="slide-up"
title="Meet Our Talented Team"
@@ -146,19 +162,25 @@ export default function LandingPage() {
ctaTitle="Ready to Book Your Appointment?"
ctaDescription="Contact us today to schedule your personalized hair and beauty experience. We're located in Mondeor, Johannesburg, and ready to welcome you."
ctaButton={{
text: "WhatsApp Us", href: "https://wa.me/27715678660?text=I%20would%20like%20to%20book%20an%20appointment%20at%20Caroline%27s%20Hair%20%26%20Beauty"}}
text: "WhatsApp Us", href: "https://wa.me/27715678660?text=I%20would%20like%20to%20book%20an%20appointment%20at%20Caroline%27s%20Hair%20%26%20Beauty"
}}
ctaIcon={MessageCircle}
faqs={[
{
id: "1", title: "What are your business hours?", content: "We're open Monday through Saturday, closing at 5:00 PM. We recommend calling ahead to book your appointment and ensure availability. Our phone number is 071 567 8660."},
id: "1", title: "What are your business hours?", content: "We're open Monday through Saturday, closing at 5:00 PM. We recommend calling ahead to book your appointment and ensure availability. Our phone number is 071 567 8660."
},
{
id: "2", title: "Where are you located?", content: "Caroline's Hair & Beauty is located at 277 Columbine Ave, Mondeor, Johannesburg South, 2091. We're conveniently situated to serve clients from across the region, including many who travel from as far as Cape Town for our services."},
id: "2", title: "Where are you located?", content: "Caroline's Hair & Beauty is located at 277 Columbine Ave, Mondeor, Johannesburg South, 2091. We're conveniently situated to serve clients from across the region, including many who travel from as far as Cape Town for our services."
},
{
id: "3", title: "How do I book an appointment?", content: "You can book an appointment by calling us at 071 567 8660 or sending us a WhatsApp message. We offer flexible scheduling to accommodate your busy lifestyle and ensure you get the perfect time slot for your service."},
id: "3", title: "How do I book an appointment?", content: "You can book an appointment by calling us at 071 567 8660 or sending us a WhatsApp message. We offer flexible scheduling to accommodate your busy lifestyle and ensure you get the perfect time slot for your service."
},
{
id: "4", title: "Do you offer services for all hair types?", content: "Yes! We specialize in working with all hair types and textures. Our team, including our renowned stylist Shina, has expertise in diverse hair care and styling techniques. We're committed to celebrating and enhancing every client's natural beauty."},
id: "4", title: "Do you offer services for all hair types?", content: "Yes! We specialize in working with all hair types and textures. Our team, including our renowned stylist Shina, has expertise in diverse hair care and styling techniques. We're committed to celebrating and enhancing every client's natural beauty."
},
{
id: "5", title: "Are you LGBTQ+ friendly?", content: "Absolutely! We're proud to be a women-owned, LGBTQ+ friendly salon. Everyone is welcome here, and we're committed to creating a safe, inclusive, and welcoming space for all our clients."},
id: "5", title: "Are you LGBTQ+ friendly?", content: "Absolutely! We're proud to be a women-owned, LGBTQ+ friendly salon. Everyone is welcome here, and we're committed to creating a safe, inclusive, and welcoming space for all our clients."
},
]}
useInvertedBackground={false}
animationType="slide-up"
@@ -172,13 +194,16 @@ export default function LandingPage() {
socialLinks={[
{
icon: Instagram,
href: "https://instagram.com", ariaLabel: "Follow us on Instagram"},
href: "https://instagram.com", ariaLabel: "Follow us on Instagram"
},
{
icon: Facebook,
href: "https://facebook.com", ariaLabel: "Like us on Facebook"},
href: "https://facebook.com", ariaLabel: "Like us on Facebook"
},
{
icon: MessageCircle,
href: "https://wa.me/27715678660", ariaLabel: "WhatsApp us"},
href: "https://wa.me/27715678660", ariaLabel: "WhatsApp us"
},
]}
/>
</div>

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

@@ -13,7 +13,7 @@
--background: #ffffff;
--card: #f9f9f9;
--foreground: #000612e6;
--primary-cta: #15479c;
--primary-cta: #ec4899;
--primary-cta-text: #ffffff;
--secondary-cta: #f9f9f9;
--secondary-cta-text: #000612e6;