bender/0b7f1f14-85bc-4720-857b-3cd686cf9cbe
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-12 23:12:34 +00:00
Conversation 0 Commits 4 Files Changed 4 +86 -262
4 changed files with 86 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSp
import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { TrendingUp, Star } from "lucide-react";
export default function AboutPage() {
const navItems = [
@@ -34,9 +35,7 @@ export default function AboutPage() {
brandName="Ditebogo"
navItems={navItems}
button={{
text: "Call Now",
href: "tel:+27119821080",
}}
text: "Call Now", href: "tel:+27119821080"}}
/>
</div>
@@ -44,31 +43,20 @@ export default function AboutPage() {
<InlineImageSplitTextAbout
heading={[
{
type: "text",
content: "Ditebogo Consultancy: Trusted Business Advisory for",
},
type: "text", content: "Ditebogo Consultancy: Trusted Business Advisory for"},
{
type: "image",
src: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg",
alt: "Business consultant",
},
type: "image", src: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg", alt: "Business consultant"},
{
type: "text",
content: "Soweto & Johannesburg",
},
type: "text", content: "Soweto & Johannesburg"},
]}
useInvertedBackground={false}
buttons={[
{
text: "Schedule a Free Consultation",
href: "tel:+27119821080",
},
text: "Schedule a Free Consultation", href: "tel:+27119821080"},
{
text: "Learn More",
href: "/about",
},
text: "Learn More", href: "/about"},
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -76,26 +64,14 @@ export default function AboutPage() {
<MetricCardEleven
metrics={[
{
id: "1",
value: "50+",
title: "Businesses Served",
description: "In Soweto and Johannesburg",
imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg?_wi=4",
imageAlt: "Business consulting session",
},
id: "1", value: "50+", title: "Businesses Served", description: "In Soweto and Johannesburg", imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg", imageAlt: "Business consulting session"},
{
id: "2",
value: "15 years",
title: "Industry Experience",
description: "Business management & consulting",
imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg?_wi=4",
imageAlt: "Strategic planning session",
},
id: "2", value: "15 years", title: "Industry Experience", description: "Business management & consulting", imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg", imageAlt: "Strategic planning session"},
]}
title="Our Impact on Local Businesses"
description="We've helped dozens of Soweto and Johannesburg businesses achieve their growth goals."
tag="Track Record"
tagIcon="TrendingUp"
tagIcon={TrendingUp}
textboxLayout="default"
useInvertedBackground={false}
animationType="slide-up"
@@ -106,46 +82,22 @@ export default function AboutPage() {
<TestimonialCardOne
testimonials={[
{
id: "1",
name: "Thabo Mkhize",
role: "Owner",
company: "ThaboTech Solutions",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg?_wi=3",
imageAlt: "Thabo Mkhize, ThaboTech Solutions",
},
id: "1", name: "Thabo Mkhize", role: "Owner", company: "ThaboTech Solutions", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg", imageAlt: "Thabo Mkhize, ThaboTech Solutions"},
{
id: "2",
name: "Nomsa Dlamini",
role: "Director",
company: "Dlamini Marketing Group",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg?_wi=2",
imageAlt: "Nomsa Dlamini, Dlamini Marketing Group",
},
id: "2", name: "Nomsa Dlamini", role: "Director", company: "Dlamini Marketing Group", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg", imageAlt: "Nomsa Dlamini, Dlamini Marketing Group"},
{
id: "3",
name: "Sipho Nkosi",
role: "Manager",
company: "Nkosi Construction",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg?_wi=2",
imageAlt: "Sipho Nkosi, Nkosi Construction",
},
id: "3", name: "Sipho Nkosi", role: "Manager", company: "Nkosi Construction", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg", imageAlt: "Sipho Nkosi, Nkosi Construction"},
{
id: "4",
name: "Lungile Mthembu",
role: "Founder",
company: "Mthembu Retail",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg?_wi=2",
imageAlt: "Lungile Mthembu, Mthembu Retail",
},
id: "4", name: "Lungile Mthembu", role: "Founder", company: "Mthembu Retail", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg", imageAlt: "Lungile Mthembu, Mthembu Retail"},
]}
title="What Our Clients Say"
description="Real feedback from Soweto and Johannesburg business owners who have benefited from our consulting services."
tag="Client Success Stories"
tagIcon="Star"
tagIcon={Star}
textboxLayout="default"
useInvertedBackground={false}
gridVariant="uniform-all-items-equal"
@@ -157,13 +109,9 @@ export default function AboutPage() {
<FooterLogoReveal
logoText="Ditebogo Consultancy"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Contact: 011 982 1080",
href: "tel:+27119821080",
}}
text: "Contact: 011 982 1080", href: "tel:+27119821080"}}
/>
</div>
</ThemeProvider>

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

@@ -6,6 +6,7 @@ import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatin
import ContactSplit from "@/components/sections/contact/ContactSplit";
import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { Phone, Star } from "lucide-react";
export default function ContactPage() {
const navItems = [
@@ -33,9 +34,7 @@ export default function ContactPage() {
brandName="Ditebogo"
navItems={navItems}
button={{
text: "Call Now",
href: "tel:+27119821080",
}}
text: "Call Now", href: "tel:+27119821080"}}
/>
</div>
@@ -44,12 +43,11 @@ export default function ContactPage() {
tag="Get in Touch"
title="Ready to Grow Your Business?"
description="Contact Ditebogo Consultancy today for a free consultation. We're here to help your Soweto business succeed."
tagIcon="Phone"
tagIcon={Phone}
background={{
variant: "plain",
}}
variant: "plain"}}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-vector/flat-design-south-africa-heritage-day-concept_23-2148627610.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-vector/flat-design-south-africa-heritage-day-concept_23-2148627610.jpg"
imageAlt="Ditebogo Consultancy location in Soweto"
mediaAnimation="slide-up"
mediaPosition="right"
@@ -63,46 +61,22 @@ export default function ContactPage() {
<TestimonialCardOne
testimonials={[
{
id: "1",
name: "Thabo Mkhize",
role: "Owner",
company: "ThaboTech Solutions",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg?_wi=4",
imageAlt: "Thabo Mkhize, ThaboTech Solutions",
},
id: "1", name: "Thabo Mkhize", role: "Owner", company: "ThaboTech Solutions", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg", imageAlt: "Thabo Mkhize, ThaboTech Solutions"},
{
id: "2",
name: "Nomsa Dlamini",
role: "Director",
company: "Dlamini Marketing Group",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg?_wi=3",
imageAlt: "Nomsa Dlamini, Dlamini Marketing Group",
},
id: "2", name: "Nomsa Dlamini", role: "Director", company: "Dlamini Marketing Group", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg", imageAlt: "Nomsa Dlamini, Dlamini Marketing Group"},
{
id: "3",
name: "Sipho Nkosi",
role: "Manager",
company: "Nkosi Construction",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg?_wi=3",
imageAlt: "Sipho Nkosi, Nkosi Construction",
},
id: "3", name: "Sipho Nkosi", role: "Manager", company: "Nkosi Construction", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg", imageAlt: "Sipho Nkosi, Nkosi Construction"},
{
id: "4",
name: "Lungile Mthembu",
role: "Founder",
company: "Mthembu Retail",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg?_wi=3",
imageAlt: "Lungile Mthembu, Mthembu Retail",
},
id: "4", name: "Lungile Mthembu", role: "Founder", company: "Mthembu Retail", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg", imageAlt: "Lungile Mthembu, Mthembu Retail"},
]}
title="Why Our Clients Trust Us"
description="Join dozens of satisfied business owners in Soweto and Johannesburg who have benefited from our consulting expertise."
tag="Client Testimonials"
tagIcon="Star"
tagIcon={Star}
textboxLayout="default"
useInvertedBackground={false}
gridVariant="uniform-all-items-equal"
@@ -114,13 +88,9 @@ export default function ContactPage() {
<FooterLogoReveal
logoText="Ditebogo Consultancy"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Contact: 011 982 1080",
href: "tel:+27119821080",
}}
text: "Contact: 011 982 1080", href: "tel:+27119821080"}}
/>
</div>
</ThemeProvider>

133
src/app/page.tsx
View File

@@ -41,9 +41,7 @@ export default function HomePage() {
id: item.id === "/" ? "/" : item.id,
}))}
button={{
text: "Call Now",
href: "tel:+27119821080",
}}
text: "Call Now", href: "tel:+27119821080"}}
/>
</div>
@@ -56,33 +54,21 @@ export default function HomePage() {
background={{ variant: "plain" }}
mediaItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg?_wi=1",
imageAlt: "Professional business consultation meeting",
},
imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg", imageAlt: "Professional business consultation meeting"},
{
imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg?_wi=1",
imageAlt: "Strategic business planning session",
},
imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg", imageAlt: "Strategic business planning session"},
{
imageSrc: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg?_wi=1",
imageAlt: "Experienced business consultant",
},
imageSrc: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg", imageAlt: "Experienced business consultant"},
{
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg?_wi=1",
imageAlt: "Satisfied client portrait",
},
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg", imageAlt: "Satisfied client portrait"},
]}
buttons={[
{
text: "Call Now: 011 982 1080",
href: "tel:+27119821080",
},
text: "Call Now: 011 982 1080", href: "tel:+27119821080"},
{
text: "Request Consultation",
href: "#contact",
},
text: "Request Consultation", href: "#contact"},
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
mediaAnimation="slide-up"
/>
</div>
@@ -93,21 +79,11 @@ export default function HomePage() {
description="We understand the unique challenges facing Soweto and Johannesburg businesses. Our consulting services are tailored to help you succeed."
negativeCard={{
items: [
"Limited business strategy guidance",
"Unclear operational processes",
"Compliance and registration confusion",
"No growth planning support",
"Expensive external consultants",
],
"Limited business strategy guidance", "Unclear operational processes", "Compliance and registration confusion", "No growth planning support", "Expensive external consultants"],
}}
positiveCard={{
items: [
"Expert business strategy & advisory",
"Streamlined operations & management",
"Compliance & registration support",
"Growth-focused planning",
"Affordable local expertise",
],
"Expert business strategy & advisory", "Streamlined operations & management", "Compliance & registration support", "Growth-focused planning", "Affordable local expertise"],
}}
animationType="slide-up"
textboxLayout="default"
@@ -121,31 +97,20 @@ export default function HomePage() {
<InlineImageSplitTextAbout
heading={[
{
type: "text",
content: "Ditebogo Consultancy: Trusted Business Advisory for",
},
type: "text", content: "Ditebogo Consultancy: Trusted Business Advisory for"},
{
type: "image",
src: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg",
alt: "Business consultant",
},
type: "image", src: "http://img.b2bpic.net/free-photo/front-view-queer-person-work_23-2150617723.jpg", alt: "Business consultant"},
{
type: "text",
content: "Soweto & Johannesburg",
},
type: "text", content: "Soweto & Johannesburg"},
]}
useInvertedBackground={false}
buttons={[
{
text: "Schedule a Free Consultation",
href: "tel:+27119821080",
},
text: "Schedule a Free Consultation", href: "tel:+27119821080"},
{
text: "Learn More",
href: "/about",
},
text: "Learn More", href: "/about"},
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -159,41 +124,17 @@ export default function HomePage() {
useInvertedBackground={false}
testimonials={[
{
id: "1",
name: "Thabo Mkhize",
role: "Owner",
company: "ThaboTech Solutions",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg?_wi=2",
imageAlt: "Thabo Mkhize, ThaboTech Solutions",
},
id: "1", name: "Thabo Mkhize", role: "Owner", company: "ThaboTech Solutions", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/smiling-happy-asian-woman-entrepreneur-recommending-cafe-showing-okay-ok-sign-approval_1258-199352.jpg", imageAlt: "Thabo Mkhize, ThaboTech Solutions"},
{
id: "2",
name: "Nomsa Dlamini",
role: "Director",
company: "Dlamini Marketing Group",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg?_wi=1",
imageAlt: "Nomsa Dlamini, Dlamini Marketing Group",
},
id: "2", name: "Nomsa Dlamini", role: "Director", company: "Dlamini Marketing Group", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-wearing-glasses_23-2148924768.jpg", imageAlt: "Nomsa Dlamini, Dlamini Marketing Group"},
{
id: "3",
name: "Sipho Nkosi",
role: "Manager",
company: "Nkosi Construction",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg?_wi=1",
imageAlt: "Sipho Nkosi, Nkosi Construction",
},
id: "3", name: "Sipho Nkosi", role: "Manager", company: "Nkosi Construction", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-queer-person-work_23-2150617713.jpg", imageAlt: "Sipho Nkosi, Nkosi Construction"},
{
id: "4",
name: "Lungile Mthembu",
role: "Founder",
company: "Mthembu Retail",
rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg?_wi=1",
imageAlt: "Lungile Mthembu, Mthembu Retail",
},
id: "4", name: "Lungile Mthembu", role: "Founder", company: "Mthembu Retail", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/creative-tailor-working-workshop_23-2148970729.jpg", imageAlt: "Lungile Mthembu, Mthembu Retail"},
]}
gridVariant="uniform-all-items-equal"
animationType="slide-up"
@@ -210,21 +151,9 @@ export default function HomePage() {
useInvertedBackground={false}
metrics={[
{
id: "1",
value: "50+",
title: "Businesses Served",
description: "In Soweto and Johannesburg",
imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg?_wi=2",
imageAlt: "Business consulting session",
},
id: "1", value: "50+", title: "Businesses Served", description: "In Soweto and Johannesburg", imageSrc: "http://img.b2bpic.net/free-photo/two-asian-male-colleagues-arguing-office_1098-20413.jpg", imageAlt: "Business consulting session"},
{
id: "2",
value: "15 years",
title: "Industry Experience",
description: "Business management & consulting",
imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg?_wi=2",
imageAlt: "Strategic planning session",
},
id: "2", value: "15 years", title: "Industry Experience", description: "Business management & consulting", imageSrc: "http://img.b2bpic.net/free-photo/business-executives-reviewing-marketing-trends_482257-121143.jpg", imageAlt: "Strategic planning session"},
]}
animationType="slide-up"
/>
@@ -238,7 +167,7 @@ export default function HomePage() {
tagIcon={Phone}
background={{ variant: "plain" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-vector/flat-design-south-africa-heritage-day-concept_23-2148627610.jpg?_wi=1"
imageSrc="http://img.b2bpic.net/free-vector/flat-design-south-africa-heritage-day-concept_23-2148627610.jpg"
imageAlt="Ditebogo Consultancy location in Soweto"
mediaAnimation="slide-up"
mediaPosition="right"
@@ -252,13 +181,9 @@ export default function HomePage() {
<FooterLogoReveal
logoText="Ditebogo Consultancy"
leftLink={{
text: "Privacy Policy",
href: "#",
}}
text: "Privacy Policy", href: "#"}}
rightLink={{
text: "Contact: 011 982 1080",
href: "tel:+27119821080",
}}
text: "Contact: 011 982 1080", href: "tel:+27119821080"}}
/>
</div>
</ThemeProvider>

57
src/components/shared/SvgTextLogo/SvgTextLogo.tsx
View File

@@ -1,51 +1,32 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React, { ReactNode } from "react";
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
children?: ReactNode;
className?: string;
textAnchor?: "start" | "middle" | "end";
dominantBaseline?: "auto" | "middle" | "hanging";
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
children,
className = "", textAnchor = "middle", dominantBaseline = "middle"}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox="0 0 200 50"
xmlns="http://www.w3.org/2000/svg"
className={className}
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x="100"
y="25"
textAnchor={textAnchor}
dominantBaseline={dominantBaseline}
fontSize="24"
fontWeight="bold"
fill="currentColor"
>
{logoText}
{children}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
};