diff --git a/components/TeamMember.module.css b/components/TeamMember.module.css index 8fcecc92..d610ad27 100644 --- a/components/TeamMember.module.css +++ b/components/TeamMember.module.css @@ -1,14 +1,15 @@ .container { - max-width: calc(126rem / 16); + width: calc(126rem / 16); display: flex; flex-direction: column; margin: 0; } .img { - width: 100%; - border-radius: 50%; - margin: 0 auto; + width: calc(118rem / 16); + height: calc(118rem / 16); + + clip-path: circle(); object-fit: cover; } @@ -29,7 +30,8 @@ @media only screen and (max-width: calc(768rem / 16)) { .img { - width: 100%; + width: calc(126rem / 16); + height: calc(126rem / 16); } .caption { diff --git a/components/TeamMemberCard.module.css b/components/TeamMemberCard.module.css index 68b0aff8..3a685090 100644 --- a/components/TeamMemberCard.module.css +++ b/components/TeamMemberCard.module.css @@ -18,11 +18,12 @@ max-width: calc(126rem / 16); max-height: calc(126rem / 16); - clip-path: circle(50%); + clip-path: circle(); } .image { - width: 100%; + width: calc(126rem / 16); + height: calc(126rem / 16); } .name { @@ -112,10 +113,6 @@ align-items: center; } -.popupImage { - width: 100%; -} - .popupName { color: var(--primary-accent); margin: calc(24rem / 16) 0 0 0; diff --git a/components/TeamMemberCard.tsx b/components/TeamMemberCard.tsx index 046ed39c..b7ef2622 100644 --- a/components/TeamMemberCard.tsx +++ b/components/TeamMemberCard.tsx @@ -28,7 +28,7 @@ function TeamMemberInfo({ <>
{`Picture diff --git a/content/team/execs/01-dora-su.md b/content/team/execs/01-dora-su.md new file mode 100644 index 00000000..928fa328 --- /dev/null +++ b/content/team/execs/01-dora-su.md @@ -0,0 +1,6 @@ +--- +name: Dora Su +role: President +--- + +Hey everyone, I'm Dora, a 2nd year CS student. diff --git a/content/team/execs/01-kallen-tu.md b/content/team/execs/01-kallen-tu.md deleted file mode 100644 index 17912751..00000000 --- a/content/team/execs/01-kallen-tu.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Kallen Tu -role: President ---- - -Hey everyone, I'm Kallen! I'm a 4th year CS student and it's my goal to make sure that every computing student at Waterloo has a place that they can belong and get the support they need 🙌. Outside of CSC, I'm an avid traveller and a hobbyist photographer 📷. I love playing games, finding new mountains to climb ⛰️, and watching horror movies. Feel free to reach out and chat with me about anything! diff --git a/content/team/execs/02-gordon-le.md b/content/team/execs/02-gordon-le.md deleted file mode 100644 index b565c869..00000000 --- a/content/team/execs/02-gordon-le.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Gordon Le -role: Vice President ---- - -Hello everyone, I'm Gordon, and welcome to CSC! As a quick introduction, I'm a 4th year CS student at UW who enjoys playing ultimate frisbee, video games, music, and recently I've gotten into doing daily crossword puzzles. At CSC, we're always trying to support UW students in any way that we can, so please come and join us at our events 😄 If you ever see me on campus, please say hello! 👋 diff --git a/content/team/execs/02-jason-sang.md b/content/team/execs/02-jason-sang.md new file mode 100644 index 00000000..39cf4c7e --- /dev/null +++ b/content/team/execs/02-jason-sang.md @@ -0,0 +1,6 @@ +--- +name: Jason Sang +role: Vice President +--- + +Hi! I’m Jason and I’m a 3B CS student. As VP, I help lead the events and operations team. Joining in Winter 2021, I quickly warmed up to the vision that Kallen and Gordon, our former Presidents, had for CSC. Like them, I saw CSC as a chance to fill the cohort gap that Engineering had and that Computer Science lacked. Other than grinding the Waterloo CS cycle, you’ll find me in my spare time composing and playing acoustic fingerstyle guitar or drowning in bass at a festival 😆. diff --git a/content/team/execs/03-anjing-li.md b/content/team/execs/03-anjing-li.md new file mode 100644 index 00000000..de22fa4d --- /dev/null +++ b/content/team/execs/03-anjing-li.md @@ -0,0 +1,6 @@ +--- +name: Anjing Li +role: Assistant Vice President +--- + +Hey guys! I'm Anjing, a 2nd year CS student. \ No newline at end of file diff --git a/content/team/execs/03-ravindu-angammana.md b/content/team/execs/03-ravindu-angammana.md deleted file mode 100644 index c0505004..00000000 --- a/content/team/execs/03-ravindu-angammana.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Ravindu Angammana -role: Assistant Vice President ---- - -Hey guys! I'm Ravindu, a 4th year Software Engineering student here at UW. I joined CSC to help create a healthy community where like-minded students at UW could easily connect with each other. If you ever have the chance to come to one of our events, please do! I promise you won't regret it. When I'm not working, I'll typically be playing video games, listening to music, or planning out a new travel destination (for when COVID ends). Feel free to say hi if you ever see me around! diff --git a/content/team/execs/04-neil-parikh.md b/content/team/execs/04-neil-parikh.md deleted file mode 100644 index 2f0e746b..00000000 --- a/content/team/execs/04-neil-parikh.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -name: Neil Parikh -role: Treasurer ---- - -Hi, I'm Neil, a 4th year Mechatronics Engineering student. I've been a part of CSC since my first term at Waterloo, and it's been a great experience for me, so I'm excited to share that with you all! In my free time, you can find me climbing or longboarding down one of the trails in Waterloo (usually not at the same time!). diff --git a/content/team/execs/04-yanni-wang.md b/content/team/execs/04-yanni-wang.md new file mode 100644 index 00000000..3f5dc023 --- /dev/null +++ b/content/team/execs/04-yanni-wang.md @@ -0,0 +1,6 @@ +--- +name: Yanni Wang +role: Treasurer +--- + +Hi, I'm Yanni, a 2nd year CS student. diff --git a/content/team/programme-committee.json b/content/team/programme-committee.json index 3e2703d6..2beb3de9 100644 --- a/content/team/programme-committee.json +++ b/content/team/programme-committee.json @@ -1,34 +1,34 @@ [ - { - "name": "Brendan Wong", - "role": "Designer" - }, - { - "name": "Kailin Chan", - "role": "Designer" - }, - { - "name": "Karen Lee", - "role": "Designer" - }, { "name": "Sam Honoridez", - "role": "Designer" + "role": "Head of Design" + }, + { + "name": "Jenny Zhang", + "role": "Design" + }, + { + "name": "Vivian Guo", + "role": "Design" + }, + { + "name": "Jason Sang", + "role": "Head of Events" + }, + { + "name": "Amya Singhal", + "role": "Events" }, { "name": "Anna Wang", "role": "Events" }, { - "name": "Jason Sang", + "name": "Eric Huang", "role": "Events" }, { - "name": "Ravindu Angammana", - "role": "Events" - }, - { - "name": "Shi Han", + "name": "Riddhi Bajaj", "role": "Events" }, { @@ -41,58 +41,78 @@ }, { "name": "Anjing Li", + "role": "Head of Marketing" + }, + { + "name": "Alex Zhang", "role": "Marketing" }, { - "name": "Patrick He", + "name": "Catherine Tao", "role": "Marketing" }, { - "name": "Richa Dalal", + "name": "David Chen", + "role": "Marketing" + }, + { + "name": "Dina Orucevic", + "role": "Marketing" + }, + { + "name": "Helen Dong", + "role": "Marketing" + }, + { + "name": "Saikrishna Tadepalli", "role": "Marketing" }, { "name": "Sherry Lev", "role": "Marketing" }, - { - "name": "Alex Zhang", - "role": "Discord Mod" - }, { "name": "Andrew Wang", - "role": "Discord Mod" + "role": "Head of Discord" }, { "name": "Charles Zhang", "role": "Discord Mod" }, + { + "name": "Chris Xie", + "role": "Discord Mod" + }, + { + "name": "Elaine Han", + "role": "Discord Mod" + }, { "name": "Edwin Yang", "role": "Discord Mod" }, + { + "name": "Kallen Tu", + "role": "Discord Mod" + }, + { + "name": "Laura Nguyen", + "role": "Discord Mod" + }, { "name": "Mark Chen", "role": "Discord Mod" }, + { + "name": "Juthika Hoque", + "role": "Head of Reps" + }, { "name": "Aaron Choo", "role": "Representative" }, { - "name": "Athena Liu", - "role": "Representative" - }, - { - "name": "Betty Guo", - "role": "Representative" - }, - { - "name": "Chris Xie", - "role": "Representative" - }, - { - "name": "Dora Su", + "name": "Amy Luo", "role": "Representative" }, { @@ -108,7 +128,15 @@ "role": "Representative" }, { - "name": "Juthika Hoque", + "name": "Sat Arora", + "role": "Representative" + }, + { + "name": "Star Xie", + "role": "Representative" + }, + { + "name": "Tracy Dong", "role": "Representative" } ] diff --git a/content/team/website-committee.json b/content/team/web-committee.json similarity index 89% rename from content/team/website-committee.json rename to content/team/web-committee.json index 6606b5e2..41dd0bdc 100644 --- a/content/team/website-committee.json +++ b/content/team/web-committee.json @@ -27,10 +27,6 @@ "name": "Jared He", "role": "Developer" }, - { - "name": "Linna Luo", - "role": "Developer" - }, { "name": "William Tran", "role": "Developer" diff --git a/images/team/AmyLuo.jpg b/images/team/AmyLuo.jpg new file mode 100644 index 00000000..02cc8a3a Binary files /dev/null and b/images/team/AmyLuo.jpg differ diff --git a/images/team/AthenaLiu.jpg b/images/team/AthenaLiu.jpg deleted file mode 100644 index ba3a765e..00000000 Binary files a/images/team/AthenaLiu.jpg and /dev/null differ diff --git a/images/team/BettyGuo.jpg b/images/team/BettyGuo.jpg deleted file mode 100644 index 1bc188b6..00000000 Binary files a/images/team/BettyGuo.jpg and /dev/null differ diff --git a/images/team/BrendanWong.jpg b/images/team/BrendanWong.jpg deleted file mode 100644 index 4b2db741..00000000 Binary files a/images/team/BrendanWong.jpg and /dev/null differ diff --git a/images/team/CatherineTao.jpg b/images/team/CatherineTao.jpg new file mode 100644 index 00000000..60957b20 Binary files /dev/null and b/images/team/CatherineTao.jpg differ diff --git a/images/team/DinaOrucevic.jpg b/images/team/DinaOrucevic.jpg new file mode 100644 index 00000000..64457e45 Binary files /dev/null and b/images/team/DinaOrucevic.jpg differ diff --git a/images/team/EricHuang.jpg b/images/team/EricHuang.jpg new file mode 100644 index 00000000..aefcc695 Binary files /dev/null and b/images/team/EricHuang.jpg differ diff --git a/images/team/GordonLe.jpg b/images/team/GordonLe.jpg deleted file mode 100644 index 254e4da0..00000000 Binary files a/images/team/GordonLe.jpg and /dev/null differ diff --git a/images/team/KailinChan.jpg b/images/team/KailinChan.jpg deleted file mode 100644 index ed7205b0..00000000 Binary files a/images/team/KailinChan.jpg and /dev/null differ diff --git a/images/team/KarenLee.jpg b/images/team/KarenLee.jpg deleted file mode 100644 index d307ccb7..00000000 Binary files a/images/team/KarenLee.jpg and /dev/null differ diff --git a/images/team/LauraNguyen.jpg b/images/team/LauraNguyen.jpg new file mode 100644 index 00000000..5b8d4c78 Binary files /dev/null and b/images/team/LauraNguyen.jpg differ diff --git a/images/team/LinnaLuo.jpg b/images/team/LinnaLuo.jpg deleted file mode 100644 index 6ddb692b..00000000 Binary files a/images/team/LinnaLuo.jpg and /dev/null differ diff --git a/images/team/PatrickHe.jpg b/images/team/PatrickHe.jpg deleted file mode 100644 index e6a1b0b6..00000000 Binary files a/images/team/PatrickHe.jpg and /dev/null differ diff --git a/images/team/RavinduAngammana.jpg b/images/team/RavinduAngammana.jpg deleted file mode 100644 index 8dc7edc3..00000000 Binary files a/images/team/RavinduAngammana.jpg and /dev/null differ diff --git a/images/team/RaymondLi.jpg b/images/team/RaymondLi.jpg deleted file mode 100644 index eef26ea8..00000000 Binary files a/images/team/RaymondLi.jpg and /dev/null differ diff --git a/images/team/RaymondLi.png b/images/team/RaymondLi.png new file mode 100644 index 00000000..72e5d839 Binary files /dev/null and b/images/team/RaymondLi.png differ diff --git a/images/team/RichaDalal.jpg b/images/team/RichaDalal.jpg deleted file mode 100644 index 6d4e7ade..00000000 Binary files a/images/team/RichaDalal.jpg and /dev/null differ diff --git a/images/team/RiddhiBajaj.jpg b/images/team/RiddhiBajaj.jpg new file mode 100644 index 00000000..0de0b934 Binary files /dev/null and b/images/team/RiddhiBajaj.jpg differ diff --git a/images/team/SatArora.png b/images/team/SatArora.png new file mode 100644 index 00000000..937c9768 Binary files /dev/null and b/images/team/SatArora.png differ diff --git a/images/team/ShiHan.jpg b/images/team/ShiHan.jpg deleted file mode 100644 index fa3543cd..00000000 Binary files a/images/team/ShiHan.jpg and /dev/null differ diff --git a/pages/about/team.tsx b/pages/about/team.tsx index c02f2818..f84e47a3 100644 --- a/pages/about/team.tsx +++ b/pages/about/team.tsx @@ -18,7 +18,7 @@ import { import programmeData from "../../content/team/programme-committee.json"; import systemsData from "../../content/team/systems-committee.json"; -import websiteData from "../../content/team/website-committee.json"; +import webData from "../../content/team/web-committee.json"; import styles from "./team.module.css"; @@ -133,7 +133,7 @@ export const getStaticProps: GetStaticProps = async () => { )) as SerializedExec[]; const [programme, website, systems] = await Promise.all([ getTeamWithImages(programmeData), - getTeamWithImages(websiteData), + getTeamWithImages(webData), getTeamWithImages(systemsData), ]);