Merge pull request #216 from all-rit/development/Lab-7

Development/lab 7

client/.eslintrc.json

@@ -1,7 +1,8 @@
 {
   "env": {
     "browser": true,
-    "es2021": true
+    "es2021": true,
+    "node": true
   },
   "extends": ["eslint:recommended", "prettier", "plugin:react/recommended"],
   "overrides": [],
@@ -25,27 +26,49 @@
     "propWrapperFunctions": [
       // The names of any function used to wrap propTypes, e.g. `forbidExtraProps`. If this isn't set, any propTypes wrapped in a function will be skipped.
       "forbidExtraProps",
-      { "property": "freeze", "object": "Object" },
-      { "property": "myFavoriteWrapper" },
+      {
+        "property": "freeze",
+        "object": "Object"
+      },
+      {
+        "property": "myFavoriteWrapper"
+      },
       // for rules that check exact prop wrappers
-      { "property": "forbidExtraProps", "exact": true }
+      {
+        "property": "forbidExtraProps",
+        "exact": true
+      }
     ],
     "componentWrapperFunctions": [
       // The name of any function used to wrap components, e.g. Mobx `observer` function. If this isn't set, components wrapped by these functions will be skipped.
       "observer", // `property`
-      { "property": "styled" }, // `object` is optional
-      { "property": "observer", "object": "Mobx" },
-      { "property": "observer", "object": "<pragma>" } // sets `object` to whatever value `settings.react.pragma` is set to
+      {
+        "property": "styled"
+      }, // `object` is optional
+      {
+        "property": "observer",
+        "object": "Mobx"
+      },
+      {
+        "property": "observer",
+        "object": "<pragma>"
+      } // sets `object` to whatever value `settings.react.pragma` is set to
     ],
     "formComponents": [
       // Components used as alternatives to <form> for forms, eg. <Form endpoint={ url } />
       "CustomForm",
-      { "name": "Form", "formAttribute": "endpoint" }
+      {
+        "name": "Form",
+        "formAttribute": "endpoint"
+      }
     ],
     "linkComponents": [
       // Components used as alternatives to <a> for linking, eg. <Link to={ url } />
       "Hyperlink",
-      { "name": "Link", "linkAttribute": "to" }
+      {
+        "name": "Link",
+        "linkAttribute": "to"
+      }
     ]
   }
 }

client/package.json

@@ -21,6 +21,9 @@
     "eslint-config-google": "^0.14.0",
     "hex-to-rgba": "^2.0.1",
     "immutability-helper": "^3.1.1",
+    "lodash": "^4.17.21",
+    "mathjax-react": "^2.0.1",
+    "mathjs": "^11.5.1",
     "node-sass": "^7.0.1",
     "prismjs": "^1.25.0",
     "rc-color-picker": "^1.2.6",

client/src/App.js

@@ -20,6 +20,7 @@ import { default as ExerciseLab4 } from "./components/exercise/lab4/Main";
 
 import { default as ExerciseLab5 } from "./components/exercise/lab5/Main";
 
+import { default as ExerciseLab7 } from "./components/exercise/lab7/Main";
 import { default as ExerciseLab6 } from "./components/exercise/lab6/Main";
 
 import { default as LandingPageBody } from "./components/body/landingpage/index";
@@ -131,6 +132,7 @@ class App extends Component {
               <ExerciseLab4 path="/Lab4/Exercise/*" user={state.main.user} />
               <ExerciseLab5 path="/Lab5/Exercise/*" user={state.main.user} />
               <ExerciseLab6 path="/Lab6/Exercise/*" user={state.main.user} />
+              <ExerciseLab7 path="/Lab7/Exercise/*" user={state.main.user} />
 
               <Reinforcement
                 path={`/Lab${lab}/Reinforcement`}
@@ -142,6 +144,9 @@ class App extends Component {
                 path={`/Lab${lab}/Quiz`}
                 labId={lab}
                 user={state.main.user}
+                isFinalQuiz
+                hideCertificate={false}
+                submitData={() => {}}
               />
             </Router>
           </div>