resolve conflicts with main

ldap-exec-test
Rebecca-Chou 9 months ago
commit ccd075fa84
  1. 19
      content/events/2022/winter/CSC-Circles-Kick-Off-Vday-Speed-Friending.md
  2. 22
      content/events/2022/winter/Project-Program-Kick-Off.md
  3. 19
      content/events/2022/winter/Switching-Fields-Panel.md
  4. 21
      content/events/2022/winter/Tesla-Autopilot-Coffee-Chat.md
  5. 21
      content/events/2022/winter/Tesla-Vehicle-Software-Development-Coffee-Chat.md
  6. 21
      content/events/2022/winter/Tesla-Vehicle-Software-Systems-Coffee-Chat.md
  7. 18
      content/team/design-team.json
  8. 39
      content/team/discord-team.json
  9. 75
      content/team/events-team.json
  10. 22
      content/team/external-affairs-team.json
  11. 31
      content/team/marketing-team.json
  12. 18
      content/team/photography-team.json
  13. 233
      content/team/programme-committee.json
  14. 42
      content/team/representative-team.json
  15. BIN
      images/events/2022/winter/CSC-Circles-Kick-Off.png
  16. BIN
      images/events/2022/winter/Project-Program-Kick-Off.png
  17. BIN
      images/events/2022/winter/Switching-Fields-Panel.png
  18. BIN
      images/events/2022/winter/Tesla-Autopilot-Coffee-Chat.png
  19. 4
      lib/team.ts
  20. 143
      pages/about/team.tsx

@ -0,0 +1,19 @@
---
name: "CSC Circles Kick-Off & Valentine's Day Speed-Friending"
short: "Attend to get details about CSC Circles, a new initiative to match participants in groups of 4-6 to create recurring social circles. There will also be a Valentine's Day themed Speed-Friending event after the info session."
date: 'February 12 2022 16:00'
online: true
location: 'Zoom'
poster: 'images/events/2022/winter/CSC-Circles-Kick-Off.png'
registerLink: https://bit.ly/csc-circles-kickoff-signup
---
📢 This term, CSC will be kickstarting a NEW event called CSC Circles! We’ll be matching participants in groups of 4-6 to create recurring social circles based on your interests 🎮, availability ⏰, location 📍, and more!
👀 Members of CSC Circles will be a part of a vibrant community within CSC, in which you have the chance to build meaningful connections over the course of a semester and hopefully beyond 🚀 !
📌 The details of the program will be discussed during our kickoff event, so if you’re interested in participating, be sure to attend! You’ll have the chance to ask questions, meet the coordinators, and participate in a Valentine’s Day themed Speed-Friending event after the info session is done 💗.
📅 Event Date: February 12th, 2022 at 4:00 PM EST online. Sign up for the kickoff event at https://bit.ly/csc-circles-kickoff-signup.
👉 Sign up for CSC Circles at https://bit.ly/csc-circles-signup by February 17th, 2022 at 11:59 PM EST. Alternatively, you can also email us at exec@csclub.uwaterloo.ca to sign up as well.

@ -0,0 +1,22 @@
---
name: 'Project Program Kick-Off'
short: 'Attend to get details about Project Program, a month-long event that will have mentors support your team in creating a side-project.'
date: 'January 28 2022 19:00'
online: true
location: 'Zoom'
poster: 'images/events/2022/winter/Project-Program-Kick-Off.png'
registerLink: https://forms.gle/b6e2vda7Y8wDfBLdA
---
📢 Project Program is back for Winter 2022, and we’re excited to see mentors support you to create a month-long project!
DSC and CSC are collaborating again to help you create your side project by guiding your group of mentees through brainstorming project ideas, creating roadmaps with milestones and achievements, and finally presenting your project for the chance to win prizes! 🏆
📌 The details of the program will be discussed during this event, so if you’re interested in participating, be sure to attend!
📅 Event Date: Friday, January 28th from 7:00-8:00pm EDT on Zoom. 💻
https://us06web.zoom.us/j/89144349767?pwd=Z3BZREI0MGNRWXdFWmZMM1JRVU5CQT09
👉 No need to register, but we'll send you an email alert if you do! Sign up at https://forms.gle/b6e2vda7Y8wDfBLdA. Alternatively, you can also email us at exec@csclub.uwaterloo.ca to sign up as well.
See you then! 👋

@ -0,0 +1,19 @@
---
name: 'Switching Fields Panel'
short: 'Listen in as our amazing panelists discuss their experiences with shifting career fields when searching for co-op.'
date: 'March 11 2022 18:00'
online: true
location: 'Zoom'
poster: 'images/events/2022/winter/Switching-Fields-Panel.png'
registerLink: https://bit.ly/3HazgpU
---
Want to move away from web development for your next co-op? Need advice on a general career switch? CSC is proud to be hosting our Switching Fields Panel! Listen in as our amazing panelists discuss their experiences with shifting career fields when searching for co-op.
Registration is not required to attend but we’ll be sending you an email reminder if you register and inviting you to the calendar event!
📅 Event Date: Firday March 11th, 6-7pm EST on Zoom
👉 Register using this link: https://bit.ly/3HazgpU
Hope to see you at the event! 🤗

@ -0,0 +1,21 @@
---
name: "Tesla Autopilot and Tesla Bot Coffee Chat"
short: "Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!"
date: 'March 9 2022 19:00'
online: true
location: 'Online'
poster: 'images/events/2022/winter/Tesla-Autopilot-Coffee-Chat.png'
registerLink: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u
---
🎉 It's that time of year again! CSC is bringing back our partnership with Tesla for multiple coffee chat events!
🚘 Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!
The **Autopilot and Tesla Bot** coffee chat will be on March 9th from 7-8PM EST. All students interested in autonomy, robotics, embedded systems and AI/ML are welcome to join!
✨ A private application link will be added for each coffee chat per team to sign up for internships for Fall 2022!
🍴 All attendees will also have a chance to win a $25 Uber Eats gift card!
👉 Sign up at: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u

@ -0,0 +1,21 @@
---
name: "Tesla Vehicle Software Development Coffee Chat"
short: "Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!"
date: 'March 23 2022 19:00'
online: true
location: 'Online'
poster: 'images/events/2022/winter/Tesla-Autopilot-Coffee-Chat.png'
registerLink: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u
---
🎉 It's that time of year again! CSC is bringing back our partnership with Tesla for multiple coffee chat events!
🚘 Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!
The **Vehicle Software Development** coffee chat will be on March 23rd from 7-8PM EST. All students interested in full stack development, infotainment, and creating fun applications are welcome to join!
✨ A private application link will be added for each coffee chat per team to sign up for internships for Fall 2022!
🍴 All attendees will also have a chance to win a $25 Uber Eats gift card!
👉 Sign up at: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u

@ -0,0 +1,21 @@
---
name: "Tesla Vehicle Software Systems Coffee Chat"
short: "Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!"
date: 'March 16 2022 19:00'
online: true
location: 'Online'
poster: 'images/events/2022/winter/Tesla-Autopilot-Coffee-Chat.png'
registerLink: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u
---
🎉 It's that time of year again! CSC is bringing back our partnership with Tesla for multiple coffee chat events!
🚘 Join 3 special events with Tesla engineers and learn more about internships and new grad roles in AI, Autopilot, and Vehicle software!
The **Vehicle Software Systems** coffee chat will be on March 16th from 7-8PM EST. All students interested in firmware, hardware, and Integration are welcome to join!
✨ A private application link will be added for each coffee chat per team to sign up for internships for Fall 2022!
🍴 All attendees will also have a chance to win a $25 Uber Eats gift card!
👉 Sign up at: https://forms.office.com/Pages/ResponsePage.aspx?id=9MUmkNCGn0u9ObfU0PtGdG9a0mm6j6BFvW5CeQngudlUOUczS1ZWQkJTRTVTQzA5MlA1N005UjVaTy4u

@ -0,0 +1,18 @@
[
{
"name": "Jenny Zhang",
"role": "Team Lead"
},
{
"name": "Vivian Guo",
"role": "Team Lead"
},
{
"name": "Rachel Ma",
"role": "Design"
},
{
"name": "Aaryan Shroff",
"role": "Design"
}
]

@ -0,0 +1,39 @@
[
{
"name": "Andy Wang",
"role": "Team Lead"
},
{
"name": "Alex Zhang",
"role": "Developer"
},
{
"name": "Allen Qin Lu",
"role": "Developer",
"image": "/images/team/AllenLu.png"
},
{
"name": "Chris Xie",
"role": "Developer"
},
{
"name": "Edwin Yang",
"role": "Developer"
},
{
"name": "Laura Nguyen",
"role": "Developer"
},
{
"name": "Marcus Chan",
"role": "Developer"
},
{
"name": "Mark Chen",
"role": "Developer"
},
{
"name": "Victor Zheng",
"role": "Developer"
}
]

@ -0,0 +1,75 @@
[
{
"name": "Eden Chan",
"role": "Team Lead"
},
{
"name": "Eric Huang",
"role": "Team Lead"
},
{
"name": "Adele Chen",
"role": "Events"
},
{
"name": "Amya Singhal",
"role": "Events"
},
{
"name": "Anna Wang",
"role": "Events"
},
{
"name": "Catherine Wan",
"role": "Events"
},
{
"name": "Diana Brebeanu",
"role": "Events"
},
{
"name": "Elaine Han",
"role": "Events"
},
{
"name": "Jonathan Cui",
"role": "Events"
},
{
"name": "Kenson Hui",
"role": "Events"
},
{
"name": "Mabel Kwok",
"role": "Events"
},
{
"name": "Mashrur Chowdhury",
"role": "Events"
},
{
"name": "Matthew Wang",
"role": "Events"
},
{
"name": "Naman Chhawchharia",
"role": "Events"
},
{
"name": "Riddhi Bajaj",
"role": "Events"
},
{
"name": "Santiago Montemayor Gomez",
"role": "Events",
"image": "/images/team/SantiagoMontemayor.jpg"
},
{
"name": "Tommy Jiang",
"role": "Events"
},
{
"name": "William Tran",
"role": "Events"
}
]

@ -0,0 +1,22 @@
[
{
"name": "David Chen",
"role": "Team Lead"
},
{
"name": "Daniel Kim",
"role": "External Affairs"
},
{
"name": "Eric Liu",
"role": "External Affairs"
},
{
"name": "Victor Wu",
"role": "External Affairs"
},
{
"name": "Wanda Song",
"role": "External Affairs"
}
]

@ -0,0 +1,31 @@
[
{
"name": "Dina Orucevic",
"role": "Team Lead"
},
{
"name": "Arjun Amit Athalye",
"role": "Marketing",
"image": "/images/team/ArjunAthalye.jpeg"
},
{
"name": "Catherine Tao",
"role": "Marketing"
},
{
"name": "Ethan Hong",
"role": "Marketing"
},
{
"name": "Gurnika Kaur",
"role": "Marketing"
},
{
"name": "Haley Song",
"role": "Marketing"
},
{
"name": "Kshama Patel",
"role": "Marketing"
}
]

@ -0,0 +1,18 @@
[
{
"name": "Bonnie Peng",
"role": "Team Lead"
},
{
"name": "Annie Zhang",
"role": "Photographer"
},
{
"name": "Calvin Zhong",
"role": "Photographer"
},
{
"name": "Jesse Liu",
"role": "Photographer"
}
]

@ -1,233 +0,0 @@
[
{
"name": "Jenny Zhang",
"role": "Head of Design"
},
{
"name": "Vivian Guo",
"role": "Head of Design"
},
{
"name": "Rachel Ma",
"role": "Design"
},
{
"name": "Aaryan Shroff",
"role": "Design"
},
{
"name": "Andy Wang",
"role": "Head of Discord"
},
{
"name": "Alex Zhang",
"role": "Discord"
},
{
"name": "Allen Qin Lu",
"role": "Discord",
"image": "/images/team/AllenLu.png"
},
{
"name": "Chris Xie",
"role": "Discord"
},
{
"name": "Edwin Yang",
"role": "Discord"
},
{
"name": "Laura Nguyen",
"role": "Discord"
},
{
"name": "Marcus Chan",
"role": "Discord"
},
{
"name": "Mark Chen",
"role": "Discord"
},
{
"name": "Victor Zheng",
"role": "Discord"
},
{
"name": "Eden Chan",
"role": "Head of Events"
},
{
"name": "Eric Huang",
"role": "Head of Events"
},
{
"name": "Adele Chen",
"role": "Events"
},
{
"name": "Amya Singhal",
"role": "Events"
},
{
"name": "Anna Wang",
"role": "Events"
},
{
"name": "Catherine Wan",
"role": "Events"
},
{
"name": "Diana Brebeanu",
"role": "Events"
},
{
"name": "Elaine Han",
"role": "Events"
},
{
"name": "Jonathan Cui",
"role": "Events"
},
{
"name": "Kenson Hui",
"role": "Events"
},
{
"name": "Mabel Kwok",
"role": "Events"
},
{
"name": "Mashrur Chowdhury",
"role": "Events"
},
{
"name": "Matthew Wang",
"role": "Events"
},
{
"name": "Naman Chhawchharia",
"role": "Events"
},
{
"name": "Riddhi Bajaj",
"role": "Events"
},
{
"name": "Santiago Montemayor Gomez",
"role": "Events",
"image": "/images/team/SantiagoMontemayor.jpg"
},
{
"name": "Tommy Jiang",
"role": "Events"
},
{
"name": "William Tran",
"role": "Events"
},
{
"name": "David Chen",
"role": "Head of External Affairs"
},
{
"name": "Daniel Kim",
"role": "External Affairs"
},
{
"name": "Eric Liu",
"role": "External Affairs"
},
{
"name": "Victor Wu",
"role": "External Affairs"
},
{
"name": "Wanda Song",
"role": "External Affairs"
},
{
"name": "Dina Orucevic",
"role": "Head of Marketing"
},
{
"name": "Arjun Amit Athalye",
"role": "Marketing",
"image": "/images/team/ArjunAthalye.jpeg"
},
{
"name": "Catherine Tao",
"role": "Marketing"
},
{
"name": "Ethan Hong",
"role": "Marketing"
},
{
"name": "Gurnika Kaur",
"role": "Marketing"
},
{
"name": "Haley Song",
"role": "Marketing"
},
{
"name": "Kshama Patel",
"role": "Marketing"
},
{
"name": "Bonnie Peng",
"role": "Head of Photography"
},
{
"name": "Annie Zhang",
"role": "Photographer"
},
{
"name": "Calvin Zhong",
"role": "Photographer"
},
{
"name": "Jesse Liu",
"role": "Photographer"
},
{
"name": "Amy Luo",
"role": "Head of Reps"
},
{
"name": "Govind Varma",
"role": "Representative"
},
{
"name": "Guneet Bola",
"role": "Representative"
},
{
"name": "Ivy Lei",
"role": "Representative"
},
{
"name": "Jasmine Bal",
"role": "Representative"
},
{
"name": "Mayank Mehra",
"role": "Representative"
},
{
"name": "Olivia Liu",
"role": "Representative"
},
{
"name": "Sat Arora",
"role": "Representative"
},
{
"name": "Star Xie",
"role": "Representative"
},
{
"name": "Tracy Dong",
"role": "Representative"
}
]

@ -0,0 +1,42 @@
[
{
"name": "Amy Luo",
"role": "Team Lead"
},
{
"name": "Govind Varma",
"role": "Representative"
},
{
"name": "Guneet Bola",
"role": "Representative"
},
{
"name": "Ivy Lei",
"role": "Representative"
},
{
"name": "Jasmine Bal",
"role": "Representative"
},
{
"name": "Mayank Mehra",
"role": "Representative"
},
{
"name": "Olivia Liu",
"role": "Representative"
},
{
"name": "Sat Arora",
"role": "Representative"
},
{
"name": "Star Xie",
"role": "Representative"
},
{
"name": "Tracy Dong",
"role": "Representative"
}
]

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 KiB

@ -152,6 +152,10 @@ export async function getMemberImagePath(name: string) {
(await getImage(imgPath + ".png")) ??
(await getImage(imgPath + ".gif")) ??
(await getImage(imgPath + ".jpeg")) ??
(await getImage(imgPath + ".JPG")) ??
(await getImage(imgPath + ".PNG")) ??
(await getImage(imgPath + ".GIF")) ??
(await getImage(imgPath + ".JPEG")) ??
placeholder;
return img;
}

@ -16,7 +16,13 @@ import {
getMemberImagePath,
} from "@/lib/team";
import programmeData from "../../content/team/programme-committee.json";
import designData from "../../content/team/design-team.json";
import discordData from "../../content/team/discord-team.json";
import eventsData from "../../content/team/events-team.json";
import externalData from "../../content/team/external-affairs-team.json";
import marketingData from "../../content/team/marketing-team.json";
import photographyData from "../../content/team/photography-team.json";
import repsData from "../../content/team/representative-team.json";
import systemsData from "../../content/team/systems-committee.json";
import terminalData from "../../content/team/terminal-committee.json";
import webData from "../../content/team/web-committee.json";
@ -30,7 +36,13 @@ interface SerializedExec {
interface Props {
execs: SerializedExec[];
programme: Metadata[];
design: Metadata[];
discord: Metadata[];
events: Metadata[];
external: Metadata[];
marketing: Metadata[];
photography: Metadata[];
reps: Metadata[];
website: Metadata[];
systems: Metadata[];
terminal: Metadata[];
@ -38,11 +50,69 @@ interface Props {
export default function Team({
execs,
programme,
design,
discord,
events,
external,
marketing,
photography,
reps,
website,
systems,
terminal,
}: Props) {
const teams = [
{
id: "design",
name: "Design Team",
members: design,
},
{
id: "discord",
name: "Discord Team",
members: discord,
},
{
id: "events",
name: "Events Team",
members: events,
},
{
id: "external",
name: "External Affairs Team",
members: external,
},
{
id: "marketing",
name: "Marketing Team",
members: marketing,
},
{
id: "photography",
name: "Photography Team",
members: photography,
},
{
id: "reps",
name: "Class Representatives",
members: reps,
},
{
id: "website",
name: "Website Committee",
members: website,
},
{
id: "system",
name: "Systems Committee",
members: systems,
},
{
id: "terminal",
name: "Terminal Committee",
members: terminal,
},
];
return (
<>
<Title>Team</Title>
@ -52,7 +122,13 @@ export default function Team({
<h1 className={styles.header}>Meet the Team!</h1>
<div className={styles.nav}>
<Link href="#execs">The Executives</Link>
<Link href="#programme">Programme Committee</Link>
<Link href="#design">Design</Link>
<Link href="#discord">Discord</Link>
<Link href="#events">Events</Link>
<Link href="#external">External Affairs</Link>
<Link href="#marketing">Marketing</Link>
<Link href="#photography">Photography</Link>
<Link href="#reps">Class Representatives</Link>
<Link href="#website">Website Committee</Link>
<Link href="#system">Systems Committee</Link>
<Link href="#terminal">Terminal Committee</Link>
@ -77,22 +153,14 @@ export default function Team({
);
})}
</div>
<div id="programme">
<h2 className={styles.subheading}>Programme Committee</h2>
<MembersList team={programme} />
</div>
<div id="website">
<h2 className={styles.subheading}>Website Committee</h2>
<MembersList team={website} />
</div>
<div id="system">
<h2 className={styles.subheading}>Systems Committee</h2>
<MembersList team={systems} />
</div>
<div id="terminal">
<h2 className={styles.subheading}>Terminal Committee</h2>
<MembersList team={terminal} />
</div>
{teams.map((team) => {
return (
<div id={team.id} key={team.id}>
<h2 className={styles.subheading}>{team.name}</h2>
<MembersList team={team.members} />
</div>
);
})}
</DefaultLayout>
<div className={styles.elections}>
<Bubble>
@ -146,14 +214,43 @@ export const getStaticProps: GetStaticProps<Props> = async () => {
execNamePosPairs.map((namePosPair) => getExec(namePosPair))
)) as SerializedExec[];
const [programme, website, systems, terminal] = await Promise.all([
getTeamWithImages(programmeData),
const [
design,
discord,
events,
external,
marketing,
photography,
reps,
website,
systems,
terminal,
] = await Promise.all([
getTeamWithImages(designData),
getTeamWithImages(discordData),
getTeamWithImages(eventsData),
getTeamWithImages(externalData),
getTeamWithImages(marketingData),
getTeamWithImages(photographyData),
getTeamWithImages(repsData),
getTeamWithImages(webData),
getTeamWithImages(systemsData),
getTeamWithImages(terminalData),
]);
return {
props: { execs, programme, website, systems, terminal },
props: {
execs,
design,
discord,
events,
external,
marketing,
photography,
reps,
website,
systems,
terminal,
},
};
};

Loading…
Cancel
Save