Scheduled Merge: dev to prod

client/.eslintrc.json

@@ -13,7 +13,11 @@
   ],
   "overrides": [
     {
-      "files": ["**/*.spec.js", "**/*.spec.jsx", "**/*.test.js"],
+      "files": [
+        "**/*.spec.js",
+        "**/*.spec.jsx",
+        "**/*.test.js"
+      ],
       "env": {
         "jest": true
       }
@@ -23,7 +27,10 @@
     "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "plugins": ["react", "jest"],
+  "plugins": [
+    "react",
+    "jest"
+  ],
   "settings": {
     "react": {
       "createClass": "createReactClass",

client/src/App.js

@@ -21,6 +21,7 @@ import { default as ExerciseLab9 } from "./components/exercise/lab9/Main";
 import { default as ExerciseLab10 } from "./components/exercise/lab10/Main";
 import { default as ExerciseLab11 } from "./components/exercise/lab11/Main";
 import { default as ExerciseLab12 } from "./components/exercise/lab12/Main";
+import { default as ExerciseLab13 } from "./components/exercise/lab13/Main";
 import { default as ExerciseLab14 } from "./components/exercise/lab14/Main";
 
 import { Sections } from "./constants/index";
@@ -115,7 +116,7 @@ const App = () => {
 
   const renderLabs = () => {
     return (
-      <div className={"tw-h-full tw-w-full tw-overflow-y-auto"}>
+      <div className={"tw-h-full tw-w-full"}>
         <Router basepath={process.env.PUBLIC_URL}>
           <About path={`/Lab${lab}/`} user={state.main.user} labID={lab} />
           <About path={`/Lab${lab}/About`} user={state.main.user} labID={lab} />
@@ -142,6 +143,7 @@ const App = () => {
           <ExerciseLab10 path="/Lab10/Exercise/*" user={state.main.user} />
           <ExerciseLab11 path="/Lab11/Exercise/*" user={state.main.user} />
           <ExerciseLab12 path="/Lab12/Exercise/*" user={state.main.user} />
+          <ExerciseLab13 path="/Lab13/Exercise/*" user={state.main.user} />
           <ExerciseLab14 path="/Lab14/Exercise/*" user={state.main.user} />
 
           <Reinforcement
@@ -178,7 +180,7 @@ const App = () => {
         <Profile path="/Profile" user={state.main.user} />
         <LabsPage path={"/Labs"} user={state.main.user} actions={actions} />
         <EducatorResources path={"/EducatorResources"} user={state.main.user} />
-        <Error actions={actions} default />
+        <Error default />
 
         <Imagine2023
           path={"/Imagine2023/*"}
@@ -202,16 +204,14 @@ const App = () => {
     <>
       {isLoaded ? (
         <div
-          className={`overflow-x-hidden ${
-            labInProgress || isImagine
-              ? "overflow-y-hidden tw-h-lvh"
-              : "overflow-y-auto min-h-screen"
-          }`}
+          className={
+            labInProgress || isImagine ? "" : "overflow-x-hidden min-h-screen"
+          }
         >
           <Suspense fallback={<Spinner />}>
             <Header isImagine={isImagine} />
-            <div className={`tw-relative ${labInProgress && "tw-h-full"}`}>
-              <div className={`tw-relative tw-grid tw-h-full`}>
+            <div className={`tw-relative`}>
+              <div className={`tw-relative tw-grid`}>
                 {labInProgress ? (
                   <LabWindow
                     lab={lab}

client/src/assets/stylesheets/components/App.css

@@ -412,38 +412,6 @@ li {
   }
 }
 
-.errorpage h1 {
-  font-size: 50px;
-  font-weight: 700;
-  line-height: 50px;
-  margin-bottom: 25px;
-  font-family:
-    Montserrat,
-    -apple-system,
-    BlinkMacSystemFont,
-    "Segoe UI",
-    Roboto,
-    "Helvetica Neue",
-    Arial,
-    sans-serif,
-    "Apple Color Emoji",
-    "Segoe UI Emoji",
-    "Segoe UI Symbol",
-    "Noto Color Emoji";
-}
-
-.errorpage p {
-  font-style: italic;
-  font-size: 25px;
-  line-height: 50px;
-  margin-bottom: 25px;
-  padding: 75px;
-}
-
-.errorpage div {
-  padding: 40px;
-}
-
 header.masthead {
   margin-top: -120px;
   text-align: center;
@@ -1991,7 +1959,6 @@ header.masthead .intro-text .intro-heading {
 
 body {
   background-color: white;
-  overflow-x: hidden;
   font-family:
     "Roboto Slab",
     -apple-system,

client/src/assets/stylesheets/components/App.scss

@@ -9,6 +9,7 @@
 html {
   margin: 0;
   padding: 0;
+  overflow-y: scroll;
 }
 
 ul {
@@ -607,44 +608,6 @@ li {
   // }
 }
 
-.errorpage {
-  h1 {
-    //font-style: Bold;
-    font-size: 50px;
-    font-weight: 700;
-    line-height: 50px;
-    margin-bottom: 25px;
-    //padding-top: 40px;
-    font-family:
-      Poppins,
-      -apple-system,
-      BlinkMacSystemFont,
-      "Segoe UI",
-      Roboto,
-      "Helvetica Neue",
-      Arial,
-      sans-serif,
-      "Apple Color Emoji",
-      "Segoe UI Emoji",
-      "Segoe UI Symbol",
-      "Noto Color Emoji";
-  }
-
-  p {
-    font-style: italic;
-    font-size: 25px;
-    line-height: 50px;
-    margin-bottom: 25px;
-    padding: 75px;
-    // padding-top: 75px;
-    // padding-bottom: 75px;
-  }
-
-  div {
-    padding: 40px;
-  }
-}
-
 header.masthead {
   margin-top: -120px;
   text-align: center;
@@ -2424,7 +2387,6 @@ header.masthead {
 
 body {
   background-color: white;
-  overflow-x: hidden;
   font-family:
     "Roboto Slab",
     -apple-system,