Skip to content

Commit 10d798b

Browse files
committed
updated graph (#81)
1 parent 06e4d58 commit 10d798b

File tree

4 files changed

+118
-41
lines changed

4 files changed

+118
-41
lines changed

website/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

website/src/components/LandingPage.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,14 @@ const landingPageInfo = [
2929
subheader: "It's not just humans that can be biased",
3030
bodyText: [
3131
{
32-
body: <p className="bold">testing</p>,
32+
body: (
33+
<p className="bold">
34+
{" "}
35+
Bias By Us is an interactive explanation of bias in machine
36+
learning algorithms, and how they affect multiple aspects of
37+
every-day life!
38+
</p>
39+
),
3340
},
3441
{
3542
body: (

website/src/components/posts/CollegeAdmissions/enrollmentGraph/WomenEnrollmentContainer.js

Lines changed: 84 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,94 @@ import {
88
CartesianGrid,
99
Tooltip,
1010
ResponsiveContainer,
11+
Legend,
1112
} from "recharts";
1213
import data from "./enrollmentData.js";
1314

1415
export default function WomenEnrollmentContainer() {
1516
return (
16-
<ResponsiveContainer width="100%" height={400}>
17-
<LineChart
18-
width={500}
19-
height={300}
20-
data={data}
21-
margin={{
22-
top: 5,
23-
right: 30,
24-
left: 20,
25-
bottom: 5,
26-
}}
27-
>
28-
<CartesianGrid strokeDasharray="3 3" />
29-
<XAxis dataKey="name" dy={2} fontSize="1.1rem" />
30-
<YAxis fontSize="1.1rem" unit="" orientation="right">
31-
<Label value="Women Enrolled" angle={90} position="right" />
32-
</YAxis>
33-
<Tooltip />
34-
<Line
35-
type="monotone"
36-
dataKey="women enrolled"
37-
stroke="#d1001f"
38-
activeDot={{ r: 8 }}
39-
unit=""
40-
/>
41-
</LineChart>
42-
</ResponsiveContainer>
17+
// <ResponsiveContainer width="100%" height={400}>
18+
// <LineChart
19+
// width={500}
20+
// height={300}
21+
// data={data}
22+
// margin={{
23+
// top: 5,
24+
// right: 30,
25+
// left: 20,
26+
// bottom: 5,
27+
// }}
28+
// >
29+
// <CartesianGrid strokeDasharray="3 3" />
30+
// <XAxis dataKey="name" dy={2} fontSize="1.1rem" />
31+
// <YAxis fontSize="1.1rem" unit="" orientation="right">
32+
// <Label value="Women Enrolled" angle={90} position="right" />
33+
// </YAxis>
34+
// <Tooltip />
35+
// <Line
36+
// type="monotone"
37+
// dataKey="women enrolled"
38+
// stroke="#d1001f"
39+
// activeDot={{ r: 8 }}
40+
// unit=""
41+
// />
42+
// </LineChart>
43+
// </ResponsiveContainer>
44+
<div style={{ textAlign: "center" }}>
45+
<h2 style={{ marginBottom: "10px" }}>
46+
Historical - Grad Enrollment of Women
47+
</h2>
48+
<ResponsiveContainer width="100%" height={450}>
49+
<LineChart
50+
data={data}
51+
margin={{ top: 20, right: 40, left: 20, bottom: 5 }}
52+
>
53+
<CartesianGrid strokeDasharray="3 3" />
54+
<XAxis dataKey="year" fontSize="1rem" />
55+
56+
{/* Left Y-Axis (Percentage Enrolled) */}
57+
<YAxis
58+
yAxisId="left"
59+
fontSize="1rem"
60+
unit="%"
61+
domain={[5, 25]} // Adjust based on range
62+
tick={{ fill: "#004f9e" }} // Blue
63+
/>
64+
65+
{/* Right Y-Axis (Number Enrolled) */}
66+
<YAxis
67+
yAxisId="right"
68+
orientation="right"
69+
fontSize="1rem"
70+
domain={[175, 525]} // Adjust based on range
71+
tick={{ fill: "#b22222" }} // Red
72+
/>
73+
74+
<Tooltip formatter={(value) => value.toLocaleString()} />
75+
<Legend verticalAlign="top" height={36} />
76+
77+
{/* Blue Line (Percent Enrolled) */}
78+
<Line
79+
yAxisId="left"
80+
type="monotone"
81+
dataKey="percent"
82+
stroke="#004f9e"
83+
strokeWidth={2}
84+
activeDot={{ r: 6 }}
85+
unit="%"
86+
/>
87+
88+
{/* Red Line (Number Enrolled) */}
89+
<Line
90+
yAxisId="right"
91+
type="monotone"
92+
dataKey="number"
93+
stroke="#b22222"
94+
strokeWidth={2}
95+
activeDot={{ r: 6 }}
96+
/>
97+
</LineChart>
98+
</ResponsiveContainer>
99+
</div>
43100
);
44101
}
Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
1-
const numbers = [
2-
195, 247, 279, 248, 342, 369, 409, 360, 406, 395, 461, 431, 426, 455, 469,
3-
472, 497,
1+
// const numbers = [
2+
// 195, 247, 279, 248, 342, 369, 409, 360, 406, 395, 461, 431, 426, 455, 469,
3+
// 472, 497,
4+
// ];
5+
// let year = 1988;
6+
// const data = numbers.map((m) => {
7+
// year += 2;
8+
// return {
9+
// name: year,
10+
// "women enrolled": m,
11+
// };
12+
// });
13+
const data = [
14+
{ year: 1990, percent: 10, number: 195 },
15+
{ year: 1992, percent: 12, number: 247 },
16+
{ year: 1994, percent: 15, number: 279 },
17+
{ year: 1996, percent: 14, number: 248 },
18+
{ year: 1998, percent: 16, number: 279 },
19+
{ year: 2000, percent: 19, number: 342 },
20+
{ year: 2002, percent: 18, number: 369 },
21+
{ year: 2004, percent: 20.8, number: 409 },
22+
{ year: 2006, percent: 19, number: 395 },
23+
{ year: 2008, percent: 21.2, number: 469 },
24+
{ year: 2010, percent: 23.6, number: 497 },
425
];
5-
let year = 1988;
6-
const data = numbers.map((m) => {
7-
year += 2;
8-
return {
9-
name: year,
10-
"women enrolled": m,
11-
};
12-
});
1326

1427
export default data;

0 commit comments

Comments
 (0)