Merge branch 'main' into task/design/dashboard-redesign

src/pages/api/exam/[module]/index.ts

@@ -1,7 +1,7 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type {NextApiRequest, NextApiResponse} from "next";
 import {app} from "@/firebase";
-import {getFirestore, collection, getDocs} from "firebase/firestore";
+import {getFirestore, collection, getDocs, query, where} from "firebase/firestore";
 import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
 
@@ -16,8 +16,10 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	}
 
 	const {module} = req.query as {module: string};
+	const moduleRef = collection(db, module);
+	const q = query(moduleRef, where("isDiagnostic", "==", false));
 
-	const snapshot = await getDocs(collection(db, module));
+	const snapshot = await getDocs(q);
 
 	res.status(200).json(
 		snapshot.docs.map((doc) => ({

src/pages/api/users/update.ts

@@ -0,0 +1,23 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type {NextApiRequest, NextApiResponse} from "next";
+import {app} from "@/firebase";
+import {getFirestore, collection, getDocs, getDoc, doc, setDoc} from "firebase/firestore";
+import {withIronSessionApiRoute} from "iron-session/next";
+import {sessionOptions} from "@/lib/session";
+import {User} from "@/interfaces/user";
+
+const db = getFirestore(app);
+
+export default withIronSessionApiRoute(handler, sessionOptions);
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+	if (!req.session.user) {
+		res.status(401).json({ok: false});
+		return;
+	}
+
+	const userRef = doc(db, "users", req.session.user.id);
+	await setDoc(userRef, req.body, {merge: true});
+
+	res.status(200).json({ok: true});
+}

src/pages/exam/index.tsx

@@ -14,11 +14,11 @@ import Finish from "@/exams/Finish";
 import axios from "axios";
 import {withIronSessionSsr} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
-import {Stat, User} from "@/interfaces/user";
+import {Stat} from "@/interfaces/user";
 import Speaking from "@/exams/Speaking";
 import {v4 as uuidv4} from "uuid";
 import useUser from "@/hooks/useUser";
-import useExamStore, {ExamState} from "@/stores/examStore";
+import useExamStore from "@/stores/examStore";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -67,7 +67,7 @@ export default function Page() {
 
 	useEffect(() => {
 		(async () => {
-			if (selectedModules.length > 0) {
+			if (selectedModules.length > 0 && exams.length === 0) {
 				const examPromises = selectedModules.map(getExam);
 				Promise.all(examPromises).then((values) => {
 					if (values.every((x) => !!x)) {
@@ -76,11 +76,11 @@ export default function Page() {
 				});
 			}
 		})();
-	}, [selectedModules, setExams]);
+	}, [selectedModules, setExams, exams]);
 
 	useEffect(() => {
 		(async () => {
-			if (selectedModules.length > 0 && moduleIndex >= selectedModules.length && !hasBeenUploaded) {
+			if (selectedModules.length > 0 && exams.length === 0 && moduleIndex >= selectedModules.length && !hasBeenUploaded) {
 				const newStats: Stat[] = userSolutions.map((solution) => ({
 					...solution,
 					session: sessionId,

src/pages/history.tsx

@@ -24,6 +24,9 @@ import {toast} from "react-toastify";
 import {useRouter} from "next/router";
 import Icon from "@mdi/react";
 import {mdiArrowRight, mdiChevronRight} from "@mdi/js";
+import {uniqBy} from "lodash";
+import {getExamById} from "@/utils/exams";
+import {sortByModule} from "@/utils/moduleUtils";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -64,27 +67,6 @@ export default function History({user}: {user: User}) {
 		}
 	}, [stats, isStatsLoading]);
 
-	const getExam = async (module: Module): Promise<Exam | undefined> => {
-		const examRequest = await axios<Exam[]>(`/api/exam/${module}`);
-		if (examRequest.status !== 200) {
-			toast.error("Something went wrong!");
-			return undefined;
-		}
-
-		const newExam = examRequest.data;
-
-		switch (module) {
-			case "reading":
-				return newExam.shift() as ReadingExam;
-			case "listening":
-				return newExam.shift() as ListeningExam;
-			case "writing":
-				return newExam.shift() as WritingExam;
-			case "speaking":
-				return newExam.shift() as SpeakingExam;
-		}
-	};
-
 	const formatTimestamp = (timestamp: string) => {
 		const date = moment(parseInt(timestamp));
 		const formatter = "YYYY/MM/DD - HH:mm";
@@ -100,16 +82,19 @@ export default function History({user}: {user: User}) {
 		const total = dateStats.reduce((accumulator, current) => accumulator + current.score.total, 0);
 
 		const selectExam = () => {
-			const examPromises = formatModuleTotalStats(dateStats)
-				.filter((x) => x.value > 0)
-				.map((module) => getExam(module.label.toLowerCase() as Module));
+			const examPromises = uniqBy(dateStats, "exam").map((stat) => getExamById(stat.module, stat.exam));
 
 			Promise.all(examPromises).then((exams) => {
 				if (exams.every((x) => !!x)) {
 					setUserSolutions(convertToUserSolutions(dateStats));
 					setShowSolutions(true);
-					setExams(exams.map((x) => x!));
-					setSelectedModules(exams.map((x) => x!.module));
+					setExams(exams.map((x) => x!).sort(sortByModule));
+					setSelectedModules(
+						exams
+							.map((x) => x!)
+							.sort(sortByModule)
+							.map((x) => x!.module),
+					);
 					router.push("/exam");
 				}
 			});

src/pages/index.tsx

@@ -12,6 +12,8 @@ import {averageScore, formatModuleTotalStats, totalExams} from "@/utils/stats";
 import {Divider} from "primereact/divider";
 import useUser from "@/hooks/useUser";
 import Sidebar from "@/components/Sidebar";
+import Diagnostic from "@/components/Diagnostic";
+import {ToastContainer} from "react-toastify";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -35,12 +37,35 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 export default function Home() {
 	const [showEndExam, setShowEndExam] = useState(false);
 	const [windowWidth, setWindowWidth] = useState(0);
+	const [showDiagnostics, setShowDiagnostics] = useState(false);
 
 	const {stats, isLoading} = useStats();
 	const {user} = useUser({redirectTo: "/login"});
 
 	useEffect(() => setShowEndExam(window.innerWidth <= 960), []);
 	useEffect(() => setWindowWidth(window.innerWidth), []);
+	useEffect(() => {
+		if (user) setShowDiagnostics(user.isFirstLogin);
+	}, [user]);
+
+	if (user && showDiagnostics) {
+		return (
+			<>
+				<Head>
+					<title>IELTS GPT | Muscat Training Institute</title>
+					<meta
+						name="description"
+						content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+					/>
+					<meta name="viewport" content="width=device-width, initial-scale=1" />
+					<link rel="icon" href="/favicon.ico" />
+				</Head>
+				<main className="w-full h-full min-h-[100vh] flex flex-col items-center justify-center bg-neutral-100 text-black">
+					<Diagnostic user={user} onFinish={() => setShowDiagnostics(false)} />
+				</main>
+			</>
+		);
+	}
 
 	return (
 		<>
@@ -53,6 +78,7 @@ export default function Home() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
+			<ToastContainer />
 			{user && (
 				<main className="w-full h-full min-h-[100vh] flex flex-col bg-mti-gray text-black">
 					<Navbar user={user} />