Added BodyLink and refactored older <a> tags
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Shahan Nedadahandeh 2023-02-04 01:44:03 -05:00
parent 6d8c5bc808
commit 0569b0d1bf
2 changed files with 33 additions and 77 deletions

15
components/BlankLink.tsx Normal file
View File

@ -0,0 +1,15 @@
import React from "react";
export const BodyLink = ({
targetBlank = true,
children,
href,
}: {
href: string;
targetBlank?: boolean;
children: React.ReactNode;
}) => (
<a href={href} target={targetBlank ? "_blank" : ""} rel="noreferrer">
<b>{children}</b>
</a>
);

View File

@ -25,6 +25,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";
@ -64,40 +65,17 @@ export default function Demographics() {
About 33% of students identified as women or gender non-conforming
(women+). This statistic has been steadily increasing throughout the
years, as seen at{" "}
<b>
<a
href="https://uwaterloo.ca/women-in-computer-science/statistics"
target="_blank"
rel="noreferrer"
>
this link
</a>
</b>
<BodyLink href="https://uwaterloo.ca/women-in-computer-science/statistics">
this link
</BodyLink>
. According to the same source, in 2017/2018 (when many 2022
graduates were admitted), around 24% of CS admits, 34% of CFM
admits, and 41% of CS/BBA admits were women+. Underrepresented
gender identities is a popular topic in the tech community, and so
it is promising that a more diverse range of people are becoming
interested in CS! Take a look at clubs such as{" "}
<b>
<a
href="https://wics.uwaterloo.ca/"
target="_blank"
rel="noreferrer"
>
WiCS
</a>
</b>{" "}
and{" "}
<b>
<a
href="https://www.techplusuw.com/"
target="_blank"
rel="noreferrer"
>
Tech+
</a>
</b>{" "}
interested in CS! Take a look at clubs such as
<BodyLink href="https://wics.uwaterloo.ca/"> WiCS </BodyLink> and
<BodyLink href="https://www.techplusuw.com/"> Tech+ </BodyLink>
that address these issues and work to provide an inclusive
environment in UW&apos;s tech scene.
</p>
@ -128,17 +106,9 @@ export default function Demographics() {
White at 17%, and South Asian at 12%. Note that certain respondents
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{" "}
<b>
<a
href="https://www.techplusuw.com/"
target="_blank"
rel="noreferrer"
>
Tech+
</a>
</b>
, which supports ethnic minorities in tech!
Check out clubs such as
<BodyLink href="https://www.techplusuw.com/"> Tech+ </BodyLink>,
which supports ethnic minorities in tech!
</p>
}
align="left"
@ -164,36 +134,13 @@ export default function Demographics() {
<p>
Over 27% of respondents identified as LGBTQ+. UW has plenty of
groups that support the LGBTQ+ community that can be found
<b>
<BodyLink href="https://uwaterloo.ca/human-rights-equity-inclusion/equity-office/pride-uwaterloo">
{" "}
<a
href="https://uwaterloo.ca/human-rights-equity-inclusion/equity-office/pride-uwaterloo"
target="_blank"
rel="noreferrer"
>
here
</a>
</b>
here
</BodyLink>
. Clubs such as{" "}
<b>
<a
href="https://www.techplusuw.com/"
target="_blank"
rel="noreferrer"
>
Tech+
</a>
</b>{" "}
and{" "}
<b>
<a
href="https://ostem.clubs.wusa.ca/"
target="_blank"
rel="noreferrer"
>
oSTEM
</a>
</b>{" "}
<BodyLink href="https://www.techplusuw.com/"> Tech+ </BodyLink>
and <BodyLink href="https://ostem.clubs.wusa.ca/"> oSTEM </BodyLink>
support queer and trans students in tech and STEM environments!
</p>
}
@ -236,15 +183,9 @@ export default function Demographics() {
<p>
Most families made more than the average family income in Canada in
2020 (
<b>
<a
href="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=1110001201"
target="_blank"
rel="noreferrer"
>
$104,350
</a>
</b>
<BodyLink href="https://www150.statcan.gc.ca/t1/tbl1/en/tv.action?pid=1110001201">
$104,350
</BodyLink>
) The range of 51k to 200k was the most common among families. To
sustain a first-year tuition fee that can hover between $8,000 to
$55,000, it would make sense for many families to rely on other