Merge pull request #594 from all-rit/573-story-create-quiz-service

573 Story to Create Quiz Service
all-rit · Apr 22, 2024 · 16b590c · 16b590c
2 parents 43debc7 + 1dc4c54
commit 16b590c
Show file tree

Hide file tree

Showing 42 changed files with 2,710 additions and 3,993 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ client/build
 # misc
 .env.local
 .env.development.local
-.env.test.local
+.env.test
 .env.production.local
 
 ### macOS ###

diff --git a/client/public/index.html b/client/public/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/client/src/App.js b/client/src/App.js
@@ -130,9 +130,8 @@ const App = () => {
                 path={`/Lab${lab}/Quiz`}
                 labId={lab}
                 user={state.main.user}
-                isFinalQuiz
+                isFinalQuiz={true}
                 hideCertificate={false}
-                submitData={() => {}}
                 quizCompleted={quizCompleted}
                 setQuizCompleted={setQuizCompleted}
               />

diff --git a/client/src/assets/stylesheets/components/Header.scss b/client/src/assets/stylesheets/components/Header.scss
@@ -15,9 +15,19 @@
 
 #all-header-text {
   color: #fed136;
-  font-family: "Calibri", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-    "Segoe UI Symbol", "Noto Color Emoji";
+  font-family:
+    "Calibri",
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    Roboto,
+    "Helvetica Neue",
+    Arial,
+    sans-serif,
+    "Apple Color Emoji",
+    "Segoe UI Emoji",
+    "Segoe UI Symbol",
+    "Noto Color Emoji";
   font-size: 30px;
   margin-left: -15px;
   margin-top: -10px;
@@ -100,7 +110,9 @@
 .labnav {
   // padding-top: 0.8rem;
   padding-bottom: 0.8rem;
-  box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
+  box-shadow:
+    0 14px 28px rgba(0, 0, 0, 0.25),
+    0 10px 10px rgba(0, 0, 0, 0.22);
 }
 
 .nav-last {

diff --git a/client/src/assets/stylesheets/pages/quiz.scss b/client/src/assets/stylesheets/pages/quiz.scss
@@ -80,7 +80,9 @@
   }
 
   .answerOption:hover {
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
+    box-shadow:
+      0 10px 20px rgba(0, 0, 0, 0.19),
+      0 6px 6px rgba(0, 0, 0, 0.23);
   }
 
   .checkboxCustomButton {

diff --git a/client/src/components/exercise/lab7/pages/AlterationActivity/AlterationQuiz.js b/client/src/components/exercise/lab7/pages/AlterationActivity/AlterationQuiz.js
@@ -1,10 +1,12 @@
 import React, { useEffect, useState } from "react";
+import PropTypes from "prop-types";
 import { default as Quiz } from "../../../../quiz/components/QuizHandler";
 import { EXERCISE_IDLE } from "src/constants/index";
 import { navigate } from "@reach/router";
 import { MathComponent } from "mathjax-react";
 import ExerciseService from "../../../../../services/lab7/ExerciseService";
 import useMainStateContext from "src/reducers/MainContext";
+import alterationQuizQuestions from "src/constants/lab7/alterationQuestions";
 
 /**
  * Renders the Alteration Quiz component.
@@ -13,7 +15,7 @@ import useMainStateContext from "src/reducers/MainContext";
  */
 const AlterationQuiz = () => {
   const [showContinue, setShowContinue] = useState(false);
-  const [quizComplete, setQuizComplete] = useState(false);
+  const [, setQuizComplete] = useState(false);
   const { state: mainState, actions: mainActions } = useMainStateContext();
 
   useEffect(() => {
@@ -51,8 +53,10 @@ const AlterationQuiz = () => {
         hideCertificate
         isFinalQuiz={false}
         submitData={handleSubmitData}
-        quizCompleted={quizComplete}
-        setQuizCompleted={setQuizComplete}
+        quizQuestions={alterationQuizQuestions}
+        setQuizCompleted={() => {
+          return true;
+        }}
       />
       {showContinue && (
         <button
@@ -66,5 +70,8 @@ const AlterationQuiz = () => {
     </div>
   );
 };
+AlterationQuiz.propTypes = {
+  setQuizCompleted: PropTypes.func.isRequired,
+};
 
 export default AlterationQuiz;
diff --git a/client/src/components/quiz/App.css b/client/src/components/quiz/App.css