From 41040f92c3795af74152a16ba68c278bd36886c0 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 27 Sep 2023 11:05:23 +0100
Subject: [PATCH] Updated the layout leave to a reload

---
 src/pages/exam.tsx      | 8 +++-----
 src/pages/exercises.tsx | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pages/exam.tsx b/src/pages/exam.tsx
index 104e5138..0effc768 100644
--- a/src/pages/exam.tsx
+++ b/src/pages/exam.tsx
@@ -32,6 +32,7 @@ import Layout from "@/components/High/Layout";
 import {speakingReverseMarking, writingReverseMarking} from "@/utils/score";
 import AbandonPopup from "@/components/AbandonPopup";
 import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation";
+import {useRouter} from "next/router";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -65,9 +66,9 @@ export default function Page() {
 	const [userSolutions, setUserSolutions] = useExamStore((state) => [state.userSolutions, state.setUserSolutions]);
 	const [showSolutions, setShowSolutions] = useExamStore((state) => [state.showSolutions, state.setShowSolutions]);
 	const [selectedModules, setSelectedModules] = useExamStore((state) => [state.selectedModules, state.setSelectedModules]);
-	const reset = useExamStore((state) => state.reset);
 
 	const {user} = useUser({redirectTo: "/login"});
+	const router = useRouter();
 
 	useEffect(() => setSessionId(uuidv4()), []);
 
@@ -289,10 +290,7 @@ export default function Page() {
 								abandonPopupTitle="Leave Exercise"
 								abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
 								abandonConfirmButtonText="Confirm"
-								onAbandon={() => {
-									reset();
-									setShowAbandonPopup(false);
-								}}
+								onAbandon={() => router.reload()}
 								onCancel={() => setShowAbandonPopup(false)}
 							/>
 						)}
diff --git a/src/pages/exercises.tsx b/src/pages/exercises.tsx
index 752721cf..85a0102c 100644
--- a/src/pages/exercises.tsx
+++ b/src/pages/exercises.tsx
@@ -35,6 +35,7 @@ import {sortByModule} from "@/utils/moduleUtils";
 import {speakingReverseMarking, writingReverseMarking} from "@/utils/score";
 import AbandonPopup from "@/components/AbandonPopup";
 import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation";
+import {useRouter} from "next/router";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -68,9 +69,9 @@ export default function Page() {
 	const [userSolutions, setUserSolutions] = useExamStore((state) => [state.userSolutions, state.setUserSolutions]);
 	const [showSolutions, setShowSolutions] = useExamStore((state) => [state.showSolutions, state.setShowSolutions]);
 	const [selectedModules, setSelectedModules] = useExamStore((state) => [state.selectedModules, state.setSelectedModules]);
-	const reset = useExamStore((state) => state.reset);
 
 	const {user} = useUser({redirectTo: "/login"});
+	const router = useRouter();
 
 	useEffect(() => console.log({examId: exam?.id, exam}), [exam]);
 	useEffect(() => setSessionId(uuidv4()), []);
@@ -290,10 +291,7 @@ export default function Page() {
 								abandonPopupTitle="Leave Exercise"
 								abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
 								abandonConfirmButtonText="Confirm"
-								onAbandon={() => {
-									reset();
-									setShowAbandonPopup(false);
-								}}
+								onAbandon={() => router.reload()}
 								onCancel={() => setShowAbandonPopup(false)}
 							/>
 						)}