Sidebar and button created.

.gitignore

@@ -38,4 +38,3 @@ next-env.d.ts
 .env
 .yarn/*
 .history*
-__ENV.js

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-yarn build

.vscode/launch.json

@@ -1,28 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-      {
-        "name": "Next.js: debug server-side",
-        "type": "node-terminal",
-        "request": "launch",
-        "command": "npm run dev"
-      },
-      {
-        "name": "Next.js: debug client-side",
-        "type": "chrome",
-        "request": "launch",
-        "url": "http://localhost:3000"
-      },
-      {
-        "name": "Next.js: debug full stack",
-        "type": "node-terminal",
-        "request": "launch",
-        "command": "npm run dev",
-        "serverReadyAction": {
-          "pattern": "- Local:.+(https?://.+)",
-          "uriFormat": "%s",
-          "action": "debugWithChrome"
-        }
-      }
-    ]
-  }

next.config.js

@@ -2,25 +2,6 @@
 const nextConfig = {
 	reactStrictMode: true,
 	output: "standalone",
-	async headers() {
-		return [
-			{
-				source: "/api/packages",
-				headers: [
-					{key: "Access-Control-Allow-Credentials", value: "false"},
-					{key: "Access-Control-Allow-Origin", value: "https://encoach.com"},
-					{
-						key: "Access-Control-Allow-Methods",
-						value: "GET",
-					},
-					{
-						key: "Access-Control-Allow-Headers",
-						value: "Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date",
-					},
-				],
-			},
-		];
-	},
 };
 
 module.exports = nextConfig;

package.json

@@ -6,95 +6,57 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint",
-    "prepare": "husky install"
+    "lint": "next lint"
   },
   "dependencies": {
-    "@beam-australia/react-env": "^3.1.1",
     "@headlessui/react": "^1.7.13",
     "@mdi/js": "^7.1.96",
     "@mdi/react": "^1.6.1",
     "@next/font": "13.1.6",
-    "@paypal/paypal-js": "^7.1.0",
-    "@paypal/react-paypal-js": "^8.1.3",
-    "@react-pdf/renderer": "^3.1.14",
-    "@tanstack/react-table": "^8.10.1",
     "@types/node": "18.13.0",
     "@types/react": "18.0.27",
     "@types/react-dom": "18.0.10",
     "axios": "^1.3.5",
-    "bcrypt": "^5.1.1",
     "chart.js": "^4.2.1",
     "clsx": "^1.2.1",
-    "countries-list": "^3.0.1",
-    "country-codes-list": "^1.6.11",
-    "currency-symbol-map": "^5.1.0",
     "daisyui": "^3.1.5",
     "eslint": "8.33.0",
     "eslint-config-next": "13.1.6",
-    "express-handlebars": "^7.1.2",
     "firebase": "9.19.1",
-    "firebase-admin": "^11.10.1",
     "formidable": "^3.5.0",
     "formidable-serverless": "^1.1.1",
     "framer-motion": "^9.0.2",
-    "howler": "^2.2.4",
     "iron-session": "^6.3.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "moment-timezone": "^0.5.44",
     "next": "13.1.6",
-    "nodemailer": "^6.9.5",
-    "nodemailer-express-handlebars": "^6.1.0",
     "primeicons": "^6.0.1",
     "primereact": "^9.2.3",
-    "qrcode": "^1.5.3",
-    "random-words": "^2.0.0",
     "react": "18.2.0",
     "react-chartjs-2": "^5.2.0",
-    "react-csv": "^2.2.2",
-    "react-currency-input-field": "^3.6.12",
-    "react-datepicker": "^4.18.0",
-    "react-diff-viewer": "^3.1.1",
     "react-dom": "18.2.0",
     "react-firebase-hooks": "^5.1.1",
     "react-icons": "^4.8.0",
     "react-lineto": "^3.3.0",
     "react-media-recorder": "1.6.5",
-    "react-phone-number-input": "^3.3.6",
     "react-player": "^2.12.0",
-    "react-select": "^5.7.5",
     "react-string-replace": "^1.1.0",
     "react-toastify": "^9.1.2",
     "react-xarrows": "^2.0.2",
-    "read-excel-file": "^5.7.1",
-    "short-unique-id": "^5.0.2",
-    "stripe": "^13.10.0",
     "swr": "^2.1.3",
-    "tailwind-scrollbar-hide": "^1.1.7",
     "typescript": "4.9.5",
-    "use-file-picker": "^2.1.0",
     "uuid": "^9.0.0",
     "wavesurfer.js": "^6.6.4",
     "zustand": "^4.3.6"
   },
   "devDependencies": {
-    "@types/blob-stream": "^0.1.33",
     "@types/formidable": "^3.4.0",
-    "@types/howler": "^2.2.11",
     "@types/lodash": "^4.14.191",
-    "@types/nodemailer": "^6.4.11",
-    "@types/nodemailer-express-handlebars": "^4.0.3",
-    "@types/qrcode": "^1.5.5",
-    "@types/react-csv": "^1.1.10",
-    "@types/react-datepicker": "^4.15.1",
     "@types/uuid": "^9.0.1",
     "@types/wavesurfer.js": "^6.0.6",
     "@wixc3/react-board": "^2.2.0",
     "autoprefixer": "^10.4.13",
-    "husky": "^8.0.3",
     "postcss": "^8.4.21",
-    "tailwindcss": "^3.2.4",
-    "types/": "paypal/react-paypal-js"
+    "tailwindcss": "^3.2.4"
   }
 }

src/components/AbandonPopup.tsx

@@ -3,53 +3,60 @@ import {Fragment} from "react";
 import Button from "./Low/Button";
 
 interface Props {
-	isOpen: boolean;
+    isOpen: boolean;
 	abandonPopupTitle: string;
 	abandonPopupDescription: string;
 	abandonConfirmButtonText: string;
-	onAbandon: () => void;
-	onCancel: () => void;
+	onAbandon: Function;
+    onCancel: Function;
 }
 
-export default function AbandonPopup({isOpen, abandonPopupTitle, abandonPopupDescription, abandonConfirmButtonText, onAbandon, onCancel}: Props) {
-	return (
-		<Transition show={isOpen} as={Fragment}>
-			<Dialog onClose={onCancel} className="relative z-50">
-				<Transition.Child
-					as={Fragment}
-					enter="ease-out duration-300"
-					enterFrom="opacity-0"
-					enterTo="opacity-100"
-					leave="ease-in duration-200"
-					leaveFrom="opacity-100"
-					leaveTo="opacity-0">
-					<div className="fixed inset-0 bg-black/30" />
-				</Transition.Child>
+export default function AbandonPopup({
+    isOpen,
+    abandonPopupTitle,
+	abandonPopupDescription,
+	abandonConfirmButtonText,
+	onAbandon,
+    onCancel,
+}: Props) {
+        return (
+            <Transition show={isOpen} as={Fragment}>
+                <Dialog onClose={onCancel} className="relative z-50">
+                    <Transition.Child
+                        as={Fragment}
+                        enter="ease-out duration-300"
+                        enterFrom="opacity-0"
+                        enterTo="opacity-100"
+                        leave="ease-in duration-200"
+                        leaveFrom="opacity-100"
+                        leaveTo="opacity-0">
+                        <div className="fixed inset-0 bg-black/30" />
+                    </Transition.Child>
     
-				<Transition.Child
-					as={Fragment}
-					enter="ease-out duration-300"
-					enterFrom="opacity-0 scale-95"
-					enterTo="opacity-100 scale-100"
-					leave="ease-in duration-200"
-					leaveFrom="opacity-100 scale-100"
-					leaveTo="opacity-0 scale-95">
-					<div className="fixed inset-0 flex items-center justify-center p-4">
-						<Dialog.Panel className="w-full max-w-2xl h-fit p-8 rounded-xl bg-white flex flex-col gap-4">
-							<Dialog.Title className="font-bold text-xl">{abandonPopupTitle}</Dialog.Title>
-							<span>{abandonPopupDescription}</span>
-							<div className="w-full flex justify-between mt-8">
-								<Button color="purple" onClick={onCancel} variant="outline" className="max-w-[200px] self-end w-full">
-									Cancel
-								</Button>
-								<Button color="purple" onClick={onAbandon} className="max-w-[200px] self-end w-full">
-									{abandonConfirmButtonText}
-								</Button>
-							</div>
-						</Dialog.Panel>
-					</div>
-				</Transition.Child>
-			</Dialog>
-		</Transition>
-	);
+                    <Transition.Child
+                        as={Fragment}
+                        enter="ease-out duration-300"
+                        enterFrom="opacity-0 scale-95"
+                        enterTo="opacity-100 scale-100"
+                        leave="ease-in duration-200"
+                        leaveFrom="opacity-100 scale-100"
+                        leaveTo="opacity-0 scale-95">
+                        <div className="fixed inset-0 flex items-center justify-center p-4">
+                            <Dialog.Panel className="w-full max-w-2xl h-fit p-8 rounded-xl bg-white flex flex-col gap-4">
+                                <Dialog.Title className="font-bold text-xl">{abandonPopupTitle}</Dialog.Title>
+                                <span>{abandonPopupDescription}</span>
+                                <div className="w-full flex justify-between mt-8">
+                                    <Button color="purple" onClick={onCancel} variant="outline" className="max-w-[200px] self-end w-full">
+                                        Cancel
+                                    </Button>
+                                    <Button color="purple" onClick={onAbandon} className="max-w-[200px] self-end w-full">
+                                        {abandonConfirmButtonText}
+                                    </Button>
+                                </div>
+                            </Dialog.Panel>
+                        </div>
+                    </Transition.Child>
+                </Dialog>
+            </Transition>
+    );
 }

src/components/BottomBar.tsx

@@ -1,63 +0,0 @@
-import clsx from "clsx";
-import {IconType} from "react-icons";
-import {MdSpaceDashboard} from "react-icons/md";
-import {BsFileEarmarkText, BsClockHistory, BsPencil, BsGraphUp} from "react-icons/bs";
-import {RiLogoutBoxFill} from "react-icons/ri";
-import {SlPencil} from "react-icons/sl";
-import {FaAward} from "react-icons/fa";
-import Link from "next/link";
-import {useRouter} from "next/router";
-import axios from "axios";
-import FocusLayer from "@/components/FocusLayer";
-import {preventNavigation} from "@/utils/navigation.disabled";
-interface Props {
-	path: string;
-	navDisabled?: boolean;
-	focusMode?: boolean;
-	onFocusLayerMouseEnter?: () => void;
-	className?: string;
-}
-
-interface NavProps {
-	Icon: IconType;
-	label: string;
-	path: string;
-	keyPath: string;
-	disabled?: boolean;
-}
-
-const Nav = ({Icon, label, path, keyPath, disabled = false}: NavProps) => (
-	<Link
-		href={!disabled ? keyPath : ""}
-		className={clsx(
-			"p-4 rounded-full flex gap-4 items-center cursor-pointer text-gray-500 hover:bg-mti-purple-light hover:text-white transition duration-300 ease-in-out",
-			path === keyPath && "bg-mti-purple-light text-white",
-		)}>
-		<Icon size={20} />
-	</Link>
-);
-
-export default function BottomBar({path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter, className}: Props) {
-	const router = useRouter();
-
-	const logout = async () => {
-		axios.post("/api/logout").finally(() => {
-			setTimeout(() => router.reload(), 500);
-		});
-	};
-
-	const disableNavigation = preventNavigation(navDisabled, focusMode);
-
-	return (
-		<section className={clsx("w-full bg-white py-2 drop-shadow-2xl shadow-2xl rounded-t-2xl", className)}>
-			<div className="flex justify-around gap-3">
-				<Nav disabled={disableNavigation} Icon={MdSpaceDashboard} label="Dashboard" path={path} keyPath="/" />
-				<Nav disabled={disableNavigation} Icon={BsFileEarmarkText} label="Exams" path={path} keyPath="/exam" />
-				<Nav disabled={disableNavigation} Icon={BsPencil} label="Exercises" path={path} keyPath="/exercises" />
-				<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" />
-				<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" />
-			</div>
-			{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
-		</section>
-	);
-}

src/components/DemographicInformationInput.tsx

@@ -1,137 +0,0 @@
-import {EmploymentStatus, EMPLOYMENT_STATUS, Gender, User} from "@/interfaces/user";
-import {FormEvent, useEffect, useState} from "react";
-import countryCodes from "country-codes-list";
-import {RadioGroup} from "@headlessui/react";
-import Input from "./Low/Input";
-import clsx from "clsx";
-import Button from "./Low/Button";
-import {BsArrowRepeat} from "react-icons/bs";
-import axios from "axios";
-import {toast} from "react-toastify";
-import {KeyedMutator} from "swr";
-import CountrySelect from "./Low/CountrySelect";
-import GenderInput from "@/components/High/GenderInput";
-import EmploymentStatusInput from "@/components/High/EmploymentStatusInput";
-import TimezoneSelect from "./Low/TImezoneSelect";
-import moment from "moment";
-
-interface Props {
-	user: User;
-	mutateUser: KeyedMutator<User>;
-}
-
-export default function DemographicInformationInput({user, mutateUser}: Props) {
-	const [country, setCountry] = useState<string>();
-	const [phone, setPhone] = useState<string>();
-	const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined);
-	const [gender, setGender] = useState<Gender>();
-	const [employment, setEmployment] = useState<EmploymentStatus>();
-	const [position, setPosition] = useState<string>();
-	const [timezone, setTimezone] = useState<string>(moment.tz.guess());
-	const [isLoading, setIsLoading] = useState(false);
-
-	const [companyName, setCompanyName] = useState<string>();
-	const [commercialRegistration, setCommercialRegistration] = useState<string>();
-
-	const save = (e?: FormEvent) => {
-		if (e) e.preventDefault();
-		setIsLoading(true);
-
-		axios
-			.patch("/api/users/update", {
-				demographicInformation: {
-					country,
-					phone: `+${countryCodes.findOne("countryCode" as any, country!).countryCallingCode}${phone}`,
-					gender,
-					employment: user.type === "corporate" ? undefined : employment,
-					position: user.type === "corporate" ? position : undefined,
-					passport_id,
-					timezone,
-				},
-				agentInformation: user.type === "agent" ? {companyName, commercialRegistration} : undefined,
-			})
-			.then((response) => mutateUser((response.data as {user: User}).user))
-			.catch(() => {
-				toast.error("Something went wrong, please try again later!", {toastId: "user-update-error"});
-			})
-			.finally(() => setIsLoading(false));
-	};
-
-	return (
-		<div className="flex flex-col items-center justify-center gap-12 w-full">
-			<h2 className="font-semibold text-center text-xl max-w-[800px]">
-				Welcome to EnCoach, the ultimate platform dedicated to helping you master the IELTS ! We are thrilled that you have chosen us as your
-				learning companion on this journey towards achieving your desired IELTS score.
-				<br />
-				<br />
-				To make the most of your learning experience, we kindly request you to complete your profile. By providing some essential information
-				about yourself.
-			</h2>
-			<form className="flex flex-col items-center justify-items-center gap-6 w-full h-full -md:px-4 lg:w-1/2 mb-32" onSubmit={save}>
-				{user.type === "agent" && (
-					<div className="w-full flex gap-8">
-						<Input type="text" onChange={setCompanyName} name="companyName" label="Corporate Name" required />
-						<Input
-							type="text"
-							onChange={setCommercialRegistration}
-							name="commercialRegistration"
-							label="Commercial Registration"
-							required
-						/>
-					</div>
-				)}
-				<div className="w-full grid grid-cols-2 gap-6">
-					<div className="relative flex flex-col gap-3 w-full">
-						<label className="font-normal text-base text-mti-gray-dim">Country *</label>
-						<CountrySelect value={country} onChange={setCountry} />
-					</div>
-					<Input type="tel" name="phone" label="Phone number" onChange={(e) => setPhone(e)} placeholder="Enter phone number" required />
-				</div>
-				{user.type === "student" && (
-					<Input
-						type="text"
-						name="passport_id"
-						label="Passport/National ID"
-						onChange={(e) => setPassportID(e)}
-						value={passport_id}
-						placeholder="Enter National ID or Passport number"
-						required
-					/>
-				)}
-
-				<div className="flex flex-col gap-3 w-full">
-					<label className="font-normal text-base text-mti-gray-dim">Timezone</label>
-					<TimezoneSelect value={timezone} onChange={setTimezone} />
-				</div>
-
-				<GenderInput value={gender} onChange={setGender} />
-				{user.type === "corporate" && (
-					<Input name="position" onChange={setPosition} type="text" label="Position" placeholder="CEO, Head of Marketing..." required />
-				)}
-				{user.type !== "corporate" && <EmploymentStatusInput value={employment} onChange={setEmployment} />}
-			</form>
-
-			<div className="self-end flex justify-end w-full gap-8 absolute bottom-8 left-0 px-8">
-				<Button
-					className="lg:mt-8 max-w-[400px] w-full self-end"
-					color="purple"
-					onClick={save}
-					disabled={
-						isLoading ||
-						!country ||
-						!phone ||
-						!gender ||
-						(user.type === "corporate" ? !position : !employment) ||
-						(user.type === "agent" ? !companyName || !commercialRegistration : false)
-					}>
-					{!isLoading && "Save information"}
-					{isLoading && (
-						<div className="flex items-center justify-center">
-							<BsArrowRepeat className="text-white animate-spin" size={25} />
-						</div>
-					)}
-				</Button>
-			</div>
-		</div>
-	);
-}

src/components/Diagnostic.tsx

@@ -1,30 +1,36 @@
 import {infoButtonStyle} from "@/constants/buttonStyles";
+import {BAND_SCORES} from "@/constants/ielts";
 import {Module} from "@/interfaces";
 import {User} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
-import {getExam, getExamById} from "@/utils/exams";
-import {MODULE_ARRAY} from "@/utils/moduleUtils";
+import {getExamById} from "@/utils/exams";
 import {writingMarking} from "@/utils/score";
 import {Menu} from "@headlessui/react";
 import axios from "axios";
 import clsx from "clsx";
 import {capitalize} from "lodash";
 import {useRouter} from "next/router";
-import {useEffect, useState} from "react";
+import {useState} from "react";
 import {BsBook, BsChevronDown, BsHeadphones, BsMegaphone, BsPen, BsQuestionSquare} from "react-icons/bs";
 import {toast} from "react-toastify";
 import Button from "./Low/Button";
-import ModuleLevelSelector from "./Medium/ModuleLevelSelector";
 
 interface Props {
 	user: User;
 	onFinish: () => void;
 }
 
+const DIAGNOSTIC_EXAMS = [
+	["reading", "CurQtQoxWmHaJHeN0JW2"],
+	["listening", "Y6cMao8kUcVnPQOo6teV"],
+	["writing", "hbueuDaEZXV37EW7I12A"],
+	["speaking", "QVFm4pdcziJQZN2iUTDo"],
+];
+
 export default function Diagnostic({onFinish}: Props) {
 	const [focus, setFocus] = useState<"academic" | "general">();
-	const [levels, setLevels] = useState({reading: -1, listening: -1, writing: -1, speaking: -1, level: 0});
-	const [desiredLevels, setDesiredLevels] = useState({reading: 9, listening: 9, writing: 9, speaking: 9, level: 9});
+	const [levels, setLevels] = useState({reading: -1, listening: -1, writing: -1, speaking: -1});
+	const [desiredLevels, setDesiredLevels] = useState({reading: 9, listening: 9, writing: 9, speaking: 9});
 
 	const router = useRouter();
 
@@ -37,13 +43,13 @@ export default function Diagnostic({onFinish}: Props) {
 	};
 
 	const selectExam = () => {
-		const examPromises = MODULE_ARRAY.map((module) => getExam(module, true, "partial"));
+		const examPromises = DIAGNOSTIC_EXAMS.map((exam) => getExamById(exam[0] as Module, exam[1]));
 
 		Promise.all(examPromises).then((exams) => {
 			if (exams.every((x) => !!x)) {
 				setExams(exams.map((x) => x!));
 				setSelectedModules(exams.map((x) => x!.module));
-				router.push("/exercises");
+				router.push("/exam");
 			}
 		});
 	};
@@ -52,7 +58,7 @@ export default function Diagnostic({onFinish}: Props) {
 		axios
 			.patch("/api/users/update", {
 				focus,
-				levels: Object.values(levels).includes(-1) ? {reading: 0, listening: 0, writing: 0, speaking: 0, level: 0} : levels,
+				levels: Object.values(levels).includes(-1) ? {reading: -1, listening: -1, writing: -1, speaking: -1} : levels,
 				desiredLevels,
 				isFirstLogin: false,
 			})
@@ -67,7 +73,7 @@ export default function Diagnostic({onFinish}: Props) {
 			<div className="flex flex-col items-center justify-center gap-8 w-full">
 				<h2 className="font-semibold text-xl">What is your current focus?</h2>
 				<div className="flex flex-col gap-16 w-full">
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16">
+					<div className="grid grid-cols-2 gap-y-4 gap-x-16">
 						<button
 							onClick={() => setFocus("academic")}
 							className={clsx(
@@ -91,44 +97,131 @@ export default function Diagnostic({onFinish}: Props) {
 					</div>
 				</div>
 			</div>
-
 			<div className="flex flex-col items-center justify-center gap-8 w-full">
 				<h2 className="font-semibold text-xl">What is your current IELTS level?</h2>
-				<ModuleLevelSelector levels={levels} setLevels={setLevels} />
-			</div>
+				<div className="flex flex-col gap-16 w-full">
+					<div className="grid grid-cols-2 gap-y-4 gap-x-16">
+						<div className="w-full flex flex-col gap-3.5 relative">
+							<span className="text-sm text-mti-gray-dim">
+								<span className="font-bold">Reading</span> level
+							</span>
+							<Menu>
+								<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
+									<BsBook className="text-ielts-reading" size={34} />
+									<span className="text-mti-gray-cool text-sm">
+										{levels.reading === -1 ? "Select your reading level" : `Level ${levels.reading}`}
+									</span>
+									<BsChevronDown className="text-mti-gray-cool" size={12} />
+								</Menu.Button>
+								<Menu.Items className="absolute origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl overflow-hidden">
+									{Object.values(writingMarking).map((x) => (
+										<Menu.Item key={x}>
+											<span
+												onClick={() => setLevels((prev) => ({...prev, reading: x}))}
+												className="w-full py-4 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
+												Level {x}
+											</span>
+										</Menu.Item>
+									))}
+								</Menu.Items>
+							</Menu>
+						</div>
+						<div className="w-full flex flex-col gap-3.5 relative">
+							<span className="text-sm text-mti-gray-dim">
+								<span className="font-bold">Listening</span> level
+							</span>
+							<Menu>
+								<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
+									<BsHeadphones className="text-ielts-listening" size={34} />
+									<span className="text-mti-gray-cool text-sm">
+										{levels.listening === -1 ? "Select your listening level" : `Level ${levels.listening}`}
+									</span>
+									<BsChevronDown className="text-mti-gray-cool" size={12} />
+								</Menu.Button>
+								<Menu.Items className="absolute origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl overflow-hidden">
+									{Object.values(writingMarking).map((x) => (
+										<Menu.Item key={x}>
+											<span
+												onClick={() => setLevels((prev) => ({...prev, listening: x}))}
+												className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
+												Level {x}
+											</span>
+										</Menu.Item>
+									))}
+								</Menu.Items>
+							</Menu>
+						</div>
+						<div className="w-full flex flex-col gap-3.5 relative">
+							<span className="text-sm text-mti-gray-dim">
+								<span className="font-bold">Writing</span> level
+							</span>
+							<Menu>
+								<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
+									<BsPen className="text-ielts-writing" size={34} />
+									<span className="text-mti-gray-cool text-sm">
+										{levels.writing === -1 ? "Select your writing level" : `Level ${levels.writing}`}
+									</span>
+									<BsChevronDown className="text-mti-gray-cool" size={12} />
+								</Menu.Button>
+								<Menu.Items className="absolute origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl overflow-hidden">
+									{Object.values(writingMarking).map((x) => (
+										<Menu.Item key={x}>
+											<span
+												onClick={() => setLevels((prev) => ({...prev, writing: x}))}
+												className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
+												Level {x}
+											</span>
+										</Menu.Item>
+									))}
+								</Menu.Items>
+							</Menu>
+						</div>
+						<div className="w-full flex flex-col gap-3.5 relative">
+							<span className="text-sm text-mti-gray-dim">
+								<span className="font-bold">Speaking</span> level
+							</span>
+							<Menu>
+								<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
+									<BsMegaphone className="text-ielts-speaking" size={34} />
+									<span className="text-mti-gray-cool text-sm">
+										{levels.speaking === -1 ? "Select your speaking level" : `Level ${levels.speaking}`}
+									</span>
+									<BsChevronDown className="text-mti-gray-cool" size={12} />
+								</Menu.Button>
+								<Menu.Items className="absolute origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl">
+									{Object.values(writingMarking).map((x) => (
+										<Menu.Item key={x}>
+											<span
+												onClick={() => setLevels((prev) => ({...prev, speaking: x}))}
+												className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
+												Level {x}
+											</span>
+										</Menu.Item>
+									))}
+								</Menu.Items>
+							</Menu>
+						</div>
+					</div>
 
-			<div className="flex flex-col items-center justify-center gap-8 w-full mb-44">
-				<h2 className="font-semibold text-xl">What is your desired IELTS level?</h2>
-				<ModuleLevelSelector levels={desiredLevels} setLevels={setDesiredLevels} />
-			</div>
-
-			<div className="md:self-end flex -md:flex-col justify-between w-full gap-8 absolute bottom-8 left-0 px-4 md:px-8">
-				<div className="w-full tooltip" data-tip="Your screen size is too small to perform a diagnostic test">
-					<Button
-						color="purple"
-						variant="outline"
-						className="group flex items-center justify-center gap-6 relative md:max-w-[400px] w-full md:hidden"
-						disabled>
-						<BsQuestionSquare className="text-mti-purple-light transition duration-300 ease-in-out" size={20} />
-						<span>Perform diagnostic test instead</span>
-					</Button>
+					<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
+						<Button
+							onClick={() => updateUser(selectExam)}
+							color="purple"
+							variant="outline"
+							className="group flex items-center justify-center gap-6 relative max-w-[400px] w-full"
+							disabled={!focus}>
+							<BsQuestionSquare
+								className="text-mti-purple-light group-hover:text-white transition duration-300 ease-in-out"
+								size={20}
+								onClick={() => updateUser(selectExam)}
+							/>
+							<span onClick={() => updateUser(selectExam)}>Perform diagnostic test instead</span>
+						</Button>
+						<Button color="purple" className="max-w-[400px] w-full" onClick={() => updateUser(onFinish)} disabled={isNextDisabled()}>
+							Next Step
+						</Button>
+					</div>
 				</div>
-				<Button
-					onClick={() => updateUser(selectExam)}
-					color="purple"
-					variant="outline"
-					className="group flex items-center justify-center gap-6 relative md:max-w-[400px] w-full -md:hidden"
-					disabled={!focus}>
-					<BsQuestionSquare
-						className="text-mti-purple-light group-hover:text-white transition duration-300 ease-in-out"
-						size={20}
-						onClick={() => updateUser(selectExam)}
-					/>
-					<span onClick={() => updateUser(selectExam)}>Perform diagnostic test instead</span>
-				</Button>
-				<Button color="purple" className="md:max-w-[400px] w-full" onClick={() => updateUser(onFinish)} disabled={isNextDisabled()}>
-					Next Step
-				</Button>
 			</div>
 		</div>
 	);

src/components/Exercises/FillBlanks.tsx

@@ -35,10 +35,10 @@ function WordsDrawer({words, isOpen, blankId, previouslySelectedWord, onCancel,
 					<div className="rounded-full w-6 h-6 flex items-center justify-center text-white bg-mti-purple-light">{blankId}</div>
 					<span> Choose the correct word:</span>
 				</div>
-				<div className="grid grid-cols-6 gap-6" key="word-array">
+				<div className="grid grid-cols-6 gap-6">
 					{words.map(({word, isDisabled}) => (
 						<button
-							key={`${word}_${blankId}`}
+							key={word}
 							onClick={() => setSelectedWord((prev) => (prev === word ? undefined : word))}
 							className={clsx(
 								"rounded-full py-3 text-center transition duration-300 ease-in-out",
@@ -53,7 +53,7 @@ function WordsDrawer({words, isOpen, blankId, previouslySelectedWord, onCancel,
 				</div>
 				<div className="flex justify-between w-full">
 					<Button color="purple" variant="outline" className="max-w-[200px] w-full" onClick={onCancel}>
-						Cancel
+						Back
 					</Button>
 					<Button color="purple" className="max-w-[200px] w-full" onClick={() => onAnswer(selectedWord!)} disabled={!selectedWord}>
 						Confirm
@@ -81,7 +81,6 @@ export default function FillBlanks({
 	const [isDrawerShowing, setIsDrawerShowing] = useState(false);
 
 	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
-	const allBlanks = Array.from(text.match(/({{\d+}})/g) || []).map((x) => x.replaceAll("{", "").replaceAll("}", ""));
 
 	useEffect(() => {
 		setTimeout(() => setIsDrawerShowing(!!currentBlankId), 100);
@@ -94,10 +93,8 @@ export default function FillBlanks({
 
 	const calculateScore = () => {
 		const total = text.match(/({{\d+}})/g)?.length || 0;
-		const correct = answers.filter(
-			(x) => solutions.find((y) => x.id.toString() === y.id.toString())?.solution === x.solution.toLowerCase() || false,
-		).length;
-		const missing = total - answers.filter((x) => solutions.find((y) => x.id.toString() === y.id.toString())).length;
+		const correct = answers.filter((x) => solutions.find((y) => x.id === y.id)?.solution === x.solution.toLowerCase() || false).length;
+		const missing = total - answers.filter((x) => solutions.find((y) => x.id === y.id)).length;
 
 		return {total, correct, missing};
 	};
@@ -131,7 +128,6 @@ export default function FillBlanks({
 			<div className="flex flex-col gap-4 mt-4 h-full mb-20">
 				{(!!currentBlankId || isDrawerShowing) && (
 					<WordsDrawer
-						key={currentBlankId}
 						blankId={currentBlankId}
 						words={words.map((word) => ({word, isDisabled: allowRepetition ? false : answers.map((x) => x.solution).includes(word)}))}
 						previouslySelectedWord={currentBlankId ? answers.find((x) => x.id === currentBlankId)?.solution : undefined}
@@ -139,10 +135,6 @@ export default function FillBlanks({
 						onCancel={() => setCurrentBlankId(undefined)}
 						onAnswer={(solution: string) => {
 							setAnswers((prev) => [...prev.filter((x) => x.id !== currentBlankId), {id: currentBlankId!, solution}]);
-							if (allBlanks.findIndex((x) => x === currentBlankId) + 1 < allBlanks.length) {
-								setCurrentBlankId(allBlanks[allBlanks.findIndex((x) => x === currentBlankId) + 1]);
-								return;
-							}
 							setCurrentBlankId(undefined);
 						}}
 					/>

src/components/Exercises/InteractiveSpeaking.tsx

@@ -1,332 +0,0 @@
-import {InteractiveSpeakingExercise} from "@/interfaces/exam";
-import {CommonProps} from ".";
-import {useEffect, useState} from "react";
-import {BsCheckCircleFill, BsMicFill, BsPauseCircle, BsPlayCircle, BsTrashFill} from "react-icons/bs";
-import dynamic from "next/dynamic";
-import Button from "../Low/Button";
-import useExamStore from "@/stores/examStore";
-import {downloadBlob} from "@/utils/evaluation";
-import axios from "axios";
-
-const Waveform = dynamic(() => import("../Waveform"), {ssr: false});
-const ReactMediaRecorder = dynamic(() => import("react-media-recorder").then((mod) => mod.ReactMediaRecorder), {
-	ssr: false,
-});
-
-export default function InteractiveSpeaking({
-	id,
-	title,
-	examID,
-	text,
-	type,
-	prompts,
-	userSolutions,
-	updateIndex,
-	onNext,
-	onBack,
-}: InteractiveSpeakingExercise & CommonProps) {
-	const [recordingDuration, setRecordingDuration] = useState(0);
-	const [isRecording, setIsRecording] = useState(false);
-	const [mediaBlob, setMediaBlob] = useState<string>();
-	const [answers, setAnswers] = useState<{prompt: string; blob: string; questionIndex: number}[]>([]);
-	const [isLoading, setIsLoading] = useState(false);
-
-	const {questionIndex, setQuestionIndex} = useExamStore((state) => state);
-	const {userSolutions: storeUserSolutions, setUserSolutions} = useExamStore((state) => state);
-
-	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
-
-	const saveToStorage = async (previousURL?: string) => {
-		if (mediaBlob && mediaBlob.startsWith("blob")) {
-			const blobBuffer = await downloadBlob(mediaBlob);
-			const audioFile = new File([blobBuffer], "audio.wav", {type: "audio/wav"});
-
-			const seed = Math.random().toString().replace("0.", "");
-
-			const formData = new FormData();
-			formData.append("audio", audioFile, `${seed}.wav`);
-			formData.append("root", "speaking_recordings");
-
-			const config = {
-				headers: {
-					"Content-Type": "audio/wav",
-				},
-			};
-
-			const response = await axios.post<{path: string}>("/api/storage/insert", formData, config);
-			if (previousURL && !previousURL.startsWith("blob")) await axios.post("/api/storage/delete", {path: previousURL});
-			return response.data.path;
-		}
-
-		return undefined;
-	};
-
-	const back = async () => {
-		setIsLoading(true);
-
-		const answer = await saveAnswer(questionIndex);
-		if (questionIndex - 1 >= 0) {
-			setQuestionIndex(questionIndex - 1);
-			setIsLoading(false);
-
-			return;
-		}
-		setIsLoading(false);
-
-		onBack({
-			exercise: id,
-			solutions: [...answers.filter((x) => x.questionIndex !== questionIndex), answer],
-			score: {correct: 1, total: 1, missing: 0},
-			type,
-		});
-	};
-
-	const next = async () => {
-		setIsLoading(true);
-
-		const answer = await saveAnswer(questionIndex);
-		if (questionIndex + 1 < prompts.length) {
-			setQuestionIndex(questionIndex + 1);
-			setIsLoading(false);
-
-			return;
-		}
-		setIsLoading(false);
-
-		onNext({
-			exercise: id,
-			solutions: [...answers.filter((x) => x.questionIndex !== questionIndex), answer],
-			score: {correct: 1, total: 1, missing: 0},
-			type,
-		});
-	};
-
-	useEffect(() => {
-		if (userSolutions.length > 0 && answers.length === 0) {
-			console.log(userSolutions);
-			const solutions = userSolutions as unknown as typeof answers;
-			setAnswers(solutions);
-
-			if (!mediaBlob) setMediaBlob(solutions.find((x) => x.questionIndex === questionIndex)?.blob);
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [userSolutions, mediaBlob, answers]);
-
-	useEffect(() => {
-		console.log({answers});
-	}, [answers]);
-
-	useEffect(() => {
-		if (updateIndex) updateIndex(questionIndex);
-	}, [questionIndex, updateIndex]);
-
-	useEffect(() => {
-		if (hasExamEnded) {
-			const answer = {
-				questionIndex,
-				prompt: prompts[questionIndex].text,
-				blob: mediaBlob!,
-			};
-
-			onNext({
-				exercise: id,
-				solutions: [...answers.filter((x) => x.questionIndex !== questionIndex), answer],
-				score: {correct: 1, total: 1, missing: 0},
-				type,
-			});
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [hasExamEnded]);
-
-	useEffect(() => {
-		let recordingInterval: NodeJS.Timer | undefined = undefined;
-		if (isRecording) {
-			recordingInterval = setInterval(() => setRecordingDuration((prev) => prev + 1), 1000);
-		} else if (recordingInterval) {
-			clearInterval(recordingInterval);
-		}
-
-		return () => {
-			if (recordingInterval) clearInterval(recordingInterval);
-		};
-	}, [isRecording]);
-
-	useEffect(() => {
-		if (questionIndex <= answers.length - 1) {
-			const blob = answers.find((x) => x.questionIndex === questionIndex)?.blob;
-			setMediaBlob(blob);
-		}
-	}, [answers, questionIndex]);
-
-	const saveAnswer = async (index: number) => {
-		const previousURL = answers.find((x) => x.questionIndex === questionIndex)?.blob;
-		const audioPath = await saveToStorage(previousURL);
-
-		const answer = {
-			questionIndex,
-			prompt: prompts[questionIndex].text,
-			blob: audioPath ? audioPath : mediaBlob!,
-		};
-
-		setAnswers((prev) => [...prev.filter((x) => x.questionIndex !== index), answer]);
-		setMediaBlob(undefined);
-
-		setUserSolutions([
-			...storeUserSolutions.filter((x) => x.exercise !== id),
-			{
-				exercise: id,
-				solutions: [...answers.filter((x) => x.questionIndex !== questionIndex), answer],
-				score: {correct: 1, total: 1, missing: 0},
-				module: "speaking",
-				exam: examID,
-				type,
-			},
-		]);
-
-		return answer;
-	};
-
-	return (
-		<div className="flex flex-col h-full w-full gap-9">
-			<div className="flex flex-col w-full gap-8 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
-				<div className="flex flex-col gap-3">
-					<span className="font-semibold">{title}</span>
-				</div>
-				{prompts && prompts.length > 0 && (
-					<div className="flex flex-col gap-4 w-full items-center">
-						<video key={questionIndex} autoPlay controls className="max-w-3xl rounded-xl">
-							<source src={prompts[questionIndex].video_url} />
-						</video>
-					</div>
-				)}
-			</div>
-
-			<ReactMediaRecorder
-				audio
-				key={questionIndex}
-				onStop={(blob) => setMediaBlob(blob)}
-				render={({status, startRecording, stopRecording, pauseRecording, resumeRecording, clearBlobUrl, mediaBlobUrl}) => (
-					<div className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex-col gap-8 items-center">
-						<p className="text-base font-normal">Record your answer:</p>
-						<div className="flex gap-8 items-center justify-center py-8">
-							{status === "idle" && !mediaBlob && (
-								<>
-									<div className="w-full h-2 max-w-4xl bg-mti-gray-smoke rounded-full" />
-									{status === "idle" && (
-										<BsMicFill
-											onClick={() => {
-												setRecordingDuration(0);
-												startRecording();
-												setIsRecording(true);
-											}}
-											className="h-5 w-5 text-mti-gray-cool cursor-pointer"
-										/>
-									)}
-								</>
-							)}
-							{status === "recording" && (
-								<>
-									<div className="flex gap-4 items-center">
-										<span className="text-xs w-9">
-											{Math.floor(recordingDuration / 60)
-												.toString(10)
-												.padStart(2, "0")}
-											:
-											{Math.floor(recordingDuration % 60)
-												.toString(10)
-												.padStart(2, "0")}
-										</span>
-									</div>
-									<div className="w-full h-2 max-w-4xl bg-mti-gray-smoke rounded-full" />
-									<div className="flex gap-4 items-center">
-										<BsPauseCircle
-											onClick={() => {
-												setIsRecording(false);
-												pauseRecording();
-											}}
-											className="text-red-500 w-8 h-8 cursor-pointer"
-										/>
-										<BsCheckCircleFill
-											onClick={() => {
-												setIsRecording(false);
-												stopRecording();
-											}}
-											className="text-mti-purple-light w-8 h-8 cursor-pointer"
-										/>
-									</div>
-								</>
-							)}
-							{status === "paused" && (
-								<>
-									<div className="flex gap-4 items-center">
-										<span className="text-xs w-9">
-											{Math.floor(recordingDuration / 60)
-												.toString(10)
-												.padStart(2, "0")}
-											:
-											{Math.floor(recordingDuration % 60)
-												.toString(10)
-												.padStart(2, "0")}
-										</span>
-									</div>
-									<div className="w-full h-2 max-w-4xl bg-mti-gray-smoke rounded-full" />
-									<div className="flex gap-4 items-center">
-										<BsPlayCircle
-											onClick={() => {
-												setIsRecording(true);
-												resumeRecording();
-											}}
-											className="text-mti-purple-light w-8 h-8 cursor-pointer"
-										/>
-										<BsCheckCircleFill
-											onClick={() => {
-												setIsRecording(false);
-												stopRecording();
-											}}
-											className="text-mti-purple-light w-8 h-8 cursor-pointer"
-										/>
-									</div>
-								</>
-							)}
-							{((status === "stopped" && mediaBlobUrl) || (status === "idle" && mediaBlob)) && (
-								<>
-									<Waveform audio={mediaBlobUrl ? mediaBlobUrl : mediaBlob!} waveColor="#FCDDEC" progressColor="#EF5DA8" />
-									<div className="flex gap-4 items-center">
-										<BsTrashFill
-											className="text-mti-gray-cool cursor-pointer w-5 h-5"
-											onClick={() => {
-												setRecordingDuration(0);
-												clearBlobUrl();
-												setMediaBlob(undefined);
-											}}
-										/>
-
-										<BsMicFill
-											onClick={() => {
-												clearBlobUrl();
-												setRecordingDuration(0);
-												startRecording();
-												setIsRecording(true);
-												setMediaBlob(undefined);
-											}}
-											className="h-5 w-5 text-mti-gray-cool cursor-pointer"
-										/>
-									</div>
-								</>
-							)}
-						</div>
-					</div>
-				)}
-			/>
-
-			<div className="self-end flex justify-between w-full  gap-8">
-				<Button color="purple" variant="outline" isLoading={isLoading} onClick={back} className="max-w-[200px] self-end w-full">
-					Back
-				</Button>
-				<Button color="purple" disabled={!mediaBlob} isLoading={isLoading} onClick={next} className="max-w-[200px] self-end w-full">
-					{questionIndex + 1 < prompts.length ? "Next Prompt" : "Submit"}
-				</Button>
-			</div>
-		</div>
-	);
-}

src/components/Exercises/MatchSentences.tsx

@@ -18,10 +18,8 @@ export default function MatchSentences({id, options, type, prompt, sentences, us
 
 	const calculateScore = () => {
 		const total = sentences.length;
-		const correct = answers.filter(
-			(x) => sentences.find((y) => y.id.toString() === x.question.toString())?.solution === x.option || false,
-		).length;
-		const missing = total - answers.filter((x) => sentences.find((y) => y.id.toString() === x.question.toString())).length;
+		const correct = answers.filter((x) => sentences.find((y) => y.id === x.question)?.solution === x.option || false).length;
+		const missing = total - answers.filter((x) => sentences.find((y) => y.id === x.question)).length;
 
 		return {total, correct, missing};
 	};

src/components/Exercises/MultipleChoice.tsx

@@ -16,30 +16,30 @@ function Question({
 	return (
 		<div className="flex flex-col gap-10">
 			<span className="">{prompt}</span>
-			<div className="flex flex-wrap gap-4 justify-between">
+			<div className="flex justify-between">
 				{variant === "image" &&
 					options.map((option) => (
 						<div
-							key={option.id.toString()}
-							onClick={() => (onSelectOption ? onSelectOption(option.id.toString()) : null)}
+							key={option.id}
+							onClick={() => (onSelectOption ? onSelectOption(option.id) : null)}
 							className={clsx(
 								"flex flex-col items-center border border-mti-gray-platinum p-4 px-8 rounded-xl gap-4 cursor-pointer bg-white relative",
-								userSolution === option.id.toString() && "border-mti-purple-light",
+								userSolution === option.id && "border-mti-purple-light",
 							)}>
-							<span className={clsx("text-sm", userSolution !== option.id.toString() && "opacity-50")}>{option.id.toString()}</span>
-							<img src={option.src!} alt={`Option ${option.id.toString()}`} />
+							<span className={clsx("text-sm", userSolution !== option.id && "opacity-50")}>{option.id}</span>
+							<img src={option.src!} alt={`Option ${option.id}`} />
 						</div>
 					))}
 				{variant === "text" &&
 					options.map((option) => (
 						<div
-							key={option.id.toString()}
-							onClick={() => (onSelectOption ? onSelectOption(option.id.toString()) : null)}
+							key={option.id}
+							onClick={() => (onSelectOption ? onSelectOption(option.id) : null)}
 							className={clsx(
 								"flex border p-4 rounded-xl gap-2 cursor-pointer bg-white text-sm",
-								userSolution === option.id.toString() && "border-mti-purple-light",
+								userSolution === option.id && "border-mti-purple-light",
 							)}>
-							<span className="font-semibold">{option.id.toString()}.</span>
+							<span className="font-semibold">{option.id}.</span>
 							<span>{option.text}</span>
 						</div>
 					))}
@@ -48,38 +48,17 @@ function Question({
 	);
 }
 
-export default function MultipleChoice({
-	id,
-	prompt,
-	type,
-	questions,
-	userSolutions,
-	updateIndex,
-	onNext,
-	onBack,
-}: MultipleChoiceExercise & CommonProps) {
+export default function MultipleChoice({id, prompt, type, questions, userSolutions, onNext, onBack}: MultipleChoiceExercise & CommonProps) {
 	const [answers, setAnswers] = useState<{question: string; option: string}[]>(userSolutions);
+	const [questionIndex, setQuestionIndex] = useState(0);
 
-	const {questionIndex, setQuestionIndex} = useExamStore((state) => state);
-	const {userSolutions: storeUserSolutions, setUserSolutions} = useExamStore((state) => state);
 	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
 
-	const scrollToTop = () => Array.from(document.getElementsByTagName("body")).forEach((body) => body.scrollTo(0, 0));
-
-	useEffect(() => {
-		setUserSolutions([...storeUserSolutions.filter((x) => x.exercise !== id), {exercise: id, solutions: answers, score: calculateScore(), type}]);
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [answers]);
-
 	useEffect(() => {
 		if (hasExamEnded) onNext({exercise: id, solutions: answers, score: calculateScore(), type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [hasExamEnded]);
 
-	useEffect(() => {
-		if (updateIndex) updateIndex(questionIndex);
-	}, [questionIndex, updateIndex]);
-
 	const onSelectOption = (option: string) => {
 		const question = questions[questionIndex];
 		setAnswers((prev) => [...prev.filter((x) => x.question !== question.id), {option, question: question.id}]);
@@ -87,10 +66,8 @@ export default function MultipleChoice({
 
 	const calculateScore = () => {
 		const total = questions.length;
-		const correct = answers.filter(
-			(x) => questions.find((y) => y.id.toString() === x.question.toString())?.solution === x.option || false,
-		).length;
-		const missing = total - answers.filter((x) => questions.find((y) => y.id.toString() === x.question.toString())).length;
+		const correct = answers.filter((x) => questions.find((y) => y.id === x.question)?.solution === x.option || false).length;
+		const missing = total - answers.filter((x) => questions.find((y) => y.id === x.question)).length;
 
 		return {total, correct, missing};
 	};
@@ -99,25 +76,21 @@ export default function MultipleChoice({
 		if (questionIndex === questions.length - 1) {
 			onNext({exercise: id, solutions: answers, score: calculateScore(), type});
 		} else {
-			setQuestionIndex(questionIndex + 1);
+			setQuestionIndex((prev) => prev + 1);
 		}
-
-		scrollToTop();
 	};
 
 	const back = () => {
 		if (questionIndex === 0) {
 			onBack({exercise: id, solutions: answers, score: calculateScore(), type});
 		} else {
-			setQuestionIndex(questionIndex - 1);
+			setQuestionIndex((prev) => prev - 1);
 		}
-
-		scrollToTop();
 	};
 
 	return (
 		<>
-			<div className="flex flex-col gap-2 mt-4 h-fit mb-20 bg-mti-gray-smoke rounded-xl px-16 py-8">
+			<div className="flex flex-col gap-2 mt-4 h-full mb-20 bg-mti-gray-smoke rounded-xl px-16 py-8">
 				<span className="text-xl font-semibold">{prompt}</span>
 				{questionIndex < questions.length && (
 					<Question

src/components/Exercises/Speaking.tsx

@@ -5,58 +5,28 @@ import {BsCheckCircleFill, BsMicFill, BsPauseCircle, BsPlayCircle, BsTrashFill}
 import dynamic from "next/dynamic";
 import Button from "../Low/Button";
 import useExamStore from "@/stores/examStore";
-import {downloadBlob} from "@/utils/evaluation";
-import axios from "axios";
 
 const Waveform = dynamic(() => import("../Waveform"), {ssr: false});
 const ReactMediaRecorder = dynamic(() => import("react-media-recorder").then((mod) => mod.ReactMediaRecorder), {
 	ssr: false,
 });
 
-export default function Speaking({id, title, text, video_url, type, prompts, userSolutions, onNext, onBack}: SpeakingExercise & CommonProps) {
+export default function Speaking({id, title, text, type, prompts, onNext, onBack}: SpeakingExercise & CommonProps) {
 	const [recordingDuration, setRecordingDuration] = useState(0);
 	const [isRecording, setIsRecording] = useState(false);
 	const [mediaBlob, setMediaBlob] = useState<string>();
-	const [audioURL, setAudioURL] = useState<string>();
-	const [isLoading, setIsLoading] = useState(false);
 
 	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
 
-	const saveToStorage = async () => {
-		if (mediaBlob && mediaBlob.startsWith("blob")) {
-			const blobBuffer = await downloadBlob(mediaBlob);
-			const audioFile = new File([blobBuffer], "audio.wav", {type: "audio/wav"});
-
-			const seed = Math.random().toString().replace("0.", "");
-
-			const formData = new FormData();
-			formData.append("audio", audioFile, `${seed}.wav`);
-			formData.append("root", "speaking_recordings");
-
-			const config = {
-				headers: {
-					"Content-Type": "audio/wav",
-				},
-			};
-
-			const response = await axios.post<{path: string}>("/api/storage/insert", formData, config);
-			if (audioURL) await axios.post("/api/storage/delete", {path: audioURL});
-			return response.data.path;
-		}
-
-		return undefined;
-	};
-
 	useEffect(() => {
-		if (userSolutions.length > 0) {
-			const {solution} = userSolutions[0] as {solution?: string};
-			if (solution && !mediaBlob) setMediaBlob(solution);
-			if (solution && !solution.startsWith("blob")) setAudioURL(solution);
+		if (hasExamEnded) {
+			onNext({
+				exercise: id,
+				solutions: mediaBlob ? [{id, solution: mediaBlob}] : [],
+				score: {correct: 1, total: 1, missing: 0},
+				type,
+			});
 		}
-	}, [userSolutions, mediaBlob]);
-
-	useEffect(() => {
-		if (hasExamEnded) next();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [hasExamEnded]);
 
@@ -73,69 +43,32 @@ export default function Speaking({id, title, text, video_url, type, prompts, use
 		};
 	}, [isRecording]);
 
-	const next = async () => {
-		setIsLoading(true);
-		const storagePath = await saveToStorage();
-		setIsLoading(false);
-
-		onNext({
-			exercise: id,
-			solutions: storagePath ? [{id, solution: storagePath}] : [],
-			score: {correct: 1, total: 1, missing: 0},
-			type,
-		});
-	};
-
-	const back = async () => {
-		setIsLoading(true);
-		const storagePath = await saveToStorage();
-		setIsLoading(false);
-
-		onBack({
-			exercise: id,
-			solutions: storagePath ? [{id, solution: storagePath}] : [],
-			score: {correct: 1, total: 1, missing: 0},
-			type,
-		});
-	};
-
 	return (
 		<div className="flex flex-col h-full w-full gap-9">
-			<div className="flex flex-col w-full gap-2 bg-mti-gray-smoke rounded-xl py-8 px-16">
+			<div className="flex flex-col w-full gap-14 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
 				<div className="flex flex-col gap-3">
 					<span className="font-semibold">{title}</span>
-					{!video_url && (
-						<span className="font-regular">
-							{text.split("\\n").map((line, index) => (
-								<Fragment key={index}>
-									<span>{line}</span>
-									<br />
-								</Fragment>
+					<span className="font-regular">
+						{text.split("\\n").map((line, index) => (
+							<Fragment key={index}>
+								<span>{line}</span>
+								<br />
+							</Fragment>
+						))}
+					</span>
+				</div>
+				{prompts && prompts.length > 0 && (
+					<div className="flex flex-col gap-4">
+						<span className="font-bold">You should talk about the following things:</span>
+						<div className="flex flex-col gap-1 ml-4">
+							{prompts.map((x, index) => (
+								<li className="italic" key={index}>
+									{x}
+								</li>
 							))}
-						</span>
-					)}
-				</div>
-				<div className="flex gap-6">
-					{video_url && (
-						<div className="flex flex-col gap-4 w-full items-center">
-							<video key={id} autoPlay controls className="max-w-3xl rounded-xl">
-								<source src={video_url} />
-							</video>
 						</div>
-					)}
-					{prompts && prompts.length > 0 && (
-						<div className="flex flex-col gap-4">
-							<span className="font-bold">You should talk about the following things:</span>
-							<div className="flex flex-col gap-1 ml-4">
-								{prompts.map((x, index) => (
-									<li className="italic" key={index}>
-										{x}
-									</li>
-								))}
-							</div>
-						</div>
-					)}
-				</div>
+					</div>
+				)}
 			</div>
 
 			<ReactMediaRecorder
@@ -145,7 +78,7 @@ export default function Speaking({id, title, text, video_url, type, prompts, use
 					<div className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex-col gap-8 items-center">
 						<p className="text-base font-normal">Record your answer:</p>
 						<div className="flex gap-8 items-center justify-center py-8">
-							{status === "idle" && !mediaBlob && (
+							{status === "idle" && (
 								<>
 									<div className="w-full h-2 max-w-4xl bg-mti-gray-smoke rounded-full" />
 									{status === "idle" && (
@@ -224,9 +157,9 @@ export default function Speaking({id, title, text, video_url, type, prompts, use
 									</div>
 								</>
 							)}
-							{((status === "stopped" && mediaBlobUrl) || (status === "idle" && mediaBlob)) && (
+							{status === "stopped" && mediaBlobUrl && (
 								<>
-									<Waveform audio={mediaBlobUrl ? mediaBlobUrl : mediaBlob!} waveColor="#FCDDEC" progressColor="#EF5DA8" />
+									<Waveform audio={mediaBlobUrl} waveColor="#FCDDEC" progressColor="#EF5DA8" />
 									<div className="flex gap-4 items-center">
 										<BsTrashFill
 											className="text-mti-gray-cool cursor-pointer w-5 h-5"
@@ -256,10 +189,32 @@ export default function Speaking({id, title, text, video_url, type, prompts, use
 			/>
 
 			<div className="self-end flex justify-between w-full  gap-8">
-				<Button color="purple" variant="outline" isLoading={isLoading} onClick={back} className="max-w-[200px] self-end w-full">
+				<Button
+					color="purple"
+					variant="outline"
+					onClick={() =>
+						onBack({
+							exercise: id,
+							solutions: mediaBlob ? [{id, solution: mediaBlob}] : [],
+							score: {correct: 1, total: 1, missing: 0},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
 					Back
 				</Button>
-				<Button color="purple" isLoading={isLoading} disabled={!mediaBlob} onClick={next} className="max-w-[200px] self-end w-full">
+				<Button
+					color="purple"
+					disabled={!mediaBlob}
+					onClick={() =>
+						onNext({
+							exercise: id,
+							solutions: mediaBlob ? [{id, solution: mediaBlob}] : [],
+							score: {correct: 1, total: 1, missing: 0},
+							type,
+						})
+					}
+					className="max-w-[200px] self-end w-full">
 					Next
 				</Button>
 			</div>

src/components/Exercises/TrueFalse.tsx

@@ -16,14 +16,8 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o
 
 	const calculateScore = () => {
 		const total = questions.length || 0;
-		const correct = answers.filter(
-			(x) =>
-				questions
-					.find((y) => x.id.toString() === y.id.toString())
-					?.solution?.toString()
-					.toLowerCase() === x.solution.toLowerCase() || false,
-		).length;
-		const missing = total - answers.filter((x) => questions.find((y) => x.id.toString() === y.id.toString())).length;
+		const correct = answers.filter((x) => questions.find((y) => x.id === y.id)?.solution === x.solution.toLowerCase() || false).length;
+		const missing = total - answers.filter((x) => questions.find((y) => x.id === y.id)).length;
 
 		return {total, correct, missing};
 	};
@@ -66,37 +60,33 @@ export default function TrueFalse({id, type, prompt, questions, userSolutions, o
 				</div>
 				<span className="text-sm w-full leading-6">You can click a selected option again to deselect it.</span>
 				<div className="bg-mti-gray-smoke rounded-xl px-5 py-6 flex flex-col gap-8">
-					{questions.map((question, index) => {
-						const id = question.id.toString();
-
-						return (
-							<div key={question.id.toString()} className="flex flex-col gap-4">
-								<span>
-									{index + 1}. {question.prompt}
-								</span>
-								<div className="flex gap-4">
-									<Button
-										variant={answers.find((x) => x.id.toString() === id)?.solution === "true" ? "solid" : "outline"}
-										onClick={() => toggleAnswer("true", id)}
-										className="!py-2">
-										True
-									</Button>
-									<Button
-										variant={answers.find((x) => x.id.toString() === id)?.solution === "false" ? "solid" : "outline"}
-										onClick={() => toggleAnswer("false", id)}
-										className="!py-2">
-										False
-									</Button>
-									<Button
-										variant={answers.find((x) => x.id.toString() === id)?.solution === "not_given" ? "solid" : "outline"}
-										onClick={() => toggleAnswer("not_given", id)}
-										className="!py-2">
-										Not Given
-									</Button>
-								</div>
+					{questions.map((question, index) => (
+						<div key={question.id} className="flex flex-col gap-4">
+							<span>
+								{index + 1}. {question.prompt}
+							</span>
+							<div className="flex gap-4">
+								<Button
+									variant={answers.find((x) => x.id === question.id)?.solution === "true" ? "solid" : "outline"}
+									onClick={() => toggleAnswer("true", question.id)}
+									className="!py-2">
+									True
+								</Button>
+								<Button
+									variant={answers.find((x) => x.id === question.id)?.solution === "false" ? "solid" : "outline"}
+									onClick={() => toggleAnswer("false", question.id)}
+									className="!py-2">
+									False
+								</Button>
+								<Button
+									variant={answers.find((x) => x.id === question.id)?.solution === "not_given" ? "solid" : "outline"}
+									onClick={() => toggleAnswer("not_given", question.id)}
+									className="!py-2">
+									Not Given
+								</Button>
 							</div>
-						);
-					})}
+						</div>
+					))}
 				</div>
 			</div>
 

src/components/Exercises/WriteBlanks.tsx

@@ -27,8 +27,8 @@ function Blank({
 	const [userInput, setUserInput] = useState(userSolution || "");
 
 	useEffect(() => {
-		const words = userInput.split(" ");
-		if (words.length > maxWords) {
+		const words = userInput.split(" ").filter((x) => x !== "");
+		if (words.length >= maxWords) {
 			toast.warning(`You have reached your word limit of ${maxWords} words!`, {toastId: "word-limit"});
 			setUserInput(words.join(" ").trim());
 		}
@@ -36,7 +36,7 @@ function Blank({
 
 	return (
 		<input
-			className="py-2 px-3 mx-2 rounded-2xl w-48 bg-white focus:outline-none my-2"
+			className="py-2 px-3 rounded-2xl w-48 bg-white focus:outline-none my-2"
 			placeholder={id}
 			onChange={(e) => setUserInput(e.target.value)}
 			onBlur={() => setUserSolution(userInput)}
@@ -61,9 +61,9 @@ export default function WriteBlanks({id, prompt, type, maxWords, solutions, user
 		const correct = answers.filter(
 			(x) =>
 				solutions
-					.find((y) => x.id.toString() === y.id.toString())
-					?.solution.map((y) => y.toLowerCase().trim())
-					.includes(x.solution.toLowerCase().trim()) || false,
+					.find((y) => x.id === y.id)
+					?.solution.map((y) => y.toLowerCase())
+					.includes(x.solution.toLowerCase()) || false,
 		).length;
 		const missing = total - answers.filter((x) => solutions.find((y) => x.id === y.id)).length;
 
@@ -91,10 +91,10 @@ export default function WriteBlanks({id, prompt, type, maxWords, solutions, user
 			<div className="flex flex-col gap-4 mt-4 h-full mb-20">
 				<span className="text-sm w-full leading-6">
 					{prompt.split("\\n").map((line, index) => (
-						<span key={index}>
+						<Fragment key={index}>
 							{line}
 							<br />
-						</span>
+						</Fragment>
 					))}
 				</span>
 				<span className="bg-mti-gray-smoke rounded-xl px-5 py-6">

src/components/Exercises/Writing.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import {WritingExercise} from "@/interfaces/exam";
 import {CommonProps} from ".";
-import React, {Fragment, useEffect, useRef, useState} from "react";
+import {Fragment, useEffect, useState} from "react";
 import {toast} from "react-toastify";
 import Button from "../Low/Button";
 import {Dialog, Transition} from "@headlessui/react";
@@ -22,47 +22,9 @@ export default function Writing({
 	const [isModalOpen, setIsModalOpen] = useState(false);
 	const [inputText, setInputText] = useState(userSolutions.length === 1 ? userSolutions[0].solution : "");
 	const [isSubmitEnabled, setIsSubmitEnabled] = useState(false);
-	const [saveTimer, setSaveTimer] = useState(0);
 
-	const {userSolutions: storeUserSolutions, setUserSolutions} = useExamStore((state) => state);
 	const hasExamEnded = useExamStore((state) => state.hasExamEnded);
 
-	useEffect(() => {
-		const saveTimerInterval = setInterval(() => {
-			setSaveTimer((prev) => prev + 1);
-		}, 1000);
-
-		return () => {
-			clearInterval(saveTimerInterval);
-		};
-	}, []);
-
-	useEffect(() => {
-		if (inputText.length > 0 && saveTimer % 10 === 0) {
-			setUserSolutions([
-				...storeUserSolutions.filter((x) => x.exercise !== id),
-				{exercise: id, solutions: [{id, solution: inputText}], score: {correct: 1, total: 1, missing: 0}, type},
-			]);
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [saveTimer]);
-
-	useEffect(() => {
-		if (localStorage.getItem("enable_paste")) return;
-
-		const listener = (e: KeyboardEvent) => {
-			if ((e.ctrlKey || e.metaKey) && e.key === "v") {
-				e.preventDefault();
-			}
-		};
-
-		document.addEventListener("keydown", listener);
-
-		return () => {
-			document.removeEventListener("keydown", listener);
-		};
-	}, []);
-
 	useEffect(() => {
 		if (hasExamEnded) onNext({exercise: id, solutions: [{id, solution: inputText}], score: {correct: 1, total: 1, missing: 0}, type});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -117,8 +79,22 @@ export default function Writing({
 			)}
 			<div className="flex flex-col h-full w-full gap-9 mb-20">
 				<div className="flex flex-col w-full gap-7 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
-					<span className="whitespace-pre-wrap">{prefix.replaceAll("\\n", "\n")}</span>
-					<span className="font-semibold whitespace-pre-wrap">{prompt.replaceAll("\\n", "\n")}</span>
+					<span>
+						{prefix.split("\\n").map((line) => (
+							<>
+								{line}
+								<br />
+							</>
+						))}
+					</span>
+					<span className="font-semibold">
+						{prompt.split("\\n").map((line, index) => (
+							<Fragment key={index}>
+								<p>{line}</p>
+								<br />
+							</Fragment>
+						))}
+					</span>
 					{attachment && (
 						<img
 							onClick={() => setIsModalOpen(true)}
@@ -130,16 +106,20 @@ export default function Writing({
 				</div>
 
 				<div className="w-full h-full flex flex-col gap-4">
-					<span className="whitespace-pre-wrap">{suffix}</span>
+					<span>
+						{suffix.split("\\n").map((line) => (
+							<>
+								{line}
+								<br />
+							</>
+						))}
+					</span>
 					<textarea
-						onContextMenu={(e) => e.preventDefault()}
-						className="w-full h-full min-h-[300px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
+						className="w-full h-full min-h-[148px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
 						onChange={(e) => setInputText(e.target.value)}
 						value={inputText}
 						placeholder="Write your text here..."
-						spellCheck={false}
 					/>
-					<span className="text-base self-end text-mti-gray-cool">Word Count: {inputText.split(" ").filter((x) => x !== "").length}</span>
 				</div>
 			</div>
 
@@ -154,14 +134,7 @@ export default function Writing({
 				<Button
 					color="purple"
 					disabled={!isSubmitEnabled}
-					onClick={() =>
-						onNext({
-							exercise: id,
-							solutions: [{id, solution: inputText.replaceAll(/\s{2,}/g, " ")}],
-							score: {correct: 1, total: 1, missing: 0},
-							type,
-						})
-					}
+					onClick={() => onNext({exercise: id, solutions: [{id, solution: inputText}], score: {correct: 1, total: 1, missing: 0}, type})}
 					className="max-w-[200px] self-end w-full">
 					Next
 				</Button>

src/components/Exercises/index.tsx

@@ -1,7 +1,6 @@
 import {
 	Exercise,
 	FillBlanksExercise,
-	InteractiveSpeakingExercise,
 	MatchSentencesExercise,
 	MultipleChoiceExercise,
 	SpeakingExercise,
@@ -17,58 +16,29 @@ import WriteBlanks from "./WriteBlanks";
 import Writing from "./Writing";
 import Speaking from "./Speaking";
 import TrueFalse from "./TrueFalse";
-import InteractiveSpeaking from "./InteractiveSpeaking";
 
 const MatchSentences = dynamic(() => import("@/components/Exercises/MatchSentences"), {ssr: false});
 
 export interface CommonProps {
-	examID?: string;
-	updateIndex?: (internalIndex: number) => void;
 	onNext: (userSolutions: UserSolution) => void;
 	onBack: (userSolutions: UserSolution) => void;
 }
 
-export const renderExercise = (
-	exercise: Exercise,
-	examID: string,
-	onNext: (userSolutions: UserSolution) => void,
-	onBack: (userSolutions: UserSolution) => void,
-	updateIndex?: (internalIndex: number) => void,
-) => {
+export const renderExercise = (exercise: Exercise, onNext: (userSolutions: UserSolution) => void, onBack: (userSolutions: UserSolution) => void) => {
 	switch (exercise.type) {
 		case "fillBlanks":
-			return <FillBlanks key={exercise.id} {...(exercise as FillBlanksExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
+			return <FillBlanks {...(exercise as FillBlanksExercise)} onNext={onNext} onBack={onBack} />;
 		case "trueFalse":
-			return <TrueFalse key={exercise.id} {...(exercise as TrueFalseExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
+			return <TrueFalse {...(exercise as TrueFalseExercise)} onNext={onNext} onBack={onBack} />;
 		case "matchSentences":
-			return <MatchSentences key={exercise.id} {...(exercise as MatchSentencesExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
+			return <MatchSentences {...(exercise as MatchSentencesExercise)} onNext={onNext} onBack={onBack} />;
 		case "multipleChoice":
-			return (
-				<MultipleChoice
-					key={exercise.id}
-					{...(exercise as MultipleChoiceExercise)}
-					updateIndex={updateIndex}
-					onNext={onNext}
-					onBack={onBack}
-					examID={examID}
-				/>
-			);
+			return <MultipleChoice {...(exercise as MultipleChoiceExercise)} onNext={onNext} onBack={onBack} />;
 		case "writeBlanks":
-			return <WriteBlanks key={exercise.id} {...(exercise as WriteBlanksExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
+			return <WriteBlanks {...(exercise as WriteBlanksExercise)} onNext={onNext} onBack={onBack} />;
 		case "writing":
-			return <Writing key={exercise.id} {...(exercise as WritingExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
+			return <Writing {...(exercise as WritingExercise)} onNext={onNext} onBack={onBack} />;
 		case "speaking":
-			return <Speaking key={exercise.id} {...(exercise as SpeakingExercise)} onNext={onNext} onBack={onBack} examID={examID} />;
-		case "interactiveSpeaking":
-			return (
-				<InteractiveSpeaking
-					key={exercise.id}
-					{...(exercise as InteractiveSpeakingExercise)}
-					examID={examID}
-					updateIndex={updateIndex}
-					onNext={onNext}
-					onBack={onBack}
-				/>
-			);
+			return <Speaking {...(exercise as SpeakingExercise)} onNext={onNext} onBack={onBack} />;
 	}
 };

src/components/FocusLayer.tsx

@@ -1,9 +1,13 @@
 import {useEffect, useState} from "react";
 
 interface Props {
-	onFocusLayerMouseEnter?: () => void;
+	onFocusLayerMouseEnter: Function,
 }
 
-export default function FocusLayer({onFocusLayerMouseEnter}: Props) {
-	return <div className="absolute top-0 left-0 bottom-0 right-0" onMouseDown={onFocusLayerMouseEnter} />;
+export default function FocusLayer({
+	onFocusLayerMouseEnter,
+}: Props) {
+	return (
+		<div className="bg-gray-700 bg-opacity-30 absolute top-0 left-0 bottom-0 right-0" onMouseEnter={onFocusLayerMouseEnter}/>
+	);
 }

src/components/High/EmploymentStatusInput.tsx

@@ -1,32 +0,0 @@
-import {EmploymentStatus, EMPLOYMENT_STATUS} from "@/interfaces/user";
-import {RadioGroup} from "@headlessui/react";
-import clsx from "clsx";
-
-interface Props {
-	value?: EmploymentStatus;
-	onChange: (value?: EmploymentStatus) => void;
-}
-
-export default function EmploymentStatusInput({value, onChange}: Props) {
-	return (
-		<div className="relative flex flex-col gap-3 w-full">
-			<label className="font-normal text-base text-mti-gray-dim">Employment Status *</label>
-			<RadioGroup value={value} onChange={onChange} className="grid grid-cols-2 items-center gap-4 place-items-center">
-				{EMPLOYMENT_STATUS.map(({status, label}) => (
-					<RadioGroup.Option value={status} key={status}>
-						{({checked}) => (
-							<span
-								className={clsx(
-									"px-6 py-4 w-40 md:w-48 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-									"transition duration-300 ease-in-out",
-									!checked ? "bg-white border-mti-gray-platinum" : "bg-mti-purple-light border-mti-purple-dark text-white",
-								)}>
-								{label}
-							</span>
-						)}
-					</RadioGroup.Option>
-				))}
-			</RadioGroup>
-		</div>
-	);
-}

src/components/High/GenderInput.tsx

@@ -1,54 +0,0 @@
-import {Gender} from "@/interfaces/user";
-import {RadioGroup} from "@headlessui/react";
-import clsx from "clsx";
-
-interface Props {
-	value?: Gender;
-	onChange: (value?: Gender) => void;
-}
-
-export default function GenderInput({value, onChange}: Props) {
-	return (
-		<div className="relative flex flex-col gap-3 w-full">
-			<label className="font-normal text-base text-mti-gray-dim">Gender *</label>
-			<RadioGroup value={value} onChange={onChange} className="flex flex-row gap-4 justify-between">
-				<RadioGroup.Option value="male">
-					{({checked}) => (
-						<span
-							className={clsx(
-								"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-								"transition duration-300 ease-in-out",
-								!checked ? "bg-white border-mti-gray-platinum" : "bg-mti-purple-light border-mti-purple-dark text-white",
-							)}>
-							Male
-						</span>
-					)}
-				</RadioGroup.Option>
-				<RadioGroup.Option value="female">
-					{({checked}) => (
-						<span
-							className={clsx(
-								"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-								"transition duration-300 ease-in-out",
-								!checked ? "bg-white border-mti-gray-platinum" : "bg-mti-purple-light border-mti-purple-dark text-white",
-							)}>
-							Female
-						</span>
-					)}
-				</RadioGroup.Option>
-				<RadioGroup.Option value="other">
-					{({checked}) => (
-						<span
-							className={clsx(
-								"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-								"transition duration-300 ease-in-out",
-								!checked ? "bg-white border-mti-gray-platinum" : "bg-mti-purple-light border-mti-purple-dark text-white",
-							)}>
-							Other
-						</span>
-					)}
-				</RadioGroup.Option>
-			</RadioGroup>
-		</div>
-	);
-}

src/components/High/Layout.tsx

@@ -1,7 +1,6 @@
 import {User} from "@/interfaces/user";
 import clsx from "clsx";
 import {useRouter} from "next/router";
-import BottomBar from "../BottomBar";
 import Navbar from "../Navbar";
 import Sidebar from "../Sidebar";
 
@@ -10,34 +9,21 @@ interface Props {
 	children: React.ReactNode;
 	className?: string;
 	navDisabled?: boolean;
-	focusMode?: boolean;
-	onFocusLayerMouseEnter?: () => void;
+	focusMode?: boolean
+	onFocusLayerMouseEnter?: Function;
 }
 
-export default function Layout({user, children, className, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
+export default function Layout({user, children, className, navDisabled = false, focusMode = false, onFocusLayerMouseEnter }: Props) {
 	const router = useRouter();
 
 	return (
-		<main className="w-full min-h-full h-screen flex flex-col bg-mti-gray-smoke relative">
-			<Navbar
-				path={router.pathname}
-				user={user}
-				navDisabled={navDisabled}
-				focusMode={focusMode}
-				onFocusLayerMouseEnter={onFocusLayerMouseEnter}
-			/>
+		<main className="w-full min-h-full h-screen flex flex-col bg-mti-gray-smoke">
+			<Navbar user={user} navDisabled={navDisabled} focusMode={focusMode} onFocusLayerMouseEnter={onFocusLayerMouseEnter} />
 			<div className="h-full w-full flex gap-2">
-				<Sidebar
-					path={router.pathname}
-					navDisabled={navDisabled}
-					focusMode={focusMode}
-					onFocusLayerMouseEnter={onFocusLayerMouseEnter}
-					className="-md:hidden"
-					userType={user.type}
-				/>
+				<Sidebar path={router.pathname} navDisabled={navDisabled} focusMode={focusMode} onFocusLayerMouseEnter={onFocusLayerMouseEnter}/>
 				<div
 					className={clsx(
-						"w-full min-h-full h-fit md:mr-8 bg-white shadow-md rounded-2xl p-4 xl:p-10 pb-8 flex flex-col gap-8 relative overflow-hidden mt-2",
+						"w-5/6 min-h-full h-fit mr-8 bg-white shadow-md rounded-2xl p-12 pb-8 flex flex-col gap-12 relative overflow-hidden mt-2",
 						className,
 					)}>
 					{children}

src/components/High/TicketDisplay.tsx

@@ -1,254 +0,0 @@
-import useUsers from "@/hooks/useUsers";
-import {
-  Ticket,
-  TicketStatus,
-  TicketStatusLabel,
-  TicketType,
-  TicketTypeLabel,
-} from "@/interfaces/ticket";
-import { User } from "@/interfaces/user";
-import { USER_TYPE_LABELS } from "@/resources/user";
-import axios from "axios";
-import moment from "moment";
-import { useState } from "react";
-import { toast } from "react-toastify";
-import ShortUniqueId from "short-unique-id";
-import Button from "../Low/Button";
-import Input from "../Low/Input";
-import Select from "../Low/Select";
-
-interface Props {
-  user: User;
-  ticket: Ticket;
-  onClose: () => void;
-}
-
-export default function TicketDisplay({ user, ticket, onClose }: Props) {
-  const [subject] = useState(ticket.subject);
-  const [type, setType] = useState<TicketType>(ticket.type);
-  const [description] = useState(ticket.description);
-  const [reporter] = useState(ticket.reporter);
-  const [reportedFrom] = useState(ticket.reportedFrom);
-  const [status, setStatus] = useState(ticket.status);
-  const [assignedTo, setAssignedTo] = useState<string | null>(
-    ticket.assignedTo || null,
-  );
-  const [isLoading, setIsLoading] = useState(false);
-
-  const { users } = useUsers();
-
-  const submit = () => {
-    if (!type)
-      return toast.error("Please choose a type!", { toastId: "missing-type" });
-
-    setIsLoading(true);
-    axios
-      .patch(`/api/tickets/${ticket.id}`, {
-        subject,
-        type,
-        description,
-        reporter,
-        reportedFrom,
-        status,
-        assignedTo,
-      })
-      .then(() => {
-        toast.success(`The ticket has been updated!`, { toastId: "submitted" });
-        onClose();
-      })
-      .catch((e) => {
-        console.error(e);
-        toast.error("Something went wrong, please try again later!", {
-          toastId: "error",
-        });
-      })
-      .finally(() => setIsLoading(false));
-  };
-
-  const del = () => {
-    if (!confirm("Are you sure you want to delete this ticket?")) return;
-
-    setIsLoading(true);
-    axios
-      .delete(`/api/tickets/${ticket.id}`)
-      .then(() => {
-        toast.success(`The ticket has been deleted!`, { toastId: "submitted" });
-        onClose();
-      })
-      .catch((e) => {
-        console.error(e);
-        toast.error("Something went wrong, please try again later!", {
-          toastId: "error",
-        });
-      })
-      .finally(() => setIsLoading(false));
-  };
-
-  return (
-    <form className="flex flex-col gap-4 pt-8">
-      <Input
-        label="Subject"
-        type="text"
-        name="subject"
-        placeholder="Subject..."
-        value={subject}
-        onChange={(e) => null}
-        disabled
-      />
-
-      <div className="-md:flex-col flex w-full items-center gap-4">
-        <div className="flex w-full flex-col gap-3">
-          <label className="text-mti-gray-dim text-base font-normal">
-            Status
-          </label>
-          <Select
-            options={Object.keys(TicketStatusLabel).map((x) => ({
-              value: x,
-              label: TicketStatusLabel[x as keyof typeof TicketStatusLabel],
-            }))}
-            value={{ value: status, label: TicketStatusLabel[status] }}
-            onChange={(value) =>
-              setStatus((value?.value as TicketStatus) ?? undefined)
-            }
-            placeholder="Status..."
-          />
-        </div>
-        <div className="flex w-full flex-col gap-3">
-          <label className="text-mti-gray-dim text-base font-normal">
-            Type
-          </label>
-          <Select
-            options={Object.keys(TicketTypeLabel).map((x) => ({
-              value: x,
-              label: TicketTypeLabel[x as keyof typeof TicketTypeLabel],
-            }))}
-            value={{ value: type, label: TicketTypeLabel[type] }}
-            onChange={(value) => setType(value!.value as TicketType)}
-            placeholder="Type..."
-          />
-        </div>
-      </div>
-
-      <div className="flex w-full flex-col gap-3">
-        <label className="text-mti-gray-dim text-base font-normal">
-          Assignee
-        </label>
-        <Select
-          options={[
-            { value: "me", label: "Assign to me" },
-            ...users
-              .filter((x) => ["admin", "developer", "agent"].includes(x.type))
-              .map((u) => ({
-                value: u.id,
-                label: `${u.name} - ${u.email}`,
-              })),
-          ]}
-          disabled={user.type === "agent"}
-          value={
-            assignedTo
-              ? {
-                  value: assignedTo,
-                  label: `${users.find((u) => u.id === assignedTo)?.name} - ${users.find((u) => u.id === assignedTo)?.email}`,
-                }
-              : null
-          }
-          onChange={(value) =>
-            value
-              ? setAssignedTo(value.value === "me" ? user.id : value.value)
-              : setAssignedTo(null)
-          }
-          placeholder="Assignee..."
-          isClearable
-        />
-      </div>
-
-      <div className="-md:flex-col flex w-full items-center gap-4">
-        <Input
-          label="Reported From"
-          type="text"
-          name="reportedFrom"
-          onChange={() => null}
-          value={reportedFrom}
-          disabled
-        />
-        <Input
-          label="Date"
-          type="text"
-          name="date"
-          onChange={() => null}
-          value={moment(ticket.date).format("DD/MM/YYYY - HH:mm")}
-          disabled
-        />
-      </div>
-
-      <div className="-md:flex-col flex w-full items-center gap-4">
-        <Input
-          label="Reporter's Name"
-          type="text"
-          name="reporter"
-          onChange={() => null}
-          value={reporter.name}
-          disabled
-        />
-        <Input
-          label="Reporter's E-mail"
-          type="text"
-          name="reporter"
-          onChange={() => null}
-          value={reporter.email}
-          disabled
-        />
-        <Input
-          label="Reporter's Type"
-          type="text"
-          name="reporterType"
-          onChange={() => null}
-          value={USER_TYPE_LABELS[reporter.type]}
-          disabled
-        />
-      </div>
-
-      <textarea
-        className="input border-mti-gray-platinum h-full min-h-[300px] w-full cursor-text rounded-3xl border bg-white px-7 py-8"
-        placeholder="Write your ticket's description here..."
-        contentEditable={false}
-        value={description}
-        spellCheck
-      />
-
-      <div className="-md:flex-col-reverse mt-2 flex w-full items-center justify-between gap-4">
-        <Button
-          type="button"
-          color="red"
-          className="w-full md:max-w-[200px]"
-          variant="outline"
-          onClick={del}
-          isLoading={isLoading}
-        >
-          Delete
-        </Button>
-
-        <div className="-md:flex-col-reverse flex w-full items-center justify-end gap-4">
-          <Button
-            type="button"
-            color="red"
-            className="w-full md:max-w-[200px]"
-            variant="outline"
-            onClick={onClose}
-            isLoading={isLoading}
-          >
-            Cancel
-          </Button>
-          <Button
-            type="button"
-            className="w-full md:max-w-[200px]"
-            isLoading={isLoading}
-            onClick={submit}
-          >
-            Update
-          </Button>
-        </div>
-      </div>
-    </form>
-  );
-}

src/components/High/TicketSubmission.tsx

@@ -1,101 +0,0 @@
-import {Ticket, TicketType, TicketTypeLabel} from "@/interfaces/ticket";
-import {User} from "@/interfaces/user";
-import axios from "axios";
-import {useState} from "react";
-import {toast} from "react-toastify";
-import ShortUniqueId from "short-unique-id";
-import Button from "../Low/Button";
-import Input from "../Low/Input";
-import Select from "../Low/Select";
-
-interface Props {
-	user: User;
-	page: string;
-	onClose: () => void;
-}
-
-export default function TicketSubmission({user, page, onClose}: Props) {
-	const [subject, setSubject] = useState("");
-	const [type, setType] = useState<TicketType>();
-	const [description, setDescription] = useState("");
-	const [isLoading, setIsLoading] = useState(false);
-
-	const submit = () => {
-		if (!type) return toast.error("Please choose a type!", {toastId: "missing-type"});
-		if (subject.trim() === "")
-			return toast.error("Please input a subject!", {
-				toastId: "missing-subject",
-			});
-		if (description.trim() === "")
-			return toast.error("Please describe your ticket!", {
-				toastId: "missing-desc",
-			});
-
-		setIsLoading(true);
-
-		const shortUID = new ShortUniqueId();
-		const ticket: Ticket = {
-			id: shortUID.randomUUID(8),
-			date: new Date().toISOString(),
-			reporter: {
-				id: user.id,
-				email: user.email,
-				name: user.name,
-				type: user.type,
-			},
-			status: "submitted",
-			subject,
-			type,
-			reportedFrom: page,
-			description,
-		};
-
-		axios
-			.post(`/api/tickets`, ticket)
-			.then(() => {
-				toast.success(`Your ticket has been submitted! You will be contacted by e-mail for further discussion.`, {toastId: "submitted"});
-				onClose();
-			})
-			.catch((e) => {
-				console.error(e);
-				toast.error("Something went wrong, please try again later!", {
-					toastId: "error",
-				});
-			})
-			.finally(() => setIsLoading(false));
-	};
-
-	return (
-		<form className="flex flex-col gap-4 pt-8">
-			<Input label="Subject" type="text" name="subject" placeholder="Subject..." onChange={(e) => setSubject(e)} />
-			<div className="-md:flex-col flex w-full items-center gap-4">
-				<div className="flex w-full flex-col gap-3">
-					<label className="text-mti-gray-dim text-base font-normal">Type</label>
-					<Select
-						options={Object.keys(TicketTypeLabel).map((x) => ({
-							value: x,
-							label: TicketTypeLabel[x as keyof typeof TicketTypeLabel],
-						}))}
-						onChange={(value) => setType((value?.value as TicketType) ?? undefined)}
-						placeholder="Type..."
-					/>
-				</div>
-				<Input label="Reporter" type="text" name="reporter" onChange={() => null} value={`${user.name} - ${user.email}`} disabled />
-			</div>
-			<textarea
-				className="input border-mti-gray-platinum h-full min-h-[300px] w-full cursor-text rounded-3xl border bg-white px-7 py-8"
-				onChange={(e) => setDescription(e.target.value)}
-				placeholder="Write your ticket's description here..."
-				spellCheck
-			/>
-			<div className="mt-2 flex w-full items-center justify-end gap-4">
-				<Button type="button" color="red" className="w-full max-w-[200px]" variant="outline" onClick={onClose} isLoading={isLoading}>
-					Cancel
-				</Button>
-				<Button type="button" className="w-full max-w-[200px]" isLoading={isLoading} onClick={submit}>
-					Submit
-				</Button>
-			</div>
-		</form>
-	);
-}

src/components/Low/AudioPlayer.tsx

@@ -11,10 +11,9 @@ interface Props {
 	autoPlay?: boolean;
 	disabled?: boolean;
 	onEnd?: () => void;
-	disablePause?: boolean;
 }
 
-export default function AudioPlayer({src, color, autoPlay = false, disabled = false, onEnd, disablePause = false}: Props) {
+export default function AudioPlayer({src, color, autoPlay = false, disabled = false, onEnd}: Props) {
 	const [isPlaying, setIsPlaying] = useState(false);
 	const [duration, setDuration] = useState(0);
 	const [currentTime, setCurrentTime] = useState(0);
@@ -22,19 +21,11 @@ export default function AudioPlayer({src, color, autoPlay = false, disabled = fa
 	const audioPlayerRef = useRef<HTMLAudioElement | null>(null);
 
 	useEffect(() => {
-		const durationInterval = setInterval(() => {
-			if (duration > 0) clearInterval(durationInterval);
-
-			const seconds = Math.floor(audioPlayerRef?.current?.duration || 0);
-			if (seconds > 0) setDuration(seconds);
-		}, 300);
-
-		if (duration > 0) clearInterval(durationInterval);
-
-		return () => {
-			clearInterval(durationInterval);
-		};
-	}, [duration]);
+		if (audioPlayerRef && audioPlayerRef.current) {
+			const seconds = Math.floor(audioPlayerRef.current.duration);
+			setDuration(seconds);
+		}
+	}, [audioPlayerRef?.current?.readyState]);
 
 	useEffect(() => {
 		let playingInterval: NodeJS.Timer | undefined = undefined;
@@ -63,8 +54,8 @@ export default function AudioPlayer({src, color, autoPlay = false, disabled = fa
 		<div className="w-full h-fit flex gap-4 items-center mt-2">
 			{isPlaying && (
 				<BsPauseFill
-					className={clsx("text-mti-gray-cool cursor-pointer w-5 h-5", (disabled || disablePause) && "opacity-60 cursor-not-allowed")}
-					onClick={disabled || disablePause ? undefined : togglePlayPause}
+					className={clsx("text-mti-gray-cool cursor-pointer w-5 h-5", disabled && "opacity-60 cursor-not-allowed")}
+					onClick={disabled ? undefined : togglePlayPause}
 				/>
 			)}
 			{!isPlaying && (

src/components/Low/Badge.tsx

@@ -1,30 +0,0 @@
-import {Module} from "@/interfaces";
-import clsx from "clsx";
-import {BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen} from "react-icons/bs";
-
-interface Props {
-	module: Module;
-	children: string;
-}
-
-export default function Badge({module, children}: Props) {
-	return (
-		<div
-			key={module}
-			className={clsx(
-				"flex gap-2 items-center w-fit text-white -md:px-4 xl:px-4 md:px-2 py-2 rounded-xl",
-				module === "reading" && "bg-ielts-reading",
-				module === "listening" && "bg-ielts-listening",
-				module === "writing" && "bg-ielts-writing",
-				module === "speaking" && "bg-ielts-speaking",
-				module === "level" && "bg-ielts-level",
-			)}>
-			{module === "reading" && <BsBook className="w-4 h-4" />}
-			{module === "listening" && <BsHeadphones className="w-4 h-4" />}
-			{module === "writing" && <BsPen className="w-4 h-4" />}
-			{module === "speaking" && <BsMegaphone className="w-4 h-4" />}
-			{module === "level" && <BsClipboard className="w-4 h-4" />}
-			<span className="text-sm">{children}</span>
-		</div>
-	);
-}

src/components/Low/Button.tsx

@@ -1,34 +1,17 @@
 import clsx from "clsx";
 import {ReactNode} from "react";
-import {BsArrowRepeat} from "react-icons/bs";
 
 interface Props {
 	children: ReactNode;
-	color?: "rose" | "purple" | "red" | "green" | "gray" | "pink";
+	color?: "rose" | "purple" | "red";
 	variant?: "outline" | "solid";
 	className?: string;
 	disabled?: boolean;
-	isLoading?: boolean;
 	onClick?: () => void;
-	type?: "button" | "reset" | "submit";
 }
 
-export default function Button({
-	color = "purple",
-	variant = "solid",
-	disabled = false,
-	isLoading = false,
-	className,
-	children,
-	type,
-	onClick,
-}: Props) {
+export default function Button({color = "purple", variant = "solid", disabled = false, className, children, onClick}: Props) {
 	const colorClassNames: {[key in typeof color]: {[key in typeof variant]: string}} = {
-		green: {
-			solid: "bg-mti-green-light text-white border border-mti-green-light hover:bg-mti-green disabled:text-mti-green disabled:bg-mti-green-ultralight selection:bg-mti-green-dark",
-			outline:
-				"bg-transparent text-mti-green-light border border-mti-green-light hover:bg-mti-green-light disabled:text-mti-green disabled:bg-mti-green-ultralight disabled:border-none selection:bg-mti-green-dark hover:text-white selection:text-white",
-		},
 		purple: {
 			solid: "bg-mti-purple-light text-white border border-mti-purple-light hover:bg-mti-purple disabled:text-mti-purple disabled:bg-mti-purple-ultralight selection:bg-mti-purple-dark",
 			outline:
@@ -39,39 +22,23 @@ export default function Button({
 			outline:
 				"bg-transparent text-mti-red-light border border-mti-red-light hover:bg-mti-red-light disabled:text-mti-red disabled:bg-mti-red-ultralight disabled:border-none selection:bg-mti-red-dark hover:text-white selection:text-white",
 		},
-		gray: {
-			solid: "bg-mti-gray-davy text-white border border-mti-gray-davy  hover:bg-mti-gray-davy disabled:text-mti-gray-davy disabled:bg-mti-gray-davy selection:bg-mti-gray-davy",
-			outline:
-				"bg-transparent text-mti-gray-davy border border-mti-gray-davy hover:bg-mti-gray-davy disabled:text-mti-gray-davy disabled:bg-mti-gray-davy disabled:border-none selection:bg-mti-gray-davy hover:text-white selection:text-white",
-		},
 		rose: {
 			solid: "bg-mti-rose-light text-white border border-mti-rose-light  hover:bg-mti-rose disabled:text-mti-rose disabled:bg-mti-rose-ultralight selection:bg-mti-rose-dark",
 			outline:
 				"bg-transparent text-mti-rose-light border border-mti-rose-light hover:bg-mti-rose-light disabled:text-mti-rose disabled:bg-mti-rose-ultralight disabled:border-none selection:bg-mti-rose-dark hover:text-white selection:text-white",
 		},
-		pink: {
-			solid: "bg-ielts-speaking text-white border border-ielts-speaking  hover:bg-ielts-speaking disabled:text-ielts-speaking disabled:bg-ielts-speaking-transparent selection:bg-ielts-speaking",
-			outline:
-				"bg-transparent text-ielts-speaking border border-ielts-speaking hover:bg-ielts-speaking disabled:text-ielts-speaking disabled:bg-ielts-speaking-transparent disabled:border-none selection:bg-ielts-speaking hover:text-white selection:text-white",
-		},
 	};
 
 	return (
 		<button
-			type={type}
 			onClick={onClick}
 			className={clsx(
-				"py-4 px-6 rounded-full transition ease-in-out duration-300 disabled:cursor-not-allowed cursor-pointer",
+				"py-4 px-6 rounded-full transition ease-in-out duration-300 disabled:cursor-not-allowed",
 				className,
 				colorClassNames[color][variant],
 			)}
-			disabled={disabled || isLoading}>
-			{!isLoading && children}
-			{isLoading && (
-				<div className="flex items-center justify-center">
-					<BsArrowRepeat className="text-white animate-spin" size={25} />
-				</div>
-			)}
+			disabled={disabled}>
+			{children}
 		</button>
 	);
 }

src/components/Low/Checkbox.tsx

@@ -1,30 +0,0 @@
-import clsx from "clsx";
-import {ReactElement, ReactNode} from "react";
-import {BsCheck} from "react-icons/bs";
-
-interface Props {
-	isChecked: boolean;
-	onChange: (isChecked: boolean) => void;
-	children: ReactNode;
-	disabled?: boolean;
-}
-
-export default function Checkbox({isChecked, onChange, children, disabled}: Props) {
-	return (
-		<div className="flex gap-3 items-center text-mti-gray-dim text-sm cursor-pointer" onClick={() => {
-			if(disabled) return;
-			onChange(!isChecked);
-		}}>
-			<input type="checkbox" className="hidden" />
-			<div
-				className={clsx(
-					"w-6 h-6 rounded-md flex items-center justify-center border border-mti-purple-light bg-white",
-					"transition duration-300 ease-in-out",
-					isChecked && "!bg-mti-purple-light ",
-				)}>
-				<BsCheck color="white" className="w-full h-full" />
-			</div>
-			<span>{children}</span>
-		</div>
-	);
-}

src/components/Low/CountrySelect.tsx

@@ -1,83 +0,0 @@
-import {countries, TCountries} from "countries-list";
-import {Fragment, useState} from "react";
-import {Combobox, Transition} from "@headlessui/react";
-import {BsChevronExpand} from "react-icons/bs";
-import countryCodes from "country-codes-list";
-
-interface Props {
-	value?: string;
-	onChange?: (value: string) => void;
-	disabled?: boolean;
-}
-
-const mapCountries = (codes: string[]) => {
-	return codes.map((code) => ({
-		label: `${countryCodes.findOne("countryCode" as any, code).flag} ${countries[code as unknown as keyof TCountries].name} (+${
-			countries[code as unknown as keyof TCountries].phone
-		})`,
-		code,
-	}));
-};
-
-export default function CountrySelect({value, disabled = false, onChange}: Props) {
-	const [query, setQuery] = useState("");
-
-	const filteredCountries =
-		query === ""
-			? mapCountries(Object.keys(countries))
-			: mapCountries(
-					Object.keys(countries).filter((x) =>
-						countries[x as unknown as keyof TCountries].name.toLowerCase().includes(query.toLowerCase()),
-					),
-			  );
-
-	return (
-		<>
-			<Combobox value={value} onChange={onChange} disabled={disabled}>
-				<div className="relative mt-1">
-					<div className="relative w-full cursor-default overflow-hidden ">
-						<Combobox.Input
-							className="py-6 w-full px-8 text-sm font-normal placeholder:text-mti-gray-cool bg-white disabled:bg-mti-gray-platinum/40 rounded-full border border-mti-gray-platinum focus:outline-none"
-							onChange={(e) => setQuery(e.target.value)}
-							displayValue={(code: string) => {
-								const country = countries[code as unknown as keyof TCountries];
-
-								return `${countryCodes.findOne("countryCode" as any, code)?.flag || ""} ${country?.name || "N/A"} (+${
-									country?.phone || "N/A"
-								})`;
-							}}
-						/>
-						<Combobox.Button className="absolute inset-y-0 right-0 flex items-center pr-8">
-							<BsChevronExpand />
-						</Combobox.Button>
-					</div>
-					<Transition
-						as={Fragment}
-						leave="transition ease-in duration-100"
-						leaveFrom="opacity-100"
-						leaveTo="opacity-0"
-						afterLeave={() => setQuery("")}>
-						<Combobox.Options className="absolute z-20 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
-							{filteredCountries.length === 0 && query !== "" ? (
-								<div className="relative cursor-default select-none py-2 px-4 text-gray-700">Nothing found.</div>
-							) : (
-								filteredCountries.map((country) => (
-									<Combobox.Option
-										key={country.code}
-										value={country.code}
-										className={({active}) =>
-											`relative cursor-default select-none py-2 pl-10 pr-4 ${
-												active ? "bg-mti-purple-light text-white" : "text-gray-900"
-											}`
-										}>
-										{country.label}
-									</Combobox.Option>
-								))
-							)}
-						</Combobox.Options>
-					</Transition>
-				</div>
-			</Combobox>
-		</>
-	);
-}

src/components/Low/Input.tsx

@@ -1,33 +1,16 @@
-import clsx from "clsx";
 import {useState} from "react";
 
 interface Props {
-	type: "email" | "text" | "password" | "tel" | "number";
-	roundness?: "full" | "xl";
+	type: "email" | "text" | "password";
 	required?: boolean;
 	label?: string;
 	placeholder?: string;
-	defaultValue?: string | number;
-	value?: string | number;
-	className?: string;
-	disabled?: boolean;
+	defaultValue?: string;
 	name: string;
 	onChange: (value: string) => void;
 }
 
-export default function Input({
-	type,
-	label,
-	placeholder,
-	name,
-	required = false,
-	value,
-	defaultValue,
-	className,
-	roundness = "full",
-	disabled = false,
-	onChange,
-}: Props) {
+export default function Input({type, label, placeholder, name, required = false, defaultValue, onChange}: Props) {
 	const [showPassword, setShowPassword] = useState(false);
 
 	if (type === "password") {
@@ -45,7 +28,6 @@ export default function Input({
 						name={name}
 						onChange={(e) => onChange(e.target.value)}
 						placeholder={placeholder}
-						defaultValue={defaultValue}
 						className="w-full px-8 py-6 text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
 					/>
 					<p
@@ -60,7 +42,7 @@ export default function Input({
 	}
 
 	return (
-		<div className={clsx("flex flex-col gap-3 w-full", className)}>
+		<div className="flex flex-col gap-3 w-full">
 			{label && (
 				<label className="font-normal text-base text-mti-gray-dim">
 					{label}
@@ -70,16 +52,9 @@ export default function Input({
 			<input
 				type={type}
 				name={name}
-				disabled={disabled}
-				value={value}
 				onChange={(e) => onChange(e.target.value)}
-				min={type === "number" ? 0 : undefined}
 				placeholder={placeholder}
-				className={clsx(
-					"px-8 py-6 text-sm font-normal bg-white border border-mti-gray-platinum focus:outline-none",
-					"placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed",
-					roundness === "full" ? "rounded-full" : "rounded-xl",
-				)}
+				className="px-8 py-6 text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
 				required={required}
 				defaultValue={defaultValue}
 			/>

src/components/Low/ProgressBar.tsx

@@ -5,14 +5,11 @@ interface Props {
 	label: string;
 	percentage: number;
 	color: "red" | "rose" | "purple" | Module;
-	mark?: number;
-	markLabel?: string;
 	useColor?: boolean;
 	className?: string;
-	textClassName?: string;
 }
 
-export default function ProgressBar({label, percentage, color, mark, markLabel, useColor = false, className, textClassName}: Props) {
+export default function ProgressBar({label, percentage, color, useColor = false, className}: Props) {
 	const progressColorClass: {[key in typeof color]: string} = {
 		red: "bg-mti-red-light",
 		rose: "bg-mti-rose-light",
@@ -21,7 +18,6 @@ export default function ProgressBar({label, percentage, color, mark, markLabel,
 		listening: "bg-ielts-listening",
 		writing: "bg-ielts-writing",
 		speaking: "bg-ielts-speaking",
-		level: "bg-ielts-level",
 	};
 
 	return (
@@ -32,14 +28,11 @@ export default function ProgressBar({label, percentage, color, mark, markLabel,
 				!useColor ? "bg-mti-gray-anti-flash" : progressColorClass[color],
 				useColor && "bg-opacity-20",
 			)}>
-			{mark && (
-				<div style={{left: `${mark}%`}} className={clsx("w-3 h-2 bg-mti-gray-davy/60 absolute -translate-x-1/2 top-0 z-20 cursor-pointer")} />
-			)}
 			<div
 				style={{width: `${percentage}%`}}
 				className={clsx("absolute transition-all duration-300 ease-in-out top-0 left-0 h-full overflow-hidden", progressColorClass[color])}
 			/>
-			<span className={clsx("z-[1] justify-self-center text-white text-sm font-bold", textClassName)}>{label}</span>
+			<span className="z-10 justify-self-center text-white text-sm font-bold">{label}</span>
 		</div>
 	);
 }

src/components/Low/Select.tsx

@@ -1,61 +0,0 @@
-import clsx from "clsx";
-import {ComponentProps, useEffect, useState} from "react";
-import ReactSelect from "react-select";
-
-interface Option {
-	[key: string]: any;
-	value: string;
-	label: string;
-}
-
-interface Props {
-	defaultValue?: Option;
-	value?: Option | null;
-	options: Option[];
-	disabled?: boolean;
-	placeholder?: string;
-	onChange: (value: Option | null) => void;
-	isClearable?: boolean;
-}
-
-export default function Select({value, defaultValue, options, placeholder, disabled, onChange, isClearable}: Props) {
-	const [target, setTarget] = useState<HTMLElement>();
-
-	useEffect(() => {
-		if (document) setTarget(document.body);
-	}, []);
-
-	return (
-		<ReactSelect
-			className={clsx(
-				"placeholder:text-mti-gray-cool border-mti-gray-platinum w-full rounded-full border bg-white px-4 py-4 text-sm font-normal focus:outline-none",
-				disabled && "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
-			)}
-			options={options}
-			value={value}
-			onChange={onChange}
-			placeholder={placeholder}
-			menuPortalTarget={target}
-			defaultValue={defaultValue}
-			styles={{
-				menuPortal: (base) => ({...base, zIndex: 9999}),
-				control: (styles) => ({
-					...styles,
-					paddingLeft: "4px",
-					border: "none",
-					outline: "none",
-					":focus": {
-						outline: "none",
-					},
-				}),
-				option: (styles, state) => ({
-					...styles,
-					backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-					color: state.isFocused ? "black" : styles.color,
-				}),
-			}}
-			isDisabled={disabled}
-			isClearable={isClearable}
-		/>
-	);
-}

src/components/Low/TImezoneSelect.tsx

@@ -1,64 +0,0 @@
-import { Fragment, useState } from "react";
-import { Combobox, Transition } from "@headlessui/react";
-import { BsChevronExpand } from "react-icons/bs";
-import moment from "moment-timezone";
-
-interface Props {
-  value?: string;
-  onChange?: (value: string) => void;
-  disabled?: boolean;
-}
-
-export default function TimezoneSelect({
-  value,
-  disabled = false,
-  onChange,
-}: Props) {
-  const [query, setQuery] = useState("");
-  
-  const timezones = moment.tz.names();
-
-  const filteredTimezones = query === "" ? timezones : timezones.filter((x) => x.toLowerCase().includes(query.toLowerCase()));
-  return (
-    <>
-      <Combobox value={value} onChange={onChange} disabled={disabled}>
-        <div className="relative mt-1">
-          <div className="relative w-full cursor-default overflow-hidden ">
-            <Combobox.Input
-              className="py-6 w-full px-8 text-sm font-normal placeholder:text-mti-gray-cool bg-white disabled:bg-mti-gray-platinum/40 rounded-full border border-mti-gray-platinum focus:outline-none"
-              onChange={(e) => setQuery(e.target.value)}
-            />
-            <Combobox.Button className="absolute inset-y-0 right-0 flex items-center pr-8">
-              <BsChevronExpand />
-            </Combobox.Button>
-          </div>
-          <Transition
-            as={Fragment}
-            leave="transition ease-in duration-100"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0"
-            afterLeave={() => setQuery("")}
-          >
-            <Combobox.Options className="absolute z-20 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
-              {filteredTimezones.map((timezone: string) => (
-                <Combobox.Option
-                  key={timezone}
-                  value={timezone}
-                  className={({ active }) =>
-                    `relative cursor-default select-none py-2 pl-10 pr-4 ${
-                      active
-                        ? "bg-mti-purple-light text-white"
-                        : "text-gray-900"
-                    }`
-                  }
-                >
-                  {timezone}
-                </Combobox.Option>
-              ))}
-            </Combobox.Options>
-          </Transition>
-        </div>
-      </Combobox>
-    </>
-  );
-}

src/components/Medium/InviteCard.tsx

@@ -1,77 +0,0 @@
-import { Invite } from "@/interfaces/invite";
-import { User } from "@/interfaces/user";
-import axios from "axios";
-import { useState } from "react";
-import { BsArrowRepeat } from "react-icons/bs";
-import { toast } from "react-toastify";
-
-interface Props {
-  invite: Invite;
-  users: User[];
-  reload: () => void;
-}
-
-export default function InviteCard({ invite, users, reload }: Props) {
-  const [isLoading, setIsLoading] = useState(false);
-
-  const inviter = users.find((u) => u.id === invite.from);
-  const name = !inviter
-    ? null
-    : inviter.type === "corporate"
-      ? inviter.corporateInformation?.companyInformation?.name || inviter.name
-      : inviter.name;
-
-  const decide = (decision: "accept" | "decline") => {
-    if (!confirm(`Are you sure you want to ${decision} this invite?`)) return;
-
-    setIsLoading(true);
-    axios
-      .get(`/api/invites/${decision}/${invite.id}`)
-      .then(() => {
-        toast.success(
-          `Successfully ${decision === "accept" ? "accepted" : "declined"} the invite!`,
-          { toastId: "success" },
-        );
-        reload();
-      })
-      .catch((e) => {
-        toast.success(`Something went wrong, please try again later!`, {
-          toastId: "error",
-        });
-        reload();
-      })
-      .finally(() => setIsLoading(false));
-  };
-
-  return (
-    <div className="border-mti-gray-anti-flash flex min-w-[200px] flex-col gap-6 rounded-xl border p-4 text-black">
-      <span>Invited by {name}</span>
-      <div className="flex items-center gap-2">
-        <button
-          onClick={() => decide("accept")}
-          disabled={isLoading}
-          className="bg-mti-green-ultralight hover:bg-mti-green-light w-24 rounded-lg p-2 px-4 transition duration-300 ease-in-out hover:text-white disabled:cursor-not-allowed"
-        >
-          {!isLoading && "Accept"}
-          {isLoading && (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="animate-spin text-white" size={25} />
-            </div>
-          )}
-        </button>
-        <button
-          onClick={() => decide("decline")}
-          disabled={isLoading}
-          className="bg-mti-red-ultralight hover:bg-mti-red-light w-24 rounded-lg p-2 px-4 transition duration-300 ease-in-out hover:text-white disabled:cursor-not-allowed"
-        >
-          {!isLoading && "Decline"}
-          {isLoading && (
-            <div className="flex items-center justify-center">
-              <BsArrowRepeat className="animate-spin text-white" size={25} />
-            </div>
-          )}
-        </button>
-      </div>
-    </div>
-  );
-}

src/components/Medium/ModuleLevelSelector.tsx

@@ -1,121 +0,0 @@
-import {Module} from "@/interfaces";
-import {writingMarking} from "@/utils/score";
-import {Menu} from "@headlessui/react";
-import {Dispatch, SetStateAction} from "react";
-import {BsBook, BsChevronDown, BsHeadphones, BsMegaphone, BsPen} from "react-icons/bs";
-
-type Levels = {[key in Module]: number};
-
-interface Props {
-	levels: Levels;
-	setLevels: Dispatch<SetStateAction<Levels>>;
-}
-
-export default function ModuleLevelSelector({levels, setLevels}: Props) {
-	return (
-		<div className="flex flex-col gap-32 w-full">
-			<div className="grid grid-cols-1 md:grid-cols-2 gap-y-4 gap-x-16">
-				<div className="w-full flex flex-col gap-3.5 relative">
-					<span className="text-sm text-mti-gray-dim">
-						<span className="font-bold">Reading</span> level
-					</span>
-					<Menu>
-						<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
-							<BsBook className="text-ielts-reading" size={34} />
-							<span className="text-mti-gray-cool text-sm">
-								{levels.reading === -1 ? "Select your reading level" : `Level ${levels.reading}`}
-							</span>
-							<BsChevronDown className="text-mti-gray-cool" size={12} />
-						</Menu.Button>
-						<Menu.Items className="absolute overflow-y-scroll scrollbar-hide max-h-[230px] origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl">
-							{Object.values(writingMarking).map((x) => (
-								<Menu.Item key={x}>
-									<span
-										onClick={() => setLevels((prev) => ({...prev, reading: x}))}
-										className="w-full py-4 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
-										Level {x}
-									</span>
-								</Menu.Item>
-							))}
-						</Menu.Items>
-					</Menu>
-				</div>
-				<div className="w-full flex flex-col gap-3.5 relative">
-					<span className="text-sm text-mti-gray-dim">
-						<span className="font-bold">Listening</span> level
-					</span>
-					<Menu>
-						<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
-							<BsHeadphones className="text-ielts-listening" size={34} />
-							<span className="text-mti-gray-cool text-sm">
-								{levels.listening === -1 ? "Select your listening level" : `Level ${levels.listening}`}
-							</span>
-							<BsChevronDown className="text-mti-gray-cool" size={12} />
-						</Menu.Button>
-						<Menu.Items className="absolute overflow-y-scroll scrollbar-hide max-h-[230px] origin-top top-full bg-white flex flex-col items-center w-full z-50 drop-shadow-lg rounded-2xl">
-							{Object.values(writingMarking).map((x) => (
-								<Menu.Item key={x}>
-									<span
-										onClick={() => setLevels((prev) => ({...prev, listening: x}))}
-										className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
-										Level {x}
-									</span>
-								</Menu.Item>
-							))}
-						</Menu.Items>
-					</Menu>
-				</div>
-				<div className="w-full flex flex-col gap-3.5 relative">
-					<span className="text-sm text-mti-gray-dim">
-						<span className="font-bold">Writing</span> level
-					</span>
-					<Menu>
-						<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
-							<BsPen className="text-ielts-writing" size={34} />
-							<span className="text-mti-gray-cool text-sm">
-								{levels.writing === -1 ? "Select your writing level" : `Level ${levels.writing}`}
-							</span>
-							<BsChevronDown className="text-mti-gray-cool" size={12} />
-						</Menu.Button>
-						<Menu.Items className="absolute overflow-y-scroll scrollbar-hide max-h-[230px] origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl">
-							{Object.values(writingMarking).map((x) => (
-								<Menu.Item key={x}>
-									<span
-										onClick={() => setLevels((prev) => ({...prev, writing: x}))}
-										className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
-										Level {x}
-									</span>
-								</Menu.Item>
-							))}
-						</Menu.Items>
-					</Menu>
-				</div>
-				<div className="w-full flex flex-col gap-3.5 relative">
-					<span className="text-sm text-mti-gray-dim">
-						<span className="font-bold">Speaking</span> level
-					</span>
-					<Menu>
-						<Menu.Button className="w-full border border-mti-gray-platinum rounded-full px-6 py-4 flex justify-between items-center gap-12 bg-white">
-							<BsMegaphone className="text-ielts-speaking" size={34} />
-							<span className="text-mti-gray-cool text-sm">
-								{levels.speaking === -1 ? "Select your speaking level" : `Level ${levels.speaking}`}
-							</span>
-							<BsChevronDown className="text-mti-gray-cool" size={12} />
-						</Menu.Button>
-						<Menu.Items className="absolute overflow-y-scroll scrollbar-hide max-h-[230px] origin-top top-full bg-white flex flex-col items-center w-full z-20 drop-shadow-lg rounded-2xl">
-							{Object.values(writingMarking).map((x) => (
-								<Menu.Item key={x}>
-									<span
-										onClick={() => setLevels((prev) => ({...prev, speaking: x}))}
-										className="w-full py-5 text-center cursor-pointer bg-white hover:bg-mti-gray-platinum transition ease-in-out duration-300">
-										Level {x}
-									</span>
-								</Menu.Item>
-							))}
-						</Menu.Items>
-					</Menu>
-				</div>
-			</div>
-		</div>
-	);
-}

src/components/Medium/ModuleTitle.tsx

@@ -4,7 +4,7 @@ import {moduleLabels} from "@/utils/moduleUtils";
 import clsx from "clsx";
 import {motion} from "framer-motion";
 import {ReactNode, useEffect, useState} from "react";
-import {BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsStopwatch} from "react-icons/bs";
+import {BsBook, BsHeadphones, BsMegaphone, BsPen, BsStopwatch} from "react-icons/bs";
 import ProgressBar from "../Low/ProgressBar";
 import TimerEndedModal from "../TimerEndedModal";
 
@@ -46,7 +46,6 @@ export default function ModuleTitle({minTimer, module, label, exerciseIndex, tot
 		listening: <BsHeadphones className="text-ielts-listening w-6 h-6" />,
 		writing: <BsPen className="text-ielts-writing w-6 h-6" />,
 		speaking: <BsMegaphone className="text-ielts-speaking w-6 h-6" />,
-		level: <BsClipboard className="text-ielts-level w-6 h-6" />,
 	};
 
 	return (
@@ -60,14 +59,14 @@ export default function ModuleTitle({minTimer, module, label, exerciseIndex, tot
 			/>
 			<motion.div
 				className={clsx(
-					"absolute top-4 right-6 bg-mti-gray-seasalt px-4 py-3 flex items-center gap-2 rounded-full text-mti-gray-davy",
+					"absolute top-4 right-6 bg-mti-gray-seasalt px-3 py-2 flex items-center gap-2 rounded-full text-mti-gray-davy",
 					warningMode && !disableTimer && "bg-mti-red-light text-mti-gray-seasalt",
 				)}
 				initial={{scale: warningMode && !disableTimer ? 0.8 : 1}}
 				animate={{scale: warningMode && !disableTimer ? 1.1 : 1}}
 				transition={{repeat: Infinity, repeatType: "reverse", duration: 0.5, ease: "easeInOut"}}>
-				<BsStopwatch className="w-6 h-6" />
-				<span className="text-base font-semibold w-12">
+				<BsStopwatch className="w-4 h-4" />
+				<span className="text-sm font-semibold w-11">
 					{timer > 0 && (
 						<>
 							{Math.floor(timer / 60)
@@ -89,8 +88,8 @@ export default function ModuleTitle({minTimer, module, label, exerciseIndex, tot
 						<span className="text-base font-semibold">
 							{moduleLabels[module]} exam {label && `- ${label}`}
 						</span>
-						<span className="text-sm font-semibold self-end">
-							Exercise {exerciseIndex}/{totalExercises}
+						<span className="text-xs font-normal self-end text-mti-gray-davy">
+							Question {exerciseIndex}/{totalExercises}
 						</span>
 					</div>
 					<ProgressBar color={module} label="" percentage={(exerciseIndex * 100) / totalExercises} className="h-2 w-full" />

src/components/Medium/SessionCard.tsx

@@ -1,101 +0,0 @@
-import {Session} from "@/hooks/useSessions";
-import useExamStore from "@/stores/examStore";
-import {sortByModuleName} from "@/utils/moduleUtils";
-import axios from "axios";
-import clsx from "clsx";
-import {capitalize} from "lodash";
-import moment from "moment";
-import {useState} from "react";
-import {BsArrowRepeat, BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen} from "react-icons/bs";
-import {toast} from "react-toastify";
-
-export default function SessionCard({
-	session,
-	reload,
-	loadSession,
-}: {
-	session: Session;
-	reload: () => void;
-	loadSession: (session: Session) => Promise<void>;
-}) {
-	const [isLoading, setIsLoading] = useState(false);
-
-	const deleteSession = async () => {
-		if (!confirm("Are you sure you want to delete this session?")) return;
-
-		setIsLoading(true);
-		await axios
-			.delete(`/api/sessions/${session.sessionId}`)
-			.then(() => {
-				toast.success(`Successfully delete session "${session.sessionId}"`);
-			})
-			.catch((e) => {
-				console.log(e);
-				toast.error("Something went wrong, please try again later");
-			})
-			.finally(() => {
-				reload();
-				setIsLoading(false);
-			});
-	};
-
-	return (
-		<div className="border-mti-gray-anti-flash flex w-64 flex-col gap-3 rounded-xl border p-4 text-black">
-			<span className="flex gap-1">
-				<b>ID:</b>
-				{session.sessionId}
-			</span>
-			<span className="flex gap-1">
-				<b>Date:</b>
-				{moment(session.date).format("DD/MM/YYYY - HH:mm")}
-			</span>
-			<div className="flex w-full items-center justify-between">
-				<div className="-md:mt-2 grid w-full grid-cols-4 place-items-center justify-center gap-2">
-					{session.selectedModules.sort(sortByModuleName).map((module) => (
-						<div
-							key={module}
-							data-tip={capitalize(module)}
-							className={clsx(
-								"-md:px-4 tooltip flex w-fit items-center gap-2 rounded-xl py-2 text-white md:px-2 xl:px-4",
-								module === "reading" && "bg-ielts-reading",
-								module === "listening" && "bg-ielts-listening",
-								module === "writing" && "bg-ielts-writing",
-								module === "speaking" && "bg-ielts-speaking",
-								module === "level" && "bg-ielts-level",
-							)}>
-							{module === "reading" && <BsBook className="h-4 w-4" />}
-							{module === "listening" && <BsHeadphones className="h-4 w-4" />}
-							{module === "writing" && <BsPen className="h-4 w-4" />}
-							{module === "speaking" && <BsMegaphone className="h-4 w-4" />}
-							{module === "level" && <BsClipboard className="h-4 w-4" />}
-						</div>
-					))}
-				</div>
-			</div>
-			<div className="flex items-center gap-2 w-full">
-				<button
-					onClick={async () => await loadSession(session)}
-					disabled={isLoading}
-					className="bg-mti-green-ultralight w-full hover:bg-mti-green-light rounded-lg p-2 px-4 transition duration-300 ease-in-out hover:text-white disabled:cursor-not-allowed">
-					{!isLoading && "Resume"}
-					{isLoading && (
-						<div className="flex items-center justify-center">
-							<BsArrowRepeat className="animate-spin text-white" size={25} />
-						</div>
-					)}
-				</button>
-				<button
-					onClick={deleteSession}
-					disabled={isLoading}
-					className="bg-mti-red-ultralight w-full hover:bg-mti-red-light rounded-lg p-2 px-4 transition duration-300 ease-in-out hover:text-white disabled:cursor-not-allowed">
-					{!isLoading && "Delete"}
-					{isLoading && (
-						<div className="flex items-center justify-center">
-							<BsArrowRepeat className="animate-spin text-white" size={25} />
-						</div>
-					)}
-				</button>
-			</div>
-		</div>
-	);
-}

src/components/MobileMenu.tsx

@@ -1,201 +0,0 @@
-import { User } from "@/interfaces/user";
-import { Dialog, Transition } from "@headlessui/react";
-import axios from "axios";
-import clsx from "clsx";
-import Image from "next/image";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import { Fragment } from "react";
-import { BsXLg } from "react-icons/bs";
-
-interface Props {
-  isOpen: boolean;
-  onClose: () => void;
-  path: string;
-  user: User;
-}
-
-export default function MobileMenu({ isOpen, onClose, path, user }: Props) {
-  const router = useRouter();
-
-  const logout = async () => {
-    axios.post("/api/logout").finally(() => {
-      setTimeout(() => router.reload(), 500);
-    });
-  };
-
-  return (
-    <Transition appear show={isOpen} as={Fragment}>
-      <Dialog as="div" className="relative z-10" onClose={onClose}>
-        <Transition.Child
-          as={Fragment}
-          enter="ease-out duration-300"
-          enterFrom="opacity-0"
-          enterTo="opacity-100"
-          leave="ease-in duration-200"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-        >
-          <div className="fixed inset-0 bg-black bg-opacity-25" />
-        </Transition.Child>
-
-        <div className="fixed inset-0 overflow-y-auto">
-          <div className="flex min-h-full items-center justify-center text-center">
-            <Transition.Child
-              as={Fragment}
-              enter="ease-out duration-300"
-              enterFrom="opacity-0 scale-95"
-              enterTo="opacity-100 scale-100"
-              leave="ease-in duration-200"
-              leaveFrom="opacity-100 scale-100"
-              leaveTo="opacity-0 scale-95"
-            >
-              <Dialog.Panel className="flex h-screen w-full transform flex-col gap-8 overflow-hidden bg-white text-left align-middle text-black shadow-xl transition-all">
-                <Dialog.Title
-                  as="header"
-                  className="-md:flex w-full items-center justify-between px-8 py-2 shadow-sm md:hidden"
-                >
-                  <Link href="/">
-                    <Image
-                      src="/logo_title.png"
-                      alt="EnCoach logo"
-                      width={69}
-                      height={69}
-                    />
-                  </Link>
-                  <div
-                    className="cursor-pointer"
-                    onClick={onClose}
-                    tabIndex={0}
-                  >
-                    <BsXLg
-                      className="text-mti-purple-light text-2xl"
-                      onClick={onClose}
-                    />
-                  </div>
-                </Dialog.Title>
-                <div className="flex h-full flex-col gap-6 px-8 text-lg">
-                  <Link
-                    href="/"
-                    className={clsx(
-                      "w-fit transition duration-300 ease-in-out",
-                      path === "/" &&
-                        "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                    )}
-                  >
-                    Dashboard
-                  </Link>
-                  {(user.type === "student" ||
-                    user.type === "teacher" ||
-                    user.type === "developer") && (
-                    <>
-                      <Link
-                        href="/exam"
-                        className={clsx(
-                          "w-fit transition duration-300 ease-in-out",
-                          path === "/exam" &&
-                            "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                        )}
-                      >
-                        Exams
-                      </Link>
-                      <Link
-                        href="/exercises"
-                        className={clsx(
-                          "w-fit transition duration-300 ease-in-out",
-                          path === "/exercises" &&
-                            "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                        )}
-                      >
-                        Exercises
-                      </Link>
-                    </>
-                  )}
-                  <Link
-                    href="/stats"
-                    className={clsx(
-                      "w-fit transition duration-300 ease-in-out",
-                      path === "/stats" &&
-                        "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                    )}
-                  >
-                    Stats
-                  </Link>
-                  <Link
-                    href="/record"
-                    className={clsx(
-                      "w-fit transition duration-300 ease-in-out",
-                      path === "/record" &&
-                        "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                    )}
-                  >
-                    Record
-                  </Link>
-                  {["admin", "developer", "agent", "corporate"].includes(
-                    user.type,
-                  ) && (
-                    <Link
-                      href="/payment-record"
-                      className={clsx(
-                        "w-fit transition duration-300 ease-in-out",
-                        path === "/payment-record" &&
-                          "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                      )}
-                    >
-                      Payment Record
-                    </Link>
-                  )}
-                  {["admin", "developer", "corporate", "teacher"].includes(
-                    user.type,
-                  ) && (
-                    <Link
-                      href="/settings"
-                      className={clsx(
-                        "w-fit transition duration-300 ease-in-out",
-                        path === "/settings" &&
-                          "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                      )}
-                    >
-                      Settings
-                    </Link>
-                  )}
-                  {["admin", "developer", "agent"].includes(user.type) && (
-                    <Link
-                      href="/tickets"
-                      className={clsx(
-                        "w-fit transition duration-300 ease-in-out",
-                        path === "/tickets" &&
-                          "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                      )}
-                    >
-                      Tickets
-                    </Link>
-                  )}
-                  <Link
-                    href="/profile"
-                    className={clsx(
-                      "w-fit transition duration-300 ease-in-out",
-                      path === "/profile" &&
-                        "text-mti-purple-light border-b-mti-purple-light border-b-2 font-semibold ",
-                    )}
-                  >
-                    Profile
-                  </Link>
-
-                  <span
-                    className={clsx(
-                      "w-fit cursor-pointer justify-self-end transition duration-300 ease-in-out",
-                    )}
-                    onClick={logout}
-                  >
-                    Logout
-                  </span>
-                </div>
-              </Dialog.Panel>
-            </Transition.Child>
-          </div>
-        </div>
-      </Dialog>
-    </Transition>
-  );
-}

src/components/Modal.tsx

@@ -1,50 +0,0 @@
-import {Dialog, Transition} from "@headlessui/react";
-import {Fragment, ReactElement} from "react";
-
-interface Props {
-	isOpen: boolean;
-	onClose: () => void;
-	title?: string;
-	children?: ReactElement;
-}
-
-export default function Modal({isOpen, title, onClose, children}: Props) {
-	return (
-		<Transition appear show={isOpen} as={Fragment}>
-			<Dialog as="div" className="relative z-[200]" onClose={onClose}>
-				<Transition.Child
-					as={Fragment}
-					enter="ease-out duration-300"
-					enterFrom="opacity-0"
-					enterTo="opacity-100"
-					leave="ease-in duration-200"
-					leaveFrom="opacity-100"
-					leaveTo="opacity-0">
-					<div className="fixed inset-0 bg-black bg-opacity-25" />
-				</Transition.Child>
-
-				<div className="fixed inset-0 overflow-y-auto">
-					<div className="flex min-h-full items-center justify-center p-4 text-center">
-						<Transition.Child
-							as={Fragment}
-							enter="ease-out duration-300"
-							enterFrom="opacity-0 scale-95"
-							enterTo="opacity-100 scale-100"
-							leave="ease-in duration-200"
-							leaveFrom="opacity-100 scale-100"
-							leaveTo="opacity-0 scale-95">
-							<Dialog.Panel className="w-full max-w-6xl transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all">
-								{title && (
-									<Dialog.Title as="h3" className="text-lg font-medium leading-6 text-gray-900">
-										{title}
-									</Dialog.Title>
-								)}
-								{children}
-							</Dialog.Panel>
-						</Transition.Child>
-					</div>
-				</div>
-			</Dialog>
-		</Transition>
-	);
-}

src/components/Navbar.tsx

@@ -1,114 +1,32 @@
 import {User} from "@/interfaces/user";
 import Link from "next/link";
-import FocusLayer from "@/components/FocusLayer";
-import {preventNavigation} from "@/utils/navigation.disabled";
-import {useRouter} from "next/router";
-import {BsList, BsQuestionCircle, BsQuestionCircleFill} from "react-icons/bs";
-import clsx from "clsx";
-import moment from "moment";
-import MobileMenu from "./MobileMenu";
-import {useEffect, useState} from "react";
-import {Type} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
-import useGroups from "@/hooks/useGroups";
-import {isUserFromCorporate} from "@/utils/groups";
-import Button from "./Low/Button";
-import Modal from "./Modal";
-import Input from "./Low/Input";
-import TicketSubmission from "./High/TicketSubmission";
+import {Avatar} from "primereact/avatar";
+import FocusLayer from '@/components/FocusLayer';
+import { preventNavigation } from "@/utils/navigation.disabled";
+
 
 interface Props {
 	user: User;
 	navDisabled?: boolean;
 	focusMode?: boolean;
-	onFocusLayerMouseEnter?: () => void;
-	path: string;
+	onFocusLayerMouseEnter?: Function;
 }
 
 /* eslint-disable @next/next/no-img-element */
-export default function Navbar({user, path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
-	const [isMenuOpen, setIsMenuOpen] = useState(false);
-	const [disablePaymentPage, setDisablePaymentPage] = useState(true);
-	const [isTicketOpen, setIsTicketOpen] = useState(false);
-
+export default function Navbar({user, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
 	const disableNavigation = preventNavigation(navDisabled, focusMode);
 
-	const expirationDateColor = (date: Date) => {
-		const momentDate = moment(date);
-		const today = moment(new Date());
-
-		if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
-		if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
-		if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
-	};
-
-	const showExpirationDate = () => {
-		if (!user.subscriptionExpirationDate) return false;
-
-		const momentDate = moment(user.subscriptionExpirationDate);
-		const today = moment(new Date());
-
-		return today.add(7, "days").isAfter(momentDate);
-	};
-
-	useEffect(() => {
-		if (user.type !== "student" && user.type !== "teacher") return setDisablePaymentPage(false);
-		isUserFromCorporate(user.id).then((result) => setDisablePaymentPage(result));
-	}, [user]);
-
 	return (
-		<>
-			<Modal isOpen={isTicketOpen} onClose={() => setIsTicketOpen(false)} title="Submit a ticket">
-				<TicketSubmission user={user} page={window.location.href} onClose={() => setIsTicketOpen(false)} />
-			</Modal>
-
-			{user && <MobileMenu path={path} isOpen={isMenuOpen} onClose={() => setIsMenuOpen(false)} user={user} />}
-			<header className="-md:justify-between -md:px-4 relative flex w-full items-center bg-transparent py-2 md:gap-12 md:py-4">
-				<Link href={disableNavigation ? "" : "/"} className=" flex items-center gap-8 md:px-8">
-					<img src="/logo.png" alt="EnCoach's Logo" className="w-8 md:w-12" />
-					<h1 className="-md:hidden w-1/6 text-2xl font-bold">EnCoach</h1>
+		<header className="w-full bg-transparent py-4 gap-2 flex items-center relative">
+			<h1 className="font-bold text-2xl w-1/6 px-8">EnCoach</h1>
+			<div className="flex justify-between w-5/6 mr-8">
+				<input type="text" placeholder="Search..." className="rounded-full py-4 px-6 border border-mti-gray-platinum outline-none" />
+				<Link href={disableNavigation ? "" : "/profile"} className="flex gap-3 items-center justify-end">
+					<img src={user.profilePicture} alt={user.name} className="w-10 h-10 rounded-full object-cover" />
+					<span className="text-right">{user.name}</span>
 				</Link>
-				<div className="flex items-center justify-end gap-4 md:mr-8 md:w-5/6">
-					{/* OPEN TICKET SYSTEM */}
-					<button
-						className={clsx(
-							"border-mti-purple-light tooltip tooltip-bottom flex h-8 w-8 flex-col items-center justify-center rounded-full border p-1",
-							"hover:bg-mti-purple-light transition duration-300 ease-in-out hover:text-white",
-						)}
-						data-tip="Submit a help/feedback ticket"
-						onClick={() => setIsTicketOpen(true)}>
-						<BsQuestionCircleFill />
-					</button>
-
-					{showExpirationDate() && (
-						<Link
-							href={disablePaymentPage ? "/payment" : ""}
-							data-tip="Expiry date"
-							className={clsx(
-								"flex w-fit cursor-pointer justify-center rounded-full border px-6 py-2 text-sm font-normal focus:outline-none",
-								"tooltip tooltip-bottom transition duration-300 ease-in-out",
-								!user.subscriptionExpirationDate
-									? "bg-mti-green-ultralight border-mti-green-light"
-									: expirationDateColor(user.subscriptionExpirationDate),
-								"border-mti-gray-platinum bg-white",
-							)}>
-							{!user.subscriptionExpirationDate && "Unlimited"}
-							{user.subscriptionExpirationDate && moment(user.subscriptionExpirationDate).format("DD/MM/YYYY")}
-						</Link>
-					)}
-					<Link href={disableNavigation ? "" : "/profile"} className="-md:hidden flex items-center justify-end gap-6">
-						<img src={user.profilePicture} alt={user.name} className="h-10 w-10 rounded-full object-cover" />
-						<span className="-md:hidden text-right">
-							{user.type === "corporate" ? `${user.corporateInformation?.companyInformation.name} |` : ""} {user.name} |{" "}
-							{USER_TYPE_LABELS[user.type]}
-						</span>
-					</Link>
-					<div className="cursor-pointer md:hidden" onClick={() => setIsMenuOpen(true)}>
-						<BsList className="text-mti-purple-light h-8 w-8" />
-					</div>
-				</div>
-				{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
-			</header>
-		</>
+			</div>
+			{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter}/>}
+		</header>
 	);
 }

src/components/PayPalPayment.tsx

@@ -1,77 +0,0 @@
-import {DurationUnit} from "@/interfaces/paypal";
-import {CreateOrderActions, CreateOrderData, OnApproveActions, OnApproveData, OnCancelledActions, OrderResponseBody} from "@paypal/paypal-js";
-import {PayPalButtons, PayPalScriptProvider, usePayPalScriptReducer} from "@paypal/react-paypal-js";
-import axios from "axios";
-import {useEffect, useState} from "react";
-import {toast} from "react-toastify";
-
-interface Props {
-	clientID: string;
-	currency: string;
-	price: number;
-	duration: number;
-	duration_unit: DurationUnit;
-	loadScript?: boolean;
-	setIsLoading: (isLoading: boolean) => void;
-	onSuccess: (duration: number, duration_unit: DurationUnit) => void;
-}
-
-export default function PayPalPayment({clientID, price, currency, duration, duration_unit, loadScript, setIsLoading, onSuccess}: Props) {
-	const createOrder = async (data: CreateOrderData, actions: CreateOrderActions): Promise<string> => {
-		setIsLoading(true);
-
-		return axios
-			.post<OrderResponseBody>("/api/paypal", {currencyCode: currency, price})
-			.then((response) => response.data)
-			.then((data) => data.id);
-	};
-
-	const onApprove = async (data: OnApproveData, actions: OnApproveActions) => {
-		const request = await axios.post<{ok: boolean; reason?: string}>("/api/paypal/approve", {id: data.orderID, duration, duration_unit});
-
-		if (request.status !== 200) {
-			toast.error("Something went wrong, please try again later");
-			return;
-		}
-
-		toast.success("Your account has been credited more time!");
-		return onSuccess(duration, duration_unit);
-	};
-
-	const onError = async (data: Record<string, unknown>) => {
-		setIsLoading(false);
-	};
-
-	const onCancel = async (data: Record<string, unknown>, actions: OnCancelledActions) => {
-		setIsLoading(false);
-	};
-
-	return loadScript ? (
-		<PayPalScriptProvider
-			options={{
-				clientId: clientID,
-				currency,
-				intent: "capture",
-				commit: true,
-				vault: true,
-			}}>
-			<PayPalButtons
-				className="w-full"
-				style={{layout: "vertical"}}
-				createOrder={createOrder}
-				onApprove={onApprove}
-				onCancel={onCancel}
-				onError={onError}
-			/>
-		</PayPalScriptProvider>
-	) : (
-		<PayPalButtons
-			className="w-full"
-			style={{layout: "vertical"}}
-			createOrder={createOrder}
-			onApprove={onApprove}
-			onCancel={onCancel}
-			onError={onError}
-		/>
-	);
-}

src/components/PaymentAssetManager.tsx

@@ -1,145 +0,0 @@
-import React, {ChangeEvent} from "react";
-import {BsUpload, BsDownload, BsTrash, BsArrowRepeat, BsXCircleFill} from "react-icons/bs";
-import {FilesStorage} from "@/interfaces/storage.files";
-import axios from "axios";
-
-interface Asset {
-	file: string | File;
-	complete: boolean;
-}
-
-const PaymentAssetManager = (props: {
-	asset: string | undefined;
-	permissions: "read" | "write";
-	type: FilesStorage;
-	reload: () => void;
-	paymentId: string;
-}) => {
-	const {asset, permissions, type, paymentId} = props;
-
-	const fileInputRef = React.useRef<HTMLInputElement>(null);
-	const fileInputReplaceRef = React.useRef<HTMLInputElement>(null);
-
-	const [managingAsset, setManagingAsset] = React.useState<Asset>({
-		file: asset || "",
-		complete: asset ? true : false,
-	});
-
-	const {file, complete} = managingAsset;
-
-	const deleteAsset = () => {
-		if (confirm("Are you sure you want to delete this document?")) {
-			axios
-				.delete(`/api/payments/files/${type}/${paymentId}`)
-				.then((response) => {
-					if (response.status === 200) {
-						console.log("File deleted successfully!");
-						setManagingAsset({
-							file: "",
-							complete: false,
-						});
-						return;
-					}
-
-					console.error("File deletion failed");
-				})
-				.catch((error) => {
-					console.error("Error occurred during file deletion:", error);
-				})
-				.finally(props.reload);
-		}
-	};
-
-	const renderFileInput = (onChange: any, ref: React.RefObject<HTMLInputElement>) => (
-		<input type="file" ref={ref} style={{display: "none"}} onChange={onChange} multiple={false} accept="application/pdf" />
-	);
-
-	const handleFileChange = async (e: Event, method: "post" | "patch") => {
-		const newFile = (e.target as HTMLInputElement).files?.[0];
-		if (newFile) {
-			setManagingAsset({
-				file: newFile,
-				complete: false,
-			});
-
-			const formData = new FormData();
-			formData.append("file", newFile);
-
-			axios[method](`/api/payments/files/${type}/${paymentId}`, formData, {
-				headers: {
-					"Content-Type": "multipart/form-data",
-				},
-			})
-				.then((response) => {
-					if (response.status === 200) {
-						console.log("File uploaded successfully!");
-						console.log("Uploaded File URL:", response.data.ref);
-						// Further actions upon successful upload
-						setManagingAsset({
-							file: response.data.ref,
-							complete: true,
-						});
-						return;
-					}
-
-					console.error("File upload failed");
-				})
-				.catch((error) => {
-					console.error("Error occurred during file upload:", error);
-				})
-				.finally(props.reload);
-		}
-	};
-
-	const downloadAsset = () => {
-		axios
-			.get(`/api/payments/files/${type}/${paymentId}`)
-			.then((response) => {
-				if (response.status === 200) {
-					console.log("Uploaded File URL:", response.data.url);
-					const link = document.createElement("a");
-					link.download = response.data.filename;
-					link.href = response.data.url;
-					link.click();
-					return;
-				}
-
-				console.error("Failed to download file");
-			})
-			.catch((error) => {
-				console.error("Error occurred during file upload:", error);
-			});
-	};
-
-	if (permissions === "read") {
-		if (file) return <BsDownload onClick={downloadAsset} />;
-		return null;
-	}
-
-	if (file) {
-		if (complete) {
-			return (
-				<>
-					<BsDownload onClick={downloadAsset} />
-					<BsArrowRepeat onClick={() => fileInputReplaceRef.current?.click()} />
-					<BsTrash onClick={deleteAsset} />
-					{renderFileInput((e: Event) => handleFileChange(e, "patch"), fileInputReplaceRef)}
-					{renderFileInput((e: Event) => handleFileChange(e, "post"), fileInputRef)}
-				</>
-			);
-		}
-
-		return <span className="loading loading-infinity w-8" />;
-	}
-
-	return permissions === "write" ? (
-		<>
-			<BsUpload onClick={() => fileInputRef.current?.click()} />
-			{renderFileInput((e: Event) => handleFileChange(e, "post"), fileInputRef)}
-		</>
-	) : (
-		<BsXCircleFill />
-	);
-};
-
-export default PaymentAssetManager;

src/components/ProfileCard.tsx

@@ -0,0 +1,31 @@
+/* eslint-disable @next/next/no-img-element */
+import {User} from "@/interfaces/user";
+import clsx from "clsx";
+import LevelLabel from "./LevelLabel";
+import LevelProgressBar from "./LevelProgressBar";
+import {Avatar} from "primereact/avatar";
+
+interface Props {
+	user: User;
+	className: string;
+}
+
+export default function ProfileCard({user, className}: Props) {
+	return (
+		<div className={clsx("bg-white drop-shadow-xl p-4 md:p-8 rounded-xl w-full flex flex-col gap-6", className)}>
+			<div className="flex w-full items-center gap-8">
+				<div className="w-16 md:w-24 h-16 md:h-24 rounded-full border-2 md:border-4 border-white drop-shadow-md md:drop-shadow-xl">
+					{user.profilePicture.length > 0 && <img src={user.profilePicture} alt="Profile picture" className="rounded-full object-cover" />}
+					{user.profilePicture.length === 0 && (
+						<Avatar size="xlarge" style={{width: "100%", height: "100%"}} label={user.name.slice(0, 1)} shape="circle" />
+					)}
+				</div>
+				<div className="flex flex-col justify-center">
+					<span className="text-neutral-600 font-bold text-xl lg:text-2xl">{user.name}</span>
+					<LevelLabel experience={user.experience} />
+				</div>
+			</div>
+			<LevelProgressBar experience={user.experience} progressBarWidth="w-32 md:w-96" />
+		</div>
+	);
+}

src/components/ProfileLevel.tsx

@@ -0,0 +1,31 @@
+/* eslint-disable @next/next/no-img-element */
+import {User} from "@/interfaces/user";
+import {levelCalculator} from "@/resources/level";
+import clsx from "clsx";
+import LevelLabel from "./LevelLabel";
+import LevelProgressBar from "./LevelProgressBar";
+import {Avatar} from "primereact/avatar";
+
+interface Props {
+	user: User;
+	className?: string;
+}
+
+export default function ProfileLevel({user, className}: Props) {
+	const levelResult = levelCalculator(user.experience);
+
+	return (
+		<div className={clsx("flex flex-col items-center justify-center gap-4", className)}>
+			<div className="w-16 md:w-24 h-16 md:h-24 rounded-full">
+				{user.profilePicture.length > 0 && <img src={user.profilePicture} alt="Profile picture" className="rounded-full object-cover" />}
+				{user.profilePicture.length === 0 && (
+					<Avatar size="xlarge" style={{width: "100%", height: "100%"}} label={user.name.slice(0, 1)} shape="circle" />
+				)}
+			</div>
+			<div className="flex flex-col gap-1 items-center">
+				<LevelLabel experience={user.experience} />
+				<LevelProgressBar experience={user.experience} className="text-black" />
+			</div>
+		</div>
+	);
+}

src/components/ProfileSummary.tsx

@@ -1,90 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import {User} from "@/interfaces/user";
-import {USER_TYPE_LABELS} from "@/resources/user";
-import {calculateAverageLevel} from "@/utils/score";
-import {capitalize} from "lodash";
-import {ReactElement} from "react";
-import ProgressBar from "./Low/ProgressBar";
-
-interface Props {
-	user: User;
-	items: {
-		icon: ReactElement;
-		value: string | number;
-		label: string;
-		tooltip?: string;
-	}[];
-	children?: ReactElement;
-}
-
-export default function ProfileSummary({user, items}: Props) {
-	return (
-		<section className="w-full flex -md:flex-col gap-4 md:gap-8">
-			<img
-				src={user.profilePicture}
-				alt={user.name}
-				className="aspect-square h-20 md:h-64 rounded-3xl drop-shadow-xl object-cover -md:hidden"
-			/>
-			<div className="flex md:flex-col gap-4 md:py-4 w-full -md:items-center">
-				<img src={user.profilePicture} alt={user.name} className="aspect-square h-24 md:hidden rounded-3xl drop-shadow-xl object-cover" />
-				<div className="flex -md:flex-col justify-between w-full gap-8">
-					<div className="flex flex-col gap-2 py-2">
-						<h1 className="font-bold text-2xl md:text-4xl">{user.name}</h1>
-						<h6 className="font-normal text-base text-mti-gray-taupe">{USER_TYPE_LABELS[user.type]}</h6>
-					</div>
-					<ProgressBar
-						label={`Level ${calculateAverageLevel(user.levels).toFixed(1)}`}
-						percentage={100}
-						color="purple"
-						className="max-w-xs w-32 md:self-end h-10 -md:hidden"
-					/>
-				</div>
-				<ProgressBar
-					label=""
-					percentage={Math.round((calculateAverageLevel(user.levels) * 100) / calculateAverageLevel(user.desiredLevels))}
-					color="red"
-					className="w-full h-3 drop-shadow-lg -md:hidden"
-				/>
-
-				<div className="flex justify-between w-full mt-8 -md:hidden">
-					{items.map((item) => (
-						<div className="flex gap-4 items-center" key={item.label}>
-							<div
-								className="w-16 h-16 border border-mti-gray-platinum bg-mti-gray-smoke flex items-center justify-center rounded-xl relative group tooltip tooltip-bottom"
-								data-tip={item.tooltip}
-							>
-								{item.icon}
-							</div>
-							<div className="flex flex-col">
-								<span className="font-bold text-xl">{item.value}</span>
-								<span className="font-normal text-base text-mti-gray-dim">{item.label}</span>
-							</div>
-						</div>
-					))}
-				</div>
-			</div>
-
-			<ProgressBar
-				label={`Level ${calculateAverageLevel(user.levels).toFixed(1)}`}
-				percentage={Math.round((calculateAverageLevel(user.levels) * 100) / calculateAverageLevel(user.desiredLevels))}
-				color="purple"
-				className="w-full md:hidden h-8"
-				textClassName="!text-mti-black"
-			/>
-
-			<div className="grid grid-cols-2  gap-4 w-full mt-4 md:hidden">
-				{items.map((item) => (
-					<div className="flex gap-4 items-center" key={item.label}>
-						<div className="w-12 h-12 md:w-16 md:h-16 border border-mti-gray-platinum bg-mti-gray-smoke flex items-center justify-center rounded-lg md:rounded-xl">
-							{item.icon}
-						</div>
-						<div className="flex flex-col">
-							<span className="font-bold text-lg md:text-xl">{item.value}</span>
-							<span className="font-normal text-sm md:text-base text-mti-gray-dim">{item.label}</span>
-						</div>
-					</div>
-				))}
-			</div>
-		</section>
-	);
-}

src/components/Sidebar.tsx

@@ -1,295 +1,76 @@
 import clsx from "clsx";
-import { IconType } from "react-icons";
-import { MdSpaceDashboard } from "react-icons/md";
-import {
-  BsFileEarmarkText,
-  BsClockHistory,
-  BsPencil,
-  BsGraphUp,
-  BsChevronBarRight,
-  BsChevronBarLeft,
-  BsShieldFill,
-  BsCloudFill,
-  BsCurrencyDollar,
-  BsClipboardData,
-} from "react-icons/bs";
-import { RiLogoutBoxFill } from "react-icons/ri";
-import { SlPencil } from "react-icons/sl";
-import { FaAward } from "react-icons/fa";
+import {IconType} from "react-icons";
+import {MdSpaceDashboard} from "react-icons/md";
+import {BsFileEarmarkText, BsClockHistory, BsPencil, BsGraphUp, BsShield} from "react-icons/bs";
+import {RiLogoutBoxFill} from "react-icons/ri";
+import {SlPencil} from "react-icons/sl";
+import {FaAward} from "react-icons/fa";
 import Link from "next/link";
-import { useRouter } from "next/router";
+import {useRouter} from "next/router";
 import axios from "axios";
-import FocusLayer from "@/components/FocusLayer";
+import FocusLayer from '@/components/FocusLayer';
 import { preventNavigation } from "@/utils/navigation.disabled";
-import { useState } from "react";
-import usePreferencesStore from "@/stores/preferencesStore";
-import { Type } from "@/interfaces/user";
 interface Props {
-  path: string;
-  navDisabled?: boolean;
-  focusMode?: boolean;
-  onFocusLayerMouseEnter?: () => void;
-  className?: string;
-  userType?: Type;
+	path: string;
+	navDisabled?: boolean;
+	focusMode?: boolean;
+	onFocusLayerMouseEnter?: Function;
 }
 
 interface NavProps {
-  Icon: IconType;
-  label: string;
-  path: string;
-  keyPath: string;
-  disabled?: boolean;
-  isMinimized?: boolean;
+	Icon: IconType;
+	label: string;
+	path: string;
+	keyPath: string;
+	disabled?: boolean;
 }
 
-const Nav = ({
-  Icon,
-  label,
-  path,
-  keyPath,
-  disabled = false,
-  isMinimized = false,
-}: NavProps) => (
-  <Link
-    href={!disabled ? keyPath : ""}
-    className={clsx(
-      "flex items-center gap-4 rounded-full p-4 text-gray-500 hover:text-white",
-      "transition-all duration-300 ease-in-out",
-      disabled
-        ? "hover:bg-mti-gray-dim cursor-not-allowed"
-        : "hover:bg-mti-purple-light cursor-pointer",
-      path === keyPath && "bg-mti-purple-light text-white",
-      isMinimized ? "w-fit" : "w-full min-w-[200px] px-8 2xl:min-w-[220px]",
-    )}
-  >
-    <Icon size={24} />
-    {!isMinimized && <span className="text-lg font-semibold">{label}</span>}
-  </Link>
+const Nav = ({Icon, label, path, keyPath, disabled = false}: NavProps) => (
+	<Link
+		href={!disabled ? keyPath : ""}
+		className={clsx(
+			"p-4 px-8 rounded-full flex gap-4 items-center cursor-pointer text-gray-500 hover:bg-mti-purple-light hover:text-white transition duration-300 ease-in-out",
+			path === keyPath && "bg-mti-purple-light text-white",
+		)}>
+		<Icon size={20} />
+		<span className="text-lg font-semibold">{label}</span>
+	</Link>
 );
 
-export default function Sidebar({
-  path,
-  navDisabled = false,
-  focusMode = false,
-  userType,
-  onFocusLayerMouseEnter,
-  className,
-}: Props) {
-  const router = useRouter();
+export default function Sidebar({path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
+	const router = useRouter();
 
-  const [isMinimized, toggleMinimize] = usePreferencesStore((state) => [
-    state.isSidebarMinimized,
-    state.toggleSidebarMinimized,
-  ]);
+	const logout = async () => {
+		axios.post("/api/logout").finally(() => {
+			setTimeout(() => router.reload(), 500);
+		});
+	};
 
-  const logout = async () => {
-    axios.post("/api/logout").finally(() => {
-      setTimeout(() => router.reload(), 500);
-    });
-  };
+	const disableNavigation: Boolean = preventNavigation(navDisabled, focusMode);
 
-  const disableNavigation = preventNavigation(navDisabled, focusMode);
+	return (
+		<section className="h-full flex bg-transparent flex-col justify-between w-1/6 px-4 py-4 pb-8 relative">
+			<div className="flex flex-col gap-3">
+				<Nav disabled={disableNavigation} Icon={MdSpaceDashboard} label="Dashboard" path={path} keyPath="/" />
+				<Nav disabled={disableNavigation} Icon={BsFileEarmarkText} label="Exams" path={path} keyPath="/exam" />
+				<Nav disabled={disableNavigation} Icon={BsPencil} label="Exercises" path={path} keyPath="/exercises" />
+				<Nav disabled={disableNavigation} Icon={BsGraphUp} label="Stats" path={path} keyPath="/stats" />
+				<Nav disabled={disableNavigation} Icon={BsClockHistory} label="Record" path={path} keyPath="/record" />
+				<Nav disabled={disableNavigation} Icon={BsShield} label="Admin" path={path} keyPath="/admin" />
+			</div>
 
-  return (
-    <section
-      className={clsx(
-        "relative flex h-full flex-col justify-between bg-transparent px-4 py-4 pb-8",
-        isMinimized ? "w-fit" : "-xl:w-fit w-1/6",
-        className,
-      )}
-    >
-      <div className="-xl:hidden flex-col gap-3 xl:flex">
-        <Nav
-          disabled={disableNavigation}
-          Icon={MdSpaceDashboard}
-          label="Dashboard"
-          path={path}
-          keyPath="/"
-          isMinimized={isMinimized}
-        />
-        {(userType === "student" ||
-          userType === "teacher" ||
-          userType === "developer") && (
-          <>
-            <Nav
-              disabled={disableNavigation}
-              Icon={BsFileEarmarkText}
-              label="Exams"
-              path={path}
-              keyPath="/exam"
-              isMinimized={isMinimized}
-            />
-            <Nav
-              disabled={disableNavigation}
-              Icon={BsPencil}
-              label="Exercises"
-              path={path}
-              keyPath="/exercises"
-              isMinimized={isMinimized}
-            />
-          </>
-        )}
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsGraphUp}
-          label="Stats"
-          path={path}
-          keyPath="/stats"
-          isMinimized={isMinimized}
-        />
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsClockHistory}
-          label="Record"
-          path={path}
-          keyPath="/record"
-          isMinimized={isMinimized}
-        />
-        {["admin", "developer", "agent", "corporate"].includes(
-          userType || "",
-        ) && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsCurrencyDollar}
-            label="Payment Record"
-            path={path}
-            keyPath="/payment-record"
-            isMinimized={isMinimized}
-          />
-        )}
-        {["admin", "developer", "corporate", "teacher"].includes(
-          userType || "",
-        ) && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsShieldFill}
-            label="Settings"
-            path={path}
-            keyPath="/settings"
-            isMinimized={isMinimized}
-          />
-        )}
-        {["admin", "developer", "agent"].includes(userType || "") && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsClipboardData}
-            label="Tickets"
-            path={path}
-            keyPath="/tickets"
-            isMinimized={isMinimized}
-          />
-        )}
-        {userType === "developer" && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsCloudFill}
-            label="Generation"
-            path={path}
-            keyPath="/generation"
-            isMinimized={isMinimized}
-          />
-        )}
-      </div>
-      <div className="-xl:flex flex-col gap-3 xl:hidden">
-        <Nav
-          disabled={disableNavigation}
-          Icon={MdSpaceDashboard}
-          label="Dashboard"
-          path={path}
-          keyPath="/"
-          isMinimized={true}
-        />
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsFileEarmarkText}
-          label="Exams"
-          path={path}
-          keyPath="/exam"
-          isMinimized={true}
-        />
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsPencil}
-          label="Exercises"
-          path={path}
-          keyPath="/exercises"
-          isMinimized={true}
-        />
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsGraphUp}
-          label="Stats"
-          path={path}
-          keyPath="/stats"
-          isMinimized={true}
-        />
-        <Nav
-          disabled={disableNavigation}
-          Icon={BsClockHistory}
-          label="Record"
-          path={path}
-          keyPath="/record"
-          isMinimized={true}
-        />
-        {userType !== "student" && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsShieldFill}
-            label="Settings"
-            path={path}
-            keyPath="/settings"
-            isMinimized={true}
-          />
-        )}
-        {userType === "developer" && (
-          <Nav
-            disabled={disableNavigation}
-            Icon={BsCloudFill}
-            label="Generation"
-            path={path}
-            keyPath="/generation"
-            isMinimized={true}
-          />
-        )}
-      </div>
-
-      <div className="fixed bottom-12 flex flex-col gap-0">
-        <div
-          role="button"
-          tabIndex={1}
-          onClick={toggleMinimize}
-          className={clsx(
-            "hover:text-mti-rose -xl:hidden flex cursor-pointer items-center gap-4 rounded-full p-4 text-black transition duration-300 ease-in-out",
-            isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
-          )}
-        >
-          {isMinimized ? (
-            <BsChevronBarRight size={24} />
-          ) : (
-            <BsChevronBarLeft size={24} />
-          )}
-          {!isMinimized && (
-            <span className="text-lg font-medium">Minimize</span>
-          )}
-        </div>
-        <div
-          role="button"
-          tabIndex={1}
-          onClick={focusMode ? () => {} : logout}
-          className={clsx(
-            "hover:text-mti-rose flex cursor-pointer items-center gap-4 rounded-full p-4 text-black transition duration-300 ease-in-out",
-            isMinimized ? "w-fit" : "w-full min-w-[250px] px-8",
-          )}
-        >
-          <RiLogoutBoxFill size={24} />
-          {!isMinimized && (
-            <span className="-xl:hidden text-lg font-medium">Log Out</span>
-          )}
-        </div>
-      </div>
-      {focusMode && (
-        <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />
-      )}
-    </section>
-  );
+			<div
+				role="button"
+				tabIndex={1}
+				onClick={focusMode ? () => {} : logout}
+				className={clsx(
+					"p-4 px-8 rounded-full flex gap-4 items-center cursor-pointer text-black hover:text-mti-rose transition duration-300 ease-in-out",
+					"absolute bottom-8",
+				)}>
+				<RiLogoutBoxFill size={20} />
+				<span className="text-lg font-medium">Log Out</span>
+			</div>
+			{focusMode && <FocusLayer onFocusLayerMouseEnter={onFocusLayerMouseEnter} />}
+		</section>
+	);
 }

src/components/Solutions/FillBlanks.tsx

@@ -8,10 +8,8 @@ import Button from "../Low/Button";
 export default function FillBlanksSolutions({id, type, prompt, solutions, text, userSolutions, onNext, onBack}: FillBlanksExercise & CommonProps) {
 	const calculateScore = () => {
 		const total = text.match(/({{\d+}})/g)?.length || 0;
-		const correct = userSolutions.filter(
-			(x) => solutions.find((y) => x.id.toString() === y.id.toString())?.solution === x.solution.toLowerCase() || false,
-		).length;
-		const missing = total - userSolutions.filter((x) => solutions.find((y) => x.id.toString() === y.id.toString())).length;
+		const correct = userSolutions.filter((x) => solutions.find((y) => x.id === y.id)?.solution === x.solution.toLowerCase() || false).length;
+		const missing = total - userSolutions.filter((x) => solutions.find((y) => x.id === y.id)).length;
 
 		return {total, correct, missing};
 	};
@@ -19,7 +17,7 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text,
 	const renderLines = (line: string) => {
 		return (
 			<span>
-				{reactStringReplace(line, /({{\d+}})/g, (match) => {
+				{reactStringReplace(line, /({{\d}})/g, (match) => {
 					const id = match.replaceAll(/[\{\}]/g, "");
 					const userSolution = userSolutions.find((x) => x.id === id);
 					const solution = solutions.find((x) => x.id === id)!;
@@ -28,9 +26,9 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text,
 						return (
 							<button
 								className={clsx(
-									"rounded-full hover:text-white hover:bg-mti-gray-davy transition duration-300 ease-in-out my-1 px-5 py-2 text-center text-white bg-mti-gray-davy",
+									"rounded-full hover:text-white hover:bg-mti-red transition duration-300 ease-in-out my-1 px-5 py-2 text-center text-white bg-mti-red-light",
 								)}>
-								{solution?.solution}
+								{solution.solution}
 							</button>
 						);
 					}
@@ -85,13 +83,12 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text,
 					))}
 				</span>
 				<span className="bg-mti-gray-smoke rounded-xl px-5 py-6">
-					{userSolutions &&
-						text.split("\\n").map((line, index) => (
-							<p key={index}>
-								{renderLines(line)}
-								<br />
-							</p>
-						))}
+					{text.split("\\n").map((line, index) => (
+						<p key={index}>
+							{renderLines(line)}
+							<br />
+						</p>
+					))}
 				</span>
 				<div className="flex gap-4 items-center">
 					<div className="flex gap-2 items-center">
@@ -99,7 +96,7 @@ export default function FillBlanksSolutions({id, type, prompt, solutions, text,
 						Correct
 					</div>
 					<div className="flex gap-2 items-center">
-						<div className="w-4 h-4 rounded-full bg-mti-gray-davy" />
+						<div className="w-4 h-4 rounded-full bg-mti-red" />
 						Unanswered
 					</div>
 					<div className="flex gap-2 items-center">

src/components/Solutions/InteractiveSpeaking.tsx

@@ -1,256 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import {InteractiveSpeakingExercise} from "@/interfaces/exam";
-import {CommonProps} from ".";
-import {useEffect, useState} from "react";
-import Button from "../Low/Button";
-import dynamic from "next/dynamic";
-import axios from "axios";
-import {speakingReverseMarking} from "@/utils/score";
-import {Tab} from "@headlessui/react";
-import clsx from "clsx";
-import Modal from "../Modal";
-import ReactDiffViewer, {DiffMethod} from "react-diff-viewer";
-
-const Waveform = dynamic(() => import("../Waveform"), {ssr: false});
-
-export default function InteractiveSpeaking({
-	id,
-	type,
-	title,
-	text,
-	prompts,
-	userSolutions,
-	onNext,
-	onBack,
-}: InteractiveSpeakingExercise & CommonProps) {
-	const [solutionsURL, setSolutionsURL] = useState<string[]>([]);
-	const [diffNumber, setDiffNumber] = useState<0 | 1 | 2 | 3>(0);
-
-	useEffect(() => {
-		if (userSolutions && userSolutions.length > 0 && userSolutions[0].solution) {
-			Promise.all(userSolutions[0].solution.map((x) => axios.post(`/api/speaking`, {path: x.answer}, {responseType: "arraybuffer"}))).then(
-				(values) => {
-					setSolutionsURL(
-						values.map(({data}) => {
-							const blob = new Blob([data], {type: "audio/wav"});
-							const url = URL.createObjectURL(blob);
-
-							return url;
-						}),
-					);
-				},
-			);
-		}
-	}, [userSolutions]);
-
-	return (
-		<>
-			<Modal title={`Correction (Prompt ${diffNumber})`} isOpen={diffNumber !== 0} onClose={() => setDiffNumber(0)}>
-				<>
-					{userSolutions &&
-						userSolutions.length > 0 &&
-						diffNumber !== 0 &&
-						userSolutions[0].evaluation &&
-						userSolutions[0].evaluation[`transcript_${diffNumber}`] &&
-						userSolutions[0].evaluation[`fixed_text_${diffNumber}`] && (
-							<div className="w-full h-full rounded-xl overflow-hidden flex flex-col mt-4">
-								<div className="w-full grid grid-cols-2 bg-neutral-100">
-									<span className="p-3 font-medium text-lg border-r border-r-neutral-200">Transcript</span>
-									<span className="p-3 font-medium text-lg border-l border-l-neutral-200">Recommended Improvements</span>
-								</div>
-								<ReactDiffViewer
-									styles={{
-										contentText: {
-											fontFamily: '"Open Sans", system-ui, -apple-system, "Helvetica Neue", sans-serif',
-											padding: "32px 28px",
-										},
-										marker: {display: "none"},
-										diffRemoved: {padding: "32px 28px"},
-										diffAdded: {padding: "32px 28px"},
-
-										wordRemoved: {padding: "0px", display: "initial"},
-										wordAdded: {padding: "0px", display: "initial"},
-										wordDiff: {padding: "0px", display: "initial"},
-									}}
-									oldValue={userSolutions[0].evaluation[`transcript_${diffNumber}`]?.replaceAll("\\n", "\n")}
-									newValue={userSolutions[0].evaluation[`fixed_text_${diffNumber}`]?.replaceAll("\\n", "\n")}
-									splitView
-									hideLineNumbers
-									showDiffOnly={false}
-								/>
-							</div>
-						)}
-				</>
-			</Modal>
-
-			<div className="flex flex-col h-full w-full gap-8 mb-20">
-				<div className="flex flex-col w-full gap-8 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
-					<div className="flex flex-col gap-3">
-						<span className="font-semibold">{title}</span>
-					</div>
-					<div className="flex flex-col gap-4">
-						<span className="font-bold">You should talk about the following things:</span>
-						<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6 text-center">
-							{prompts.map((x, index) => (
-								<div className="italic flex flex-col gap-2 text-sm" key={index}>
-									<video key={index} controls className="">
-										<source src={x.video_url} />
-									</video>
-									<span>{x.text}</span>
-								</div>
-							))}
-						</div>
-					</div>
-				</div>
-
-				<div className="w-full h-full flex flex-col gap-8">
-					<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8">
-						{solutionsURL.map((x, index) => (
-							<div
-								key={index}
-								className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex flex-col gap-4">
-								<div className="flex gap-8 items-center justify-center py-8">
-									<Waveform audio={x} waveColor="#FCDDEC" progressColor="#EF5DA8" />
-								</div>
-								{userSolutions &&
-									userSolutions.length > 0 &&
-									userSolutions[0].evaluation &&
-									userSolutions[0].evaluation[`transcript_${(index + 1) as 1 | 2 | 3}`] &&
-									userSolutions[0].evaluation[`fixed_text_${(index + 1) as 1 | 2 | 3}`] && (
-										<Button
-											className="w-full max-w-[180px] !py-2 self-center"
-											color="pink"
-											variant="outline"
-											onClick={() => setDiffNumber((index + 1) as 1 | 2 | 3)}>
-											View Correction
-										</Button>
-									)}
-							</div>
-						))}
-					</div>
-
-					{userSolutions && userSolutions.length > 0 && userSolutions[0].evaluation && typeof userSolutions[0].evaluation !== "string" && (
-						<div className="flex flex-col gap-4 w-full">
-							<div className="flex gap-4 px-1">
-								{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => (
-									<div className="bg-ielts-speaking text-ielts-speaking-light rounded-xl px-4 py-2" key={key}>
-										{key}: Level {userSolutions[0].evaluation!.task_response[key]}
-									</div>
-								))}
-							</div>
-							{userSolutions[0].evaluation &&
-							Object.keys(userSolutions[0].evaluation).filter((x) => x.startsWith("perfect_answer")).length === 3 ? (
-								<Tab.Group>
-									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Evaluation
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 1)
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 2)
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer (Prompt 3)
-										</Tab>
-									</Tab.List>
-									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_1!.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_2!.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer_3!.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-									</Tab.Panels>
-								</Tab.Group>
-							) : (
-								<div className="w-full h-full min-h-fit cursor-text px-7 py-8 bg-ielts-speaking/10 rounded-3xl">
-									{userSolutions[0].evaluation!.comment}
-								</div>
-							)}
-						</div>
-					)}
-				</div>
-			</div>
-
-			<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8">
-				<Button
-					color="purple"
-					variant="outline"
-					onClick={() =>
-						onBack({
-							exercise: id,
-							solutions: userSolutions,
-							score: {total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
-							type,
-						})
-					}
-					className="max-w-[200px] self-end w-full">
-					Back
-				</Button>
-				<Button
-					color="purple"
-					onClick={() =>
-						onNext({
-							exercise: id,
-							solutions: userSolutions,
-							score: {
-								total: 100,
-								missing: 0,
-								correct: userSolutions[0]?.evaluation ? speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
-							},
-							type,
-						})
-					}
-					className="max-w-[200px] self-end w-full">
-					Next
-				</Button>
-			</div>
-		</>
-	);
-}

src/components/Solutions/MatchSentences.tsx

@@ -21,10 +21,8 @@ export default function MatchSentencesSolutions({
 }: MatchSentencesExercise & CommonProps) {
 	const calculateScore = () => {
 		const total = sentences.length;
-		const correct = userSolutions.filter(
-			(x) => sentences.find((y) => y.id.toString() === x.question.toString())?.solution === x.option || false,
-		).length;
-		const missing = total - userSolutions.filter((x) => sentences.find((y) => y.id.toString() === x.question.toString())).length;
+		const correct = userSolutions.filter((x) => sentences.find((y) => y.id === x.question)?.solution === x.option || false).length;
+		const missing = total - userSolutions.filter((x) => sentences.find((y) => y.id === x.question)).length;
 
 		return {total, correct, missing};
 	};
@@ -50,9 +48,9 @@ export default function MatchSentencesSolutions({
 									className={clsx(
 										"w-8 h-8 rounded-full z-10 text-white",
 										"transition duration-300 ease-in-out",
-										!userSolutions.find((x) => x.question.toString() === id.toString()) && "!bg-mti-gray-davy",
-										userSolutions.find((x) => x.question.toString() === id.toString())?.option === solution && "bg-mti-purple",
-										userSolutions.find((x) => x.question.toString() === id.toString())?.option !== solution && "bg-mti-rose",
+										!userSolutions.find((x) => x.question === id) && "!bg-mti-red",
+										userSolutions.find((x) => x.question === id)?.option === solution && "bg-mti-purple",
+										userSolutions.find((x) => x.question === id)?.option !== solution && "bg-mti-rose",
 									)}>
 									{id}
 								</button>
@@ -74,29 +72,28 @@ export default function MatchSentencesSolutions({
 							</div>
 						))}
 					</div>
-					{userSolutions &&
-						sentences.map((sentence, index) => (
-							<Xarrow
-								key={index}
-								start={sentence.id}
-								end={sentence.solution}
-								lineColor={
-									!userSolutions.find((x) => x.question === sentence.id)
-										? "#CC5454"
-										: userSolutions.find((x) => x.question === sentence.id)?.option === sentence.solution
-										? "#7872BF"
-										: "#CC5454"
-								}
-								showHead={false}
-							/>
-						))}
+					{sentences.map((sentence, index) => (
+						<Xarrow
+							key={index}
+							start={sentence.id}
+							end={sentence.solution}
+							lineColor={
+								!userSolutions.find((x) => x.question === sentence.id)
+									? "#CC5454"
+									: userSolutions.find((x) => x.question === sentence.id)?.option === sentence.solution
+									? "#7872BF"
+									: "#CC5454"
+							}
+							showHead={false}
+						/>
+					))}
 				</div>
 				<div className="flex gap-4 items-center">
 					<div className="flex gap-2 items-center">
 						<div className="w-4 h-4 rounded-full bg-mti-purple" /> Correct
 					</div>
 					<div className="flex gap-2 items-center">
-						<div className="w-4 h-4 rounded-full bg-mti-gray-davy" /> Unanswered
+						<div className="w-4 h-4 rounded-full bg-mti-red" /> Unanswered
 					</div>
 					<div className="flex gap-2 items-center">
 						<div className="w-4 h-4 rounded-full bg-mti-rose" /> Wrong

src/components/Solutions/MultipleChoice.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import {MultipleChoiceExercise, MultipleChoiceQuestion} from "@/interfaces/exam";
 import clsx from "clsx";
-import {useEffect, useState} from "react";
+import {useState} from "react";
 import {CommonProps} from ".";
 import Button from "../Low/Button";
 
@@ -14,7 +14,7 @@ function Question({
 }: MultipleChoiceQuestion & {userSolution: string | undefined; onSelectOption?: (option: string) => void; showSolution?: boolean}) {
 	const optionColor = (option: string) => {
 		if (option === solution && !userSolution) {
-			return "!border-mti-gray-davy !text-mti-gray-davy";
+			return "!border-mti-red-light !text-mti-red-light";
 		}
 
 		if (option === solution) {
@@ -54,32 +54,17 @@ function Question({
 	);
 }
 
-export default function MultipleChoice({
-	id,
-	type,
-	prompt,
-	questions,
-	userSolutions,
-	updateIndex,
-	onNext,
-	onBack,
-}: MultipleChoiceExercise & CommonProps) {
+export default function MultipleChoice({id, type, prompt, questions, userSolutions, onNext, onBack}: MultipleChoiceExercise & CommonProps) {
 	const [questionIndex, setQuestionIndex] = useState(0);
 
 	const calculateScore = () => {
 		const total = questions.length;
-		const correct = userSolutions.filter(
-			(x) => questions.find((y) => y.id.toString() === x.question.toString())?.solution === x.option || false,
-		).length;
-		const missing = total - userSolutions.filter((x) => questions.find((y) => y.id.toString() === x.question.toString())).length;
+		const correct = userSolutions.filter((x) => questions.find((y) => y.id === x.question)?.solution === x.option || false).length;
+		const missing = total - userSolutions.filter((x) => questions.find((y) => y.id === x.question)).length;
 
 		return {total, correct, missing};
 	};
 
-	useEffect(() => {
-		if (updateIndex) updateIndex(questionIndex);
-	}, [questionIndex, updateIndex]);
-
 	const next = () => {
 		if (questionIndex === questions.length - 1) {
 			onNext({exercise: id, solutions: userSolutions, score: calculateScore(), type});
@@ -101,7 +86,7 @@ export default function MultipleChoice({
 			<div className="flex flex-col gap-4 w-full h-full mb-20">
 				<div className="flex flex-col gap-2 mt-4 h-full bg-mti-gray-smoke rounded-xl px-16 py-8">
 					<span className="text-xl font-semibold">{prompt}</span>
-					{userSolutions && questionIndex < questions.length && (
+					{questionIndex < questions.length && (
 						<Question
 							{...questions[questionIndex]}
 							userSolution={userSolutions.find((x) => questions[questionIndex].id === x.question)?.option}
@@ -114,7 +99,7 @@ export default function MultipleChoice({
 						Correct
 					</div>
 					<div className="flex gap-2 items-center">
-						<div className="w-4 h-4 rounded-full bg-mti-gray-davy" />
+						<div className="w-4 h-4 rounded-full bg-mti-red" />
 						Unanswered
 					</div>
 					<div className="flex gap-2 items-center">

src/components/Solutions/Speaking.tsx

@@ -5,122 +5,55 @@ import {Fragment, useEffect, useState} from "react";
 import Button from "../Low/Button";
 import dynamic from "next/dynamic";
 import axios from "axios";
-import {speakingReverseMarking} from "@/utils/score";
-import {Tab} from "@headlessui/react";
-import clsx from "clsx";
-import Modal from "../Modal";
-import {BsQuestionCircleFill} from "react-icons/bs";
-import ReactDiffViewer, {DiffMethod} from "react-diff-viewer";
 
 const Waveform = dynamic(() => import("../Waveform"), {ssr: false});
 
-export default function Speaking({id, type, title, video_url, text, prompts, userSolutions, onNext, onBack}: SpeakingExercise & CommonProps) {
+export default function Speaking({id, type, title, text, prompts, userSolutions, onNext, onBack}: SpeakingExercise & CommonProps) {
 	const [solutionURL, setSolutionURL] = useState<string>();
-	const [showDiff, setShowDiff] = useState(false);
 
 	useEffect(() => {
-		if (userSolutions && userSolutions.length > 0 && userSolutions[0].solution) {
-			axios.post(`/api/speaking`, {path: userSolutions[0].solution}, {responseType: "arraybuffer"}).then(({data}) => {
-				const blob = new Blob([data], {type: "audio/wav"});
-				const url = URL.createObjectURL(blob);
+		axios.post(`/api/speaking`, {path: userSolutions[0].solution}, {responseType: "arraybuffer"}).then(({data}) => {
+			const blob = new Blob([data], {type: "audio/wav"});
+			const url = URL.createObjectURL(blob);
 
-				setSolutionURL(url);
-			});
-		}
+			setSolutionURL(url);
+		});
 	}, [userSolutions]);
 
 	return (
 		<>
-			<Modal title="Correction" isOpen={showDiff} onClose={() => setShowDiff(false)}>
-				<>
-					{userSolutions &&
-						userSolutions.length > 0 &&
-						userSolutions[0].evaluation?.transcript_1 &&
-						userSolutions[0].evaluation?.fixed_text_1 && (
-							<div className="w-full h-full rounded-xl overflow-hidden flex flex-col mt-4">
-								<div className="w-full grid grid-cols-2 bg-neutral-100">
-									<span className="p-3 font-medium text-lg border-r border-r-neutral-200">Transcript</span>
-									<span className="p-3 font-medium text-lg border-l border-l-neutral-200">Recommended Improvements</span>
-								</div>
-								<ReactDiffViewer
-									styles={{
-										contentText: {
-											fontFamily: '"Open Sans", system-ui, -apple-system, "Helvetica Neue", sans-serif',
-											padding: "32px 28px",
-										},
-										marker: {display: "none"},
-										diffRemoved: {padding: "32px 28px"},
-										diffAdded: {padding: "32px 28px"},
-
-										wordRemoved: {padding: "0px", display: "initial"},
-										wordAdded: {padding: "0px", display: "initial"},
-										wordDiff: {padding: "0px", display: "initial"},
-									}}
-									oldValue={userSolutions[0].evaluation.transcript_1.replaceAll("\\n", "\n")}
-									newValue={userSolutions[0].evaluation.fixed_text_1.replaceAll("\\n", "\n")}
-									splitView
-									hideLineNumbers
-									showDiffOnly={false}
-								/>
-							</div>
-						)}
-				</>
-			</Modal>
-
 			<div className="flex flex-col h-full w-full gap-8 mb-20">
-				<div className="flex flex-col w-full gap-2 bg-mti-gray-smoke rounded-xl py-8 px-16">
+				<div className="flex flex-col w-full gap-14 bg-mti-gray-smoke rounded-xl py-8 pb-12 px-16">
 					<div className="flex flex-col gap-3">
 						<span className="font-semibold">{title}</span>
-						{!video_url && (
-							<span className="font-regular">
-								{text.split("\\n").map((line, index) => (
-									<Fragment key={index}>
-										<span>{line}</span>
-										<br />
-									</Fragment>
-								))}
-							</span>
-						)}
+						<span className="font-regular">
+							{text.split("\\n").map((line, index) => (
+								<Fragment key={index}>
+									<span>{line}</span>
+									<br />
+								</Fragment>
+							))}
+						</span>
 					</div>
-					<div className="flex gap-6">
-						{video_url && (
-							<div className="flex flex-col gap-4 w-full items-center">
-								<video key={id} autoPlay controls className="max-w-3xl rounded-xl">
-									<source src={video_url} />
-								</video>
-							</div>
-						)}
-						{prompts && prompts.length > 0 && (
-							<div className="flex flex-col gap-4">
-								<span className="font-bold">You should talk about the following things:</span>
-								<div className="flex flex-col gap-1 ml-4">
-									{prompts.map((x, index) => (
-										<li className="italic" key={index}>
-											{x}
-										</li>
-									))}
-								</div>
-							</div>
-						)}
+					<div className="flex flex-col gap-4">
+						<span className="font-bold">You should talk about the following things:</span>
+						<div className="flex flex-col gap-1 ml-4">
+							{prompts.map((x, index) => (
+								<li className="italic" key={index}>
+									{x}
+								</li>
+							))}
+						</div>
 					</div>
 				</div>
 
-				<div className="w-full h-full flex flex-col gap-8 relative">
-					<div className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex-col gap-8 items-center relative">
+				<div className="w-full h-full flex flex-col gap-8">
+					<div className="w-full p-4 px-8 bg-transparent border-2 border-mti-gray-platinum rounded-2xl flex-col gap-8 items-center">
 						<div className="flex gap-8 items-center justify-center py-8">
 							{solutionURL && <Waveform audio={solutionURL} waveColor="#FCDDEC" progressColor="#EF5DA8" />}
-
-							{userSolutions &&
-								userSolutions.length > 0 &&
-								userSolutions[0].evaluation?.transcript_1 &&
-								userSolutions[0].evaluation?.fixed_text_1 && (
-									<Button className="w-full max-w-[180px] !py-2" color="pink" variant="outline" onClick={() => setShowDiff(true)}>
-										View Correction
-									</Button>
-								)}
 						</div>
 					</div>
-					{userSolutions && userSolutions.length > 0 && userSolutions[0].evaluation && typeof userSolutions[0].evaluation !== "string" && (
+					{userSolutions && userSolutions.length > 0 && (
 						<div className="flex flex-col gap-4 w-full">
 							<div className="flex gap-4 px-1">
 								{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => (
@@ -129,52 +62,9 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 									</div>
 								))}
 							</div>
-							{userSolutions[0].evaluation &&
-							(userSolutions[0].evaluation.perfect_answer || userSolutions[0].evaluation.perfect_answer_1) ? (
-								<Tab.Group>
-									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-speaking/20 p-1">
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Evaluation
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-speaking/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-speaking focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-speaking",
-												)
-											}>
-											Recommended Answer
-										</Tab>
-									</Tab.List>
-									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-speaking/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer &&
-													userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n")}
-												{userSolutions[0].evaluation!.perfect_answer_1 &&
-													userSolutions[0].evaluation!.perfect_answer_1.replaceAll(/\s{2,}/g, "\n\n")}
-											</span>
-										</Tab.Panel>
-									</Tab.Panels>
-								</Tab.Group>
-							) : (
-								<div className="w-full h-full min-h-fit cursor-text px-7 py-8 bg-ielts-speaking/10 rounded-3xl">
-									{userSolutions[0].evaluation!.comment}
-								</div>
-							)}
+							<div className="w-full h-full min-h-fit cursor-text px-7 py-8 bg-mti-gray-smoke rounded-3xl">
+								{userSolutions[0].evaluation!.comment}
+							</div>
 						</div>
 					)}
 				</div>
@@ -188,7 +78,7 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 						onBack({
 							exercise: id,
 							solutions: userSolutions,
-							score: {total: 100, missing: 0, correct: speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
+							score: {correct: 1, total: 1, missing: 0},
 							type,
 						})
 					}
@@ -201,11 +91,7 @@ export default function Speaking({id, type, title, video_url, text, prompts, use
 						onNext({
 							exercise: id,
 							solutions: userSolutions,
-							score: {
-								total: 100,
-								missing: 0,
-								correct: userSolutions[0]?.evaluation ? speakingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
-							},
+							score: {correct: 1, total: 1, missing: 0},
 							type,
 						})
 					}

src/components/Solutions/TrueFalse.tsx

@@ -10,10 +10,8 @@ type Solution = "true" | "false" | "not_given";
 export default function TrueFalseSolution({prompt, type, id, questions, userSolutions, onNext, onBack}: TrueFalseExercise & CommonProps) {
 	const calculateScore = () => {
 		const total = questions.length || 0;
-		const correct = userSolutions.filter(
-			(x) => questions.find((y) => x.id.toString() === y.id.toString())?.solution === x.solution.toLowerCase() || false,
-		).length;
-		const missing = total - userSolutions.filter((x) => questions.find((y) => x.id.toString() === y.id.toString())).length;
+		const correct = userSolutions.filter((x) => questions.find((y) => x.id === y.id)?.solution === x.solution.toLowerCase() || false).length;
+		const missing = total - userSolutions.filter((x) => questions.find((y) => x.id === y.id)).length;
 
 		return {total, correct, missing};
 	};
@@ -33,7 +31,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 			return "rose";
 		}
 
-		return "gray";
+		return "red";
 	};
 
 	return (
@@ -64,41 +62,37 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 				</div>
 				<span className="text-sm w-full leading-6">You can click a selected option again to deselect it.</span>
 				<div className="bg-mti-gray-smoke rounded-xl px-5 py-6 flex flex-col gap-8">
-					{userSolutions &&
-						questions.map((question, index) => {
-							const userSolution = userSolutions.find((x) => x.id === question.id.toString());
-							const solution = question.solution.toString().toLowerCase() as Solution;
+					{questions.map((question, index) => {
+						const userSolution = userSolutions.find((x) => x.id === question.id);
 
-							return (
-								<div key={question.id.toString()} className="flex flex-col gap-4">
-									<span>
-										{index + 1}. {question.prompt}
-									</span>
-									<div className="flex gap-4">
-										<Button
-											variant={solution === "true" || userSolution?.solution.toLowerCase() === "true" ? "solid" : "outline"}
-											className="!py-2"
-											color={getButtonColor("true", solution, userSolution?.solution.toLowerCase() as Solution)}>
-											True
-										</Button>
-										<Button
-											variant={solution === "false" || userSolution?.solution.toLowerCase() === "false" ? "solid" : "outline"}
-											className="!py-2"
-											color={getButtonColor("false", solution, userSolution?.solution.toLowerCase() as Solution)}>
-											False
-										</Button>
-										<Button
-											variant={
-												solution === "not_given" || userSolution?.solution.toLowerCase() === "not_given" ? "solid" : "outline"
-											}
-											className="!py-2"
-											color={getButtonColor("not_given", solution, userSolution?.solution.toLowerCase() as Solution)}>
-											Not Given
-										</Button>
-									</div>
+						return (
+							<div key={question.id} className="flex flex-col gap-4">
+								<span>
+									{index + 1}. {question.prompt}
+								</span>
+								<div className="flex gap-4">
+									<Button
+										variant={question.solution === "true" || userSolution?.solution === "true" ? "solid" : "outline"}
+										className="!py-2"
+										color={getButtonColor("true", question.solution, userSolution?.solution)}>
+										True
+									</Button>
+									<Button
+										variant={question.solution === "false" || userSolution?.solution === "false" ? "solid" : "outline"}
+										className="!py-2"
+										color={getButtonColor("false", question.solution, userSolution?.solution)}>
+										False
+									</Button>
+									<Button
+										variant={question.solution === "not_given" || userSolution?.solution === "not_given" ? "solid" : "outline"}
+										className="!py-2"
+										color={getButtonColor("not_given", question.solution, userSolution?.solution)}>
+										Not Given
+									</Button>
 								</div>
-							);
-						})}
+							</div>
+						);
+					})}
 				</div>
 				<div className="flex gap-4 items-center">
 					<div className="flex gap-2 items-center">
@@ -106,7 +100,7 @@ export default function TrueFalseSolution({prompt, type, id, questions, userSolu
 						Correct
 					</div>
 					<div className="flex gap-2 items-center">
-						<div className="w-4 h-4 rounded-full bg-mti-gray-davy" />
+						<div className="w-4 h-4 rounded-full bg-mti-red" />
 						Unanswered
 					</div>
 					<div className="flex gap-2 items-center">

src/components/Solutions/WriteBlanks.tsx

@@ -29,6 +29,7 @@ function Blank({
 	useEffect(() => {
 		const words = userInput.split(" ").filter((x) => x !== "");
 		if (words.length >= maxWords) {
+			toast.warning(`You have reached your word limit of ${maxWords} words!`, {toastId: "word-limit"});
 			setUserInput(words.join(" ").trim());
 			if (setUserSolution) setUserSolution(words.join(" ").trim());
 		}
@@ -38,28 +39,30 @@ function Blank({
 
 	const getSolutionStyling = () => {
 		if (!userSolution) {
-			return "bg-mti-gray-davy text-white";
+			return "bg-mti-red-ultralight text-mti-red-light";
 		}
 
 		return "bg-mti-purple-ultralight text-mti-purple-light";
 	};
 
 	return (
-		<span className="inline-flex gap-2 ml-2">
+		<span className="inline-flex gap-2">
 			{userSolution && !isUserSolutionCorrect() && (
-				<div
-					className="py-2 px-3 rounded-2xl w-fit focus:outline-none my-2 bg-mti-rose-ultralight text-mti-rose-light"
+				<input
+					className="py-2 px-3 rounded-2xl w-48 focus:outline-none my-2 bg-mti-rose-ultralight text-mti-rose-light"
 					placeholder={id}
-					contentEditable={disabled}>
-					{userSolution}
-				</div>
+					onChange={(e) => setUserInput(e.target.value)}
+					value={userSolution}
+					contentEditable={disabled}
+				/>
 			)}
-			<div
-				className={clsx("py-2 px-3 rounded-2xl w-fit focus:outline-none my-2", getSolutionStyling())}
+			<input
+				className={clsx("py-2 px-3 rounded-2xl w-48 focus:outline-none my-2", getSolutionStyling())}
 				placeholder={id}
-				contentEditable={disabled}>
-				{!solutions ? userInput : solutions.join(" / ")}
-			</div>
+				onChange={(e) => setUserInput(e.target.value)}
+				value={!solutions ? userInput : solutions.join(" / ")}
+				contentEditable={disabled}
+			/>
 		</span>
 	);
 }
@@ -80,11 +83,11 @@ export default function WriteBlanksSolutions({
 		const correct = userSolutions.filter(
 			(x) =>
 				solutions
-					.find((y) => x.id.toString() === y.id.toString())
-					?.solution.map((y) => y.toLowerCase().trim())
-					.includes(x.solution.toLowerCase().trim()) || false,
+					.find((y) => x.id === y.id)
+					?.solution.map((y) => y.toLowerCase())
+					.includes(x.solution.toLowerCase()) || false,
 		).length;
-		const missing = total - userSolutions.filter((x) => solutions.find((y) => x.id.toString() === y.id.toString())).length;
+		const missing = total - userSolutions.filter((x) => solutions.find((y) => x.id === y.id)).length;
 
 		return {total, correct, missing};
 	};
@@ -93,13 +96,11 @@ export default function WriteBlanksSolutions({
 		return (
 			<span className="text-base leading-5">
 				{reactStringReplace(line, /({{\d+}})/g, (match) => {
-					const id = match.replaceAll(/[\{\}]/g, "").toString();
-					const userSolution = userSolutions.find((x) => x.id.toString() === id.toString());
-					const solution = solutions.find((x) => x.id.toString() === id.toString())!;
+					const id = match.replaceAll(/[\{\}]/g, "");
+					const userSolution = userSolutions.find((x) => x.id === id);
+					const solution = solutions.find((x) => x.id === id)!;
 
-					return (
-						<Blank userSolution={userSolution?.solution} maxWords={maxWords} id={id.toString()} solutions={solution.solution} disabled />
-					);
+					return <Blank userSolution={userSolution?.solution} maxWords={maxWords} id={id} solutions={solution.solution} disabled />;
 				})}
 			</span>
 		);
@@ -117,13 +118,12 @@ export default function WriteBlanksSolutions({
 					))}
 				</span>
 				<span className="bg-mti-gray-smoke rounded-xl px-5 py-6">
-					{userSolutions &&
-						text.split("\\n").map((line, index) => (
-							<p key={index}>
-								{renderLines(line)}
-								<br />
-							</p>
-						))}
+					{text.split("\\n").map((line, index) => (
+						<p key={index}>
+							{renderLines(line)}
+							<br />
+						</p>
+					))}
 				</span>
 				<div className="flex gap-4 items-center">
 					<div className="flex gap-2 items-center">
@@ -131,7 +131,7 @@ export default function WriteBlanksSolutions({
 						Correct
 					</div>
 					<div className="flex gap-2 items-center">
-						<div className="w-4 h-4 rounded-full bg-mti-gray-davy" />
+						<div className="w-4 h-4 rounded-full bg-mti-red" />
 						Unanswered
 					</div>
 					<div className="flex gap-2 items-center">

src/components/Solutions/Writing.tsx

@@ -1,16 +1,17 @@
 /* eslint-disable @next/next/no-img-element */
+import {errorButtonStyle, infoButtonStyle} from "@/constants/buttonStyles";
 import {WritingExercise} from "@/interfaces/exam";
+import {mdiArrowLeft, mdiArrowRight} from "@mdi/js";
+import Icon from "@mdi/react";
+import clsx from "clsx";
 import {CommonProps} from ".";
 import {Fragment, useEffect, useState} from "react";
+import {toast} from "react-toastify";
 import Button from "../Low/Button";
-import {Dialog, Tab, Transition} from "@headlessui/react";
-import {writingReverseMarking} from "@/utils/score";
-import clsx from "clsx";
-import ReactDiffViewer, {DiffMethod} from "react-diff-viewer";
+import {Dialog, Transition} from "@headlessui/react";
 
 export default function Writing({id, type, prompt, attachment, userSolutions, onNext, onBack}: WritingExercise & CommonProps) {
 	const [isModalOpen, setIsModalOpen] = useState(false);
-	const [showDiff, setShowDiff] = useState(false);
 
 	return (
 		<>
@@ -66,55 +67,18 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 				</div>
 
 				<div className="w-full h-full flex flex-col gap-8">
-					{userSolutions && userSolutions.length > 0 && (
-						<div className="flex flex-col gap-4 w-full relative">
-							{!showDiff && (
-								<>
-									<span>Your answer:</span>
-									<div className="w-full h-full min-h-[320px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl whitespace-pre-wrap">
-										{userSolutions[0]!.solution.replaceAll("\\n", "\n")}
-									</div>
-								</>
-							)}
-							{showDiff && userSolutions[0].evaluation && (
-								<>
-									<span>Correction:</span>
-									<div className="w-full h-full max-h-[320px] overflow-y-scroll scrollbar-hide cursor-text border-2 overflow-x-hidden border-mti-gray-platinum bg-white rounded-3xl">
-										<ReactDiffViewer
-											styles={{
-												contentText: {
-													fontFamily: '"Open Sans", system-ui, -apple-system, "Helvetica Neue", sans-serif',
-													padding: "32px 28px",
-												},
-												marker: {display: "none"},
-												diffRemoved: {padding: "32px 28px"},
-												diffAdded: {padding: "32px 28px"},
-
-												wordRemoved: {padding: "0px", display: "initial"},
-												wordAdded: {padding: "0px", display: "initial"},
-												wordDiff: {padding: "0px", display: "initial"},
-											}}
-											oldValue={userSolutions[0].solution.replaceAll("\\n", "\n")}
-											newValue={userSolutions[0].evaluation!.fixed_text!.replaceAll("\\n", "\n")}
-											splitView
-											hideLineNumbers
-											showDiffOnly={false}
-										/>
-									</div>
-								</>
-							)}
-							{userSolutions[0].solution && userSolutions[0].evaluation?.fixed_text && (
-								<Button
-									color="green"
-									variant="outline"
-									className="w-full max-w-[200px] self-end absolute -top-4 right-0 !py-2"
-									onClick={() => setShowDiff((prev) => !prev)}>
-									{showDiff ? "View answer" : "View correction"}
-								</Button>
-							)}
+					{userSolutions && (
+						<div className="flex flex-col gap-4 w-full">
+							<span>Your answer:</span>
+							<textarea
+								className="w-full h-full min-h-[320px] cursor-text px-7 py-8 input border-2 border-mti-gray-platinum bg-white rounded-3xl"
+								contentEditable={false}
+								readOnly
+								value={userSolutions[0]!.solution}
+							/>
 						</div>
 					)}
-					{userSolutions && userSolutions.length > 0 && userSolutions[0].evaluation && typeof userSolutions[0].evaluation !== "string" && (
+					{userSolutions && userSolutions.length > 0 && (
 						<div className="flex flex-col gap-4 w-full">
 							<div className="flex gap-4 px-1">
 								{Object.keys(userSolutions[0].evaluation!.task_response).map((key) => (
@@ -123,48 +87,9 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 									</div>
 								))}
 							</div>
-							{userSolutions[0].evaluation && userSolutions[0].evaluation.perfect_answer ? (
-								<Tab.Group>
-									<Tab.List className="flex space-x-1 rounded-xl bg-ielts-writing/20 p-1">
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-writing/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-writing focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-writing",
-												)
-											}>
-											Evaluation
-										</Tab>
-										<Tab
-											className={({selected}) =>
-												clsx(
-													"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-writing/80",
-													"ring-white ring-opacity-60 ring-offset-2 ring-offset-ielts-writing focus:outline-none focus:ring-2",
-													"transition duration-300 ease-in-out",
-													selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-ielts-writing",
-												)
-											}>
-											Recommended Answer
-										</Tab>
-									</Tab.List>
-									<Tab.Panels>
-										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text">{userSolutions[0].evaluation!.comment}</span>
-										</Tab.Panel>
-										<Tab.Panel className="w-full bg-ielts-writing/10 h-fit rounded-xl p-6 flex flex-col gap-4">
-											<span className="w-full h-full min-h-fit cursor-text whitespace-pre-wrap">
-												{userSolutions[0].evaluation!.perfect_answer.replaceAll(/\s{2,}/g, "\n\n").replaceAll("\\n", "\n")}
-											</span>
-										</Tab.Panel>
-									</Tab.Panels>
-								</Tab.Group>
-							) : (
-								<div className="w-full h-full min-h-fit cursor-text px-7 py-8 bg-ielts-writing/10 rounded-3xl">
-									{userSolutions[0].evaluation!.comment}
-								</div>
-							)}
+							<div className="w-full h-full min-h-fit cursor-text px-7 py-8 bg-mti-gray-smoke rounded-3xl">
+								{userSolutions[0].evaluation!.comment}
+							</div>
 						</div>
 					)}
 				</div>
@@ -174,31 +99,13 @@ export default function Writing({id, type, prompt, attachment, userSolutions, on
 				<Button
 					color="purple"
 					variant="outline"
-					onClick={() =>
-						onBack({
-							exercise: id,
-							solutions: userSolutions,
-							score: {total: 100, missing: 0, correct: writingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0},
-							type,
-						})
-					}
+					onClick={() => onBack({exercise: id, solutions: userSolutions, score: {correct: 1, total: 1, missing: 0}, type})}
 					className="max-w-[200px] self-end w-full">
 					Back
 				</Button>
 				<Button
 					color="purple"
-					onClick={() =>
-						onNext({
-							exercise: id,
-							solutions: userSolutions,
-							score: {
-								total: 100,
-								missing: 0,
-								correct: userSolutions[0]?.evaluation ? writingReverseMarking[userSolutions[0]!.evaluation!.overall] || 0 : 0,
-							},
-							type,
-						})
-					}
+					onClick={() => onNext({exercise: id, solutions: userSolutions, score: {correct: 1, total: 1, missing: 0}, type})}
 					className="max-w-[200px] self-end w-full">
 					Next
 				</Button>

src/components/Solutions/index.tsx

@@ -1,7 +1,6 @@
 import {
 	Exercise,
 	FillBlanksExercise,
-	InteractiveSpeakingExercise,
 	MatchSentencesExercise,
 	MultipleChoiceExercise,
 	SpeakingExercise,
@@ -12,7 +11,6 @@ import {
 } from "@/interfaces/exam";
 import dynamic from "next/dynamic";
 import FillBlanks from "./FillBlanks";
-import InteractiveSpeaking from "./InteractiveSpeaking";
 import MultipleChoice from "./MultipleChoice";
 import Speaking from "./Speaking";
 import TrueFalseSolution from "./TrueFalse";
@@ -22,36 +20,25 @@ import Writing from "./Writing";
 const MatchSentences = dynamic(() => import("@/components/Solutions/MatchSentences"), {ssr: false});
 
 export interface CommonProps {
-	updateIndex?: (internalIndex: number) => void;
 	onNext: (userSolutions: UserSolution) => void;
 	onBack: (userSolutions: UserSolution) => void;
 }
 
-export const renderSolution = (exercise: Exercise, onNext: () => void, onBack: () => void, updateIndex?: (internalIndex: number) => void) => {
+export const renderSolution = (exercise: Exercise, onNext: () => void, onBack: () => void) => {
 	switch (exercise.type) {
 		case "fillBlanks":
-			return <FillBlanks key={exercise.id} {...(exercise as FillBlanksExercise)} onNext={onNext} onBack={onBack} />;
+			return <FillBlanks {...(exercise as FillBlanksExercise)} onNext={onNext} onBack={onBack} />;
 		case "trueFalse":
-			return <TrueFalseSolution key={exercise.id} {...(exercise as TrueFalseExercise)} onNext={onNext} onBack={onBack} />;
+			return <TrueFalseSolution {...(exercise as TrueFalseExercise)} onNext={onNext} onBack={onBack} />;
 		case "matchSentences":
-			return <MatchSentences key={exercise.id} {...(exercise as MatchSentencesExercise)} onNext={onNext} onBack={onBack} />;
+			return <MatchSentences {...(exercise as MatchSentencesExercise)} onNext={onNext} onBack={onBack} />;
 		case "multipleChoice":
-			return (
-				<MultipleChoice
-					key={exercise.id}
-					{...(exercise as MultipleChoiceExercise)}
-					updateIndex={updateIndex}
-					onNext={onNext}
-					onBack={onBack}
-				/>
-			);
+			return <MultipleChoice {...(exercise as MultipleChoiceExercise)} onNext={onNext} onBack={onBack} />;
 		case "writeBlanks":
-			return <WriteBlanks key={exercise.id} {...(exercise as WriteBlanksExercise)} onNext={onNext} onBack={onBack} />;
+			return <WriteBlanks {...(exercise as WriteBlanksExercise)} onNext={onNext} onBack={onBack} />;
 		case "writing":
-			return <Writing key={exercise.id} {...(exercise as WritingExercise)} onNext={onNext} onBack={onBack} />;
+			return <Writing {...(exercise as WritingExercise)} onNext={onNext} onBack={onBack} />;
 		case "speaking":
-			return <Speaking key={exercise.id} {...(exercise as SpeakingExercise)} onNext={onNext} onBack={onBack} />;
-		case "interactiveSpeaking":
-			return <InteractiveSpeaking key={exercise.id} {...(exercise as InteractiveSpeakingExercise)} onNext={onNext} onBack={onBack} />;
+			return <Speaking {...(exercise as SpeakingExercise)} onNext={onNext} onBack={onBack} />;
 	}
 };

src/components/UserCard.tsx

@@ -1,614 +0,0 @@
-import useStats from "@/hooks/useStats";
-import {EMPLOYMENT_STATUS, User} from "@/interfaces/user";
-import {groupBySession, averageScore} from "@/utils/stats";
-import {RadioGroup} from "@headlessui/react";
-import axios from "axios";
-import clsx from "clsx";
-import moment from "moment";
-import {Divider} from "primereact/divider";
-import {useEffect, useState} from "react";
-import ReactDatePicker from "react-datepicker";
-import {BsFileEarmarkText, BsPencil, BsStar} from "react-icons/bs";
-import {toast} from "react-toastify";
-import Button from "./Low/Button";
-import Checkbox from "./Low/Checkbox";
-import CountrySelect from "./Low/CountrySelect";
-import Input from "./Low/Input";
-import ProfileSummary from "./ProfileSummary";
-import Select from "react-select";
-import useUsers from "@/hooks/useUsers";
-import {USER_TYPE_LABELS} from "@/resources/user";
-import {CURRENCIES} from "@/resources/paypal";
-
-const expirationDateColor = (date: Date) => {
-	const momentDate = moment(date);
-	const today = moment(new Date());
-
-	if (today.add(1, "days").isAfter(momentDate)) return "!bg-mti-red-ultralight border-mti-red-light";
-	if (today.add(3, "days").isAfter(momentDate)) return "!bg-mti-rose-ultralight border-mti-rose-light";
-	if (today.add(7, "days").isAfter(momentDate)) return "!bg-mti-orange-ultralight border-mti-orange-light";
-};
-
-interface Props {
-	user: User;
-	loggedInUser: User;
-	onClose: (reload?: boolean) => void;
-	onViewStudents?: () => void;
-	onViewTeachers?: () => void;
-	onViewCorporate?: () => void;
-	disabled?: boolean;
-}
-
-const USER_STATUS_OPTIONS = [
-	{
-		value: "active",
-		label: "Active",
-	},
-	{
-		value: "disabled",
-		label: "Disabled",
-	},
-	{
-		value: "paymentDue",
-		label: "Payment Due",
-	},
-];
-
-const USER_TYPE_OPTIONS = Object.keys(USER_TYPE_LABELS).map((type) => ({
-	value: type,
-	label: USER_TYPE_LABELS[type as keyof typeof USER_TYPE_LABELS],
-}));
-
-const CURRENCIES_OPTIONS = CURRENCIES.map(({label, currency}) => ({value: currency, label}));
-
-const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, onViewCorporate, disabled = false}: Props) => {
-	const [expiryDate, setExpiryDate] = useState<Date | null | undefined>(user.subscriptionExpirationDate);
-	const [type, setType] = useState(user.type);
-	const [status, setStatus] = useState(user.status);
-	const [referralAgentLabel, setReferralAgentLabel] = useState<string>();
-	const [position, setPosition] = useState<string | undefined>(user.type === "corporate" ? user.demographicInformation?.position : undefined);
-	const [passport_id, setPassportID] = useState<string | undefined>(user.type === "student" ? user.demographicInformation?.passport_id : undefined);
-
-	const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined);
-	const [companyName, setCompanyName] = useState(
-		user.type === "corporate"
-			? user.corporateInformation?.companyInformation.name
-			: user.type === "agent"
-			? user.agentInformation?.companyName
-			: undefined,
-	);
-	const [commercialRegistration, setCommercialRegistration] = useState(
-		user.type === "agent" ? user.agentInformation?.commercialRegistration : undefined,
-	);
-	const [userAmount, setUserAmount] = useState(user.type === "corporate" ? user.corporateInformation?.companyInformation.userAmount : undefined);
-	const [paymentValue, setPaymentValue] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.value : undefined);
-	const [paymentCurrency, setPaymentCurrency] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.currency : "EUR");
-	const [monthlyDuration, setMonthlyDuration] = useState(user.type === "corporate" ? user.corporateInformation?.monthlyDuration : undefined);
-	const [commissionValue, setCommission] = useState(user.type === "corporate" ? user.corporateInformation?.payment?.commission : undefined);
-	const {stats} = useStats(user.id);
-	const {users} = useUsers();
-
-	useEffect(() => {
-		if (users && users.length > 0) {
-			if (!referralAgent) {
-				setReferralAgentLabel("No manager");
-				return;
-			}
-
-			const agent = users.find((x) => x.id === referralAgent);
-			setReferralAgentLabel(`${agent?.name} - ${agent?.email}`);
-		}
-	}, [users, referralAgent]);
-
-	const updateUser = () => {
-		if (user.type === "corporate" && (!paymentValue || paymentValue < 0))
-			return toast.error("Please set a price for the user's package before updating!");
-		if (!confirm(`Are you sure you want to update ${user.name}'s account?`)) return;
-
-		axios
-			.post<{user?: User; ok?: boolean}>(`/api/users/update?id=${user.id}`, {
-				...user,
-				subscriptionExpirationDate: expiryDate,
-				type,
-				status,
-				agentInformation:
-					type === "agent"
-						? {
-								name: companyName,
-								commercialRegistration,
-						  }
-						: undefined,
-				corporateInformation:
-					type === "corporate"
-						? {
-								referralAgent,
-								monthlyDuration,
-								companyInformation: {
-									name: companyName,
-									userAmount,
-								},
-								payment: {
-									value: paymentValue,
-									currency: paymentCurrency,
-									...(referralAgent === "" ? {} : {commission: commissionValue}),
-								},
-						  }
-						: undefined,
-			})
-			.then(() => {
-				toast.success("User updated successfully!");
-				onClose(true);
-			})
-			.catch(() => {
-				toast.error("Something went wrong!", {toastId: "update-error"});
-			});
-	};
-
-	return (
-		<>
-			<ProfileSummary
-				user={user}
-				items={[
-					{
-						icon: <BsFileEarmarkText className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-						value: Object.keys(groupBySession(stats)).length,
-						label: "Exams",
-					},
-					{
-						icon: <BsPencil className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-						value: stats.length,
-						label: "Exercises",
-					},
-					{
-						icon: <BsStar className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-						value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
-						label: "Average Score",
-					},
-				]}
-			/>
-
-			{user.type === "agent" && (
-				<>
-					<div className="grid grid-cols-1 md:grid-cols-2 gap-8 w-full">
-						<Input
-							label="Corporate Name"
-							type="text"
-							name="companyName"
-							onChange={setCompanyName}
-							placeholder="Enter corporate name"
-							defaultValue={companyName}
-							required
-							disabled={disabled}
-						/>
-						<Input
-							label="Commercial Registration"
-							type="text"
-							name="commercialRegistration"
-							onChange={setCommercialRegistration}
-							placeholder="Enter commercial registration"
-							defaultValue={commercialRegistration}
-							required
-							disabled={disabled}
-						/>
-					</div>
-					<Divider className="w-full !m-0" />
-				</>
-			)}
-			{user.type === "corporate" && (
-				<>
-					<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
-						<Input
-							label="Corporate Name"
-							type="text"
-							name="companyName"
-							onChange={setCompanyName}
-							placeholder="Enter corporate name"
-							defaultValue={companyName}
-							disabled={disabled}
-						/>
-						<Input
-							label="Number of Users"
-							type="number"
-							name="userAmount"
-							onChange={(e) => setUserAmount(e ? parseInt(e) : undefined)}
-							placeholder="Enter number of users"
-							defaultValue={userAmount}
-							disabled={disabled}
-						/>
-						<Input
-							label="Monthly Duration"
-							type="number"
-							name="monthlyDuration"
-							onChange={(e) => setMonthlyDuration(e ? parseInt(e) : undefined)}
-							placeholder="Enter monthly duration"
-							defaultValue={monthlyDuration}
-							disabled={disabled}
-						/>
-						<div className="flex flex-col gap-3 w-full lg:col-span-2">
-							<label className="font-normal text-base text-mti-gray-dim">Pricing</label>
-							<div className="w-full grid grid-cols-5 gap-2">
-								<Input
-									name="paymentValue"
-									onChange={(e) => setPaymentValue(e ? parseInt(e) : undefined)}
-									type="number"
-									defaultValue={paymentValue || 0}
-									className="col-span-3"
-									disabled={disabled}
-								/>
-								<Select
-									className={clsx(
-										"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
-										disabled && "!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
-									)}
-									options={CURRENCIES_OPTIONS}
-									value={CURRENCIES_OPTIONS.find((c) => c.value === paymentCurrency)}
-									onChange={(value) => setPaymentCurrency(value?.value)}
-									menuPortalTarget={document?.body}
-									styles={{
-										menuPortal: (base) => ({...base, zIndex: 9999}),
-										control: (styles) => ({
-											...styles,
-											paddingLeft: "4px",
-											border: "none",
-											outline: "none",
-											":focus": {
-												outline: "none",
-											},
-										}),
-										option: (styles, state) => ({
-											...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-											color: state.isFocused ? "black" : styles.color,
-										}),
-									}}
-									isDisabled={disabled}
-								/>
-							</div>
-						</div>
-					</div>
-					<div className="flex gap-3 w-full">
-						<div className="flex flex-col gap-3 w-8/12">
-							<label className="font-normal text-base text-mti-gray-dim">Country Manager</label>
-							{referralAgentLabel && (
-								<Select
-									className={clsx(
-										"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
-										!["developer", "admin"].includes(loggedInUser.type) &&
-											"!bg-mti-gray-platinum/40 !text-mti-gray-dim cursor-not-allowed",
-									)}
-									options={[
-										{value: "", label: "No referral"},
-										...users.filter((u) => u.type === "agent").map((x) => ({value: x.id, label: `${x.name} - ${x.email}`})),
-									]}
-									defaultValue={{
-										value: referralAgent,
-										label: referralAgentLabel,
-									}}
-									menuPortalTarget={document?.body}
-									onChange={(value) => setReferralAgent(value?.value)}
-									styles={{
-										menuPortal: (base) => ({...base, zIndex: 9999}),
-										control: (styles) => ({
-											...styles,
-											paddingLeft: "4px",
-											border: "none",
-											outline: "none",
-											":focus": {
-												outline: "none",
-											},
-										}),
-										option: (styles, state) => ({
-											...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-											color: state.isFocused ? "black" : styles.color,
-										}),
-									}}
-									// editing country manager should only be available for dev/admin
-									isDisabled={!["developer", "admin"].includes(loggedInUser.type)}
-								/>
-							)}
-						</div>
-						<div className="flex flex-col gap-3 w-4/12">
-							{referralAgent !== "" && loggedInUser.type !== "corporate" ? (
-								<>
-									<label className="font-normal text-base text-mti-gray-dim">Commission</label>
-									<Input
-										name="commissionValue"
-										onChange={(e) => setCommission(e ? parseInt(e) : undefined)}
-										type="number"
-										defaultValue={commissionValue || 0}
-										className="col-span-3"
-										disabled={disabled || loggedInUser.type === "agent"}
-									/>
-								</>
-							) : (
-								<div />
-							)}
-						</div>
-					</div>
-					<Divider className="w-full !m-0" />
-				</>
-			)}
-			<section className="flex flex-col gap-4 justify-between">
-				<div className="flex flex-col md:flex-row gap-8 w-full">
-					<Input
-						label="Name"
-						type="text"
-						name="name"
-						onChange={() => null}
-						placeholder="Enter your name"
-						defaultValue={user.name}
-						disabled
-					/>
-					<Input
-						label="E-mail Address"
-						type="email"
-						name="email"
-						onChange={() => null}
-						placeholder="Enter email address"
-						defaultValue={user.email}
-						disabled
-					/>
-				</div>
-
-				<div className="flex flex-col md:flex-row gap-8 w-full">
-					<div className="flex flex-col gap-3 w-full">
-						<label className="font-normal text-base text-mti-gray-dim">Country</label>
-						<CountrySelect disabled value={user.demographicInformation?.country} />
-					</div>
-					<Input
-						type="tel"
-						name="phone"
-						label="Phone number"
-						onChange={() => null}
-						placeholder="Enter phone number"
-						defaultValue={user.demographicInformation?.phone}
-						disabled
-					/>
-				</div>
-
-				{user.type === "student" && (
-					<Input
-						type="text"
-						name="passport_id"
-						label="Passport/National ID"
-						onChange={() => null}
-						placeholder="Enter National ID or Passport number"
-						value={user.type === "student" ? user.demographicInformation?.passport_id : undefined}
-						disabled
-						required
-					/>
-				)}
-
-				<div className="flex flex-col md:flex-row gap-8 w-full">
-					{user.type !== "corporate" && (
-						<div className="relative flex flex-col gap-3 w-full">
-							<label className="font-normal text-base text-mti-gray-dim">Employment Status</label>
-							<RadioGroup
-								value={user.demographicInformation?.employment}
-								className="grid grid-cols-2 items-center gap-4 place-items-center"
-								disabled={disabled}>
-								{EMPLOYMENT_STATUS.map(({status, label}) => (
-									<RadioGroup.Option value={status} key={status}>
-										{({checked}) => (
-											<span
-												className={clsx(
-													"px-6 py-4 w-40 md:w-48 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-													"transition duration-300 ease-in-out",
-													!checked
-														? "bg-white border-mti-gray-platinum"
-														: "bg-mti-purple-light border-mti-purple-dark text-white",
-												)}>
-												{label}
-											</span>
-										)}
-									</RadioGroup.Option>
-								))}
-							</RadioGroup>
-						</div>
-					)}
-					{user.type === "corporate" && (
-						<Input
-							name="position"
-							onChange={setPosition}
-							type="text"
-							label="Position"
-							defaultValue={position}
-							placeholder="CEO, Head of Marketing..."
-							disabled
-							required
-						/>
-					)}
-					<div className="flex flex-col gap-8 w-full">
-						<div className="relative flex flex-col gap-3 w-full">
-							<label className="font-normal text-base text-mti-gray-dim">Gender</label>
-							<RadioGroup
-								value={user.demographicInformation?.gender}
-								className="flex flex-row gap-4 justify-between"
-								disabled={disabled}>
-								<RadioGroup.Option value="male">
-									{({checked}) => (
-										<span
-											className={clsx(
-												"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-												"transition duration-300 ease-in-out",
-												!checked
-													? "bg-white border-mti-gray-platinum"
-													: "bg-mti-purple-light border-mti-purple-dark text-white",
-											)}>
-											Male
-										</span>
-									)}
-								</RadioGroup.Option>
-								<RadioGroup.Option value="female">
-									{({checked}) => (
-										<span
-											className={clsx(
-												"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-												"transition duration-300 ease-in-out",
-												!checked
-													? "bg-white border-mti-gray-platinum"
-													: "bg-mti-purple-light border-mti-purple-dark text-white",
-											)}>
-											Female
-										</span>
-									)}
-								</RadioGroup.Option>
-								<RadioGroup.Option value="other">
-									{({checked}) => (
-										<span
-											className={clsx(
-												"px-6 py-4 w-28 flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-												"transition duration-300 ease-in-out",
-												!checked
-													? "bg-white border-mti-gray-platinum"
-													: "bg-mti-purple-light border-mti-purple-dark text-white",
-											)}>
-											Other
-										</span>
-									)}
-								</RadioGroup.Option>
-							</RadioGroup>
-						</div>
-						<div className="flex flex-col gap-3">
-							<div className="flex justify-between items-center">
-								<label className="font-normal text-base text-mti-gray-dim">Expiry Date</label>
-								<Checkbox
-									isChecked={!!expiryDate}
-									onChange={(checked) => setExpiryDate(checked ? user.subscriptionExpirationDate || new Date() : null)}
-									disabled={disabled}>
-									Enabled
-								</Checkbox>
-							</div>
-							{!expiryDate && (
-								<div
-									className={clsx(
-										"p-6 w-full flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-										"transition duration-300 ease-in-out",
-										!expiryDate ? "!bg-mti-green-ultralight !border-mti-green-light" : expirationDateColor(expiryDate),
-										"bg-white border-mti-gray-platinum",
-									)}>
-									{!expiryDate && "Unlimited"}
-									{expiryDate && moment(expiryDate).format("DD/MM/YYYY")}
-								</div>
-							)}
-							{expiryDate && (
-								<ReactDatePicker
-									className={clsx(
-										"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-										"hover:border-mti-purple tooltip",
-										expirationDateColor(expiryDate),
-										"transition duration-300 ease-in-out",
-									)}
-									filterDate={(date) =>
-										moment(date).isAfter(new Date()) &&
-										(loggedInUser.subscriptionExpirationDate
-											? moment(date).isBefore(moment(loggedInUser.subscriptionExpirationDate))
-											: true)
-									}
-									dateFormat="dd/MM/yyyy"
-									selected={moment(expiryDate).toDate()}
-									onChange={(date) => setExpiryDate(date)}
-									disabled={disabled}
-								/>
-							)}
-						</div>
-					</div>
-				</div>
-				{(loggedInUser.type === "developer" || loggedInUser.type === "admin") && (
-					<>
-						<Divider className="w-full !m-0" />
-						<div className="flex flex-col md:flex-row gap-8 w-full">
-							<div className="flex flex-col gap-3 w-full">
-								<label className="font-normal text-base text-mti-gray-dim">Status</label>
-								<Select
-									className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
-									options={USER_STATUS_OPTIONS}
-									menuPortalTarget={document?.body}
-									value={USER_STATUS_OPTIONS.find((o) => o.value === status)}
-									onChange={(value) => setStatus(value?.value as typeof user.status)}
-									styles={{
-										control: (styles) => ({
-											...styles,
-											paddingLeft: "4px",
-											border: "none",
-											outline: "none",
-											":focus": {
-												outline: "none",
-											},
-										}),
-										menuPortal: (base) => ({...base, zIndex: 9999}),
-										option: (styles, state) => ({
-											...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-											color: state.isFocused ? "black" : styles.color,
-										}),
-									}}
-									isDisabled={disabled}
-								/>
-							</div>
-							<div className="flex flex-col gap-3 w-full">
-								<label className="font-normal text-base text-mti-gray-dim">Type</label>
-								<Select
-									className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
-									options={USER_TYPE_OPTIONS}
-									menuPortalTarget={document?.body}
-									value={USER_TYPE_OPTIONS.find((o) => o.value === type)}
-									onChange={(value) => setType(value?.value as typeof user.type)}
-									styles={{
-										control: (styles) => ({
-											...styles,
-											paddingLeft: "4px",
-											border: "none",
-											outline: "none",
-											":focus": {
-												outline: "none",
-											},
-										}),
-										menuPortal: (base) => ({...base, zIndex: 9999}),
-										option: (styles, state) => ({
-											...styles,
-											backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-											color: state.isFocused ? "black" : styles.color,
-										}),
-									}}
-									isDisabled={disabled}
-								/>
-							</div>
-						</div>
-					</>
-				)}
-			</section>
-
-			<div className="flex gap-4 justify-between mt-4 w-full">
-				<div className="self-start flex gap-4 justify-start items-center w-full">
-					{onViewCorporate && ["student", "teacher"].includes(user.type) && (
-						<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewCorporate}>
-							View Corporate
-						</Button>
-					)}
-					{onViewStudents && ["corporate", "teacher"].includes(user.type) && (
-						<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewStudents}>
-							View Students
-						</Button>
-					)}
-					{onViewTeachers && ["student", "corporate"].includes(user.type) && (
-						<Button className="w-full max-w-[200px]" variant="outline" color="rose" onClick={onViewTeachers}>
-							View Teachers
-						</Button>
-					)}
-				</div>
-				<div className="self-end flex gap-4 w-full justify-end">
-					<Button className="w-full max-w-[200px]" variant="outline" onClick={onClose}>
-						Close
-					</Button>
-					<Button disabled={disabled} onClick={updateUser} className="w-full max-w-[200px]">
-						Update
-					</Button>
-				</div>
-			</div>
-		</>
-	);
-};
-
-export default UserCard;

src/components/UserResultChart.tsx

@@ -0,0 +1,31 @@
+import {SEMI_TRANSPARENT} from "@/resources/colors";
+import {Chart as ChartJS, RadialLinearScale, ArcElement, Tooltip, Legend} from "chart.js";
+import clsx from "clsx";
+import {PolarArea} from "react-chartjs-2";
+import {Chart} from "primereact/chart";
+
+interface Props {
+	data: {label: string; value: number}[];
+	label?: string;
+	title: string;
+	type: string;
+	colors?: string[];
+}
+
+ChartJS.register(RadialLinearScale, ArcElement, Tooltip, Legend);
+
+export default function SingleDatasetChart({data, type, label, title, colors = Object.values(SEMI_TRANSPARENT)}: Props) {
+	const labels = data.map((x) => x.label);
+	const chartData = {
+		labels,
+		datasets: [
+			{
+				label,
+				data: data.map((x) => x.value),
+				backgroundColor: colors,
+			},
+		],
+	};
+
+	return <Chart type={type} data={chartData} options={{plugins: {title: {text: title, display: true}}}} />;
+}

src/constants/ielts.tsx

@@ -2,119 +2,35 @@ import {Module} from "@/interfaces";
 
 export const MODULES: Module[] = ["reading", "listening", "writing", "speaking"];
 
-// BAND SCORES is not in use anymore and level scoring is made based on thresholds
-// export const BAND_SCORES: {[key in Module]: number[]} = {
-// 	reading: [0, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9],
-// 	listening: [0, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9],
-// 	writing: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-// 	speaking: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-// 	level: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-// };
-
-export type LevelScore = "Advanced" | "Upper-Intermediate" | "Intermediate" | "Pre-Intermediate" | "Elementary" | "Beginner";
-
-
-const generateHighestScoreText = () : React.ReactNode => (
-	<>
-		<br />
-		<br />
-		If you disagree with the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of
-		the results.
-		<br />
-		<br />
-		Please contact us for further information. Congratulations again on your outstanding achievement! We are here to support you on your
-		academic journey.
-	</>
-);
-
-const generateAverageScoreText = () : React.ReactNode => (
-	<>
-		<br />
-		<br />
-		If you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and
-		transparency of the results.
-		<br />
-		<br />
-		Please contact us for further information. Congratulations again on your achievement! We are here to support you on your academic
-		journey.
-	</>
-);
-
-const generateLowestScoreText = () : React.ReactNode => (
-	<>
-		<br />
-		<br />
-		If you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and
-		transparency of the results.
-		<br />
-		<br />
-		Please contact us for further information. We encourage you to continue your studies and wish you the best of luck in your future
-		endeavors.
-	</>
-)
-
-export const levelResultText = (level: number) => {
-	if(level === 9) {
-		return (
-			<>
-				{"Outstanding! Your command of English is excellent. Focus on fine-tuning subtle language nuances and exploring sophisticated vocabulary. Keep up the excellent work!"}
-				{generateHighestScoreText()}
-			</>
-		);
-	}
-	if(level >= 8) {
-		return (
-			<>
-				{"Impressive! You're approaching fluency. Continue refining nuances in grammar and expanding your vocabulary to express ideas more precisely."}
-				{generateAverageScoreText()}
-			</>
-		);
-	}
-	if(level >= 6) {
-		return (
-			<>
-				{"Great job! You're navigating the complexities of English. Keep honing your grammar skills and exploring more advanced vocabulary."}
-				{generateAverageScoreText()}
-			</>
-		);
-	}
-	if(level >= 4) {
-		return (
-			<>
-				{"Well done! You're moving beyond the basics. Work on expanding your vocabulary and refining your understanding of grammar structures."}
-				{generateAverageScoreText()}
-			</>
-		);
-	}
-	if(level >= 2) {
-		return (
-			<>
-				{"Good effort! You're making progress. Continue studying and pay attention to common vocabulary and fundamental grammar rules."}
-				{generateAverageScoreText()}
-			</>
-		);
-	}
-	if(level >= 0) {
-		return (
-			<>
-				{"Keep practicing! You're just starting, and improvement takes time. Focus on building your vocabulary and basic grammar skills."}
-				{generateLowestScoreText()}
-			</>
-		);
-	}
-
-	return null;
+export const BAND_SCORES: {[key in Module]: number[]} = {
+	reading: [0, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9],
+	listening: [0, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9],
+	writing: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+	speaking: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
 };
 
+export const LEVEL_TEXT = {
+	excellent:
+		"Congratulations on your exam performance! You achieved an impressive {{level}}, demonstrating excellent mastery of the assessed knowledge.\n\nIf you disagree with the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of the results.\n\nPlease contact us for further information. Congratulations again on your outstanding achievement! We are here to support you on your academic journey.",
+	high: "Congratulations on your exam performance! You achieved a commendable {{level}}, demonstrating a good understanding of the assessed knowledge.\n\nIf you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of the results.\n\nPlease contact us for further information. Congratulations again on your achievement! We are here to support you on your academic journey.",
+	medium: "Congratulations on your exam performance! You achieved a {{level}}, demonstrating a satisfactory understanding of the assessed knowledge.\n\nIf you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of the results.\n\nPlease contact us for further information. Congratulations again on your achievement! We are here to support you on your academic journey.",
+	low: "Thank you for taking the exam. You achieved a {{level}}, but unfortunately, it did not meet the required standards.\n\nIf you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of the results.\n\nPlease contact us for further information. We encourage you to continue your studies and wish you the best of luck in your future endeavors.",
+};
 
-export const moduleResultText = (module: Module, level: number) => {
-	if(module === 'level') return levelResultText(level);
+export const levelText = (level: number) => {
 	if (level === 9) {
 		return (
 			<>
 				Congratulations on your exam performance! You achieved an impressive <span className="font-bold">level {level}</span>, demonstrating
 				excellent mastery of the assessed knowledge.
-				{generateHighestScoreText()}
+				<br />
+				<br />
+				If you disagree with the result, you can request a review by a qualified teacher. We are committed to the accuracy and transparency of
+				the results.
+				<br />
+				<br />
+				Please contact us for further information. Congratulations again on your outstanding achievement! We are here to support you on your
+				academic journey.
 			</>
 		);
 	}
@@ -124,7 +40,14 @@ export const moduleResultText = (module: Module, level: number) => {
 			<>
 				Congratulations on your exam performance! You achieved a commendable <span className="font-bold">level {level}</span>, demonstrating a
 				good understanding of the assessed knowledge.
-				{generateAverageScoreText()}
+				<br />
+				<br />
+				If you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and
+				transparency of the results.
+				<br />
+				<br />
+				Please contact us for further information. Congratulations again on your achievement! We are here to support you on your academic
+				journey.
 			</>
 		);
 	}
@@ -134,7 +57,14 @@ export const moduleResultText = (module: Module, level: number) => {
 			<>
 				Congratulations on your exam performance! You achieved a <span className="font-bold">level of {level}</span>, demonstrating a
 				satisfactory understanding of the assessed knowledge.
-				{generateAverageScoreText()}
+				<br />
+				<br />
+				If you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and
+				transparency of the results.
+				<br />
+				<br />
+				Please contact us for further information. Congratulations again on your achievement! We are here to support you on your academic
+				journey.
 			</>
 		);
 	}
@@ -143,7 +73,14 @@ export const moduleResultText = (module: Module, level: number) => {
 		<>
 			Thank you for taking the exam. You achieved a <span className="font-bold">level {level}</span>, but unfortunately, it did not meet the
 			required standards.
-			{generateLowestScoreText()}
+			<br />
+			<br />
+			If you have any concerns about the result, you can request a review by a qualified teacher. We are committed to the accuracy and
+			transparency of the results.
+			<br />
+			<br />
+			Please contact us for further information. We encourage you to continue your studies and wish you the best of luck in your future
+			endeavors.
 		</>
 	);
 };

src/constants/serviceAccountKey.json

@@ -1,13 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "storied-phalanx-349916",
-  "private_key_id": "c9e05f6fe413b1031a71f981160075ff4b044444",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdgavFB63nMHyb\n38ncwijTrUmqU9UyzNJ8wlZCWAWuoz25Gng988fkKNDXnHY+ap9esHyNYg9IdSA7\nAuZeHpzTZmKiWZzFWq61KWSTgIn1JwKHGHJJdmVhTYfCe9I51cFLa5q2lTFzJ0ce\nbP7/X/7kw53odgva+M8AhDTbe60akpemgZc+LFwO0Abm7erH2HiNyjoNZzNw525L\n933PCaQwhZan04s1u0oRdVlBIBwMk+J0ojgVEpUiJOzF7gkN+UpDXujalLYdlR4q\nhkGgScXQhDYJkECC3GuvOnEo1YXGNjW9D73S6sSH+Lvqta4wW1+sTn0kB6goiQBI\n7cA1G6x3AgMBAAECggEAZPMwAX/adb7XS4LWUNH8IVyccg/63kgSteErxtiu3kRv\nYOj7W+C6fPVNGLap/RBCybjNSvIh3PfkVICh1MtG1eGXmj4VAKyvaskOmVq/hQbe\nVAuEKo7W7V2UPcKIsOsGSQUlYYjlHIIOG4O5Q1HQrRmp4cPK62Txkl6uaEkZPz4u\nbvIK2BJI8aHRwxE3Phw09blwlLqQQQ8nrhK29x5puaN+ft++IlzIOVsLz+n4kTdB\n6qkG/dhenn3K8o3+NkmSN6eNRbdJd36zXTo4Oatbvqb7r0E8vYn/3Llawo2X75zn\nec7jMHrOmcwtiu9H3PsrTWtzdSjxPHy0UtEn1HWK4QKBgQD+c/V8tAvbaUGVoZf6\ntKtDSKF6IHuY2vUO33v950mVdjrTursqOG2d+SLfSnKpc+sjDlj7/S5u4uRP+qUN\ng1rb2U7oIA7tsDa2ZTSkIx6HkPUzS+fBOxELLrbgMoJ2RLzgkiPhS95YgXJ/rYG5\nWQTehzCT5roes0RvtgM0gl3EhQKBgQDe2m7PRIU4g3RJ8HTx92B4ja8W9FVCYDG5\nPOAdZB8WB6Bvu4BJHBDLr8vDi930pKj+vYObRqBDQuILW4t8wZQJ834dnoq6EpUz\nhbVEURVBP4A/nEHrQHfq0Lp+cxThy2rw7obRQOLPETtC7p3WFgSHT6PRTcpGzCCX\n+76a30yrywKBgC/5JNtyBppDaf4QDVtTHMb+tpMT9LmI7pLzR6lDJfhr5gNtPURk\nhyY1hoGaw6t3E2n0lopL3alCVdFObDfz//lbKylQggAGLQqOYjJf/K2KgvA862Df\nBgOZtxjl7PrnUsT0SJd9elotbazsxXxwcB6UVnBMG+MV4V0+b7RCr/MRAoGBAIfp\nTcVIs7roqOZjKN9dEE/VkR/9uXW2tvyS/NfP9Ql5c0ZRYwazgCbJOwsyZRZLyek6\naWYsp5b91mA435QhdwiuoI6t30tmA+qdNBTLIpxdfvjMcoNoGPpzfBmcU/L1HW58\n+mnqGalRiAPlBQvI99ASKQWAXMnaulIWrYNEhj0LAoGBALi+QZ2pp+hDeC59ezWr\nbP1zbbONceHKGgJcevChP2k1OJyIOIqmBYeTuM4cPc5ofZYQNaMC31cs8SVeSRX1\nNTxQZmvCjMyTe/WYWYNFXdgkVz4egFXbeochCGzMYo57HV1PCkPBrARRZO8OfdDD\n8sDu//ohb7nCzceEI0DnWs13\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-3ml0u@storied-phalanx-349916.iam.gserviceaccount.com",
-  "client_id": "114163760341944984396",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-3ml0u%40storied-phalanx-349916.iam.gserviceaccount.com",
-  "universe_domain": "googleapis.com"
-}

src/constants/userPermissions.ts

@@ -1,39 +0,0 @@
-import {Type} from "@/interfaces/user";
-
-export const PERMISSIONS = {
-	generateCode: {
-		student: ["corporate", "developer", "admin"],
-		teacher: ["corporate", "developer", "admin"],
-		corporate: ["admin", "developer"],
-		admin: ["developer", "admin"],
-		agent: ["developer", "admin"],
-		developer: ["developer"],
-	},
-	deleteUser: {
-		student: ["corporate", "developer", "admin"],
-		teacher: ["corporate", "developer", "admin"],
-		corporate: ["admin", "developer"],
-		admin: ["developer", "admin"],
-		agent: ["developer", "admin"],
-		developer: ["developer"],
-	},
-	updateUser: {
-		student: ["developer", "admin"],
-		teacher: ["developer", "admin"],
-		corporate: ["admin", "developer"],
-		admin: ["developer", "admin"],
-		agent: ["developer", "admin"],
-		developer: ["developer"],
-	},
-	updateExpiryDate: {
-		student: ["developer", "admin"],
-		teacher: ["developer", "admin"],
-		corporate: ["admin", "developer"],
-		admin: ["developer", "admin"],
-		agent: ["developer", "admin"],
-		developer: ["developer"],
-	},
-	examManagement: {
-		delete: ["developer", "admin"],
-	},
-};

src/dashboards/Admin.tsx

@@ -1,528 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Modal from "@/components/Modal";
-import useStats from "@/hooks/useStats";
-import useUsers from "@/hooks/useUsers";
-import {User} from "@/interfaces/user";
-import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
-import moment from "moment";
-import {useEffect, useState} from "react";
-import {
-	BsArrowLeft,
-	BsBriefcaseFill,
-	BsGlobeCentralSouthAsia,
-	BsPerson,
-	BsPersonFill,
-	BsPencilSquare,
-	BsBank,
-	BsCurrencyDollar,
-} from "react-icons/bs";
-import UserCard from "@/components/UserCard";
-import useGroups from "@/hooks/useGroups";
-import IconCard from "./IconCard";
-import useFilterStore from "@/stores/listFilterStore";
-import {useRouter} from "next/router";
-import usePaymentStatusUsers from "@/hooks/usePaymentStatusUsers";
-
-interface Props {
-	user: User;
-}
-
-export default function AdminDashboard({user}: Props) {
-	const [page, setPage] = useState("");
-	const [selectedUser, setSelectedUser] = useState<User>();
-	const [showModal, setShowModal] = useState(false);
-
-	const {stats} = useStats(user.id);
-	const {users, reload} = useUsers();
-	const {groups} = useGroups();
-	const {pending, done} = usePaymentStatusUsers();
-
-	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
-	const router = useRouter();
-
-	useEffect(() => {
-		setShowModal(!!selectedUser && page === "");
-	}, [selectedUser, page]);
-
-	// eslint-disable-next-line react-hooks/exhaustive-deps
-	useEffect(reload, [page]);
-
-	const inactiveCountryManagerFilter = (x: User) =>
-		x.type === "agent" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
-	const UserDisplay = (displayUser: User) => (
-		<div
-			onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>
-					{displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
-						: displayUser.name}
-				</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
-	const StudentsList = () => {
-		const filter = (x: User) =>
-			x.type === "student" &&
-			(!!selectedUser
-				? groups
-						.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-						.flatMap((g) => g.participants)
-						.includes(x.id)
-				: true);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const TeachersList = () => {
-		const filter = (x: User) =>
-			x.type === "teacher" &&
-			(!!selectedUser
-				? groups
-						.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-						.flatMap((g) => g.participants)
-						.includes(x.id) || false
-				: true);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Teachers ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const AgentsList = () => {
-		const filter = (x: User) => x.type === "agent";
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Country Managers ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const CorporateList = () => (
-		<>
-			<div className="flex flex-col gap-4">
-				<div
-					onClick={() => setPage("")}
-					className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-					<BsArrowLeft className="text-xl" />
-					<span>Back</span>
-				</div>
-				<h2 className="text-2xl font-semibold">Corporate ({users.filter((x) => x.type === "corporate").length})</h2>
-			</div>
-
-			<UserList user={user} filters={[(x) => x.type === "corporate"]} />
-		</>
-	);
-
-	const CorporatePaidStatusList = ({paid}: {paid: Boolean}) => {
-		const list = paid ? done : pending;
-		const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">
-						{paid ? "Payment Done" : "Pending Payment"} ({list.length})
-					</h2>
-				</div>
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const InactiveCountryManagerList = () => {
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Inactive Country Managers ({users.filter(inactiveCountryManagerFilter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[inactiveCountryManagerFilter]} />
-			</>
-		);
-	};
-
-	const InactiveStudentsList = () => {
-		const filter = (x: User) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Inactive Students ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const InactiveCorporateList = () => {
-		const filter = (x: User) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Inactive Corporate ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const DefaultDashboard = () => (
-		<>
-			<section className="w-full grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 place-items-center items-center justify-between">
-				<IconCard
-					Icon={BsPersonFill}
-					label="Students"
-					value={users.filter((x) => x.type === "student").length}
-					onClick={() => setPage("students")}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsPencilSquare}
-					label="Teachers"
-					value={users.filter((x) => x.type === "teacher").length}
-					onClick={() => setPage("teachers")}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsBank}
-					label="Corporate"
-					value={users.filter((x) => x.type === "corporate").length}
-					onClick={() => setPage("corporate")}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsBriefcaseFill}
-					label="Country Managers"
-					value={users.filter((x) => x.type === "agent").length}
-					onClick={() => setPage("agents")}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsGlobeCentralSouthAsia}
-					label="Countries"
-					value={[...new Set(users.filter((x) => x.demographicInformation).map((x) => x.demographicInformation?.country))].length}
-					color="purple"
-				/>
-				<IconCard
-					onClick={() => setPage("inactiveStudents")}
-					Icon={BsPersonFill}
-					label="Inactive Students"
-					value={
-						users.filter((x) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
-							.length
-					}
-					color="rose"
-				/>
-				<IconCard
-					onClick={() => setPage("inactiveCountryManagers")}
-					Icon={BsBriefcaseFill}
-					label="Inactive Country Managers"
-					value={users.filter(inactiveCountryManagerFilter).length}
-					color="rose"
-				/>
-				<IconCard
-					onClick={() => setPage("inactiveCorporate")}
-					Icon={BsBank}
-					label="Inactive Corporate"
-					value={
-						users.filter((x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
-							.length
-					}
-					color="rose"
-				/>
-				<IconCard onClick={() => setPage("paymentdone")} Icon={BsCurrencyDollar} label="Payment Done" value={done.length} color="purple" />
-				<IconCard
-					onClick={() => setPage("paymentpending")}
-					Icon={BsCurrencyDollar}
-					label="Pending Payment"
-					value={pending.length}
-					color="rose"
-				/>
-			</section>
-
-			<section className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 w-full justify-between">
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "student")
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest corporate</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "corporate")
-							.sort((a, b) => {
-								return dateSorter(a, b, "desc", "registrationDate");
-							})
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Unpaid Corporate</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "corporate" && x.status === "paymentDue")
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Students expiring in 1 month</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									x.type === "student" &&
-									x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Country Manager expiring in 1 month</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									x.type === "teacher" &&
-									x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Corporate expiring in 1 month</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									x.type === "corporate" &&
-									x.subscriptionExpirationDate &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Expired Students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) => x.type === "student" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Expired Country Manager</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) => x.type === "teacher" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Expired Corporate</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									x.type === "corporate" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-			</section>
-		</>
-	);
-
-	return (
-		<>
-			<Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
-				<>
-					{selectedUser && (
-						<div className="w-full flex flex-col gap-8">
-							<UserCard
-								loggedInUser={user}
-								onClose={(shouldReload) => {
-									setSelectedUser(undefined);
-									if (shouldReload) reload();
-								}}
-								onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher"
-										? () => {
-												appendUserFilters({
-													id: "view-students",
-													filter: (x: User) => x.type === "student",
-												});
-												appendUserFilters({
-													id: "belongs-to-admin",
-													filter: (x: User) =>
-														groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-															.flatMap((g) => g.participants)
-															.includes(x.id),
-												});
-
-												router.push("/list/users");
-										  }
-										: undefined
-								}
-								onViewTeachers={
-									selectedUser.type === "corporate" || selectedUser.type === "student"
-										? () => {
-												appendUserFilters({
-													id: "view-teachers",
-													filter: (x: User) => x.type === "teacher",
-												});
-												appendUserFilters({
-													id: "belongs-to-admin",
-													filter: (x: User) =>
-														groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-															.flatMap((g) => g.participants)
-															.includes(x.id),
-												});
-
-												router.push("/list/users");
-										  }
-										: undefined
-								}
-								onViewCorporate={
-									selectedUser.type === "teacher" || selectedUser.type === "student"
-										? () => {
-												appendUserFilters({
-													id: "view-corporate",
-													filter: (x: User) => x.type === "corporate",
-												});
-												appendUserFilters({
-													id: "belongs-to-admin",
-													filter: (x: User) =>
-														groups
-															.filter((g) => g.participants.includes(selectedUser.id))
-															.flatMap((g) => [g.admin, ...g.participants])
-															.includes(x.id),
-												});
-
-												router.push("/list/users");
-										  }
-										: undefined
-								}
-								user={selectedUser}
-							/>
-						</div>
-					)}
-				</>
-			</Modal>
-			{page === "students" && <StudentsList />}
-			{page === "teachers" && <TeachersList />}
-			{page === "corporate" && <CorporateList />}
-			{page === "agents" && <AgentsList />}
-			{page === "inactiveStudents" && <InactiveStudentsList />}
-			{page === "inactiveCorporate" && <InactiveCorporateList />}
-			{page === "inactiveCountryManagers" && <InactiveCountryManagerList />}
-			{page === "paymentdone" && <CorporatePaidStatusList paid={true} />}
-			{page === "paymentpending" && <CorporatePaidStatusList paid={false} />}
-			{page === "" && <DefaultDashboard />}
-		</>
-	);
-}

src/dashboards/Agent.tsx

@@ -1,244 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Modal from "@/components/Modal";
-import useStats from "@/hooks/useStats";
-import useUsers from "@/hooks/useUsers";
-import { User} from "@/interfaces/user";
-import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
-import moment from "moment";
-import {useEffect, useState} from "react";
-import {BsArrowLeft, BsPersonFill, BsBank, BsCurrencyDollar} from "react-icons/bs";
-import UserCard from "@/components/UserCard";
-import useGroups from "@/hooks/useGroups";
-
-import IconCard from "./IconCard";
-import usePaymentStatusUsers from '@/hooks/usePaymentStatusUsers';
-
-interface Props {
-	user: User;
-}
-
-export default function AgentDashboard({user}: Props) {
-	const [page, setPage] = useState("");
-	const [selectedUser, setSelectedUser] = useState<User>();
-	const [showModal, setShowModal] = useState(false);
-
-	const {stats} = useStats();
-	const {users, reload} = useUsers();
-	const {groups} = useGroups(user.id);
-	const { pending, done } = usePaymentStatusUsers();
-
-	useEffect(() => {
-		setShowModal(!!selectedUser && page === "");
-	}, [selectedUser, page]);
-
-	const corporateFilter = (user: User) => user.type === "corporate";
-	const referredCorporateFilter = (x: User) =>
-		x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id;
-	const inactiveReferredCorporateFilter = (x: User) =>
-		referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate));
-
-	const UserDisplay = ({ displayUser, allowClick = true }: {displayUser: User, allowClick?: boolean}) => (
-		<div
-			onClick={() => allowClick && setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>
-					{displayUser.type === "corporate"
-						? displayUser.corporateInformation?.companyInformation?.name || displayUser.name
-						: displayUser.name}
-				</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
-	const ReferredCorporateList = () => {
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Referred Corporate ({users.filter(referredCorporateFilter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[referredCorporateFilter]} />
-			</>
-		);
-	};
-
-	const InactiveReferredCorporateList = () => {
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Inactive Referred Corporate ({users.filter(inactiveReferredCorporateFilter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[inactiveReferredCorporateFilter]} />
-			</>
-		);
-	};
-
-	const CorporateList = () => {
-		const filter = (x: User) => x.type === "corporate";
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Corporate ({users.filter(filter).length})</h2>
-				</div>
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const CorporatePaidStatusList = ({ paid }: {paid: Boolean}) => {
-		const list = paid ? done : pending;
-		const filter = (x: User) => x.type === "corporate" && list.includes(x.id);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">{paid ? 'Payment Done' : 'Pending Payment'} ({list.length})</h2>
-				</div>
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const DefaultDashboard = () => (
-		<>
-			<section className="flex flex-wrap gap-2 items-center -lg:justify-center lg:gap-4 text-center">
-				<IconCard
-					onClick={() => setPage("referredCorporate")}
-					Icon={BsBank}
-					label="Referred Corporate"
-					value={users.filter(referredCorporateFilter).length}
-					color="purple"
-				/>
-				<IconCard
-					onClick={() => setPage("inactiveReferredCorporate")}
-					Icon={BsBank}
-					label="Inactive Referred Corporate"
-					value={users.filter(inactiveReferredCorporateFilter).length}
-					color="rose"
-				/>
-				<IconCard
-					onClick={() => setPage("corporate")}
-					Icon={BsBank}
-					label="Corporate"
-					value={users.filter(corporateFilter).length}
-					color="purple"
-				/>
-				<IconCard
-					onClick={() => setPage("paymentdone")}
-					Icon={BsCurrencyDollar}
-					label="Payment Done"
-					value={done.length}
-					color="purple"
-				/>
-				<IconCard
-					onClick={() => setPage("paymentpending")}
-					Icon={BsCurrencyDollar}
-					label="Pending Payment"
-					value={pending.length}
-					color="rose"
-				/>
-			</section>
-
-			<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest Referred Corporate</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(referredCorporateFilter)
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} displayUser={x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest corporate</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(corporateFilter)
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} displayUser={x} allowClick={false} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Referenced corporate expiring in 1 month</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									referredCorporateFilter(x) &&
-									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
-									moment().isBefore(moment(x.subscriptionExpirationDate)),
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} displayUser={x} />
-							))}
-					</div>
-				</div>
-			</section>
-		</>
-	);
-
-	return (
-		<>
-			<Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
-				<>
-					{selectedUser && (
-						<div className="w-full flex flex-col gap-8">
-							<UserCard
-								loggedInUser={user}
-								onClose={(shouldReload) => {
-									setSelectedUser(undefined);
-									if (shouldReload) reload();
-								}}
-								onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
-								}
-								onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
-								user={selectedUser}
-							/>
-						</div>
-					)}
-				</>
-			</Modal>
-			{page === "referredCorporate" && <ReferredCorporateList />}
-			{page === "corporate" && <CorporateList />}
-			{page === "inactiveReferredCorporate" && <InactiveReferredCorporateList />}
-			{page === "paymentdone" && <CorporatePaidStatusList paid={true} />}
-			{page === "paymentpending" && <CorporatePaidStatusList paid={false} />}
-			{page === "" && <DefaultDashboard />}
-		</>
-	);
-}

src/dashboards/AssignmentCard.tsx

@@ -1,115 +0,0 @@
-import ProgressBar from "@/components/Low/ProgressBar";
-import useUsers from "@/hooks/useUsers";
-import { Module } from "@/interfaces";
-import { Assignment } from "@/interfaces/results";
-import { calculateBandScore } from "@/utils/score";
-import clsx from "clsx";
-import moment from "moment";
-import {
-  BsBook,
-  BsClipboard,
-  BsHeadphones,
-  BsMegaphone,
-  BsPen,
-} from "react-icons/bs";
-import { usePDFDownload } from "@/hooks/usePDFDownload";
-import { uniqBy } from "lodash";
-
-interface Props {
-  onClick?: () => void;
-  allowDownload?: boolean;
-}
-
-export default function AssignmentCard({
-  id,
-  name,
-  assigner,
-  startDate,
-  endDate,
-  assignees,
-  results,
-  exams,
-  onClick,
-  allowDownload,
-}: Assignment & Props) {
-  const { users } = useUsers();
-  const renderPdfIcon = usePDFDownload("assignments");
-
-  const calculateAverageModuleScore = (module: Module) => {
-    const resultModuleBandScores = results.map((r) => {
-      const moduleStats = r.stats.filter((s) => s.module === module);
-
-      const correct = moduleStats.reduce(
-        (acc, curr) => acc + curr.score.correct,
-        0,
-      );
-      const total = moduleStats.reduce(
-        (acc, curr) => acc + curr.score.total,
-        0,
-      );
-      return calculateBandScore(correct, total, module, r.type);
-    });
-
-    return resultModuleBandScores.length === 0
-      ? -1
-      : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) /
-          results.length;
-  };
-
-  return (
-    <div
-      onClick={onClick}
-      className="border-mti-gray-platinum flex h-fit w-[350px] cursor-pointer flex-col gap-6 rounded-xl border bg-white p-4 transition duration-300 ease-in-out hover:drop-shadow"
-    >
-      <div className="flex flex-col gap-3">
-        <div className="flex flex-row justify-between">
-          <h3 className="text-xl font-semibold">{name}</h3>
-          {allowDownload &&
-            renderPdfIcon(id, "text-mti-gray-dim", "text-mti-gray-dim")}
-        </div>
-        <ProgressBar
-          color={results.length / assignees.length < 0.5 ? "red" : "purple"}
-          percentage={(results.length / assignees.length) * 100}
-          label={`${results.length}/${assignees.length}`}
-          className="h-5"
-          textClassName={
-            results.length / assignees.length < 0.5
-              ? "!text-mti-gray-dim font-light"
-              : "text-white"
-          }
-        />
-      </div>
-      <span className="flex justify-between gap-1">
-        <span>{moment(startDate).format("DD/MM/YY, HH:mm")}</span>
-        <span>-</span>
-        <span>{moment(endDate).format("DD/MM/YY, HH:mm")}</span>
-      </span>
-      <div className="-md:mt-2 grid w-full grid-cols-4 place-items-start gap-2">
-        {uniqBy(exams, (x) => x.module).map(({ module }) => (
-          <div
-            key={module}
-            className={clsx(
-              "-md:px-4 flex w-fit items-center gap-2 rounded-xl py-2 text-white md:px-2 xl:px-4",
-              module === "reading" && "bg-ielts-reading",
-              module === "listening" && "bg-ielts-listening",
-              module === "writing" && "bg-ielts-writing",
-              module === "speaking" && "bg-ielts-speaking",
-              module === "level" && "bg-ielts-level",
-            )}
-          >
-            {module === "reading" && <BsBook className="h-4 w-4" />}
-            {module === "listening" && <BsHeadphones className="h-4 w-4" />}
-            {module === "writing" && <BsPen className="h-4 w-4" />}
-            {module === "speaking" && <BsMegaphone className="h-4 w-4" />}
-            {module === "level" && <BsClipboard className="h-4 w-4" />}
-            {calculateAverageModuleScore(module) > -1 && (
-              <span className="text-sm">
-                {calculateAverageModuleScore(module).toFixed(1)}
-              </span>
-            )}
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}

src/dashboards/AssignmentCreator.tsx

@@ -1,336 +0,0 @@
-import Input from "@/components/Low/Input";
-import Modal from "@/components/Modal";
-import {Module} from "@/interfaces";
-import clsx from "clsx";
-import {useState} from "react";
-import {BsBook, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
-import {generate} from "random-words";
-import {capitalize} from "lodash";
-import useUsers from "@/hooks/useUsers";
-import {Group, User} from "@/interfaces/user";
-import ProgressBar from "@/components/Low/ProgressBar";
-import {calculateAverageLevel} from "@/utils/score";
-import Button from "@/components/Low/Button";
-import ReactDatePicker from "react-datepicker";
-import moment from "moment";
-import axios from "axios";
-import {getExam} from "@/utils/exams";
-import {toast} from "react-toastify";
-import {uuidv4} from "@firebase/util";
-import {Assignment} from "@/interfaces/results";
-import Checkbox from "@/components/Low/Checkbox";
-import {InstructorGender, Variant} from "@/interfaces/exam";
-import Select from "@/components/Low/Select";
-
-interface Props {
-	isCreating: boolean;
-	assigner: string;
-	users: User[];
-	groups: Group[];
-	assignment?: Assignment;
-	cancelCreation: () => void;
-}
-
-export default function AssignmentCreator({isCreating, assignment, assigner, groups, users, cancelCreation}: Props) {
-	const [selectedModules, setSelectedModules] = useState<Module[]>(assignment?.exams.map((e) => e.module) || []);
-	const [assignees, setAssignees] = useState<string[]>(assignment?.assignees || []);
-	const [name, setName] = useState(assignment?.name || generate({minLength: 6, maxLength: 8, min: 2, max: 3, join: " ", formatter: capitalize}));
-	const [isLoading, setIsLoading] = useState(false);
-	const [startDate, setStartDate] = useState<Date | null>(assignment ? moment(assignment.startDate).toDate() : new Date());
-	const [endDate, setEndDate] = useState<Date | null>(
-		assignment ? moment(assignment.endDate).toDate() : moment().hours(23).minutes(59).add(8, "day").toDate(),
-	);
-	const [variant, setVariant] = useState<Variant>("full");
-	const [instructorGender, setInstructorGender] = useState<InstructorGender>(assignment?.instructorGender || "varied");
-	// creates a new exam for each assignee or just one exam for all assignees
-	const [generateMultiple, setGenerateMultiple] = useState<boolean>(false);
-
-	const toggleModule = (module: Module) => {
-		const modules = selectedModules.filter((x) => x !== module);
-		setSelectedModules((prev) => (prev.includes(module) ? modules : [...modules, module]));
-	};
-
-	const toggleAssignee = (user: User) => {
-		setAssignees((prev) => (prev.includes(user.id) ? prev.filter((a) => a !== user.id) : [...prev, user.id]));
-	};
-
-	const createAssignment = () => {
-		setIsLoading(true);
-
-		(assignment ? axios.patch : axios.post)(`/api/assignments${assignment ? `/${assignment.id}` : ""}`, {
-			assignees,
-			name,
-			startDate,
-			endDate,
-			selectedModules,
-			generateMultiple,
-			variant,
-			instructorGender,
-		})
-			.then(() => {
-				toast.success(`The assignment "${name}" has been ${assignment ? "updated" : "created"} successfully!`);
-				cancelCreation();
-			})
-			.catch((e) => {
-				console.log(e);
-				toast.error("Something went wrong, please try again later!");
-			})
-			.finally(() => setIsLoading(false));
-	};
-
-	const deleteAssignment = () => {
-		if (assignment) {
-			setIsLoading(true);
-
-			if (!confirm(`Are you sure you want to delete the "${assignment.name}" assignment?`)) return;
-			axios
-				.delete(`api/assignments/${assignment.id}`)
-				.then(() => {
-					toast.success(`The assignment "${name}" has been deleted successfully!`);
-					cancelCreation();
-				})
-				.catch((e) => {
-					console.log(e);
-					toast.error("Something went wrong, please try again later!");
-				})
-				.finally(() => setIsLoading(false));
-		}
-	};
-
-	return (
-		<Modal isOpen={isCreating} onClose={cancelCreation} title="New Assignment">
-			<div className="w-full flex flex-col gap-4">
-				<section className="w-full grid -md:grid-cols-1 md:grid-cols-2 place-items-center lg:grid-cols-6 -md:flex-col -md:items-center -md:gap-12 justify-between gap-8 mt-8 px-8">
-					<div
-						onClick={!selectedModules.includes("level") ? () => toggleModule("reading") : undefined}
-						className={clsx(
-							"w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-							"lg:col-span-2",
-							selectedModules.includes("reading") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-						)}>
-						<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-reading top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
-							<BsBook className="text-white w-7 h-7" />
-						</div>
-						<span className="ml-8 font-semibold">Reading</span>
-						{!selectedModules.includes("reading") && !selectedModules.includes("level") && (
-							<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
-						)}
-						{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-						{selectedModules.includes("reading") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
-					</div>
-					<div
-						onClick={!selectedModules.includes("level") ? () => toggleModule("listening") : undefined}
-						className={clsx(
-							"w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-							"lg:col-span-2",
-							selectedModules.includes("listening") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-						)}>
-						<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-listening top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
-							<BsHeadphones className="text-white w-7 h-7" />
-						</div>
-						<span className="ml-8 font-semibold">Listening</span>
-						{!selectedModules.includes("listening") && !selectedModules.includes("level") && (
-							<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
-						)}
-						{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-						{selectedModules.includes("listening") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
-					</div>
-					<div
-						onClick={!selectedModules.includes("level") ? () => toggleModule("writing") : undefined}
-						className={clsx(
-							"w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-							"lg:col-span-2",
-							selectedModules.includes("writing") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-						)}>
-						<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-writing top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
-							<BsPen className="text-white w-7 h-7" />
-						</div>
-						<span className="ml-8 font-semibold">Writing</span>
-						{!selectedModules.includes("writing") && !selectedModules.includes("level") && (
-							<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
-						)}
-						{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-						{selectedModules.includes("writing") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
-					</div>
-					<div
-						onClick={!selectedModules.includes("level") ? () => toggleModule("speaking") : undefined}
-						className={clsx(
-							"w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-							"lg:col-span-3",
-							selectedModules.includes("speaking") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-						)}>
-						<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-speaking top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
-							<BsMegaphone className="text-white w-7 h-7" />
-						</div>
-						<span className="ml-8 font-semibold">Speaking</span>
-						{!selectedModules.includes("speaking") && !selectedModules.includes("level") && (
-							<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
-						)}
-						{selectedModules.includes("level") && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-						{selectedModules.includes("speaking") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
-					</div>
-					<div
-						onClick={
-							(!selectedModules.includes("level") && selectedModules.length === 0) || selectedModules.includes("level")
-								? () => toggleModule("level")
-								: undefined
-						}
-						className={clsx(
-							"w-52 relative max-w-xs flex items-center bg-mti-white-alt transition duration-300 ease-in-out border p-5 rounded-xl gap-8 cursor-pointer",
-							"lg:col-span-3",
-							selectedModules.includes("level") ? "border-mti-purple-light" : "border-mti-gray-platinum",
-						)}>
-						<div className="absolute w-16 h-16 flex items-center justify-center rounded-full bg-ielts-level top-1/2 -translate-y-1/2 left-0 -translate-x-1/2">
-							<BsClipboard className="text-white w-7 h-7" />
-						</div>
-						<span className="ml-8 font-semibold">Level</span>
-						{!selectedModules.includes("level") && selectedModules.length === 0 && (
-							<div className="border border-mti-gray-platinum w-8 h-8 rounded-full" />
-						)}
-						{!selectedModules.includes("level") && selectedModules.length > 0 && <BsXCircle className="text-mti-red-light w-8 h-8" />}
-						{selectedModules.includes("level") && <BsCheckCircle className="text-mti-purple-light w-8 h-8" />}
-					</div>
-				</section>
-
-				<Input type="text" name="name" onChange={(e) => setName(e)} defaultValue={name} label="Assignment Name" required />
-
-				<div className="w-full grid -md:grid-cols-1 md:grid-cols-2 gap-8">
-					<div className="flex flex-col gap-2">
-						<label className="font-normal text-base text-mti-gray-dim">Start Date *</label>
-						<ReactDatePicker
-							className={clsx(
-								"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-								"hover:border-mti-purple tooltip z-10",
-								"transition duration-300 ease-in-out",
-							)}
-							popperClassName="!z-20"
-							filterTime={(date) => moment(date).isSameOrAfter(new Date())}
-							dateFormat="dd/MM/yyyy HH:mm"
-							selected={startDate}
-							showTimeSelect
-							onChange={(date) => setStartDate(date)}
-						/>
-					</div>
-					<div className="flex flex-col gap-2">
-						<label className="font-normal text-base text-mti-gray-dim">End Date *</label>
-						<ReactDatePicker
-							className={clsx(
-								"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
-								"hover:border-mti-purple tooltip z-10",
-								"transition duration-300 ease-in-out",
-							)}
-							popperClassName="!z-20"
-							filterTime={(date) => moment(date).isAfter(startDate)}
-							dateFormat="dd/MM/yyyy HH:mm"
-							selected={endDate}
-							showTimeSelect
-							onChange={(date) => setEndDate(date)}
-						/>
-					</div>
-				</div>
-
-				<div className="flex flex-col gap-3 w-full">
-					<label className="font-normal text-base text-mti-gray-dim">Speaking Instructor&apos;s Gender</label>
-					<Select
-						value={{value: instructorGender, label: capitalize(instructorGender)}}
-						onChange={(value) => (value ? setInstructorGender(value.value as InstructorGender) : null)}
-						disabled={!selectedModules.includes("speaking") || !!assignment}
-						options={[
-							{value: "male", label: "Male"},
-							{value: "female", label: "Female"},
-							{value: "varied", label: "Varied"},
-						]}
-					/>
-				</div>
-
-				<section className="w-full flex flex-col gap-3">
-					<span className="font-semibold">Assignees ({assignees.length} selected)</span>
-					<div className="flex gap-4 overflow-x-scroll scrollbar-hide">
-						{groups.map((g) => (
-							<button
-								key={g.id}
-								onClick={() => {
-									const groupStudentIds = users.filter((u) => g.participants.includes(u.id)).map((u) => u.id);
-									if (groupStudentIds.every((u) => assignees.includes(u))) {
-										setAssignees((prev) => prev.filter((a) => !groupStudentIds.includes(a)));
-									} else {
-										setAssignees((prev) => [...prev.filter((a) => !groupStudentIds.includes(a)), ...groupStudentIds]);
-									}
-								}}
-								className={clsx(
-									"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
-									"transition duration-300 ease-in-out",
-									users.filter((u) => g.participants.includes(u.id)).every((u) => assignees.includes(u.id)) &&
-										"!bg-mti-purple-light !text-white",
-								)}>
-								{g.name}
-							</button>
-						))}
-					</div>
-					<div className="flex flex-wrap -md:justify-center gap-4">
-						{users.map((user) => (
-							<div
-								onClick={() => toggleAssignee(user)}
-								className={clsx(
-									"p-4 flex flex-col gap-2 rounded-xl border cursor-pointer w-72",
-									"transition ease-in-out duration-300",
-									assignees.includes(user.id) ? "border-mti-purple" : "border-mti-gray-platinum",
-								)}
-								key={user.id}>
-								<span className="flex flex-col gap-0 justify-center">
-									<span className="font-semibold">{user.name}</span>
-									<span className="text-sm opacity-80">{user.email}</span>
-								</span>
-								<ProgressBar
-									color="purple"
-									textClassName="!text-mti-black/80"
-									label={`Level ${calculateAverageLevel(user.levels)}`}
-									percentage={(calculateAverageLevel(user.levels) / 9) * 100}
-									className="h-6"
-								/>
-								<span className="text-mti-black/80 text-sm whitespace-pre-wrap mt-2">
-									Groups:{" "}
-									{groups
-										.filter((g) => g.participants.includes(user.id))
-										.map((g) => g.name)
-										.join(", ")}
-								</span>
-							</div>
-						))}
-					</div>
-				</section>
-				<div className="flex flex-col gap-4 w-full items-end">
-					<Checkbox isChecked={variant === "full"} onChange={() => setVariant((prev) => (prev === "full" ? "partial" : "full"))}>
-						Full length exams
-					</Checkbox>
-					<Checkbox isChecked={generateMultiple} onChange={() => setGenerateMultiple((d) => !d)}>
-						Generate different exams
-					</Checkbox>
-				</div>
-				<div className="flex gap-4 w-full justify-end">
-					<Button className="w-full max-w-[200px]" variant="outline" onClick={cancelCreation} disabled={isLoading} isLoading={isLoading}>
-						Cancel
-					</Button>
-					{assignment && (
-						<Button
-							className="w-full max-w-[200px]"
-							color="red"
-							variant="outline"
-							onClick={deleteAssignment}
-							disabled={isLoading}
-							isLoading={isLoading}>
-							Delete
-						</Button>
-					)}
-					<Button
-						disabled={selectedModules.length === 0 || !name || !startDate || !endDate || assignees.length === 0}
-						className="w-full max-w-[200px]"
-						onClick={createAssignment}
-						isLoading={isLoading}>
-						{assignment ? "Update" : "Create"}
-					</Button>
-				</div>
-			</div>
-		</Modal>
-	);
-}

src/dashboards/AssignmentView.tsx

@@ -1,354 +0,0 @@
-import ProgressBar from "@/components/Low/ProgressBar";
-import Modal from "@/components/Modal";
-import useUsers from "@/hooks/useUsers";
-import { Module } from "@/interfaces";
-import { Assignment } from "@/interfaces/results";
-import { Stat, User } from "@/interfaces/user";
-import useExamStore from "@/stores/examStore";
-import { getExamById } from "@/utils/exams";
-import { sortByModule } from "@/utils/moduleUtils";
-import { calculateBandScore } from "@/utils/score";
-import { convertToUserSolutions } from "@/utils/stats";
-import clsx from "clsx";
-import { capitalize, uniqBy } from "lodash";
-import moment from "moment";
-import { useRouter } from "next/router";
-import {
-  BsBook,
-  BsClipboard,
-  BsHeadphones,
-  BsMegaphone,
-  BsPen,
-} from "react-icons/bs";
-
-interface Props {
-  isOpen: boolean;
-  assignment?: Assignment;
-  onClose: () => void;
-}
-
-export default function AssignmentView({ isOpen, assignment, onClose }: Props) {
-  const { users } = useUsers();
-  const router = useRouter();
-
-  const setExams = useExamStore((state) => state.setExams);
-  const setShowSolutions = useExamStore((state) => state.setShowSolutions);
-  const setUserSolutions = useExamStore((state) => state.setUserSolutions);
-  const setSelectedModules = useExamStore((state) => state.setSelectedModules);
-
-  const formatTimestamp = (timestamp: string) => {
-    const date = moment(parseInt(timestamp));
-    const formatter = "YYYY/MM/DD - HH:mm";
-
-    return date.format(formatter);
-  };
-
-  const calculateAverageModuleScore = (module: Module) => {
-    if (!assignment) return -1;
-
-    const resultModuleBandScores = assignment.results.map((r) => {
-      const moduleStats = r.stats.filter((s) => s.module === module);
-
-      const correct = moduleStats.reduce(
-        (acc, curr) => acc + curr.score.correct,
-        0,
-      );
-      const total = moduleStats.reduce(
-        (acc, curr) => acc + curr.score.total,
-        0,
-      );
-      return calculateBandScore(correct, total, module, r.type);
-    });
-
-    return resultModuleBandScores.length === 0
-      ? -1
-      : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) /
-          assignment.results.length;
-  };
-
-  const aggregateScoresByModule = (
-    stats: Stat[],
-  ): { module: Module; total: number; missing: number; correct: number }[] => {
-    const scores: {
-      [key in Module]: { total: number; missing: number; correct: number };
-    } = {
-      reading: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      listening: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      writing: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      speaking: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-      level: {
-        total: 0,
-        correct: 0,
-        missing: 0,
-      },
-    };
-
-    stats.forEach((x) => {
-      scores[x.module!] = {
-        total: scores[x.module!].total + x.score.total,
-        correct: scores[x.module!].correct + x.score.correct,
-        missing: scores[x.module!].missing + x.score.missing,
-      };
-    });
-
-    return Object.keys(scores)
-      .filter((x) => scores[x as Module].total > 0)
-      .map((x) => ({ module: x as Module, ...scores[x as Module] }));
-  };
-
-  const customContent = (
-    stats: Stat[],
-    user: string,
-    focus: "academic" | "general",
-  ) => {
-    const correct = stats.reduce(
-      (accumulator, current) => accumulator + current.score.correct,
-      0,
-    );
-    const total = stats.reduce(
-      (accumulator, current) => accumulator + current.score.total,
-      0,
-    );
-    const aggregatedScores = aggregateScoresByModule(stats).filter(
-      (x) => x.total > 0,
-    );
-
-    const aggregatedLevels = aggregatedScores.map((x) => ({
-      module: x.module,
-      level: calculateBandScore(x.correct, x.total, x.module, focus),
-    }));
-
-    const timeSpent = stats[0].timeSpent;
-
-    const selectExam = () => {
-      const examPromises = uniqBy(stats, "exam").map((stat) =>
-        getExamById(stat.module, stat.exam),
-      );
-
-      Promise.all(examPromises).then((exams) => {
-        if (exams.every((x) => !!x)) {
-          setUserSolutions(convertToUserSolutions(stats));
-          setShowSolutions(true);
-          setExams(exams.map((x) => x!).sort(sortByModule));
-          setSelectedModules(
-            exams
-              .map((x) => x!)
-              .sort(sortByModule)
-              .map((x) => x!.module),
-          );
-          router.push("/exercises");
-        }
-      });
-    };
-
-    const content = (
-      <>
-        <div className="-md:items-center flex w-full justify-between 2xl:items-center">
-          <div className="-md:gap-2 -md:items-center flex md:flex-col md:gap-1 2xl:flex-row 2xl:items-center 2xl:gap-2">
-            <span className="font-medium">
-              {formatTimestamp(stats[0].date.toString())}
-            </span>
-            {timeSpent && (
-              <>
-                <span className="md:hidden 2xl:flex">• </span>
-                <span className="text-sm">
-                  {Math.floor(timeSpent / 60)} minutes
-                </span>
-              </>
-            )}
-          </div>
-          <span
-            className={clsx(
-              correct / total >= 0.7 && "text-mti-purple",
-              correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
-              correct / total < 0.3 && "text-mti-rose",
-            )}
-          >
-            Level{" "}
-            {(
-              aggregatedLevels.reduce(
-                (accumulator, current) => accumulator + current.level,
-                0,
-              ) / aggregatedLevels.length
-            ).toFixed(1)}
-          </span>
-        </div>
-
-        <div className="flex w-full flex-col gap-1">
-          <div className="-md:mt-2 grid w-full grid-cols-4 place-items-start gap-2">
-            {aggregatedLevels.map(({ module, level }) => (
-              <div
-                key={module}
-                className={clsx(
-                  "-md:px-4 flex w-fit items-center gap-2 rounded-xl py-2 text-white md:px-2 xl:px-4",
-                  module === "reading" && "bg-ielts-reading",
-                  module === "listening" && "bg-ielts-listening",
-                  module === "writing" && "bg-ielts-writing",
-                  module === "speaking" && "bg-ielts-speaking",
-                  module === "level" && "bg-ielts-level",
-                )}
-              >
-                {module === "reading" && <BsBook className="h-4 w-4" />}
-                {module === "listening" && <BsHeadphones className="h-4 w-4" />}
-                {module === "writing" && <BsPen className="h-4 w-4" />}
-                {module === "speaking" && <BsMegaphone className="h-4 w-4" />}
-                {module === "level" && <BsClipboard className="h-4 w-4" />}
-                <span className="text-sm">{level.toFixed(1)}</span>
-              </div>
-            ))}
-          </div>
-        </div>
-      </>
-    );
-
-    return (
-      <div className="flex flex-col gap-2">
-        <span>
-          {(() => {
-            const student = users.find((u) => u.id === user);
-            return `${student?.name} (${student?.email})`;
-          })()}
-        </span>
-        <div
-          key={user}
-          className={clsx(
-            "border-mti-gray-platinum -md:hidden flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out",
-            correct / total >= 0.7 && "hover:border-mti-purple",
-            correct / total >= 0.3 &&
-              correct / total < 0.7 &&
-              "hover:border-mti-red",
-            correct / total < 0.3 && "hover:border-mti-rose",
-          )}
-          onClick={selectExam}
-          role="button"
-        >
-          {content}
-        </div>
-        <div
-          key={user}
-          className={clsx(
-            "border-mti-gray-platinum -md:tooltip flex cursor-pointer flex-col gap-4 rounded-xl border p-4 transition duration-300 ease-in-out md:hidden",
-            correct / total >= 0.7 && "hover:border-mti-purple",
-            correct / total >= 0.3 &&
-              correct / total < 0.7 &&
-              "hover:border-mti-red",
-            correct / total < 0.3 && "hover:border-mti-rose",
-          )}
-          data-tip="Your screen size is too small to view previous exams."
-          role="button"
-        >
-          {content}
-        </div>
-      </div>
-    );
-  };
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} title={assignment?.name}>
-      <div className="mt-4 flex w-full flex-col gap-4">
-        <ProgressBar
-          color="purple"
-          label={`${assignment?.results.length}/${assignment?.assignees.length} assignees completed`}
-          className="h-6"
-          textClassName={
-            (assignment?.results.length || 0) /
-              (assignment?.assignees.length || 1) <
-            0.5
-              ? "!text-mti-gray-dim font-light"
-              : "text-white"
-          }
-          percentage={
-            ((assignment?.results.length || 0) /
-              (assignment?.assignees.length || 1)) *
-            100
-          }
-        />
-        <div className="flex items-start gap-8">
-          <div className="flex flex-col gap-2">
-            <span>
-              Start Date:{" "}
-              {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}
-            </span>
-            <span>
-              End Date: {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}
-            </span>
-          </div>
-          <span>
-            Assignees:{" "}
-            {users
-              .filter((u) => assignment?.assignees.includes(u.id))
-              .map((u) => `${u.name} (${u.email})`)
-              .join(", ")}
-          </span>
-        </div>
-        <div className="flex flex-col gap-2">
-          <span className="text-xl font-bold">Average Scores</span>
-          <div className="-md:mt-2 flex w-full items-center gap-4">
-            {assignment &&
-              uniqBy(assignment.exams, (x) => x.module).map(({ module }) => (
-                <div
-                  data-tip={capitalize(module)}
-                  key={module}
-                  className={clsx(
-                    "-md:px-4 tooltip flex w-fit items-center gap-2 rounded-xl py-2 text-white md:px-2 xl:px-4",
-                    module === "reading" && "bg-ielts-reading",
-                    module === "listening" && "bg-ielts-listening",
-                    module === "writing" && "bg-ielts-writing",
-                    module === "speaking" && "bg-ielts-speaking",
-                    module === "level" && "bg-ielts-level",
-                  )}
-                >
-                  {module === "reading" && <BsBook className="h-4 w-4" />}
-                  {module === "listening" && (
-                    <BsHeadphones className="h-4 w-4" />
-                  )}
-                  {module === "writing" && <BsPen className="h-4 w-4" />}
-                  {module === "speaking" && <BsMegaphone className="h-4 w-4" />}
-                  {module === "level" && <BsClipboard className="h-4 w-4" />}
-                  {calculateAverageModuleScore(module) > -1 && (
-                    <span className="text-sm">
-                      {calculateAverageModuleScore(module).toFixed(1)}
-                    </span>
-                  )}
-                </div>
-              ))}
-          </div>
-        </div>
-        <div className="flex flex-col gap-2">
-          <span className="text-xl font-bold">
-            Results ({assignment?.results.length}/{assignment?.assignees.length}
-            )
-          </span>
-          <div>
-            {assignment && assignment?.results.length > 0 && (
-              <div className="grid w-full grid-cols-1 gap-4 md:grid-cols-2 xl:grid-cols-3 xl:gap-6">
-                {assignment.results.map((r) =>
-                  customContent(r.stats, r.user, r.type),
-                )}
-              </div>
-            )}
-            {assignment && assignment?.results.length === 0 && (
-              <span className="ml-1 font-semibold">No results yet...</span>
-            )}
-          </div>
-        </div>
-      </div>
-    </Modal>
-  );
-}

src/dashboards/Corporate.tsx

@@ -1,326 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Modal from "@/components/Modal";
-import useStats from "@/hooks/useStats";
-import useUsers from "@/hooks/useUsers";
-import {CorporateUser, Group, Stat, User} from "@/interfaces/user";
-import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
-import moment from "moment";
-import {useEffect, useState} from "react";
-import {
-	BsArrowLeft,
-	BsClipboard2Data,
-	BsClipboard2DataFill,
-	BsClock,
-	BsGlobeCentralSouthAsia,
-	BsPaperclip,
-	BsPerson,
-	BsPersonAdd,
-	BsPersonFill,
-	BsPersonFillGear,
-	BsPersonGear,
-	BsPencilSquare,
-	BsPersonBadge,
-	BsPersonCheck,
-	BsPeople,
-} from "react-icons/bs";
-import UserCard from "@/components/UserCard";
-import useGroups from "@/hooks/useGroups";
-import {calculateAverageLevel, calculateBandScore} from "@/utils/score";
-import {MODULE_ARRAY} from "@/utils/moduleUtils";
-import {Module} from "@/interfaces";
-import {groupByExam} from "@/utils/stats";
-import IconCard from "./IconCard";
-import GroupList from "@/pages/(admin)/Lists/GroupList";
-import useFilterStore from "@/stores/listFilterStore";
-import {useRouter} from "next/router";
-import useCodes from "@/hooks/useCodes";
-
-interface Props {
-	user: CorporateUser;
-}
-
-export default function CorporateDashboard({user}: Props) {
-	const [page, setPage] = useState("");
-	const [selectedUser, setSelectedUser] = useState<User>();
-	const [showModal, setShowModal] = useState(false);
-
-	const {stats} = useStats();
-	const {users, reload} = useUsers();
-	const {codes} = useCodes(user.id);
-	const {groups} = useGroups(user.id);
-
-	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
-	const router = useRouter();
-
-	useEffect(() => {
-		setShowModal(!!selectedUser && page === "");
-	}, [selectedUser, page]);
-
-	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);
-	const teacherFilter = (user: User) => user.type === "teacher" && groups.flatMap((g) => g.participants).includes(user.id);
-
-	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
-
-	const UserDisplay = (displayUser: User) => (
-		<div
-			onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>{displayUser.name}</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
-	const StudentsList = () => {
-		const filter = (x: User) =>
-			x.type === "student" &&
-			(!!selectedUser
-				? groups
-						.filter((g) => g.admin === selectedUser.id)
-						.flatMap((g) => g.participants)
-						.includes(x.id) || false
-				: groups.flatMap((g) => g.participants).includes(x.id));
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const TeachersList = () => {
-		const filter = (x: User) =>
-			x.type === "teacher" &&
-			(!!selectedUser
-				? groups
-						.filter((g) => g.admin === selectedUser.id)
-						.flatMap((g) => g.participants)
-						.includes(x.id) || false
-				: groups.flatMap((g) => g.participants).includes(x.id));
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Teachers ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const GroupsList = () => {
-		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
-				</div>
-
-				<GroupList user={user} />
-			</>
-		);
-	};
-
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({focus: users.find((u) => u.id === s.user)?.focus, score: s.score, module: s.module}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: {[key in Module]: number} = {reading: 0, listening: 0, writing: 0, speaking: 0, level: 0};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
-
-	const DefaultDashboard = () => (
-		<>
-			<section className="flex flex-wrap gap-2 items-center -lg:justify-center lg:justify-between text-center">
-				<IconCard
-					onClick={() => setPage("students")}
-					Icon={BsPersonFill}
-					label="Students"
-					value={users.filter(studentFilter).length}
-					color="purple"
-				/>
-				<IconCard
-					onClick={() => setPage("teachers")}
-					Icon={BsPencilSquare}
-					label="Teachers"
-					value={users.filter(teacherFilter).length}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsClipboard2Data}
-					label="Exams Performed"
-					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsPaperclip}
-					label="Average Level"
-					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
-					color="purple"
-				/>
-				<IconCard onClick={() => setPage("groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
-				<IconCard
-					Icon={BsPersonCheck}
-					label="User Balance"
-					value={`${codes.length}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsClock}
-					label="Expiration Date"
-					value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
-					color="rose"
-				/>
-			</section>
-
-			<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest teachers</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(teacherFilter)
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Highest level students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Highest exam count students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort(
-								(a, b) =>
-									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-			</section>
-		</>
-	);
-
-	return (
-		<>
-			<Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
-				<>
-					{selectedUser && (
-						<div className="w-full flex flex-col gap-8">
-							<UserCard
-								loggedInUser={user}
-								onClose={(shouldReload) => {
-									setSelectedUser(undefined);
-									if (shouldReload) reload();
-								}}
-								onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher"
-										? () => {
-												appendUserFilters({
-													id: "view-students",
-													filter: (x: User) => x.type === "student",
-												});
-												appendUserFilters({
-													id: "belongs-to-admin",
-													filter: (x: User) =>
-														groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-															.flatMap((g) => g.participants)
-															.includes(x.id),
-												});
-
-												router.push("/list/users");
-										  }
-										: undefined
-								}
-								onViewTeachers={
-									selectedUser.type === "corporate" || selectedUser.type === "student"
-										? () => {
-												appendUserFilters({
-													id: "view-teachers",
-													filter: (x: User) => x.type === "teacher",
-												});
-												appendUserFilters({
-													id: "belongs-to-admin",
-													filter: (x: User) =>
-														groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-															.flatMap((g) => g.participants)
-															.includes(x.id),
-												});
-
-												router.push("/list/users");
-										  }
-										: undefined
-								}
-								user={selectedUser}
-							/>
-						</div>
-					)}
-				</>
-			</Modal>
-			{page === "students" && <StudentsList />}
-			{page === "teachers" && <TeachersList />}
-			{page === "groups" && <GroupsList />}
-			{page === "" && <DefaultDashboard />}
-		</>
-	);
-}

src/dashboards/IconCard.tsx

@@ -1,35 +0,0 @@
-import clsx from "clsx";
-import {IconType} from "react-icons";
-
-interface Props {
-	Icon: IconType;
-	label: string;
-	value: string | number;
-	color: "purple" | "rose" | "red";
-	tooltip?: string;
-	onClick?: () => void;
-}
-
-export default function IconCard({Icon, label, value, color, tooltip, onClick}: Props) {
-	const colorClasses: {[key in typeof color]: string} = {
-		purple: "text-mti-purple-light",
-		red: "text-mti-red-light",
-		rose: "text-mti-rose-light",
-	};
-
-	return (
-		<div
-			onClick={onClick}
-			className={clsx(
-				"bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center text-center w-52 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300",
-				tooltip && "tooltip tooltip-bottom",
-			)}
-			data-tip={tooltip}>
-			<Icon className={clsx("text-6xl", colorClasses[color])} />
-			<span className="flex flex-col gap-1 items-center text-xl">
-				<span className="text-lg">{label}</span>
-				<span className={clsx("font-semibold", colorClasses[color])}>{value}</span>
-			</span>
-		</div>
-	);
-}

src/dashboards/Student.tsx

@@ -1,260 +0,0 @@
-import Button from "@/components/Low/Button";
-import ProgressBar from "@/components/Low/ProgressBar";
-import InviteCard from "@/components/Medium/InviteCard";
-import PayPalPayment from "@/components/PayPalPayment";
-import ProfileSummary from "@/components/ProfileSummary";
-import useAssignments from "@/hooks/useAssignments";
-import useInvites from "@/hooks/useInvites";
-import useStats from "@/hooks/useStats";
-import useUsers from "@/hooks/useUsers";
-import {Invite} from "@/interfaces/invite";
-import {Assignment} from "@/interfaces/results";
-import {CorporateUser, User} from "@/interfaces/user";
-import useExamStore from "@/stores/examStore";
-import {getExamById} from "@/utils/exams";
-import {getUserCorporate} from "@/utils/groups";
-import {MODULE_ARRAY, sortByModule, sortByModuleName} from "@/utils/moduleUtils";
-import {averageScore, groupBySession} from "@/utils/stats";
-import {CreateOrderActions, CreateOrderData, OnApproveActions, OnApproveData, OrderResponseBody} from "@paypal/paypal-js";
-import {PayPalButtons} from "@paypal/react-paypal-js";
-import axios from "axios";
-import clsx from "clsx";
-import {capitalize} from "lodash";
-import moment from "moment";
-import Link from "next/link";
-import {useRouter} from "next/router";
-import {useEffect, useState} from "react";
-import {BsArrowRepeat, BsBook, BsClipboard, BsFileEarmarkText, BsHeadphones, BsMegaphone, BsPen, BsPencil, BsStar} from "react-icons/bs";
-import {toast} from "react-toastify";
-
-interface Props {
-	user: User;
-}
-
-export default function StudentDashboard({user}: Props) {
-	const [corporateUserToShow, setCorporateUserToShow] = useState<CorporateUser>();
-
-	const {stats} = useStats(user.id);
-	const {users} = useUsers();
-	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({assignees: user?.id});
-	const {invites, isLoading: isInvitesLoading, reload: reloadInvites} = useInvites({to: user.id});
-
-	const router = useRouter();
-
-	const setExams = useExamStore((state) => state.setExams);
-	const setShowSolutions = useExamStore((state) => state.setShowSolutions);
-	const setUserSolutions = useExamStore((state) => state.setUserSolutions);
-	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
-	const setAssignment = useExamStore((state) => state.setAssignment);
-
-	useEffect(() => {
-		getUserCorporate(user.id).then(setCorporateUserToShow);
-	}, [user]);
-
-	const startAssignment = (assignment: Assignment) => {
-		const examPromises = assignment.exams.filter((e) => e.assignee === user.id).map((e) => getExamById(e.module, e.id));
-
-		Promise.all(examPromises).then((exams) => {
-			if (exams.every((x) => !!x)) {
-				setUserSolutions([]);
-				setShowSolutions(false);
-				setExams(exams.map((x) => x!).sort(sortByModule));
-				setSelectedModules(
-					exams
-						.map((x) => x!)
-						.sort(sortByModule)
-						.map((x) => x!.module),
-				);
-				setAssignment(assignment);
-
-				router.push("/exercises");
-			}
-		});
-	};
-
-	return (
-		<>
-			{corporateUserToShow && (
-				<div className="absolute right-4 top-4 rounded-lg bg-neutral-200 px-2 py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
-				</div>
-			)}
-			<ProfileSummary
-				user={user}
-				items={[
-					{
-						icon: <BsFileEarmarkText className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />,
-						value: Object.keys(groupBySession(stats)).length,
-						label: "Exams",
-					},
-					{
-						icon: <BsPencil className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />,
-						value: stats.length,
-						label: "Exercises",
-					},
-					{
-						icon: <BsStar className="text-mti-red-light h-6 w-6 md:h-8 md:w-8" />,
-						value: `${stats.length > 0 ? averageScore(stats) : 0}%`,
-						label: "Average Score",
-					},
-				]}
-			/>
-
-			{/* Bio */}
-			<section className="flex flex-col gap-1 md:gap-3">
-				<span className="text-lg font-bold">Bio</span>
-				<span className="text-mti-gray-taupe">
-					{user.bio || "Your bio will appear here, you can change it by clicking on your name in the top right corner."}
-				</span>
-			</section>
-
-			{/* Assignments */}
-			<section className="flex flex-col gap-1 md:gap-3">
-				<div className="flex items-center gap-4">
-					<div
-						onClick={reloadAssignments}
-						className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out">
-						<span className="text-mti-black text-lg font-bold">Assignments</span>
-						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
-					</div>
-				</div>
-				<span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
-					{assignments.filter((a) => moment(a.endDate).isSameOrAfter(moment())).length === 0 &&
-						"Assignments will appear here. It seems that for now there are no assignments for you."}
-					{assignments
-						.filter((a) => moment(a.endDate).isSameOrAfter(moment()))
-						.sort((a, b) => moment(a.startDate).diff(b.startDate))
-						.map((assignment) => (
-							<div
-								className={clsx(
-									"border-mti-gray-anti-flash flex min-w-[300px] flex-col gap-6 rounded-xl border p-4",
-									assignment.results.map((r) => r.user).includes(user.id) && "border-mti-green-light",
-								)}
-								key={assignment.id}>
-								<div className="flex flex-col gap-1">
-									<h3 className="text-mti-black/90 text-xl font-semibold">{assignment.name}</h3>
-									<span className="flex justify-between gap-1">
-										<span>{moment(assignment.startDate).format("DD/MM/YY, HH:mm")}</span>
-										<span>-</span>
-										<span>{moment(assignment.endDate).format("DD/MM/YY, HH:mm")}</span>
-									</span>
-								</div>
-								<div className="flex w-full items-center justify-between">
-									<div className="-md:mt-2 grid w-fit min-w-[104px] grid-cols-2 place-items-center justify-center gap-2">
-										{assignment.exams
-											.filter((e) => e.assignee === user.id)
-											.map((e) => e.module)
-											.sort(sortByModuleName)
-											.map((module) => (
-												<div
-													key={module}
-													data-tip={capitalize(module)}
-													className={clsx(
-														"-md:px-4 tooltip flex w-fit items-center gap-2 rounded-xl py-2 text-white md:px-2 xl:px-4",
-														module === "reading" && "bg-ielts-reading",
-														module === "listening" && "bg-ielts-listening",
-														module === "writing" && "bg-ielts-writing",
-														module === "speaking" && "bg-ielts-speaking",
-														module === "level" && "bg-ielts-level",
-													)}>
-													{module === "reading" && <BsBook className="h-4 w-4" />}
-													{module === "listening" && <BsHeadphones className="h-4 w-4" />}
-													{module === "writing" && <BsPen className="h-4 w-4" />}
-													{module === "speaking" && <BsMegaphone className="h-4 w-4" />}
-													{module === "level" && <BsClipboard className="h-4 w-4" />}
-												</div>
-											))}
-									</div>
-									{!assignment.results.map((r) => r.user).includes(user.id) && (
-										<>
-											<div
-												className="tooltip flex h-full w-full items-center justify-end pl-8 md:hidden"
-												data-tip="Your screen size is too small to perform an assignment">
-												<Button
-													disabled={moment(assignment.startDate).isAfter(moment())}
-													className="h-full w-full !rounded-xl"
-													variant="outline">
-													Start
-												</Button>
-											</div>
-											<Button
-												disabled={moment(assignment.startDate).isAfter(moment())}
-												className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
-												onClick={() => startAssignment(assignment)}
-												variant="outline">
-												Start
-											</Button>
-										</>
-									)}
-									{assignment.results.map((r) => r.user).includes(user.id) && (
-										<Button
-											onClick={() => router.push("/record")}
-											color="green"
-											className="-md:hidden h-full w-full max-w-[50%] !rounded-xl"
-											variant="outline">
-											Submitted
-										</Button>
-									)}
-								</div>
-							</div>
-						))}
-				</span>
-			</section>
-
-			{/* Invites */}
-			{invites.length > 0 && (
-				<section className="flex flex-col gap-1 md:gap-3">
-					<div className="flex items-center gap-4">
-						<div
-							onClick={reloadInvites}
-							className="text-mti-purple-light hover:text-mti-purple-dark flex cursor-pointer items-center gap-2 transition duration-300 ease-in-out">
-							<span className="text-mti-black text-lg font-bold">Invites</span>
-							<BsArrowRepeat className={clsx("text-xl", isInvitesLoading && "animate-spin")} />
-						</div>
-					</div>
-					<span className="text-mti-gray-taupe scrollbar-hide flex gap-8 overflow-x-scroll">
-						{invites.map((invite) => (
-							<InviteCard key={invite.id} invite={invite} users={users} reload={reloadInvites} />
-						))}
-					</span>
-				</section>
-			)}
-
-			{/* Score History */}
-			<section className="flex flex-col gap-3">
-				<span className="text-lg font-bold">Score History</span>
-				<div className="-md:grid-rows-4 grid gap-6 md:grid-cols-2">
-					{MODULE_ARRAY.map((module) => (
-						<div className="border-mti-gray-anti-flash flex flex-col gap-2 rounded-xl border p-4" key={module}>
-							<div className="flex items-center gap-2 md:gap-3">
-								<div className="bg-mti-gray-smoke flex h-8 w-8 items-center justify-center rounded-lg md:h-12 md:w-12 md:rounded-xl">
-									{module === "reading" && <BsBook className="text-ielts-reading h-4 w-4 md:h-5 md:w-5" />}
-									{module === "listening" && <BsHeadphones className="text-ielts-listening h-4 w-4 md:h-5 md:w-5" />}
-									{module === "writing" && <BsPen className="text-ielts-writing h-4 w-4 md:h-5 md:w-5" />}
-									{module === "speaking" && <BsMegaphone className="text-ielts-speaking h-4 w-4 md:h-5 md:w-5" />}
-									{module === "level" && <BsClipboard className="text-ielts-level h-4 w-4 md:h-5 md:w-5" />}
-								</div>
-								<div className="flex w-full justify-between">
-									<span className="text-sm font-bold md:font-extrabold">{capitalize(module)}</span>
-									<span className="text-mti-gray-dim text-sm font-normal">
-										Level {user.levels[module] || 0} / Level 9 (Desired Level: {user.desiredLevels[module] || 9})
-									</span>
-								</div>
-							</div>
-							<div className="md:pl-14">
-								<ProgressBar
-									color={module}
-									label=""
-									mark={Math.round((user.desiredLevels[module] * 100) / 9)}
-									markLabel={`Desired Level: ${user.desiredLevels[module]}`}
-									percentage={Math.round((user.levels[module] * 100) / 9)}
-									className="h-2 w-full"
-								/>
-							</div>
-						</div>
-					))}
-				</div>
-			</section>
-		</>
-	);
-}

src/dashboards/Teacher.tsx

@@ -1,357 +0,0 @@
-/* eslint-disable @next/next/no-img-element */
-import Modal from "@/components/Modal";
-import useStats from "@/hooks/useStats";
-import useUsers from "@/hooks/useUsers";
-import {CorporateUser, Group, Stat, User} from "@/interfaces/user";
-import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
-import moment from "moment";
-import {useEffect, useState} from "react";
-import {
-	BsArrowLeft,
-	BsArrowRepeat,
-	BsClipboard2Data,
-	BsClipboard2DataFill,
-	BsClipboard2Heart,
-	BsClipboard2X,
-	BsClipboardPulse,
-	BsClock,
-	BsEnvelopePaper,
-	BsGlobeCentralSouthAsia,
-	BsPaperclip,
-	BsPeople,
-	BsPerson,
-	BsPersonAdd,
-	BsPersonFill,
-	BsPersonFillGear,
-	BsPersonGear,
-	BsPlus,
-	BsRepeat,
-	BsRepeat1,
-} from "react-icons/bs";
-import UserCard from "@/components/UserCard";
-import useGroups from "@/hooks/useGroups";
-import {calculateAverageLevel, calculateBandScore} from "@/utils/score";
-import {MODULE_ARRAY} from "@/utils/moduleUtils";
-import {Module} from "@/interfaces";
-import {groupByExam} from "@/utils/stats";
-import IconCard from "./IconCard";
-import GroupList from "@/pages/(admin)/Lists/GroupList";
-import useAssignments from "@/hooks/useAssignments";
-import {Assignment} from "@/interfaces/results";
-import AssignmentCard from "./AssignmentCard";
-import Button from "@/components/Low/Button";
-import clsx from "clsx";
-import ProgressBar from "@/components/Low/ProgressBar";
-import AssignmentCreator from "./AssignmentCreator";
-import AssignmentView from "./AssignmentView";
-import {getUserCorporate} from "@/utils/groups";
-
-interface Props {
-	user: User;
-}
-
-export default function TeacherDashboard({user}: Props) {
-	const [page, setPage] = useState("");
-	const [selectedUser, setSelectedUser] = useState<User>();
-	const [showModal, setShowModal] = useState(false);
-	const [selectedAssignment, setSelectedAssignment] = useState<Assignment>();
-	const [isCreatingAssignment, setIsCreatingAssignment] = useState(false);
-	const [corporateUserToShow, setCorporateUserToShow] = useState<CorporateUser>();
-
-	const {stats} = useStats();
-	const {users, reload} = useUsers();
-	const {groups} = useGroups(user.id);
-	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({assigner: user.id});
-
-	useEffect(() => {
-		setShowModal(!!selectedUser && page === "");
-	}, [selectedUser, page]);
-
-	useEffect(() => {
-		getUserCorporate(user.id).then(setCorporateUserToShow);
-	}, [user]);
-
-	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(user.id);
-
-	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
-
-	const UserDisplay = (displayUser: User) => (
-		<div
-			onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-			<div className="flex flex-col gap-1 items-start">
-				<span>{displayUser.name}</span>
-				<span className="text-sm opacity-75">{displayUser.email}</span>
-			</div>
-		</div>
-	);
-
-	const StudentsList = () => {
-		const filter = (x: User) =>
-			x.type === "student" &&
-			(!!selectedUser
-				? groups
-						.filter((g) => g.admin === selectedUser.id)
-						.flatMap((g) => g.participants)
-						.includes(x.id) || false
-				: groups.flatMap((g) => g.participants).includes(x.id));
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Students ({users.filter(filter).length})</h2>
-				</div>
-
-				<UserList user={user} filters={[filter]} />
-			</>
-		);
-	};
-
-	const GroupsList = () => {
-		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
-
-		return (
-			<>
-				<div className="flex flex-col gap-4">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
-				</div>
-
-				<GroupList user={user} />
-			</>
-		);
-	};
-
-	const averageLevelCalculator = (studentStats: Stat[]) => {
-		const formattedStats = studentStats
-			.map((s) => ({focus: users.find((u) => u.id === s.user)?.focus, score: s.score, module: s.module}))
-			.filter((f) => !!f.focus);
-		const bandScores = formattedStats.map((s) => ({
-			module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-		}));
-
-		const levels: {[key in Module]: number} = {reading: 0, listening: 0, writing: 0, speaking: 0, level: 0};
-		bandScores.forEach((b) => (levels[b.module] += b.level));
-
-		return calculateAverageLevel(levels);
-	};
-
-	const AssignmentsPage = () => {
-		const activeFilter = (a: Assignment) =>
-			moment(a.endDate).isAfter(moment()) && moment(a.startDate).isBefore(moment()) && a.assignees.length > a.results.length;
-		const pastFilter = (a: Assignment) => moment(a.endDate).isBefore(moment()) || a.assignees.length === a.results.length;
-		const futureFilter = (a: Assignment) => moment(a.startDate).isAfter(moment());
-
-		return (
-			<>
-				<AssignmentView
-					isOpen={!!selectedAssignment && !isCreatingAssignment}
-					onClose={() => {
-						setSelectedAssignment(undefined);
-						setIsCreatingAssignment(false);
-					}}
-					assignment={selectedAssignment}
-				/>
-				<AssignmentCreator
-					assignment={selectedAssignment}
-					groups={groups.filter((x) => x.admin === user.id || x.participants.includes(user.id))}
-					users={users.filter(
-						(x) =>
-							x.type === "student" &&
-							(!!selectedUser
-								? groups
-										.filter((g) => g.admin === selectedUser.id)
-										.flatMap((g) => g.participants)
-										.includes(x.id) || false
-								: groups.flatMap((g) => g.participants).includes(x.id)),
-					)}
-					assigner={user.id}
-					isCreating={isCreatingAssignment}
-					cancelCreation={() => {
-						setIsCreatingAssignment(false);
-						setSelectedAssignment(undefined);
-						reloadAssignments();
-					}}
-				/>
-				<div className="w-full flex justify-between items-center">
-					<div
-						onClick={() => setPage("")}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<BsArrowLeft className="text-xl" />
-						<span>Back</span>
-					</div>
-					<div
-						onClick={reloadAssignments}
-						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-						<span>Reload</span>
-						<BsArrowRepeat className={clsx("text-xl", isAssignmentsLoading && "animate-spin")} />
-					</div>
-				</div>
-				<section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Active Assignments ({assignments.filter(activeFilter).length})</h2>
-					<div className="flex flex-wrap gap-2">
-						{assignments.filter(activeFilter).map((a) => (
-							<AssignmentCard {...a} onClick={() => setSelectedAssignment(a)} key={a.id} />
-						))}
-					</div>
-				</section>
-				<section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Planned Assignments ({assignments.filter(futureFilter).length})</h2>
-					<div className="flex flex-wrap gap-2">
-						<div
-							onClick={() => setIsCreatingAssignment(true)}
-							className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
-							<BsPlus className="text-6xl" />
-							<span className="text-lg">New Assignment</span>
-						</div>
-						{assignments.filter(futureFilter).map((a) => (
-							<AssignmentCard
-								{...a}
-								onClick={() => {
-									setSelectedAssignment(a);
-									setIsCreatingAssignment(true);
-								}}
-								key={a.id}
-							/>
-						))}
-					</div>
-				</section>
-				<section className="flex flex-col gap-4">
-					<h2 className="text-2xl font-semibold">Past Assignments ({assignments.filter(pastFilter).length})</h2>
-					<div className="flex flex-wrap gap-2">
-						{assignments.filter(pastFilter).map((a) => (
-							<AssignmentCard {...a} onClick={() => setSelectedAssignment(a)} key={a.id} allowDownload />
-						))}
-					</div>
-				</section>
-			</>
-		);
-	};
-
-	const DefaultDashboard = () => (
-		<>
-			{corporateUserToShow && (
-				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-					Linked to: <b>{corporateUserToShow?.corporateInformation?.companyInformation.name || corporateUserToShow.name}</b>
-				</div>
-			)}
-			<section
-				className={clsx(
-					"flex -lg:flex-wrap gap-4 items-center -lg:justify-center lg:justify-start text-center",
-					!!corporateUserToShow && "mt-12 xl:mt-6",
-				)}>
-				<IconCard
-					onClick={() => setPage("students")}
-					Icon={BsPersonFill}
-					label="Students"
-					value={users.filter(studentFilter).length}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsClipboard2Data}
-					label="Exams Performed"
-					value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
-					color="purple"
-				/>
-				<IconCard
-					Icon={BsPaperclip}
-					label="Average Level"
-					value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
-					color="purple"
-				/>
-				<IconCard Icon={BsPeople} label="Groups" value={groups.length} color="purple" onClick={() => setPage("groups")} />
-				<div
-					onClick={() => setPage("assignments")}
-					className="bg-white rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
-					<BsEnvelopePaper className="text-6xl text-mti-purple-light" />
-					<span className="flex flex-col gap-1 items-center text-xl">
-						<span className="text-lg">Assignments</span>
-						<span className="font-semibold text-mti-purple-light">{assignments.length}</span>
-					</span>
-				</div>
-			</section>
-
-			<section className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 w-full justify-between">
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Latest students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Highest level students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-				<div className="bg-white shadow flex flex-col rounded-xl w-full">
-					<span className="p-4">Highest exam count students</span>
-					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(studentFilter)
-							.sort(
-								(a, b) =>
-									Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
-							)
-							.map((x) => (
-								<UserDisplay key={x.id} {...x} />
-							))}
-					</div>
-				</div>
-			</section>
-		</>
-	);
-
-	return (
-		<>
-			<Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
-				<>
-					{selectedUser && (
-						<div className="w-full flex flex-col gap-8">
-							<UserCard
-								loggedInUser={user}
-								onClose={(shouldReload) => {
-									setSelectedUser(undefined);
-									if (shouldReload) reload();
-								}}
-								onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher" ? () => setPage("students") : undefined
-								}
-								onViewTeachers={selectedUser.type === "corporate" ? () => setPage("teachers") : undefined}
-								user={selectedUser}
-							/>
-						</div>
-					)}
-				</>
-			</Modal>
-			{page === "students" && <StudentsList />}
-			{page === "groups" && <GroupsList />}
-			{page === "assignments" && <AssignmentsPage />}
-			{page === "" && <DefaultDashboard />}
-		</>
-	);
-}

src/email/index.ts

@@ -1,54 +0,0 @@
-import nodemailer from "nodemailer";
-import hbs from "nodemailer-express-handlebars";
-import path from "path";
-
-interface MailOptions {
-	from: string;
-	to: string[];
-	subject: string;
-	template: string;
-	context: object;
-}
-
-export function prepareMailer(template?: string): nodemailer.Transporter {
-	const transport = nodemailer.createTransport({
-		host: process.env.SMTP_HOST,
-		auth: {
-			user: process.env.MAIL_USER!,
-			pass: process.env.MAIL_PASS!,
-		},
-	});
-
-	const handlebarOptions: hbs.NodemailerExpressHandlebarsOptions = {
-		viewEngine: {
-			partialsDir: path.resolve("src/email/templates"),
-			defaultLayout: `src/email/templates/${template || "main"}`,
-		},
-		viewPath: path.resolve("src/email/templates"),
-	};
-
-	transport.use("compile", hbs(handlebarOptions));
-	return transport;
-}
-
-export function prepareMailOptions(context: object, to: string[], subject: string, template: string): MailOptions {
-	return {
-		from: process.env.MAIL_USER!,
-		to,
-		subject,
-		template,
-		context,
-	};
-}
-
-export async function sendEmail(template: string, context: object, to: string[], subject: string): Promise<boolean> {
-	try {
-		const transport = prepareMailer(template);
-		const mailOptions = prepareMailOptions(context, to, subject, template);
-
-		await transport.sendMail(mailOptions);
-		return true;
-	} catch {
-		return false;
-	}
-}

src/email/templates/assignment.handlebars

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
-</head>
-<div>
-  <p>Hello {{user.name}},</p>
-  <br />
-  <p>You have just been given the assignment <b>"{{assignment.name}}"</b> by your teacher {{assignment.assigner}}!</p>
-  <br />
-  <p>It's start date will be on <b>{{assignment.startDate}}</b> and will only last until <b>{{assignment.endDate}}</b>
-  </p>
-  <br />
-  <p>For this assignment, you've been tasked with completing exams of the following modules:
-    <b>{{assignment.modules}}</b>.
-  </p>
-  <br />
-  <p>Don't forget to do it before its end date!</p>
-  <p>Click <b><a href="https://platform.encoach.com">here</a></b> to open the EnCoach Platform!</p>
-  <br />
-  <p>Thanks,</p>
-  <p>Your EnCoach team</p>
-</div>
-
-</html>