Lab 6 - path fix

client/src/components/exercise/lab3/pages/AdvancedExercise/AdvancedExerciseConclusion.js

@@ -4,9 +4,25 @@ import { navigate } from "@reach/router";
 import { EXERCISE_IDLE, LAB_ID } from "../../../../../constants/lab3/index";
 import UserLabService from "../../../../../services/UserLabService";
 class AdvancedExerciseConclusion extends Component {
+   constructor(props) {
+    super(props);
+
+    this.handleSubmit = this.handleSubmit.bind(this);
+    this.handleNext = this.handleNext.bind(this);
+  }
+
+  handleSubmit() {
+    navigate("/Lab3/Exercise");
+  }
+
+  handleNext() {
+    navigate("/Lab3/Reinforcement");
+  }
+
   handleSubmit() {
     navigate("/Lab3/Exercise");
   }
+
   componentDidMount() {
     const { actions, user } = this.props;
     actions.updateState(EXERCISE_IDLE);
@@ -27,17 +43,25 @@ class AdvancedExerciseConclusion extends Component {
         <br />
         <p className={"tw-body-text tw-font-medium tw-text-left"}>
           Click the <strong> Return to Exercise Start </strong> button below to
-          restart the exercise, or click the <strong> Next</strong> button in
-          the bottom right.
+          restart the exercise, or click the <strong> Next</strong> button on the right to continue to the Reinforcement section.
         </p>
         <br />
-        <button
+        <div className="tw-flex tw-justify-center tw-items-center tw-gap-4 tw-mt-6">
+      <button
           className="btn tw-shadow-md tw-bg-secondary-gray tw-h-[4rem] text-uppercase hover:tw-bg-primary-yellow hover:tw-shadow-lg"
           onClick={this.handleSubmit}
           key="start"
-        >
-          Return to Exercise Start
-        </button>
+      >
+      Return to Exercise Start
+      </button>
+
+      <button
+          className="btn tw-shadow-md tw-bg-secondary-gray tw-h-[4rem] tw-w-[8rem] text-uppercase hover:tw-bg-primary-yellow hover:tw-shadow-lg"
+          onClick={this.handleNext}
+      >
+       Next
+      </button>
+      </div>
       </div>
     );
   }

client/src/components/exercise/lab3/pages/AdvancedExercise/ProblemFix.js

@@ -263,7 +263,7 @@ class ProblemFix extends Component {
               <HTMLTag>&#60;button aria-label="</HTMLTag>
               <input
                 className={
-                  "tw-bg-secondary-gray tw-rounded-md tw-text-primary-yellow code_editor code_editor__input"
+                  "tw-bg-black tw-rounded-md tw-text-primary-yellow code_editor code_editor__input"
                 }
                 type={"text"}
                 value={this.state.textValue}

client/src/components/exercise/lab3/pages/AdvancedExercise/ViewFix.js

@@ -21,8 +21,18 @@ class ViewFix extends Component {
   static navOnClick() {
     const name = "ViewFix";
     PageService.createPage(name, this.state.secondsElapsed, LAB_ID);
+<<<<<<< HEAD
+<<<<<<< HEAD
+    navigate("/Lab3/Exercise/AdvancedExerciseConclusion");  
+    }
+=======
+    navigate("/Lab3/Exercise/ProblemFix");
+  }
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
+=======
     navigate("/Lab3/Exercise/ProblemFix");
   }
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
 
   componentDidMount() {
     const { actions } = this.props;

client/src/components/exercise/lab4/pages/Finish.js

@@ -12,6 +12,17 @@ const Finish = () => {
     navigate("/Lab4/Exercise");
   };
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+  const handleNext = () => {
+  navigate("/Lab4/Reinforcement");
+  };
+
+
+=======
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
+=======
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
   useEffect(() => {
     UserLabService.complete_exercise(LAB_ID);
     if (state.main.user?.firstname !== null && state.main.user !== null) {
@@ -33,13 +44,42 @@ const Finish = () => {
         the reinforcement section scroll down and click the{" "}
         <strong>Next</strong> button.
       </p>
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+
+
+    <div className="tw-flex tw-justify-center tw-gap-x-3 tw-my-6">
+      <button
+        className="btn tw-bg-secondary-gray tw-shadow-md hover:tw-bg-primary-yellow hover:tw-shadow-xl btn-xl text-uppercase"
+        onClick={handleSubmit}
+        key="start"
+    >
+    Return to Exercise Start
+    </button>
+
+      <button
+        className="btn tw-bg-secondary-gray tw-shadow-md hover:tw-bg-primary-yellow hover:tw-shadow-xl btn-xl text-uppercase"
+        onClick={handleNext}
+        key="next"
+    >
+    Next
+    </button>
+    </div>
+=======
+=======
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
       <button
         className="btn tw-bg-secondary-gray tw-shadow-md hover:tw-bg-primary-yellow hover:tw-shadow-xl btn-xl text-uppercase tw-my-6"
         onClick={handleSubmit}
         key="start"
       >
         Return to Exercise Start
       </button>
+<<<<<<< HEAD
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
+=======
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
     </div>
   );
 };

client/src/components/exercise/lab6/pages/Employer/ExerciseEnd.js

@@ -16,8 +16,18 @@ const ExerciseEnd = () => {
   };
 
   const handleRepair = () => {
+<<<<<<< HEAD
+<<<<<<< HEAD
+  actions.updateUserState(EXERCISE_PLAYING);
+  navigate("/Lab6/Exercise/AIRepair");
+=======
     actions.updateState(EXERCISE_PLAYING);
     navigate("/Lab6/Exercise/AIRepair");
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
+=======
+    actions.updateState(EXERCISE_PLAYING);
+    navigate("/Lab6/Exercise/AIRepair");
+>>>>>>> a1f93297d5b58032f71a700b729806cd88f14691
   };
 
   return (