Fix merge conflicts
continuous-integration/drone/push Build is passing Details

This commit is contained in:
e26chiu 2022-12-04 19:33:39 -05:00
parent 2c4f62b99f
commit 4c10454c95
1 changed files with 1 additions and 42 deletions

View File

@ -170,42 +170,6 @@ export default function CoopPage() {
</div>
</ComponentWrapper>
{/* C7i */}
<ComponentWrapper
heading="What company did you work for?"
bodyText="There are lots of companies that people have worked at! It just goes to show that the software world is HUGE."
align="center"
>
<WordCloud
data={C7i}
// For components that we don't want to match the width necessarily we can provide direct values
width={isMobile ? pageWidth / 1.5 : 800}
height={DefaultProp.graphHeight}
wordPadding={7}
desktopMaxFontSize={75}
mobileMaxFontSize={38}
/>
</ComponentWrapper>
{/* 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={C7ii}
colorRange={colorRange}
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
margin={{
top: 20,
bottom: 80,
left: 30,
right: 20,
}}
/>
</ComponentWrapper>
{/* C7iii */}
<ComponentWrapper
heading="What was your salary per hour in CAD (excluding other forms of compensation)?"
@ -303,12 +267,7 @@ export default function CoopPage() {
<div style={{ padding: "10px" }}>
<LineGraph
data={C7vii}
colorRange={[
Color.primaryAccent,
Color.secondaryAccentLight,
Color.primaryAccentLighter,
Color.secondaryAccent,
]}
colorRange={colorRange}
width={isMobile ? pageWidth / 1.5 : 600}
height={DefaultProp.graphHeight}
margin={{