bender/30226cfe-bbbf-4442-b0c9-670ede4cf319
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #4

Merged
bender merged 5 commits from version_3 into main 2026-06-08 00:06:49 +00:00
Conversation 0 Commits 5 Files Changed 5 +94 -262
5 changed files with 94 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,27 +28,17 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home",
id: "/",
},
name: "Home", id: "/"},
{
name: "About",
id: "/about",
},
name: "About", id: "/about"},
{
name: "Events",
id: "/events",
},
name: "Events", id: "/events"},
{
name: "Chapters",
id: "/chapter",
},
name: "Chapters", id: "/chapter"},
{
name: "Contact",
id: "/contact",
},
name: "Contact", id: "/contact"},
]}
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="Controversy Meets Conversation Logo"
brandName="CMC"
/>
@@ -62,17 +52,11 @@ export default function LandingPage() {
description="Controversy Meets Conversation was founded on the belief that robust, respectful dialogue is the cornerstone of a healthy democracy. We strive to cultivate a future where individuals, regardless of background, can engage with complex issues, understand diverse perspectives, and work collaboratively towards common goals."
bulletPoints={[
{
title: "Bridge Divides",
description: "Create pathways for understanding across ideological and social lines.",
},
title: "Bridge Divides", description: "Create pathways for understanding across ideological and social lines."},
{
title: "Empower Voices",
description: "Equip every individual with the skills to express their views effectively and respectfully.",
},
title: "Empower Voices", description: "Equip every individual with the skills to express their views effectively and respectfully."},
{
title: "Inspire Action",
description: "Transform dialogue into informed action for positive societal change.",
},
title: "Inspire Action", description: "Transform dialogue into informed action for positive societal change."},
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780876229304-sin0d0oo.jpg?_wi=2"
imageAlt="Students engaged in a facilitated discussion in a school setting"
@@ -87,23 +71,14 @@ export default function LandingPage() {
useInvertedBackground={false}
metrics={[
{
id: "1",
icon: Users,
title: "Participants Engaged",
value: "2,500+",
},
id: "1", icon: Users,
title: "Participants Engaged", value: "2,500+"},
{
id: "2",
icon: Award,
title: "Workshops Hosted",
value: "150+",
},
id: "2", icon: Award,
title: "Workshops Hosted", value: "150+"},
{
id: "3",
icon: GraduationCap,
title: "Chapters Established",
value: "12+",
},
id: "3", icon: GraduationCap,
title: "Chapters Established", value: "12+"},
]}
title="Our Impact & Reach"
description="Witness the tangible results of our commitment to fostering informed and respectful civic discourse across communities."
@@ -118,26 +93,11 @@ export default function LandingPage() {
useInvertedBackground={true}
members={[
{
id: "1",
name: "John Doe",
role: "Founder & CEO",
imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1640.jpg",
imageAlt: "Portrait of John Doe",
},
id: "1", name: "John Doe", role: "Founder & CEO", imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1640.jpg", imageAlt: "Portrait of John Doe"},
{
id: "2",
name: "Jane Smith",
role: "Program Director",
imageSrc: "http://img.b2bpic.net/free-photo/friendly-successful-business-woman-posing-with-arms-crossed_74855-2813.jpg",
imageAlt: "Portrait of Jane Smith",
},
id: "2", name: "Jane Smith", role: "Program Director", imageSrc: "http://img.b2bpic.net/free-photo/friendly-successful-business-woman-posing-with-arms-crossed_74855-2813.jpg", imageAlt: "Portrait of Jane Smith"},
{
id: "3",
name: "Dr. Alan Turing",
role: "Advisory Board",
imageSrc: "http://img.b2bpic.net/free-photo/group-business-people-huddled-around-table-working_329181-17080.jpg",
imageAlt: "Portrait of Dr. Alan Turing",
},
id: "3", name: "Dr. Alan Turing", role: "Advisory Board", imageSrc: "http://img.b2bpic.net/free-photo/group-business-people-huddled-around-table-working_329181-17080.jpg", imageAlt: "Portrait of Dr. Alan Turing"},
]}
title="Meet Our Team"
description="Dedicated leaders and educators passionate about empowering the next generation of engaged citizens."
@@ -146,67 +106,42 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="CMC Logo"
logoText="Controversy Meets Conversation"
columns={[
{
title: "Navigation",
items: [
title: "Navigation", items: [
{
label: "Home",
href: "/",
},
label: "Home", href: "/"},
{
label: "About Us",
href: "/about",
},
label: "About Us", href: "/about"},
{
label: "Events",
href: "/events",
},
label: "Events", href: "/events"},
{
label: "Start a Chapter",
href: "/chapter",
},
label: "Start a Chapter", href: "/chapter"},
{
label: "Contact",
href: "/contact",
},
label: "Contact", href: "/contact"},
],
},
{
title: "Resources",
items: [
title: "Resources", items: [
{
label: "Blog",
href: "#",
},
label: "Blog", href: "#"},
{
label: "Volunteer",
href: "#",
},
label: "Volunteer", href: "#"},
{
label: "Donate",
href: "#",
},
label: "Donate", href: "#"},
],
},
{
title: "Connect",
items: [
title: "Connect", items: [
{
label: "Twitter",
href: "#",
},
label: "Twitter", href: "#"},
{
label: "LinkedIn",
href: "#",
},
label: "LinkedIn", href: "#"},
{
label: "Instagram",
href: "#",
},
label: "Instagram", href: "#"},
],
},
]}
@@ -216,4 +151,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

112
src/app/chapter/page.tsx
View File

@@ -26,27 +26,17 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home",
id: "/",
},
name: "Home", id: "/"},
{
name: "About",
id: "/about",
},
name: "About", id: "/about"},
{
name: "Events",
id: "/events",
},
name: "Events", id: "/events"},
{
name: "Chapters",
id: "/chapter",
},
name: "Chapters", id: "/chapter"},
{
name: "Contact",
id: "/contact",
},
name: "Contact", id: "/contact"},
]}
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="Controversy Meets Conversation Logo"
brandName="CMC"
/>
@@ -60,23 +50,11 @@ export default function LandingPage() {
useInvertedBackground={true}
features={[
{
title: "Empower Students",
description: "Develop leadership and communication skills in a supportive environment.",
imageSrc: "http://img.b2bpic.net/free-photo/african-american-schoolboy-using-hands-sanitizer-classroom_637285-8706.jpg",
imageAlt: "Students collaborating on a project in a school setting",
},
title: "Empower Students", description: "Develop leadership and communication skills in a supportive environment.", imageSrc: "http://img.b2bpic.net/free-photo/african-american-schoolboy-using-hands-sanitizer-classroom_637285-8706.jpg", imageAlt: "Students collaborating on a project in a school setting"},
{
title: "Curriculum Support",
description: "Access resources and guidance to integrate civic discourse into your school's programs.",
imageSrc: "http://img.b2bpic.net/free-photo/leadership-leader-authoritarian-management-trainer-concept_53876-123784.jpg",
imageAlt: "Teacher helping students with their work",
},
title: "Curriculum Support", description: "Access resources and guidance to integrate civic discourse into your school's programs.", imageSrc: "http://img.b2bpic.net/free-photo/leadership-leader-authoritarian-management-trainer-concept_53876-123784.jpg", imageAlt: "Teacher helping students with their work"},
{
title: "National Network",
description: "Connect with other chapters and share best practices across the country.",
imageSrc: "http://img.b2bpic.net/free-photo/charming-female-student-with-blonde-hair-glasses-standing-classmates-looking-with-smile-asian-boy-blissful-friends-discussing-exams-outdoor_197531-3867.jpg",
imageAlt: "Diverse group of students on a school campus",
},
title: "National Network", description: "Connect with other chapters and share best practices across the country.", imageSrc: "http://img.b2bpic.net/free-photo/charming-female-student-with-blonde-hair-glasses-standing-classmates-looking-with-smile-asian-boy-blissful-friends-discussing-exams-outdoor_197531-3867.jpg", imageAlt: "Diverse group of students on a school campus"},
]}
title="Bring CMC to Your School"
description="Empower students to engage in critical thinking, respectful dialogue, and community building by starting a Controversy Meets Conversation chapter at your educational institution."
@@ -88,20 +66,11 @@ export default function LandingPage() {
useInvertedBackground={false}
faqs={[
{
id: "1",
title: "What are the requirements to start a chapter?",
content: "Typically, you'll need a faculty advisor, a core group of interested students, and a commitment to our mission of civic discourse.",
},
id: "1", title: "What are the requirements to start a chapter?", content: "Typically, you'll need a faculty advisor, a core group of interested students, and a commitment to our mission of civic discourse."},
{
id: "2",
title: "What support does CMC provide?",
content: "We offer guidance on event planning, curriculum resources, training for student leaders, and marketing materials.",
},
id: "2", title: "What support does CMC provide?", content: "We offer guidance on event planning, curriculum resources, training for student leaders, and marketing materials."},
{
id: "3",
title: "How long does it take to establish a chapter?",
content: "The process varies by school, but we work to make it as streamlined as possible, typically a few weeks to a couple of months.",
},
id: "3", title: "How long does it take to establish a chapter?", content: "The process varies by school, but we work to make it as streamlined as possible, typically a few weeks to a couple of months."},
]}
sideTitle="Starting a CMC Chapter"
sideDescription="Have questions about bringing Controversy Meets Conversation to your school? Find your answers here."
@@ -113,67 +82,42 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="CMC Logo"
logoText="Controversy Meets Conversation"
columns={[
{
title: "Navigation",
items: [
title: "Navigation", items: [
{
label: "Home",
href: "/",
},
label: "Home", href: "/"},
{
label: "About Us",
href: "/about",
},
label: "About Us", href: "/about"},
{
label: "Events",
href: "/events",
},
label: "Events", href: "/events"},
{
label: "Start a Chapter",
href: "/chapter",
},
label: "Start a Chapter", href: "/chapter"},
{
label: "Contact",
href: "/contact",
},
label: "Contact", href: "/contact"},
],
},
{
title: "Resources",
items: [
title: "Resources", items: [
{
label: "Blog",
href: "#",
},
label: "Blog", href: "#"},
{
label: "Volunteer",
href: "#",
},
label: "Volunteer", href: "#"},
{
label: "Donate",
href: "#",
},
label: "Donate", href: "#"},
],
},
{
title: "Connect",
items: [
title: "Connect", items: [
{
label: "Twitter",
href: "#",
},
label: "Twitter", href: "#"},
{
label: "LinkedIn",
href: "#",
},
label: "LinkedIn", href: "#"},
{
label: "Instagram",
href: "#",
},
label: "Instagram", href: "#"},
],
},
]}
@@ -183,4 +127,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -26,27 +26,17 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home",
id: "/",
},
name: "Home", id: "/"},
{
name: "About",
id: "/about",
},
name: "About", id: "/about"},
{
name: "Events",
id: "/events",
},
name: "Events", id: "/events"},
{
name: "Chapters",
id: "/chapter",
},
name: "Chapters", id: "/chapter"},
{
name: "Contact",
id: "/contact",
},
name: "Contact", id: "/contact"},
]}
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="Controversy Meets Conversation Logo"
brandName="CMC"
/>
@@ -56,18 +46,13 @@ export default function LandingPage() {
<ContactText
useInvertedBackground={true}
background={{
variant: "plain",
}}
variant: "plain"}}
text="Reach Out to Controversy Meets Conversation"
buttons={[
{
text: "Email Us",
href: "mailto:info@cmc.org",
},
text: "Email Us", href: "mailto:info@cmc.org"},
{
text: "Call Us",
href: "tel:+15551234567",
},
text: "Call Us", href: "tel:+15551234567"},
]}
/>
</div>
@@ -77,14 +62,7 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={false}
names={[
"Twitter",
"Facebook",
"Instagram",
"LinkedIn",
"YouTube",
"TikTok",
"Discord",
]}
"Twitter", "Facebook", "Instagram", "LinkedIn", "YouTube", "TikTok", "Discord"]}
title="Connect With Us"
description="Follow us on social media for updates, event announcements, and daily insights into civic discourse."
/>
@@ -92,67 +70,42 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="CMC Logo"
logoText="Controversy Meets Conversation"
columns={[
{
title: "Navigation",
items: [
title: "Navigation", items: [
{
label: "Home",
href: "/",
},
label: "Home", href: "/"},
{
label: "About Us",
href: "/about",
},
label: "About Us", href: "/about"},
{
label: "Events",
href: "/events",
},
label: "Events", href: "/events"},
{
label: "Start a Chapter",
href: "/chapter",
},
label: "Start a Chapter", href: "/chapter"},
{
label: "Contact",
href: "/contact",
},
label: "Contact", href: "/contact"},
],
},
{
title: "Resources",
items: [
title: "Resources", items: [
{
label: "Blog",
href: "#",
},
label: "Blog", href: "#"},
{
label: "Volunteer",
href: "#",
},
label: "Volunteer", href: "#"},
{
label: "Donate",
href: "#",
},
label: "Donate", href: "#"},
],
},
{
title: "Connect",
items: [
title: "Connect", items: [
{
label: "Twitter",
href: "#",
},
label: "Twitter", href: "#"},
{
label: "LinkedIn",
href: "#",
},
label: "LinkedIn", href: "#"},
{
label: "Instagram",
href: "#",
},
label: "Instagram", href: "#"},
],
},
]}
@@ -162,4 +115,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

6
src/app/events/page.tsx
View File

@@ -36,7 +36,7 @@ export default function LandingPage() {
{
name: "Contact", id: "/contact"},
]}
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="Controversy Meets Conversation Logo"
brandName="CMC"
/>
@@ -84,7 +84,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="CMC Logo"
logoText="Controversy Meets Conversation"
columns={[
@@ -129,4 +129,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

6
src/app/page.tsx
View File

@@ -38,7 +38,7 @@ export default function LandingPage() {
{
name: "Contact", id: "/contact"},
]}
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="Controversy Meets Conversation Logo"
brandName="CMC"
/>
@@ -119,7 +119,7 @@ export default function LandingPage() {
<div id="footer" data-section="footer">
<FooterBaseCard
logoSrc="http://img.b2bpic.net/free-photo/top-view-elections-concept-with-sign_23-2148499933.jpg"
logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EpWuLQrdKe7CGSmTG6T2l1Ypvr/uploaded-1780877157402-ru83wxqx.jpg"
logoAlt="CMC Logo"
logoText="Controversy Meets Conversation"
columns={[
@@ -164,4 +164,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}