From c03df2fdcbb6ac1d9c975ba4b4b243e10841be5b Mon Sep 17 00:00:00 2001
From: e26chiu <e26chiu@csc.uwaterloo.ca>
Date: Sun, 4 Dec 2022 21:38:22 -0500
Subject: [PATCH] Merge WordCloud changes + fix lint

---
 data/post-grad.ts   | 6 +++---
 pages/post-grad.tsx | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/post-grad.ts b/data/post-grad.ts
index 5e5c091..a6af396 100644
--- a/data/post-grad.ts
+++ b/data/post-grad.ts
@@ -30,7 +30,7 @@ export const P2 = [
     category: "No",
     value: 21.8,
   },
-];           
+];
 
 export const P3 = [
   {
@@ -50,7 +50,7 @@ export const P3 = [
     value: 13,
   },
   {
-    text: "California (other cities)",
+    text: "California",
     value: 13,
   },
   {
@@ -228,4 +228,4 @@ export const P8 = [
     text: "Computer Networking",
     value: 2,
   },
-];  
+];
diff --git a/pages/post-grad.tsx b/pages/post-grad.tsx
index b36586c..5c5c5b9 100644
--- a/pages/post-grad.tsx
+++ b/pages/post-grad.tsx
@@ -7,6 +7,7 @@ import {
   pieChartProps,
   barGraphMargin,
   barGraphWidth,
+  wordCloudWidth,
 } from "utils/defaultProps";
 import { useWindowDimensions } from "utils/getWindowDimensions";
 import { useIsMobile } from "utils/isMobile";
@@ -70,7 +71,7 @@ export default function Demographics() {
       >
         <WordCloud
           data={P3}
-          width={isMobile ? pageWidth / 1.5 : 800}
+          width={wordCloudWidth(isMobile, pageWidth)}
           height={DefaultProp.graphHeight}
           wordPadding={7}
           desktopMaxFontSize={75}
@@ -95,7 +96,7 @@ export default function Demographics() {
           data={P5}
           width={barGraphWidth(isMobile, pageWidth)}
           height={DefaultProp.graphHeight}
-          margin={{ ...barGraphMargin, ...{ left: 220 } }}
+          margin={barGraphMargin}
         />
       </ComponentWrapper>
 
@@ -119,7 +120,7 @@ export default function Demographics() {
       >
         <WordCloud
           data={P8}
-          width={isMobile ? pageWidth / 1.5 : 800}
+          width={wordCloudWidth(isMobile, pageWidth)}
           height={DefaultProp.graphHeight}
           wordPadding={10}
           desktopMaxFontSize={75}