Reordered data and renamed data headings

components/About.tsx

@@ -30,7 +30,7 @@ export function About() {
             offered only as a co-op program with 6 co-op terms. The program is
             offered only as a co-op program with 6 co-op terms.
           </p>
-          <h4>CS/BBA</h4>
+          <h4>Computer Science/Business Administration</h4>
           <p>
             Joint with Wilfrid Laurier University, the Business Administration
             and Computer Science Double Degree (CS/BBA) is an exclusive offering

data/coop.ts

@@ -1523,7 +1523,7 @@ export const C7ii = {
       yValues: [7.4, 4.8, 4.8, 82.1, 80.5, 73.2],
     },
     {
-      label: "USA(California, Washington, New York)",
+      label: "USA (California, Washington, New York)",
       yValues: [8.4, 18.1, 35, 0, 5.2, 17.9],
     },
   ],
@@ -1765,7 +1765,7 @@ export const C7vii = {
   ],
 };
 
-export const C7viiiKey = ["No", "Yes"];
+export const C7viiiKey = ["Yes", "No"];
 
 export const C7viii = [
   {

data/demographics.ts

@@ -30,7 +30,7 @@ export const D2 = [
 
 export const D3 = [
   {
-    category: "She/Her/Her",
+    category: "She/Her/Hers",
     value: 29.0,
   },
   {

data/friends.ts

@@ -321,7 +321,7 @@ export const F12 = [
     value: 8,
   },
   {
-    category: "No",
+    category: "None",
     value: 1,
   },
 ];
@@ -378,38 +378,30 @@ export const F14 = [
     category: "SLC",
     value: 11,
   },
-  {
-    category: "DP",
-    value: 4,
-  },
   {
     category: "E7",
     value: 9,
   },
-  {
-    category: "E5",
-    value: 3,
-  },
-  {
-    category: "E5",
-    value: 3,
-  },
   {
     category: "CIF",
     value: 5,
   },
   {
-    category: "AL",
-    value: 2,
+    category: "DP",
+    value: 4,
   },
   {
-    category: "CIF",
-    value: 5,
+    category: "E5",
+    value: 3,
   },
   {
     category: "Plaza",
     value: 3,
   },
+  {
+    category: "AL",
+    value: 2,
+  },
 ];
 
 export const F15 = [
@@ -481,7 +473,7 @@ export const F16 = [
     value: 6,
   },
   {
-    category: "No",
+    category: "None",
     value: 2,
   },
 ];

data/intimacy-and-drugs.ts

@@ -129,7 +129,7 @@ export const I2 = [
     },
   },
   {
-    category: "Mushrooms",
+    category: "Magic Mushrooms",
     values: {
       "Tried/used first before university": 0,
       "Tried/used first during university": 10,
@@ -285,10 +285,6 @@ export const I7 = [
     category: "Yes",
     value: 36,
   },
-  {
-    category: "N/A",
-    value: 24,
-  },
 ];
 
 export const I8 = [

data/lifestyle-and-interests.ts

@@ -30,19 +30,19 @@ export const L2 = [
 
 export const L3 = [
   {
-    category: "Never",
+    category: "Never religious",
     value: 76,
   },
   {
-    category: "No longer",
+    category: "No longer religious",
     value: 5,
   },
   {
-    category: "Still",
+    category: "Still religious",
     value: 19,
   },
   {
-    category: "Became",
+    category: "Became religious",
     value: 2,
   },
 ];
@@ -172,7 +172,7 @@ export const L8 = [
 
 export const L9 = [
   {
-    category: "Before 9",
+    category: "Before 9pm",
     value: 1,
   },
   {
@@ -671,14 +671,14 @@ export const L17 = [
 ];
 
 export const L18 = [
-  {
-    category: "DC",
-    value: 22,
-  },
   {
     category: "MC",
     value: 23,
   },
+  {
+    category: "DC",
+    value: 22,
+  },
   {
     category: "Res",
     value: 16,

data/miscellaneous.ts

@@ -66,7 +66,7 @@ export const M2 = [
 
 export const M3 = [
   {
-    category: "Computer Science!",
+    category: "CS / CS/BBA / CFM",
     value: 84,
   },
   {

pages/friends.tsx

@@ -10,11 +10,11 @@ import {
   F9,
   F10,
   F11,
-  F12,
   F13,
   F14,
   F15,
   F16,
+  F12,
 } from "data/friends";
 import { pageRoutes } from "data/routes";
 import React from "react";
@@ -76,6 +76,18 @@ export default function Demographics() {
         </div>
       </ComponentWrapper>
 
+      <ComponentWrapper
+        heading="How many of your friendships were made after starting university?"
+        bodyText="For a lot of people, most or at least some friendships are made during university. This goes to show how university is an important point in life where people form their most valuable relationships!"
+        align="right"
+      >
+        <BarGraphVertical
+          data={F12}
+          {...barGraphProps(isMobile, pageWidth)}
+          lowerLabelDy="0"
+        />
+      </ComponentWrapper>
+
       <ComponentWrapper
         heading="How many close friends throughout university were also in your program?"
         bodyText="For a lot of people, the majority of their friends are in the same program. Perhaps the shared classes, career goals, and pain from shared assignments make scheduling and conversations easier."

pages/intimacy-and-drugs.tsx

@@ -56,7 +56,7 @@ export default function Demographics() {
 
       <ComponentWrapper
         heading="Which drugs have you tried/used?"
-        bodyText="A lot of students also experiment with substances during university. However, we can see that most students have not tried drugs that are more harsh than Marijuana, such as nicotine, cigarettes, or mushrooms."
+        bodyText="A lot of students also experiment with substances during university. However, we can see that most students have not tried drugs that are more harsh than Marijuana, such as nicotine, cigarettes, or magic mushrooms."
       >
         <GroupedBarGraphHorizontal
           className={styles.barGraphDemo}