:refactor: standard

This commit is contained in:
Rebecca-Chou 2022-11-30 12:43:10 -04:00
parent bcef84014e
commit bd44c970c8
2 changed files with 58 additions and 61 deletions

View File

@ -1,4 +1,4 @@
export const c1Data = [
export const C1 = [
{
category: "Coop",
value: 100,
@ -9,7 +9,7 @@ export const c1Data = [
},
];
export const c2Data = [
export const C2 = [
{ key: "Toronto", value: 32 },
{ key: "California", value: 26 },
{ key: "West CA", value: 12 },
@ -17,7 +17,7 @@ export const c2Data = [
{ key: "Waterloo", value: 9 },
];
export const c3Data = [
export const C3 = [
{
category: "Yes",
value: 17,
@ -28,7 +28,7 @@ export const c3Data = [
},
];
export const c4Data = [
export const C4 = [
{ key: "Google", value: 14 },
{ key: "Jane Street", value: 8 },
{ key: "Meta/Facebook", value: 4 },
@ -46,7 +46,7 @@ export const c4Data = [
{ key: "Capital One", value: 1 },
];
export const c5Data = [
export const C5 = [
{
category: "Yes",
value: 6,
@ -57,7 +57,7 @@ export const c5Data = [
},
];
export const c6Data = [
export const C6 = [
{
category: "0",
value: 92,
@ -68,7 +68,7 @@ export const c6Data = [
},
];
export const c7iData = [
export const C7i = [
{ key: "Google", value: 2 },
{ key: "Konrad", value: 1 },
{ key: "Jane Street", value: 2 },
@ -112,7 +112,7 @@ export const c7iData = [
{ key: "EA", value: 1 },
];
export const c7iiData = {
export const C7ii = {
xValues: ["1", "2", "3", "4", "5", "6"],
lines: [
{
@ -134,7 +134,7 @@ export const c7iiData = {
],
};
export const c7iiiData = [
export const C7iii = [
{
category: "1",
min: 14,
@ -191,7 +191,7 @@ export const c7iiiData = [
},
];
export const c7ivData = [
export const C7iv = [
{
category: "1",
min: 0,
@ -248,9 +248,9 @@ export const c7ivData = [
},
];
export const c7vDataKey = ["Outstanding", "Excellent", "Very Good", "Good"];
export const C7vKey = ["Outstanding", "Excellent", "Very Good", "Good"];
export const c7vData = [
export const C7v = [
{
category: "1",
Outstanding: 48.9,
@ -295,9 +295,9 @@ export const c7vData = [
},
];
export const c7viDataKey = ["5", "4", "3", "2", "1"];
export const C7viKey = ["5", "4", "3", "2", "1"];
export const c7viData = [
export const C7vi = [
{
category: "1",
5: 41.3,
@ -348,7 +348,7 @@ export const c7viData = [
},
];
export const c7viiData = {
export const C7vii = {
xValues: ["1", "2", "3", "4", "5", "6"],
lines: [
{
@ -370,9 +370,9 @@ export const c7viiData = {
],
};
export const c7viiiDataKey = ["No", "Yes"];
export const C7viiiKey = ["No", "Yes"];
export const c7viiiData = [
export const C7viii = [
{
category: "1",
Yes: 16.3,

View File

@ -1,29 +1,26 @@
import {
c1Data,
c2Data,
c3Data,
c4Data,
c5Data,
c6Data,
c7iData,
c7iiData,
c7iiiData,
c7ivData,
c7vData,
c7vDataKey,
c7viData,
c7viDataKey,
c7viiData,
c7viiiData,
c7viiiDataKey,
C1,
C2,
C3,
C4,
C5,
C6,
C7i,
C7ii,
C7iii,
C7iv,
C7v,
C7vKey,
C7vi,
C7viKey,
C7vii,
C7viii,
C7viiiKey,
} from "data/coop";
import React from "react";
import {
barGraphProps,
DefaultProp,
pieChartProps,
barGraphMargin,
barGraphWidth,
} from "utils/defaultProps";
import { Color } from "utils/Color";
import { useWindowDimensions } from "utils/getWindowDimensions";
@ -64,7 +61,7 @@ export default function CoopPage() {
align="left"
>
<div className={styles.graphContainer}>
<PieChart data={c1Data} {...pieChartProps(isMobile, pageWidth)} />
<PieChart data={C1} {...pieChartProps(isMobile, pageWidth)} />
</div>
</ComponentWrapper>
@ -75,7 +72,7 @@ export default function CoopPage() {
align="center"
>
<WordCloud
data={c2Data.map((word) => ({
data={C2.map((word) => ({
text: word.key,
value: word.value,
}))}
@ -95,7 +92,7 @@ export default function CoopPage() {
align="right"
>
<div className={styles.graphContainer}>
<PieChart data={c3Data} {...pieChartProps(isMobile, pageWidth)} />
<PieChart data={C3} {...pieChartProps(isMobile, pageWidth)} />
</div>
</ComponentWrapper>
@ -107,7 +104,7 @@ export default function CoopPage() {
noBackground
>
<WordCloud
data={c4Data.map((word) => ({
data={C4.map((word) => ({
text: word.key,
value: word.value,
}))}
@ -126,7 +123,7 @@ export default function CoopPage() {
bodyText=""
>
<div className={styles.graphContainer}>
<PieChart data={c5Data} {...pieChartProps(isMobile, pageWidth)} />
<PieChart data={C5} {...pieChartProps(isMobile, pageWidth)} />
</div>
</ComponentWrapper>
@ -138,7 +135,7 @@ export default function CoopPage() {
noBackground
>
<div className={styles.graphContainer}>
<PieChart data={c6Data} {...pieChartProps(isMobile, pageWidth)} />
<PieChart data={C6} {...pieChartProps(isMobile, pageWidth)} />
</div>
</ComponentWrapper>
@ -149,7 +146,7 @@ export default function CoopPage() {
align="center"
>
<WordCloud
data={c7iData.map((word) => ({
data={C7i.map((word) => ({
text: word.key,
value: word.value,
}))}
@ -161,14 +158,14 @@ export default function CoopPage() {
mobileMaxFontSize={38}
/>
</ComponentWrapper>
{/* c7ii */}
{/* C7ii */}
<ComponentWrapper
heading="Where were you located during work?"
bodyText="Many students started in GTA or Waterloo region, then slowly progressed to California / USA. However, due to the pandemic, the last 3 co-op placements locations were dominantly remote."
align="right"
>
<LineGraph
data={c7iiData}
data={C7ii}
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
margin={{
@ -180,7 +177,7 @@ export default function CoopPage() {
/>
</ComponentWrapper>
{/* c7iii */}
{/* C7iii */}
<ComponentWrapper
heading="What was your salary per hour in CAD (excluding other forms of compensation)?"
bodyText="Compensation generally went up throughout the terms! For reference, in 2021, the average co-op salaries in the Faculty of Mathematics in Canada were $20.15, $22.05, $24.98, $27.60, $28.96, and $30.95 CAD, respectively. The same amounts in the USA were $28.08, $30.82, $33.65, $34.50, $37.15, and $37.60 USD, respectively. So, CS students tend to get paid more than the faculty average."
@ -190,7 +187,7 @@ export default function CoopPage() {
<BoxPlot
width={isMobile ? pageWidth / 1.5 : 500}
height={DefaultProp.graphHeight}
data={c7iiiData}
data={C7iii}
margin={{
top: 20,
left: 20,
@ -198,7 +195,7 @@ export default function CoopPage() {
/>
</ComponentWrapper>
{/* c7iv */}
{/* C7iv */}
<ComponentWrapper
heading="How much did you receive in other forms of compensation in CAD? (i.e. bonuses, stock options, relocation, housing, etc.)"
bodyText="Additional compensation had increased as terms progressed. Its great to see students having accommodations to make their lives easier."
@ -207,7 +204,7 @@ export default function CoopPage() {
<BoxPlot
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
data={c7ivData}
data={C7iv}
margin={{
top: 20,
left: 20,
@ -215,7 +212,7 @@ export default function CoopPage() {
/>
</ComponentWrapper>
{/* c7v */}
{/* C7v */}
<ComponentWrapper
heading="What was your coop evaluation rating?"
bodyText="Ratings were pretty positive overall!"
@ -226,14 +223,14 @@ export default function CoopPage() {
<StackedBarGraphHorizontal
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
keys={c7vDataKey}
keys={C7vKey}
colorRange={[
Color.primaryAccent,
Color.secondaryAccentLight,
Color.primaryAccentLighter,
Color.secondaryAccent,
]}
data={c7vData}
data={C7v}
margin={{
top: 20,
left: 20,
@ -242,7 +239,7 @@ export default function CoopPage() {
</div>
</ComponentWrapper>
{/* c7vi */}
{/* C7vi */}
<ComponentWrapper
heading="How happy were you with your coop during the work term specified?"
bodyText="The ratio of people rating 4+ in happiness stayed roughly the same throughout the terms."
@ -252,7 +249,7 @@ export default function CoopPage() {
<StackedBarGraphVertical
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
keys={c7viDataKey}
keys={C7viKey}
colorRange={[
Color.primaryAccent,
Color.secondaryAccentLight,
@ -260,7 +257,7 @@ export default function CoopPage() {
Color.secondaryAccent,
Color.primaryText,
]}
data={c7viData}
data={C7vi}
margin={{
top: 20,
left: 20,
@ -269,7 +266,7 @@ export default function CoopPage() {
</div>
</ComponentWrapper>
{/* c7vii */}
{/* C7vii */}
<ComponentWrapper
heading="How did you find your job?"
bodyText="People found more co-ops externally and through return offers as terms progressed, which makes sense as people gain more experience as they learn and grow. WaterlooWorks was still really good in helping people find jobs in the main and continuous rounds."
@ -278,7 +275,7 @@ export default function CoopPage() {
>
<div style={{ padding: "10px" }}>
<LineGraph
data={c7viiData}
data={C7vii}
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
margin={{
@ -291,7 +288,7 @@ export default function CoopPage() {
</div>
</ComponentWrapper>
{/* c7viii */}
{/* C7viii */}
<ComponentWrapper
heading="Were you referred for the job?"
bodyText="Interestingly, the referral to non-referral ratio stayed roughly the same as the co-op terms progressed, apart from the first one which had the most referrals. This goes to show that, without a doubt networking can really get you some great opportunities!"
@ -301,9 +298,9 @@ export default function CoopPage() {
<StackedBarGraphVertical
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
keys={c7viiiDataKey}
keys={C7viiiKey}
colorRange={[Color.primaryAccent, Color.secondaryAccentLight]}
data={c7viiiData}
data={C7viii}
margin={{
top: 20,
left: 20,