Merge pull request #65 from claudiamccomb/master

F22 updates to committee lists, statistics, and office hours

src/res/strings/calendarStrings.js

@@ -1,6 +1,6 @@
 const calendarStrings = {
   calendarTitle: "Monthly Schedule",
-  link: "https://calendar.google.com/calendar/u/0/embed?src=0kst6i6n49krq8kp4qbkh23ic8@group.calendar.google.com&ctz=America/Toronto",
+  link: "https://calendar.google.com/calendar/embed?src=0kst6i6n49krq8kp4qbkh23ic8%40group.calendar.google.com&ctz=America%2FToronto",
   loadingText: "Loading...",
   view: "View Google Calendar"
 };

src/res/strings/currentExecStrings.js

@@ -1,6 +1,6 @@
 const currentExecStrings = {
   title: 'Current Executives',
-  term: 'Winter 2022'
+  term: 'Fall 2022'
 };
 
 export default currentExecStrings;

src/res/strings/littleWicsStrings.js

@@ -10,11 +10,11 @@ const littleWiCSStrings = {
     mobileDescription2:  "online",
     mobileDescription3:  "!",
     onlineLink: "https://discord.gg/mHyPD2mXqv",
-    mon: '1:00-2:00PM, 6:00-7:00PM',
-    tues: '1:00-2:00PM, 2:30-3:30PM, 4:00-5:00PM',
-    wed: '5:00-6:00PM, 6:00-7:00PM',
-    thurs: '1:00-2:00PM, 4:30-5:30PM, 7:00-8:00PM',
-    fri: '7:00-8:00PM',
+    mon: '2:00-3:00PM, 4:00-5:00PM',
+    tues: '2:00-3:00PM, 6:00-7:00PM',
+    wed: '4:00-5:00PM, 6:00-7:00PM',
+    thurs: '1:00-2:00PM, 4:00-5:00PM',
+    fri: '3:00-4:00PM, 4:00-5:00PM',
   },
   careerMentorship: {
     title: 'Career & Mentorship',

src/res/strings/numberStrings.js

@@ -4,19 +4,19 @@ const numberStrings = {
      female-identifying individuals represent about:  `,
     linkName: 'Sources',
     href: 'https://cs.uwaterloo.ca/wics/resources-and-information',
-    updated: '2020',
+    updated: '2022',
     firstCard:{
-      number:'24%',
+      number:'26.4%',
       description: 'first-year students',
       approx: 'approx. 1 in 4'
     },
     secondCard:{
-      number:'24%',
+      number:'26%',
       description: 'undergrad students',
       approx: 'approx. 1 in 4'
     },
     thirdCard:{
-      number:'19%',
+      number:'22%',
       description: 'graduate students',
       approx: 'approx. 1 in 5'
     }

src/res/strings/pastExecStrings.js

@@ -12,6 +12,18 @@ const pastExecStrings = {
   // exec1 must be the chair of the corresponding term
   // exec1a and exec2a must be the co-chairs of the corresponding term
   pastExecs: {
+    "Spring 2022": {
+      exec1a: "Kitty L.",
+      exec2a: "Amanda B.",
+      exec3: "Jaskomal N.",
+      exec4: "Layne L.",
+      exec5: "Leen K.",
+      exec6: "Melanie F.",
+      exec7: "Nina T.",
+      exec8: "Sachi S.",
+      exec9: "Star X.",
+      exec10: "Jui S.",
+    },
     "Winter 2022": {
       exec1: "Priyadarshini S.",
       exec2: "Amanda B.",
@@ -32,7 +44,7 @@ const pastExecStrings = {
       exec7: "Claudia M.",
       exec8: "Angela Z.",
     },
-    "Summer 2021": {
+    "Spring 2021": {
       exec1: "Audrey H.",
       exec2: "Maryam A.",
       exec3: "Celine L.",

src/sections/CurrentCommittee/CurrentCommittee.js

@@ -3,15 +3,15 @@ import SectionTitleDescription from "../../components/SectionTitleDescription/Se
 import currentExecStrings from "../../res/strings/currentExecStrings";
 
 // current committee member pictures
-import amanda from "../../res/images/currentExecs/amanda_bishop.jpg";
-import kitty from "../../res/images/currentExecs/kitty_li.jpg";
-import jaskomal from "../../res/images/currentExecs/jaskomal_natt.png";
-import jui from "../../res/images/currentExecs/jui_shah.JPG";
-import layne from "../../res/images/currentExecs/layne_lim_ah_tock.jpeg";
+import priya from "../../res/images/currentExecs/priya_saha.jpg";
+import molly from "../../res/images/currentExecs/molly_xu.jpg";
+import claudia from "../../res/images/currentExecs/claudia_mccomb.jpeg";
+import madison from "../../res/images/currentExecs/madison_mussari.jpg";
+import richa from "../../res/images/currentExecs/richa_dalal.PNG";
 import leen from "../../res/images/currentExecs/leen_kamalmaz.jpeg";
 import melanie from "../../res/images/currentExecs/melanie_foltak.jpg";
-import nina from "../../res/images/currentExecs/nina_tan.jpeg";
-import sachi from "../../res/images/currentExecs/sachi_shah.JPG";
+import yani from "../../res/images/currentExecs/yani_mei.JPEG";
+import vanessa from "../../res/images/currentExecs/vanessa_wong.jpeg";
 import star from "../../res/images/currentExecs/star_xie.jpg";
 
 import CurrentCommitteeCard from "../../components/CurrentCommitteeCard/CurrentCommitteeCard";
@@ -79,53 +79,53 @@ class CurrentCommittee extends Component {
     // Change current executives' images, names, and positions here
     const executives = {
       exec1: {
-        pic: amanda,
-        name: "Amanda Bishop",
+        pic: priya,
+        name: "Priyadarshini Saha",
         position: "Co-chair"
       },
       exec2: {
-        pic: kitty,
-        name: "Kitty Li",
+        pic: molly,
+        name: "Molly Xu",
         position: "Co-chair"
       },
       exec3: {
-        pic: jaskomal,
-        name: "Jaskomal Natt",
-        position: "Secretary"
+        pic: star,
+        name: "Star Xie",
+        position: "Secretary & Director of Finance"
       },
       exec4: {
-        pic: jui,
-        name: "Jui Shah",
+        pic: melanie,
+        name: "Melanie Foltak",
         position: "Director of Outreach"
       },
       exec5: {
-        pic: layne,
-        name: "Layne Lim Ah Tock",
-        position: "Office Manager"
+        pic: claudia,
+        name: "Claudia McComb",
+        position: "Systems Administrator"
       },
       exec6: {
         pic: leen,
         name: "Leen Kamalmaz",
-        position: "Systems Administrator"
+        position: "Director of Publicity"
       },
       exec7: {
-        pic: melanie,
-        name: "Melanie Foltak",
-        position: "Director of Publicity"
+        pic: madison,
+        name: "Madison Mussari",
+        position: "Operations Manager"
       },
       exec8: {
-        pic: nina,
-        name: "Nina Tan",
-        position: "BigCster Director"
+        pic: richa,
+        name: "Richa Dalal",
+        position: "Director of Internal Affairs"
       },
       exec9: {
-        pic: sachi,
-        name: "Sachi Shah",
-        position: "Finance Director"
+        pic: vanessa,
+        name: "Vanessa Wong",
+        position: "Creative Director"
       },
       exec10: {
-        pic: star,
-        name: "Star Xie",
+        pic: yani,
+        name: "Yani Mei",
         position: "First Year Representative"
       },
     };