diff --git a/components/About.tsx b/components/About.tsx index ab23234..5d955ac 100644 --- a/components/About.tsx +++ b/components/About.tsx @@ -27,8 +27,7 @@ export function About() { courses with electives from areas such as accounting, economics, and financial management. This is a joint offering by the Faculty of Mathematics and the School of Accounting and Finance. The program is - offered only as a co-op program with 6 co-op terms. The program is - offered only as a co-op program with 6 co-op terms. + offered only as a co-op program with 6 co-op terms.{" "}

Computer Science/Business Administration

diff --git a/components/BottomNav.tsx b/components/BottomNav.tsx index 6475aef..2705bd2 100644 --- a/components/BottomNav.tsx +++ b/components/BottomNav.tsx @@ -25,12 +25,12 @@ export function BottomNav(props: PagesInfo) { > {props.leftPage ? (

- + - + {props.leftPage.name} @@ -39,10 +39,10 @@ export function BottomNav(props: PagesInfo) { ) : null} {props.rightPage ? (
- + {props.rightPage.name} - + diff --git a/components/ComponentSwitcher.tsx b/components/ComponentSwitcher.tsx index 364f1de..1d7d516 100644 --- a/components/ComponentSwitcher.tsx +++ b/components/ComponentSwitcher.tsx @@ -13,15 +13,18 @@ export function ComponentSwitcher({ }: ComponentSwitcherProps) { const [selectedButton, setSelectedButton] = useState(buttonList[0]); const [currentGraph, setCurrentGraph] = useState(graphList[0]); + const [currentGraphNumber, setCurrentGraphNumber] = useState(0); const handleSwitch = (buttonName: string) => { const graphIndex = buttonList.indexOf(buttonName); setSelectedButton(buttonName); setCurrentGraph(graphList[graphIndex]); + setCurrentGraphNumber(graphIndex); }; useEffect(() => { - setCurrentGraph(graphList[0]); + setCurrentGraph(graphList[currentGraphNumber]); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [graphList]); return ( diff --git a/data/academics.ts b/data/academics.ts index 19f51df..8fdf155 100644 --- a/data/academics.ts +++ b/data/academics.ts @@ -187,15 +187,15 @@ export const A5 = [ export const A6 = [ { - category: "WINDOWS", + category: "Windows", value: 37, }, { - category: "MACOS", + category: "Macos", value: 40, }, { - category: "LINUX", + category: "Linux", value: 23, }, ]; @@ -226,7 +226,7 @@ export const A7 = [ value: 4, }, { - category: "Combinatorics & Optimization", + category: "C&O", value: 1, }, { @@ -936,13 +936,13 @@ export const A12i = [ "8-10": 19, }, { - category: "STAT240E", + category: "STAT240", "1-4": 0, "5-7": 4, "8-10": 6, }, { - category: "STAT241E", + category: "STAT241", "1-4": 1, "5-7": 6, "8-10": 9, diff --git a/data/contributors.ts b/data/contributors.ts index 74d7123..541d7f3 100644 --- a/data/contributors.ts +++ b/data/contributors.ts @@ -19,6 +19,18 @@ export const communityReps = [ name: "Juthika Hoque", link: "https://www.linkedin.com/in/juthikahoque/", }, + { + name: "Ivy Lei", + link: "https://www.linkedin.com/in/ivy-lei/", + }, + { + name: "Kevin Cui", + link: "https://www.linkedin.com/in/kevincui1/", + }, + { + name: "Nikki Guo", + link: "https://www.linkedin.com/in/nikkiguo", + }, ]; export const designers = [ @@ -45,14 +57,6 @@ export const webDevs = [ name: "Amy Wang", link: "", }, - { - name: "Beihao Zhou", - link: "https://www.linkedin.com/in/beihaozhou/", - }, - { - name: "Jared He", - link: "https://www.linkedin.com/in/jaredhe/", - }, { name: "Mark Chiu", link: "https://linkedin.com/in/markchiu02", @@ -61,6 +65,14 @@ export const webDevs = [ name: "Shahan Nedadahandeh", link: "https://shahan.ca/", }, + { + name: "Beihao Zhou", + link: "https://www.linkedin.com/in/beihaozhou/", + }, + { + name: "Jared He", + link: "https://www.linkedin.com/in/jaredhe/", + }, ]; export const sysCom = [ diff --git a/data/intimacy-and-drugs.ts b/data/intimacy-and-drugs.ts index 37c7e44..0fcff66 100644 --- a/data/intimacy-and-drugs.ts +++ b/data/intimacy-and-drugs.ts @@ -327,7 +327,7 @@ export const I9 = [ "It takes a lot of work and patience", "My understanding of dating and relationships got a lot more detailed. The reality takes a lot more work and emotional maturity.", "I stopped simping", - "I didn't know that soul mates exist, but I guess I do now.", + "I didn't know that soulmates exist, but I guess I do now.", "Learning to co-exist intimately with (an)other human being(s) is almost always difficult. However, if you can make it work, it is absolutely worth it.", "I have become lost in the sauce", "nill", @@ -337,9 +337,9 @@ export const I9 = [ "Much deeper understanding ", "Communication is the most important things in a relationship. You gotta figure out how to get to the root of a problem in order to truly tackle it. Sometimes what people say isn't what they're actually concerned about. Also, people often don't understand you and they don't understand themselves.", "I know I am not yet wanting to be in a relationship.", - "Hasnt", + "Hasn't", "I've changed. ", - "tbh it hasnt", + "tbh it hasn't", "I've become more understanding/open to long-distance relationships, especially after graduation since me and my partner are not living in the same city", "I now understand relationships are different for everyone, and that there isn't a particular way to be in a relationship. As long as you are happy in your relationship, it is good for you and works for you.", "Communication is very important", diff --git a/data/mental-health.ts b/data/mental-health.ts index 3ea618d..dd12783 100644 --- a/data/mental-health.ts +++ b/data/mental-health.ts @@ -289,6 +289,7 @@ export const H9 = [ ]; export const H9i = [ + "If you ever feel your mental health is declining, don't be afraid to talk to your profs and TA's about it, they're all there to help you. Don't isolate yourself from your friend group, as that'll only make things worse. The most important thing is to not keep everything bottled up.", "Mental health at Waterloo is pretty bad. The environment generates a lot of pressure and people crack very much under that pressure.", "Everyone deals with mental health. You aren't some special snowflake, and you also aren't immune. It will always get better once you accept that and are able to talk about it at least to yourself. ", "Take breaks", @@ -296,7 +297,6 @@ export const H9i = [ "Don't be afraid to reach out for help, therapy is worth it!", "Competition at Waterloo can be tough on mental health sometimes.", "It is pretty scary that you could just be totally unknown in university, nobody would never know anything that happens to you. I feel that a lot of people with mental health problems can go down like this.", - "If you ever feel your mental health is declining, don't be afraid to talk to your profs and TA's about it, they're all there to help you. Don't isolate yourself from your friend group, as that'll only make things worse. The most important thing is to not keep everything bottled up.", "Consider reaching out to professionals if you are struggling with mental health. However, it is completely normal to try multiple therapists until you can find the one that really vibes with you.", "UW has terrible support nets for students who are struggling. This is the biggest differentiator between UW and say a liberator arts college. Recognizing that you are on your own is an important step to taking control of your own mental health.", "I think the support systems for mental health in university are definitely less structured, and it's easier to 'fall through the cracks', especially being away from long-time friends and family from your hometown.", diff --git a/pages/_app.css b/pages/_app.css index 5c0a9ab..d1be7ae 100644 --- a/pages/_app.css +++ b/pages/_app.css @@ -3,6 +3,16 @@ html { scroll-padding-top: calc(92rem / 16); } +@-moz-document url-prefix() { + + /* Firefox has a bug relating to smooth scrolling + https://github.com/vercel/next.js/issues/22858 + */ + html { + scroll-behavior: auto; + } +} + body { /* Theme colours */ --pink: #EF839D; diff --git a/pages/academics.tsx b/pages/academics.tsx index fd707e8..049ee06 100644 --- a/pages/academics.tsx +++ b/pages/academics.tsx @@ -80,8 +80,7 @@ export default function Academics() {
@@ -113,9 +112,8 @@ export default function Academics() { @@ -131,7 +129,7 @@ export default function Academics() { @@ -144,8 +142,7 @@ export default function Academics() { There are lots of amazing non-math electives mentioned in the list, @@ -164,15 +161,15 @@ export default function Academics() { MUSIC 140 - , + ,{" "} - MUSIC 246 l + MUSIC 246 , and{" "} CLAS 104 {" "} - being crowd favourites` + being crowd favourites!

} align="center" @@ -232,9 +229,8 @@ export default function Academics() { Coming in second place is{" "} CS 348, Introduction to Database Management, which has a 36% liked rating on - UWFlow. Some common complaints of these courses include - applicability to non-academic settings, organization of the course, - and how interesting the course content is. + UWFlow. Some common complaints of these courses include organization + of the course and how interesting the course content is.

} noBackground @@ -286,8 +282,8 @@ export default function Academics() {
+ The class of 2022 would like to give a shout out to   + + Alice Gao + + ,  + + Carmen Bruni + + ,  + + Lesley Istead + + , and  + + Brad Lushman + +   as some of the best professors at UW! Go read their ratings + UWFlow! We would also like to give an honourable mention to every + professor who has poured their passion into teaching. This has + helped the CS Class of 2022 grow and succeed! You guys are all + amazing! ❤️ +

+ } align="right" noBackground > @@ -362,7 +382,7 @@ export default function Academics() {
@@ -370,10 +390,7 @@ export default function Academics() {
- +
@@ -424,7 +441,7 @@ export default function Academics() { @@ -432,7 +449,7 @@ export default function Academics() {
@@ -468,7 +486,7 @@ export default function Academics() {
@@ -487,8 +505,8 @@ export default function Academics() {
@@ -504,7 +522,7 @@ export default function Academics() {
diff --git a/pages/contributors.tsx b/pages/contributors.tsx index b529c7d..5d86400 100644 --- a/pages/contributors.tsx +++ b/pages/contributors.tsx @@ -52,7 +52,6 @@ export default function Contributors() { title="Contributors" subtitle="Huge thanks to all CSC members who have contributed to creating the first ever uWaterloo CS class profile!" /> -

The 2022 CS Class Profile was completed by members of the UW Computer @@ -84,8 +83,29 @@ export default function Contributors() { +

+ Furthermore, special thanks to former CSC President and Vice + President,{" "} + + Kallen Tu + {" "} + and{" "} + + Gordon Le + + , for kickstarting the existence of the CS Class Profile and for + providing feedback! Note there may be other anonymous contributors on + any of the teams or committees, but their names are not listed here. +

-
{/* C7vi */}
@@ -273,7 +273,7 @@ export default function CoopPage() { {/* C7vii */} @@ -295,7 +295,7 @@ export default function CoopPage() { {/* C7viii */} @@ -308,7 +308,7 @@ export default function CoopPage() { data={C7viii} margin={barGraphMargin} displayPercentage={true} - tooltipBottomLabel="Coop term: " + tooltipBottomLabel="Co-op term: " />
diff --git a/pages/demographics.tsx b/pages/demographics.tsx index 40e0399..e863111 100644 --- a/pages/demographics.tsx +++ b/pages/demographics.tsx @@ -62,11 +62,12 @@ export default function Demographics() { heading="Please select the gender identity option(s) with which you identify." bodyText={

- About 33% of students identified as women or gender non-conforming - (women+). This statistic has been steadily increasing throughout the - years, as seen at{" "} + Unsurprisingly, most respondents were men at around 69%. About 31% + of students identified as women or gender non-conforming (women+). + This statistic has been steadily increasing throughout the years, as + seen{" "} - this link + here . According to the same source, in 2017/2018 (when many 2022 graduates were admitted), around 24% of CS admits, 34% of CFM @@ -75,9 +76,9 @@ export default function Demographics() { it is promising that a more diverse range of people are becoming interested in CS! Take a look at clubs such as WiCS and - Tech+ - that address these issues and work to provide an inclusive - environment in UW's tech scene. + Tech+ that + address these issues and work to provide an inclusive environment in + UW's tech scene.

} align="right" @@ -108,7 +109,7 @@ export default function Demographics() { have chosen two or more of the listed categories. We have counted each of them as a separate entry rather than a category itself. Check out clubs such as - Tech+ , + Tech+, which supports ethnic minorities in tech!

} @@ -203,7 +204,7 @@ export default function Demographics() {
diff --git a/pages/intimacy-and-drugs.tsx b/pages/intimacy-and-drugs.tsx index 21d0c5c..be3e78a 100644 --- a/pages/intimacy-and-drugs.tsx +++ b/pages/intimacy-and-drugs.tsx @@ -51,20 +51,20 @@ export default function Demographics() { Intimacy and Drugs
diff --git a/pages/lifestyle-and-interests.tsx b/pages/lifestyle-and-interests.tsx index ef1dd1b..30cb139 100644 --- a/pages/lifestyle-and-interests.tsx +++ b/pages/lifestyle-and-interests.tsx @@ -51,12 +51,12 @@ export default function Demographics() { Lifestyle and Interests
@@ -64,8 +64,8 @@ export default function Demographics() { @@ -76,7 +76,7 @@ export default function Demographics() { @@ -98,7 +99,7 @@ export default function Demographics() { @@ -117,7 +118,7 @@ export default function Demographics() { @@ -125,7 +126,7 @@ export default function Demographics() { @@ -139,7 +140,7 @@ export default function Demographics() { @@ -147,7 +148,7 @@ export default function Demographics() { @@ -155,8 +156,8 @@ export default function Demographics() {
@@ -222,8 +224,8 @@ export default function Demographics() { diff --git a/pages/mental-health.tsx b/pages/mental-health.tsx index 65ed64c..4043ab6 100644 --- a/pages/mental-health.tsx +++ b/pages/mental-health.tsx @@ -182,7 +182,21 @@ export default function Demographics() { + UW Health Services is a program that provides accessible medical + services. It’s great to see a chunk of our respondents were able to + utilize it for their benefit and we hope that these services + continue to be used even more in the future. University life is + stressful, and turning to UW Health Services is something you would + not be alone in doing. To book an appointment with them, you can + call (519) 888-4096 or{" "} + + email hsforms@uwaterloo.ca + {" "} + if you are unable to book by phone. +

+ } >
@@ -191,7 +205,7 @@ export default function Demographics() {
@@ -257,7 +271,7 @@ export default function Demographics() {
diff --git a/pages/miscellaneous.tsx b/pages/miscellaneous.tsx index 112b7b1..fc38fcf 100644 --- a/pages/miscellaneous.tsx +++ b/pages/miscellaneous.tsx @@ -13,6 +13,7 @@ import { useWindowDimensions } from "utils/getWindowDimensions"; import { useIsMobile } from "utils/isMobile"; import { BarGraphVertical, BarGraphHorizontal } from "@/components/BarGraph"; +import { BodyLink } from "@/components/BlankLink"; import { BottomNav } from "@/components/BottomNav"; import { ComponentWrapper } from "@/components/ComponentWrapper"; import { Header } from "@/components/Header"; @@ -47,7 +48,18 @@ export default function Demographics() { + There’s a reason why{" "} + + r/uwaterloo{" "} + + is one of the most popular university Reddit communities. It is very + highly propelled by students, with over 87k members as of January + 2023, and even has some profs on there too! Check it out if you + haven’t heard of it! +

+ } align="right" >
diff --git a/pages/post-grad.tsx b/pages/post-grad.tsx index e5d9c31..26fb3d5 100644 --- a/pages/post-grad.tsx +++ b/pages/post-grad.tsx @@ -33,11 +33,11 @@ export default function Demographics() { Post-grad