Merge remote-tracking branch 'origin/develop' into feature/training-content

src/components/DemographicInformationInput.tsx

@@ -106,7 +106,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 
 				<GenderInput value={gender} onChange={setGender} />
 				{user.type === "corporate" && (
-					<Input name="position" onChange={setPosition} type="text" label="Position" placeholder="CEO, Head of Marketing..." required />
+					<Input name="position" onChange={setPosition} type="text" label="Department" placeholder="CEO, Head of Marketing..." required />
 				)}
 				{user.type !== "corporate" && <EmploymentStatusInput value={employment} onChange={setEmployment} />}
 			</form>

src/components/Medium/Timer.tsx

@@ -1,80 +1,80 @@
 import useExamStore from "@/stores/examStore";
-import { useEffect, useState } from "react";
-import { motion } from "framer-motion";
+import {useEffect, useState} from "react";
+import {motion} from "framer-motion";
 import TimerEndedModal from "../TimerEndedModal";
 import clsx from "clsx";
-import { BsStopwatch } from "react-icons/bs";
+import {BsStopwatch} from "react-icons/bs";
 
 interface Props {
-    minTimer: number;
-    disableTimer?: boolean;
-    standalone?: boolean;
+	minTimer: number;
+	disableTimer?: boolean;
+	standalone?: boolean;
 }
 
 const Timer: React.FC<Props> = ({minTimer, disableTimer, standalone = false}) => {
-    const [timer, setTimer] = useState(minTimer * 60);
-    const [showModal, setShowModal] = useState(false);
-    const [warningMode, setWarningMode] = useState(false);
+	const [timer, setTimer] = useState(minTimer * 60);
+	const [showModal, setShowModal] = useState(false);
+	const [warningMode, setWarningMode] = useState(false);
 
-    const setHasExamEnded = useExamStore((state) => state.setHasExamEnded);
-    const { timeSpent } = useExamStore((state) => state);
+	const setHasExamEnded = useExamStore((state) => state.setHasExamEnded);
+	const {timeSpent} = useExamStore((state) => state);
 
-    useEffect(() => setTimer((prev) => prev - timeSpent), [timeSpent]);
+	useEffect(() => setTimer((prev) => prev - timeSpent), [timeSpent]);
 
-    useEffect(() => {
-        if (!disableTimer) {
-            const timerInterval = setInterval(() => setTimer((prev) => prev - 1), 1000);
+	useEffect(() => {
+		if (!disableTimer) {
+			const timerInterval = setInterval(() => setTimer((prev) => prev - 1), 1000);
 
-            return () => {
-                clearInterval(timerInterval);
-            };
-        }
-    }, [disableTimer, minTimer]);
+			return () => {
+				clearInterval(timerInterval);
+			};
+		}
+	}, [disableTimer, minTimer]);
 
-    useEffect(() => {
-        if (timer <= 0) setShowModal(true);
-    }, [timer]);
+	useEffect(() => {
+		if (timer <= 0) setShowModal(true);
+	}, [timer]);
 
-    useEffect(() => {
-        if (timer < 300 && !warningMode) setWarningMode(true);
-    }, [timer, warningMode]);
+	useEffect(() => {
+		if (timer < 300 && !warningMode) setWarningMode(true);
+	}, [timer, warningMode]);
 
-    return (
-        <>
-            <TimerEndedModal
-                isOpen={showModal}
-                onClose={() => {
-                    setHasExamEnded(true);
-                    setShowModal(false);
-                }}
-            />
-            <motion.div
-                className={clsx(
-                    "absolute right-6 bg-mti-gray-seasalt px-4 py-3 flex items-center gap-2 rounded-full text-mti-gray-davy",
-                    standalone ? "top-10" : "top-4", 
-                    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">
-                    {timer > 0 && (
-                        <>
-                            {Math.floor(timer / 60)
-                                .toString(10)
-                                .padStart(2, "0")}
-                            :
-                            {Math.floor(timer % 60)
-                                .toString(10)
-                                .padStart(2, "0")}
-                        </>
-                    )}
-                    {timer <= 0 && <>00:00</>}
-                </span>
-            </motion.div>
-        </>
-    );
-}
+	return (
+		<>
+			<TimerEndedModal
+				isOpen={showModal}
+				onClose={() => {
+					setHasExamEnded(true);
+					setShowModal(false);
+				}}
+			/>
+			<motion.div
+				className={clsx(
+					"absolute right-6 bg-mti-gray-seasalt px-4 py-3 flex items-center gap-2 rounded-full text-mti-gray-davy",
+					standalone ? "top-10" : "top-4",
+					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-lg font-bold w-12">
+					{timer > 0 && (
+						<>
+							{Math.floor(timer / 60)
+								.toString(10)
+								.padStart(2, "0")}
+							:
+							{Math.floor(timer % 60)
+								.toString(10)
+								.padStart(2, "0")}
+						</>
+					)}
+					{timer <= 0 && <>00:00</>}
+				</span>
+			</motion.div>
+		</>
+	);
+};
 
 export default Timer;

src/components/Navbar.tsx

@@ -1,219 +1,163 @@
-import { User } from "@/interfaces/user";
+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 {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 {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 {isUserFromCorporate} from "@/utils/groups";
 import Button from "./Low/Button";
 import Modal from "./Modal";
 import Input from "./Low/Input";
 import TicketSubmission from "./High/TicketSubmission";
-import { Module } from "@/interfaces";
+import {Module} from "@/interfaces";
 import Badge from "./Low/Badge";
 
-import {
-  BsArrowRepeat,
-  BsBook,
-  BsCheck,
-  BsCheckCircle,
-  BsClipboard,
-  BsHeadphones,
-  BsMegaphone,
-  BsPen,
-  BsXCircle,
-} from "react-icons/bs";
+import {BsArrowRepeat, BsBook, BsCheck, BsCheckCircle, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsXCircle} from "react-icons/bs";
 interface Props {
-  user: User;
-  navDisabled?: boolean;
-  focusMode?: boolean;
-  onFocusLayerMouseEnter?: () => void;
-  path: string;
+	user: User;
+	navDisabled?: boolean;
+	focusMode?: boolean;
+	onFocusLayerMouseEnter?: () => void;
+	path: string;
 }
 
 /* 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, path, navDisabled = false, focusMode = false, onFocusLayerMouseEnter}: Props) {
+	const [isMenuOpen, setIsMenuOpen] = useState(false);
+	const [disablePaymentPage, setDisablePaymentPage] = useState(true);
+	const [isTicketOpen, setIsTicketOpen] = useState(false);
 
-  const router = useRouter();
+	const router = useRouter();
 
-  const disableNavigation = preventNavigation(navDisabled, focusMode);
+	const disableNavigation = preventNavigation(navDisabled, focusMode);
 
-  const expirationDateColor = (date: Date) => {
-    const momentDate = moment(date);
-    const today = moment(new Date());
+	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";
-  };
+		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 showExpirationDate = () => {
+		if (!user.subscriptionExpirationDate) return false;
 
-    const momentDate = moment(user.subscriptionExpirationDate);
-    const today = moment(new Date());
+		const momentDate = moment(user.subscriptionExpirationDate);
+		const today = moment(new Date());
 
-    return today.add(7, "days").isAfter(momentDate);
-  };
+		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]);
+	useEffect(() => {
+		if (user.type !== "student" && user.type !== "teacher") return setDisablePaymentPage(false);
+		isUserFromCorporate(user.id).then((result) => setDisablePaymentPage(result));
+	}, [user]);
 
-  const badges = [
-      {
-        module: "reading",
-        icon: () => <BsBook className="h-4 w-4 text-white" />,
-        achieved: user.levels.reading >= user.desiredLevels.reading,
-      },
+	const badges = [
+		{
+			module: "reading",
+			icon: () => <BsBook className="h-4 w-4 text-white" />,
+			achieved: user.levels.reading >= user.desiredLevels.reading,
+		},
 
-      {
-        module: "listening",
-        icon: () => <BsHeadphones className="h-4 w-4 text-white" />,
-        achieved: user.levels.listening >= user.desiredLevels.listening,
-      },
-      {
-        module: "writing",
-        icon: () => <BsPen className="h-4 w-4 text-white" />,
-        achieved: user.levels.writing >= user.desiredLevels.writing,
-      },
-      {
-        module: "speaking",
-        icon: () => <BsMegaphone className="h-4 w-4 text-white" />,
-        achieved: user.levels.speaking >= user.desiredLevels.speaking,
-      },
-      {
-        module: "level",
-        icon: () => <BsClipboard className="h-4 w-4 text-white" />,
-        achieved: user.levels.level >= user.desiredLevels.level,
-      },
-    ];
+		{
+			module: "listening",
+			icon: () => <BsHeadphones className="h-4 w-4 text-white" />,
+			achieved: user.levels.listening >= user.desiredLevels.listening,
+		},
+		{
+			module: "writing",
+			icon: () => <BsPen className="h-4 w-4 text-white" />,
+			achieved: user.levels.writing >= user.desiredLevels.writing,
+		},
+		{
+			module: "speaking",
+			icon: () => <BsMegaphone className="h-4 w-4 text-white" />,
+			achieved: user.levels.speaking >= user.desiredLevels.speaking,
+		},
+		{
+			module: "level",
+			icon: () => <BsClipboard className="h-4 w-4 text-white" />,
+			achieved: user.levels.level >= user.desiredLevels.level,
+		},
+	];
 
-  return (
-    <>
-      <Modal
-        isOpen={isTicketOpen}
-        onClose={() => setIsTicketOpen(false)}
-        title="Submit a ticket"
-      >
-        <TicketSubmission
-          user={user}
-          page={router.asPath}
-          onClose={() => setIsTicketOpen(false)}
-        />
-      </Modal>
+	return (
+		<>
+			<Modal isOpen={isTicketOpen} onClose={() => setIsTicketOpen(false)} title="Submit a ticket">
+				<TicketSubmission user={user} page={router.asPath} onClose={() => setIsTicketOpen(false)} />
+			</Modal>
 
-      {user && (
-        <MobileMenu
-          disableNavigation={disableNavigation}
-          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>
-        </Link>
-        <div className="flex items-center justify-end gap-4 md:mr-8 md:w-5/6">
-          {user.type === "student" &&
-            badges.map((badge) => (
-              <div
-                key={badge.module}
-                className={`${badge.achieved ? `bg-ielts-${badge.module}`: 'bg-mti-gray-anti-flash'} flex h-8 w-8 items-center justify-center rounded-full`}
-              >
-                {badge.icon()}
-              </div>
-            ))}
-          {/* 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 z-20"
-            )}
-            data-tip="Submit a help/feedback ticket"
-            onClick={() => setIsTicketOpen(true)}
-          >
-            <BsQuestionCircleFill />
-          </button>
+			{user && (
+				<MobileMenu disableNavigation={disableNavigation} 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>
+				</Link>
+				<div className="flex items-center justify-end gap-4 md:mr-8 md:w-5/6">
+					{user.type === "student" &&
+						badges.map((badge) => (
+							<div
+								key={badge.module}
+								className={`${
+									badge.achieved ? `bg-ielts-${badge.module}` : "bg-mti-gray-anti-flash"
+								} flex h-8 w-8 items-center justify-center rounded-full`}>
+								{badge.icon()}
+							</div>
+						))}
+					{/* 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 z-20",
+						)}
+						data-tip="Submit a help/feedback ticket"
+						onClick={() => setIsTicketOpen(true)}>
+						<BsQuestionCircleFill />
+					</button>
 
-          {showExpirationDate() && (
-            <Link
-              href={
-                !!user.subscriptionExpirationDate && !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>
-    </>
-  );
+					{showExpirationDate() && (
+						<Link
+							href={!!user.subscriptionExpirationDate && !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]}
+							{user.type === "corporate" &&
+								!!user.demographicInformation?.position &&
+								` | ${user.demographicInformation?.position || "N/A"}`}
+						</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>
+		</>
+	);
 }

src/components/Sidebar.tsx

@@ -212,7 +212,7 @@ export default function Sidebar({path, navDisabled = false, focusMode = false, u
 				)}
 			</div>
 
-			<div className="fixed bottom-12 flex flex-col gap-0">
+			<div className="2xl:fixed bottom-12 flex flex-col gap-0 -2xl:mt-8">
 				<div
 					role="button"
 					tabIndex={1}

src/components/UserCard.tsx

@@ -140,8 +140,9 @@ const UserCard = ({
 	}, [users, referralAgent]);
 
 	const updateUser = () => {
-		if (user.type === "corporate" || (user.type === "mastercorporate" && (!paymentValue || paymentValue < 0)))
+		if ((user.type === "corporate" || user.type === "mastercorporate") && (!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
@@ -213,7 +214,7 @@ const UserCard = ({
 					},
 					{
 						icon: <BsPersonAdd className="w-6 h-6 md:w-8 md:h-8 text-mti-red-light" />,
-						value: user.corporateInformation.companyInformation.userAmount,
+						value: user.corporateInformation?.companyInformation?.userAmount,
 						label: "Number of Users",
 					},
 			  ]
@@ -277,7 +278,15 @@ const UserCard = ({
 							onChange={setCompanyName}
 							placeholder="Enter corporate name"
 							defaultValue={companyName}
-							disabled={disabled || checkAccess(loggedInUser, getTypesOfUser(["developer", "admin"]))}
+							disabled={
+								disabled ||
+								checkAccess(
+									loggedInUser,
+									getTypesOfUser(
+										user.type === "mastercorporate" ? ["developer", "admin"] : ["developer", "admin", "mastercorporate"],
+									),
+								)
+							}
 						/>
 						<Input
 							label="Number of Users"
@@ -508,7 +517,7 @@ const UserCard = ({
 							name="position"
 							onChange={setPosition}
 							type="text"
-							label="Position"
+							label="Department"
 							defaultValue={position}
 							placeholder="CEO, Head of Marketing..."
 							disabled

src/dashboards/AssignmentCreator.tsx

@@ -24,14 +24,13 @@ import useExams from "@/hooks/useExams";
 
 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) {
+export default function AssignmentCreator({isCreating, assignment, 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(

src/dashboards/Student.tsx

@@ -9,7 +9,7 @@ import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
 import {Invite} from "@/interfaces/invite";
 import {Assignment} from "@/interfaces/results";
-import {CorporateUser, Stat, User} from "@/interfaces/user";
+import {CorporateUser, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
 import {getExamById} from "@/utils/exams";
 import {getUserCorporate} from "@/utils/groups";
@@ -30,11 +30,10 @@ import {toast} from "react-toastify";
 
 interface Props {
 	user: User;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
-export default function StudentDashboard({user}: Props) {
-	const [corporateUserToShow, setCorporateUserToShow] = useState<CorporateUser>();
-
+export default function StudentDashboard({user, linkedCorporate}: Props) {
 	const {users} = useUsers();
 	const {gradingSystem} = useGradingSystem();
 	const {data: stats} = useFilterRecordsByUser<Stat[]>(user.id, !user?.id);
@@ -49,10 +48,6 @@ export default function StudentDashboard({user}: Props) {
 	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));
 
@@ -76,9 +71,9 @@ export default function StudentDashboard({user}: Props) {
 
 	return (
 		<>
-			{corporateUserToShow && (
+			{linkedCorporate && (
 				<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>
+					Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
 				</div>
 			)}
 			<ProfileSummary

src/dashboards/Teacher.tsx

@@ -2,486 +2,406 @@
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import useUsers from "@/hooks/useUsers";
-import { CorporateUser, Group, Stat, User } from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import { dateSorter } from "@/utils";
+import {dateSorter} from "@/utils";
 import moment from "moment";
-import { useEffect, useState } from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
-  BsArrowLeft,
-  BsArrowRepeat,
-  BsClipboard2Data,
-  BsClipboard2DataFill,
-  BsClipboard2Heart,
-  BsClipboard2X,
-  BsClipboardPulse,
-  BsClock,
-  BsEnvelopePaper,
-  BsGlobeCentralSouthAsia,
-  BsPaperclip,
-  BsPeople,
-  BsPerson,
-  BsPersonAdd,
-  BsPersonFill,
-  BsPersonFillGear,
-  BsPersonGear,
-  BsPlus,
-  BsRepeat,
-  BsRepeat1,
+	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 {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 {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";
-import { checkAccess } from "@/utils/permissions";
+import {getUserCorporate} from "@/utils/groups";
+import {checkAccess} from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
-import {
-	futureAssignmentFilter,
-	pastAssignmentFilter,
-	archivedAssignmentFilter,
-	activeAssignmentFilter
-} from '@/utils/assignments';
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
 
 interface Props {
-  user: User;
+	user: User;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
-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>();
+export default function TeacherDashboard({user, linkedCorporate}: 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 { data: stats } = useFilterRecordsByUser<Stat[]>();
-  const { users, reload } = useUsers();
-  const { groups } = useGroups({ adminAdmins: user.id });
-  const { permissions } = usePermissions(user.id);
-  const {
-    assignments,
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ assigner: user.id });
+	const {data: stats} = useFilterRecordsByUser<Stat[]>();
+	const {users, reload} = useUsers();
+	const {groups} = useGroups({adminAdmins: user.id});
+	const {permissions} = usePermissions(user.id);
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({assigner: user.id});
 
-  useEffect(() => {
-    setShowModal(!!selectedUser && page === "");
-  }, [selectedUser, page]);
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
 
-  useEffect(() => {
-    getUserCorporate(user.id).then(setCorporateUserToShow);
-  }, [user]);
+	const assignmentsUsers = useMemo(
+		() =>
+			users.filter(
+				(x) =>
+					x.type === "student" &&
+					(!!selectedUser
+						? groups
+								.filter((g) => g.admin === selectedUser.id)
+								.flatMap((g) => g.participants)
+								.includes(x.id)
+						: groups.flatMap((g) => g.participants).includes(x.id)),
+			),
+		[groups, users, selectedUser],
+	);
 
-  const studentFilter = (user: User) =>
-    user.type === "student" &&
-    groups.flatMap((g) => g.participants).includes(user.id);
+	useEffect(() => {
+		setShowModal(!!selectedUser && page === "");
+	}, [selectedUser, page]);
 
-  const getStatsByStudent = (user: User) =>
-    stats.filter((s) => s.user === user.id);
+	const studentFilter = (user: User) => user.type === "student" && groups.flatMap((g) => g.participants).includes(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 getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
 
-  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));
+	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>
+	);
 
-    return (
-      <UserList
-        user={user}
-        filters={[filter]}
-        renderHeader={(total) => (
-          <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 ({total})</h2>
-          </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));
 
-  const GroupsList = () => {
-    const filter = (x: Group) => x.admin === user.id;
+		return (
+			<UserList
+				user={user}
+				filters={[filter]}
+				renderHeader={(total) => (
+					<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 ({total})</h2>
+					</div>
+				)}
+			/>
+		);
+	};
 
-    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>
+	const GroupsList = () => {
+		const filter = (x: Group) => x.admin === user.id;
 
-        <GroupList user={user} />
-      </>
-    );
-  };
+		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>
 
-  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!
-      ),
-    }));
+				<GroupList user={user} />
+			</>
+		);
+	};
 
-    const levels: { [key in Module]: number } = {
-      reading: 0,
-      listening: 0,
-      writing: 0,
-      speaking: 0,
-      level: 0,
-    };
-    bandScores.forEach((b) => (levels[b.module] += b.level));
+	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!),
+		}));
 
-    return calculateAverageLevel(levels);
-  };
+		const levels: {[key in Module]: number} = {
+			reading: 0,
+			listening: 0,
+			writing: 0,
+			speaking: 0,
+			level: 0,
+		};
+		bandScores.forEach((b) => (levels[b.module] += b.level));
 
-  const AssignmentsPage = () => {
-    return (
-      <>
-        <AssignmentView
-          isOpen={!!selectedAssignment && !isCreatingAssignment}
-          onClose={() => {
-            setSelectedAssignment(undefined);
-            setIsCreatingAssignment(false);
-            reloadAssignments();
-          }}
-          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)
-                : 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(activeAssignmentFilter).length})
-          </h2>
-          <div className="flex flex-wrap gap-2">
-            {assignments.filter(activeAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                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(futureAssignmentFilter).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(futureAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                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(pastAssignmentFilter).length})
-          </h2>
-          <div className="flex flex-wrap gap-2">
-            {assignments.filter(pastAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                onClick={() => setSelectedAssignment(a)}
-                key={a.id}
-                allowDownload
-                reload={reloadAssignments}
-                allowArchive
-                allowExcelDownload
-              />
-            ))}
-          </div>
-        </section>
-        <section className="flex flex-col gap-4">
-          <h2 className="text-2xl font-semibold">
-            Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})
-          </h2>
-          <div className="flex flex-wrap gap-2">
-            {assignments.filter(archivedAssignmentFilter).map((a) => (
-              <AssignmentCard
-                {...a}
-                users={users}
-                onClick={() => setSelectedAssignment(a)}
-                key={a.id}
-                allowDownload
-                reload={reloadAssignments}
-                allowUnarchive
-                allowExcelDownload
-              />
-            ))}
-          </div>
-        </section>
-      </>
-    );
-  };
+		return calculateAverageLevel(levels);
+	};
 
-  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"
-        />
-        {checkAccess(
-          user,
-          ["teacher", "developer"],
-          permissions,
-          "viewGroup"
-        ) && (
-          <IconCard
-            Icon={BsPeople}
-            label="Groups"
-            value={groups.filter((x) => x.admin === user.id).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.filter((a) => !a.archived).length}
-            </span>
-          </span>
-        </div>
-      </section>
+	const AssignmentsPage = () => {
+		return (
+			<>
+				<AssignmentView
+					isOpen={!!selectedAssignment && !isCreatingAssignment}
+					onClose={() => {
+						setSelectedAssignment(undefined);
+						setIsCreatingAssignment(false);
+						reloadAssignments();
+					}}
+					assignment={selectedAssignment}
+				/>
+				<AssignmentCreator
+					assignment={selectedAssignment}
+					groups={assignmentsGroups}
+					users={assignmentsUsers}
+					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(activeAssignmentFilter).length})</h2>
+					<div className="flex flex-wrap gap-2">
+						{assignments.filter(activeAssignmentFilter).map((a) => (
+							<AssignmentCard {...a} users={users} 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(futureAssignmentFilter).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(futureAssignmentFilter).map((a) => (
+							<AssignmentCard
+								{...a}
+								users={users}
+								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(pastAssignmentFilter).length})</h2>
+					<div className="flex flex-wrap gap-2">
+						{assignments.filter(pastAssignmentFilter).map((a) => (
+							<AssignmentCard
+								{...a}
+								users={users}
+								onClick={() => setSelectedAssignment(a)}
+								key={a.id}
+								allowDownload
+								reload={reloadAssignments}
+								allowArchive
+								allowExcelDownload
+							/>
+						))}
+					</div>
+				</section>
+				<section className="flex flex-col gap-4">
+					<h2 className="text-2xl font-semibold">Archived Assignments ({assignments.filter(archivedAssignmentFilter).length})</h2>
+					<div className="flex flex-wrap gap-2">
+						{assignments.filter(archivedAssignmentFilter).map((a) => (
+							<AssignmentCard
+								{...a}
+								users={users}
+								onClick={() => setSelectedAssignment(a)}
+								key={a.id}
+								allowDownload
+								reload={reloadAssignments}
+								allowUnarchive
+								allowExcelDownload
+							/>
+						))}
+					</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>
-    </>
-  );
+	const DefaultDashboard = () => (
+		<>
+			{linkedCorporate && (
+				<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
+					Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
+				</div>
+			)}
+			<section
+				className={clsx(
+					"flex -lg:flex-wrap gap-4 items-center -lg:justify-center lg:justify-start text-center",
+					!!linkedCorporate && "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"
+				/>
+				{checkAccess(user, ["teacher", "developer"], permissions, "viewGroup") && (
+					<IconCard
+						Icon={BsPeople}
+						label="Groups"
+						value={groups.filter((x) => x.admin === user.id).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.filter((a) => !a.archived).length}</span>
+					</span>
+				</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 />}
-    </>
-  );
+			<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/pages/(admin)/BatchCodeGenerator.tsx

@@ -55,7 +55,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };
 
-export default function BatchCodeGenerator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function BatchCodeGenerator({user, users, permissions, onFinish}: Props) {
 	const [infos, setInfos] = useState<{email: string; name: string; passport_id: string}[]>([]);
 	const [isLoading, setIsLoading] = useState(false);
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
@@ -65,9 +72,6 @@ export default function BatchCodeGenerator({user, onFinish}: {user: User; onFini
 	const [type, setType] = useState<Type>("student");
 	const [showHelp, setShowHelp] = useState(false);
 
-	const {users} = useUsers();
-	const {permissions} = usePermissions(user?.id || "");
-
 	const {openFilePicker, filesContent, clear} = useFilePicker({
 		accept: ".xlsx",
 		multiple: false,

src/pages/(admin)/BatchCreateUser.tsx

@@ -61,7 +61,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };
 
-export default function BatchCreateUser({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function BatchCreateUser({user, users, permissions, onFinish}: Props) {
 	const [infos, setInfos] = useState<
 		{
 			email: string;
@@ -83,9 +90,6 @@ export default function BatchCreateUser({user, onFinish}: {user: User; onFinish:
 	const [type, setType] = useState<Type>("student");
 	const [showHelp, setShowHelp] = useState(false);
 
-	const {users} = useUsers();
-	const {permissions} = usePermissions(user?.id || "");
-
 	const {openFilePicker, filesContent, clear} = useFilePicker({
 		accept: ".xlsx",
 		multiple: false,

src/pages/(admin)/CodeGenerator.tsx

@@ -48,14 +48,19 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };
 
-export default function CodeGenerator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function CodeGenerator({user, permissions, onFinish}: Props) {
 	const [generatedCode, setGeneratedCode] = useState<string>();
 	const [expiryDate, setExpiryDate] = useState<Date | null>(
 		user?.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).toDate() : null,
 	);
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [type, setType] = useState<Type>("student");
-	const {permissions} = usePermissions(user?.id || "");
 
 	useEffect(() => {
 		if (!isExpiryDateEnabled) setExpiryDate(null);

src/pages/(admin)/Lists/GroupList.tsx

@@ -7,7 +7,7 @@ import {CorporateUser, Group, User} from "@/interfaces/user";
 import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
 import axios from "axios";
 import {capitalize, uniq} from "lodash";
-import {useEffect, useState} from "react";
+import {useEffect, useMemo, useState} from "react";
 import {BsPencil, BsQuestionCircleFill, BsTrash} from "react-icons/bs";
 import Select from "react-select";
 import {toast} from "react-toastify";
@@ -65,6 +65,14 @@ const CreatePanel = ({user, users, group, onClose}: CreateDialogProps) => {
 		readAs: "ArrayBuffer",
 	});
 
+	const availableUsers = useMemo(() => {
+		if (user.type === "teacher") return users.filter((x) => ["student"].includes(x.type));
+		if (user.type === "corporate") return users.filter((x) => ["teacher", "student"].includes(x.type));
+		if (user.type === "mastercorporate") return users.filter((x) => ["corporate", "teacher", "student"].includes(x.type));
+
+		return users;
+	}, [user, users]);
+
 	useEffect(() => {
 		if (filesContent.length > 0) {
 			setIsLoading(true);
@@ -155,15 +163,7 @@ const CreatePanel = ({user, users, group, onClose}: CreateDialogProps) => {
 								value: x,
 								label: `${users.find((y) => y.id === x)?.email} - ${users.find((y) => y.id === x)?.name}`,
 							}))}
-							options={users
-								.filter((x) =>
-									user.type === "teacher"
-										? x.type === "student"
-										: user.type === "corporate"
-										? x.type === "student" || x.type === "teacher"
-										: x.type === "student" || x.type === "teacher" || x.type === "corporate",
-								)
-								.map((x) => ({value: x.id, label: `${x.email} - ${x.name}`}))}
+							options={availableUsers.map((x) => ({value: x.id, label: `${x.email} - ${x.name}`}))}
 							onChange={(value) => setParticipants(value.map((x) => x.value))}
 							isMulti
 							isSearchable

src/pages/(admin)/Lists/index.tsx

@@ -9,10 +9,15 @@ import PackageList from "./PackageList";
 import UserList from "./UserList";
 import {checkAccess} from "@/utils/permissions";
 import usePermissions from "@/hooks/usePermissions";
+import {PermissionType} from "@/interfaces/permissions";
 
-export default function Lists({user}: {user: User}) {
-	const {permissions} = usePermissions(user?.id || "");
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+}
 
+export default function Lists({user, users, permissions}: Props) {
 	return (
 		<TabGroup>
 			<TabList className="flex space-x-1 rounded-xl bg-mti-purple-ultralight/40 p-1">

src/pages/(admin)/UserCreator.tsx

@@ -54,7 +54,14 @@ const USER_TYPE_PERMISSIONS: {
 	},
 };
 
-export default function UserCreator({user, onFinish}: {user: User; onFinish: () => void}) {
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+	onFinish: () => void;
+}
+
+export default function UserCreator({user, users, permissions, onFinish}: Props) {
 	const [name, setName] = useState<string>();
 	const [email, setEmail] = useState<string>();
 	const [phone, setPhone] = useState<string>();
@@ -72,10 +79,9 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 	const [isExpiryDateEnabled, setIsExpiryDateEnabled] = useState(true);
 	const [isLoading, setIsLoading] = useState(false);
 	const [type, setType] = useState<Type>("student");
+	const [position, setPosition] = useState<string>();
 
-	const {permissions} = usePermissions(user?.id || "");
 	const {groups} = useGroups({admin: ["developer", "admin"].includes(user?.type) ? undefined : user?.id, userType: user?.type});
-	const {users} = useUsers();
 
 	useEffect(() => {
 		if (!isExpiryDateEnabled) setExpiryDate(null);
@@ -104,6 +110,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 			email,
 			password,
 			groupID: group,
+			corporate: selectedCorporate || user.id,
 			type,
 			studentID: type === "student" ? studentID : undefined,
 			expiryDate,
@@ -111,6 +118,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 				passport_id: type === "student" ? passportID : undefined,
 				phone,
 				country,
+				position,
 			},
 		};
 
@@ -131,6 +139,7 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 				setExpiryDate(user?.subscriptionExpirationDate ? moment(user?.subscriptionExpirationDate).toDate() : null);
 				setIsExpiryDateEnabled(true);
 				setType("student");
+				setPosition(undefined);
 			})
 			.catch(() => toast.error("Something went wrong! Please try again later!"))
 			.finally(() => setIsLoading(false));
@@ -186,10 +195,16 @@ export default function UserCreator({user, onFinish}: {user: User; onFinish: ()
 					</div>
 				)}
 
+				{["corporate", "mastercorporate"].includes(type) && (
+					<Input type="text" name="department" label="Department" onChange={setPosition} value={position} placeholder="Department" />
+				)}
+
 				<div
 					className={clsx(
 						"flex flex-col gap-4",
-						(!["student", "teacher"].includes(type) || ["corporate", "teacher"].includes(user?.type)) && "col-span-2",
+						(!["student", "teacher"].includes(type) || ["corporate", "teacher"].includes(user?.type)) &&
+							!["corporate", "mastercorporate"].includes(type) &&
+							"col-span-2",
 					)}>
 					<label className="font-normal text-base text-mti-gray-dim">Group</label>
 					<Select

src/pages/(exam)/ExamPage.tsx

@@ -13,7 +13,7 @@ import Speaking from "@/exams/Speaking";
 import Writing from "@/exams/Writing";
 import useUser from "@/hooks/useUser";
 import {Exam, LevelExam, UserSolution, Variant} from "@/interfaces/exam";
-import {Stat} from "@/interfaces/user";
+import {Stat, User} from "@/interfaces/user";
 import useExamStore from "@/stores/examStore";
 import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation";
 import {defaultExamUserSolutions, getExam} from "@/utils/exams";
@@ -28,9 +28,10 @@ import useGradingSystem from "@/hooks/useGrading";
 
 interface Props {
 	page: "exams" | "exercises";
+	user: User;
 }
 
-export default function ExamPage({page}: Props) {
+export default function ExamPage({page, user}: Props) {
 	const [variant, setVariant] = useState<Variant>("full");
 	const [avoidRepeated, setAvoidRepeated] = useState(false);
 	const [hasBeenUploaded, setHasBeenUploaded] = useState(false);
@@ -59,7 +60,6 @@ export default function ExamPage({page}: Props) {
 	const {bgColor, setBgColor} = useExamStore((state) => state);
 	const setShuffleMaps = useExamStore((state) => state.setShuffles);
 
-	const {user} = useUser({redirectTo: "/login"});
 	const router = useRouter();
 
 	// eslint-disable-next-line react-hooks/exhaustive-deps

src/pages/api/make_user.ts

@@ -67,6 +67,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				focus: "academic",
 				status: "active",
 				desiredLevels: DEFAULT_DESIRED_LEVELS,
+				profilePicture: "/defaultAvatar.png",
 				levels: DEFAULT_LEVELS,
 				isFirstLogin: false,
 				isVerified: true,

src/pages/api/register.ts

@@ -75,6 +75,7 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 				levels: DEFAULT_LEVELS,
 				bio: "",
 				isFirstLogin: codeData ? codeData.type === "student" : true,
+				profilePicture: "/defaultAvatar.png",
 				focus: "academic",
 				type: email.endsWith("@ecrop.dev") ? "developer" : codeData ? codeData.type : "student",
 				subscriptionExpirationDate: codeData ? codeData.expiryDate : moment().subtract(1, "days").toISOString(),

src/pages/exam.tsx

@@ -5,6 +5,7 @@ import {sessionOptions} from "@/lib/session";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import ExamPage from "./(exam)/ExamPage";
 import Head from "next/head";
+import {User} from "@/interfaces/user";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -14,7 +15,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -23,7 +24,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -32,7 +33,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);
 
-export default function Page() {
+interface Props {
+	user: User;
+}
+
+export default function Page({user}: Props) {
 	return (
 		<>
 			<Head>
@@ -44,7 +49,7 @@ export default function Page() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			<ExamPage page="exams" />
+			<ExamPage page="exams" user={user} />
 		</>
 	);
 }

src/pages/exercises.tsx

@@ -5,6 +5,7 @@ import {sessionOptions} from "@/lib/session";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import ExamPage from "./(exam)/ExamPage";
 import Head from "next/head";
+import {User} from "@/interfaces/user";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -14,7 +15,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/login",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -23,7 +24,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			redirect: {
 				destination: "/",
 				permanent: false,
-			}
+			},
 		};
 	}
 
@@ -32,7 +33,11 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);
 
-export default function Page() {
+interface Props {
+	user: User;
+}
+
+export default function Page({user}: Props) {
 	return (
 		<>
 			<Head>
@@ -44,7 +49,7 @@ export default function Page() {
 				<meta name="viewport" content="width=device-width, initial-scale=1" />
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
-			<ExamPage page="exercises" />
+			<ExamPage page="exercises" user={user} />
 		</>
 	);
 }

src/pages/generation.tsx

@@ -22,6 +22,7 @@ import WritingGeneration from "./(generation)/WritingGeneration";
 import LevelGeneration from "./(generation)/LevelGeneration";
 import SpeakingGeneration from "./(generation)/SpeakingGeneration";
 import {checkAccess} from "@/utils/permissions";
+import {User} from "@/interfaces/user";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -49,10 +50,12 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	};
 }, sessionOptions);
 
-export default function Generation() {
-	const [module, setModule] = useState<Module>("reading");
+interface Props {
+	user: User;
+}
 
-	const {user} = useUser({redirectTo: "/login"});
+export default function Generation({user}: Props) {
+	const [module, setModule] = useState<Module>("reading");
 
 	const [title, setTitle] = useState<string>("");
 	return (

src/pages/groups.tsx

@@ -29,7 +29,7 @@ import MasterCorporateDashboard from "@/dashboards/MasterCorporate";
 import PaymentDue from "./(status)/PaymentDue";
 import {useRouter} from "next/router";
 import {PayPalScriptProvider} from "@paypal/react-paypal-js";
-import {CorporateUser, MasterCorporateUser, Type, User, userTypes} from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, Type, User, userTypes} from "@/interfaces/user";
 import Select from "react-select";
 import {USER_TYPE_LABELS} from "@/resources/user";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
@@ -37,8 +37,10 @@ import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import useGroups from "@/hooks/useGroups";
 import useUsers from "@/hooks/useUsers";
 import {getUserName} from "@/utils/users";
+import {getParticipantGroups, getUserGroups} from "@/utils/groups.be";
+import {getUsers} from "@/utils/users.be";
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
 	if (!user || !user.isVerified) {
@@ -59,26 +61,20 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 		};
 	}
 
+	const groups = await getParticipantGroups(user.id);
+	const users = await getUsers();
+
 	return {
-		props: {user: req.session.user},
+		props: {user, groups, users},
 	};
 }, sessionOptions);
 
 interface Props {
 	user: User;
-	envVariables: {[key: string]: string};
+	groups: Group[];
+	users: User[];
 }
-export default function Home(props: Props) {
-	const {user, mutateUser} = useUser({redirectTo: "/login"});
-	const {groups} = useGroups({});
-	const {users} = useUsers();
-
-	const router = useRouter();
-
-	useEffect(() => {
-		console.log(groups);
-	}, [groups]);
-
+export default function Home({user, groups, users}: Props) {
 	return (
 		<>
 			<Head>

src/pages/index.tsx

@@ -1,32 +1,24 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
 import Navbar from "@/components/Navbar";
-import {
-  BsFileEarmarkText,
-  BsPencil,
-  BsStar,
-  BsBook,
-  BsHeadphones,
-  BsPen,
-  BsMegaphone,
-} from "react-icons/bs";
-import { withIronSessionSsr } from "iron-session/next";
-import { sessionOptions } from "@/lib/session";
-import { useEffect, useState } from "react";
-import { averageScore, groupBySession, totalExams } from "@/utils/stats";
+import {BsFileEarmarkText, BsPencil, BsStar, BsBook, BsHeadphones, BsPen, BsMegaphone} from "react-icons/bs";
+import {withIronSessionSsr} from "iron-session/next";
+import {sessionOptions} from "@/lib/session";
+import {useEffect, useState} from "react";
+import {averageScore, groupBySession, totalExams} from "@/utils/stats";
 import useUser from "@/hooks/useUser";
 import Diagnostic from "@/components/Diagnostic";
-import { ToastContainer } from "react-toastify";
-import { capitalize } from "lodash";
-import { Module } from "@/interfaces";
+import {ToastContainer} from "react-toastify";
+import {capitalize} from "lodash";
+import {Module} from "@/interfaces";
 import ProgressBar from "@/components/Low/ProgressBar";
 import Layout from "@/components/High/Layout";
-import { calculateAverageLevel } from "@/utils/score";
+import {calculateAverageLevel} from "@/utils/score";
 import axios from "axios";
 import DemographicInformationInput from "@/components/DemographicInformationInput";
 import moment from "moment";
 import Link from "next/link";
-import { MODULE_ARRAY } from "@/utils/moduleUtils";
+import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import ProfileSummary from "@/components/ProfileSummary";
 import StudentDashboard from "@/dashboards/Student";
 import AdminDashboard from "@/dashboards/Admin";
@@ -35,209 +27,184 @@ import TeacherDashboard from "@/dashboards/Teacher";
 import AgentDashboard from "@/dashboards/Agent";
 import MasterCorporateDashboard from "@/dashboards/MasterCorporate";
 import PaymentDue from "./(status)/PaymentDue";
-import { useRouter } from "next/router";
-import { PayPalScriptProvider } from "@paypal/react-paypal-js";
-import {
-  CorporateUser,
-  MasterCorporateUser,
-  Type,
-  userTypes,
-} from "@/interfaces/user";
+import {useRouter} from "next/router";
+import {PayPalScriptProvider} from "@paypal/react-paypal-js";
+import {CorporateUser, MasterCorporateUser, Type, userTypes} from "@/interfaces/user";
 import Select from "react-select";
-import { USER_TYPE_LABELS } from "@/resources/user";
-import { checkAccess, getTypesOfUser } from "@/utils/permissions";
+import {USER_TYPE_LABELS} from "@/resources/user";
+import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {getUserCorporate} from "@/utils/groups.be";
 
-export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
-  const user = req.session.user;
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
+	const user = req.session.user;
 
-  const envVariables: { [key: string]: string } = {};
-  Object.keys(process.env)
-    .filter((x) => x.startsWith("NEXT_PUBLIC"))
-    .forEach((x: string) => {
-      envVariables[x] = process.env[x]!;
-    });
+	const envVariables: {[key: string]: string} = {};
+	Object.keys(process.env)
+		.filter((x) => x.startsWith("NEXT_PUBLIC"))
+		.forEach((x: string) => {
+			envVariables[x] = process.env[x]!;
+		});
 
-  if (!user || !user.isVerified) {
-    return {
-      redirect: {
-        destination: "/login",
-        permanent: false,
-      },
-    };
-  }
+	if (!user || !user.isVerified) {
+		return {
+			redirect: {
+				destination: "/login",
+				permanent: false,
+			},
+		};
+	}
 
-  return {
-    props: { user: req.session.user, envVariables },
-  };
+	const linkedCorporate = (await getUserCorporate(user.id)) || null;
+
+	return {
+		props: {user, envVariables, linkedCorporate},
+	};
 }, sessionOptions);
 
 interface Props {
-  user: any;
-  envVariables: { [key: string]: string };
+	user: any;
+	envVariables: {[key: string]: string};
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
-export default function Home(props: Props) {
-  const { envVariables } = props;
-  const [showDiagnostics, setShowDiagnostics] = useState(false);
-  const [showDemographicInput, setShowDemographicInput] = useState(false);
-  const [selectedScreen, setSelectedScreen] = useState<Type>("admin");
 
-  const { user, mutateUser } = useUser({ redirectTo: "/login" });
-  const router = useRouter();
+export default function Home({linkedCorporate}: Props) {
+	const [showDiagnostics, setShowDiagnostics] = useState(false);
+	const [showDemographicInput, setShowDemographicInput] = useState(false);
+	const [selectedScreen, setSelectedScreen] = useState<Type>("admin");
 
-  useEffect(() => {
-    if (user) {
-      setShowDemographicInput(
-        !user.demographicInformation ||
-          !user.demographicInformation.country ||
-          !user.demographicInformation.gender ||
-          !user.demographicInformation.phone
-      );
-      setShowDiagnostics(user.isFirstLogin && user.type === "student");
-    }
-  }, [user]);
+	const {user, mutateUser} = useUser({redirectTo: "/login"});
+	const router = useRouter();
 
-  const checkIfUserExpired = () => {
-    const expirationDate = user!.subscriptionExpirationDate;
+	useEffect(() => {
+		if (user) {
+			setShowDemographicInput(
+				!user.demographicInformation ||
+					!user.demographicInformation.country ||
+					!user.demographicInformation.gender ||
+					!user.demographicInformation.phone,
+			);
+			setShowDiagnostics(user.isFirstLogin && user.type === "student");
+		}
+	}, [user]);
 
-    if (expirationDate === null || expirationDate === undefined) return false;
-    if (moment(expirationDate).isAfter(moment(new Date()))) return false;
+	const checkIfUserExpired = () => {
+		const expirationDate = user!.subscriptionExpirationDate;
 
-    return true;
-  };
+		if (expirationDate === null || expirationDate === undefined) return false;
+		if (moment(expirationDate).isAfter(moment(new Date()))) return false;
 
-  if (
-    user &&
-    (user.status === "paymentDue" ||
-      user.status === "disabled" ||
-      checkIfUserExpired())
-  ) {
-    return (
-      <>
-        <Head>
-          <title>EnCoach</title>
-          <meta
-            name="description"
-            content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-          />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <link rel="icon" href="/favicon.ico" />
-        </Head>
-        {user.status === "disabled" && (
-          <Layout user={user} navDisabled>
-            <div className="flex flex-col items-center justify-center text-center w-full gap-4">
-              <span className="font-bold text-lg">
-                Your account has been disabled!
-              </span>
-              <span>
-                Please contact an administrator if you believe this to be a
-                mistake.
-              </span>
-            </div>
-          </Layout>
-        )}
-        {(user.status === "paymentDue" || checkIfUserExpired()) && (
-          <PaymentDue hasExpired user={user} reload={router.reload} />
-        )}
-      </>
-    );
-  }
+		return true;
+	};
 
-  if (user && showDemographicInput) {
-    return (
-      <>
-        <Head>
-          <title>EnCoach</title>
-          <meta
-            name="description"
-            content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-          />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <link rel="icon" href="/favicon.ico" />
-        </Head>
-        <Layout user={user} navDisabled>
-          <DemographicInformationInput mutateUser={mutateUser} user={user} />
-        </Layout>
-      </>
-    );
-  }
+	if (user && (user.status === "paymentDue" || user.status === "disabled" || checkIfUserExpired())) {
+		return (
+			<>
+				<Head>
+					<title>EnCoach</title>
+					<meta
+						name="description"
+						content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+					/>
+					<meta name="viewport" content="width=device-width, initial-scale=1" />
+					<link rel="icon" href="/favicon.ico" />
+				</Head>
+				{user.status === "disabled" && (
+					<Layout user={user} navDisabled>
+						<div className="flex flex-col items-center justify-center text-center w-full gap-4">
+							<span className="font-bold text-lg">Your account has been disabled!</span>
+							<span>Please contact an administrator if you believe this to be a mistake.</span>
+						</div>
+					</Layout>
+				)}
+				{(user.status === "paymentDue" || checkIfUserExpired()) && <PaymentDue hasExpired user={user} reload={router.reload} />}
+			</>
+		);
+	}
 
-  if (user && showDiagnostics) {
-    return (
-      <>
-        <Head>
-          <title>EnCoach</title>
-          <meta
-            name="description"
-            content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-          />
-          <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <link rel="icon" href="/favicon.ico" />
-        </Head>
-        <Layout user={user} navDisabled>
-          <Diagnostic user={user} onFinish={() => setShowDiagnostics(false)} />
-        </Layout>
-      </>
-    );
-  }
+	if (user && showDemographicInput) {
+		return (
+			<>
+				<Head>
+					<title>EnCoach</title>
+					<meta
+						name="description"
+						content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+					/>
+					<meta name="viewport" content="width=device-width, initial-scale=1" />
+					<link rel="icon" href="/favicon.ico" />
+				</Head>
+				<Layout user={user} navDisabled>
+					<DemographicInformationInput mutateUser={mutateUser} user={user} />
+				</Layout>
+			</>
+		);
+	}
 
-  return (
-    <>
-      <Head>
-        <title>EnCoach</title>
-        <meta
-          name="description"
-          content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
-        />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
-      <ToastContainer />
-      {user && (
-        <Layout user={user}>
-          {checkAccess(user, ["student"]) && <StudentDashboard user={user} />}
-          {checkAccess(user, ["teacher"]) && <TeacherDashboard user={user} />}
-          {checkAccess(user, ["corporate"]) && (
-            <CorporateDashboard user={user as CorporateUser} />
-          )}
-          {checkAccess(user, ["mastercorporate"]) && (
-            <MasterCorporateDashboard user={user as MasterCorporateUser} />
-          )}
-          {checkAccess(user, ["agent"]) && <AgentDashboard user={user} />}
-          {checkAccess(user, ["admin"]) && <AdminDashboard user={user} />}
-          {checkAccess(user, ["developer"]) && (
-            <>
-              <Select
-                options={userTypes.map((u) => ({
-                  value: u,
-                  label: USER_TYPE_LABELS[u],
-                }))}
-                value={{
-                  value: selectedScreen,
-                  label: USER_TYPE_LABELS[selectedScreen],
-                }}
-                onChange={(value) =>
-                  value
-                    ? setSelectedScreen(value.value)
-                    : setSelectedScreen("admin")
-                }
-              />
+	if (user && showDiagnostics) {
+		return (
+			<>
+				<Head>
+					<title>EnCoach</title>
+					<meta
+						name="description"
+						content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+					/>
+					<meta name="viewport" content="width=device-width, initial-scale=1" />
+					<link rel="icon" href="/favicon.ico" />
+				</Head>
+				<Layout user={user} navDisabled>
+					<Diagnostic user={user} onFinish={() => setShowDiagnostics(false)} />
+				</Layout>
+			</>
+		);
+	}
 
-              {selectedScreen === "student" && <StudentDashboard user={user} />}
-              {selectedScreen === "teacher" && <TeacherDashboard user={user} />}
-              {selectedScreen === "corporate" && (
-                <CorporateDashboard user={user as unknown as CorporateUser} />
-              )}
-              {selectedScreen === "mastercorporate" && (
-                <MasterCorporateDashboard
-                  user={user as unknown as MasterCorporateUser}
-                />
-              )}
-              {selectedScreen === "agent" && <AgentDashboard user={user} />}
-              {selectedScreen === "admin" && <AdminDashboard user={user} />}
-            </>
-          )}
-        </Layout>
-      )}
-    </>
-  );
+	return (
+		<>
+			<Head>
+				<title>EnCoach</title>
+				<meta
+					name="description"
+					content="A training platform for the IELTS exam provided by the Muscat Training Institute and developed by eCrop."
+				/>
+				<meta name="viewport" content="width=device-width, initial-scale=1" />
+				<link rel="icon" href="/favicon.ico" />
+			</Head>
+			<ToastContainer />
+			{user && (
+				<Layout user={user}>
+					{checkAccess(user, ["student"]) && <StudentDashboard linkedCorporate={linkedCorporate} user={user} />}
+					{checkAccess(user, ["teacher"]) && <TeacherDashboard linkedCorporate={linkedCorporate} user={user} />}
+					{checkAccess(user, ["corporate"]) && <CorporateDashboard linkedCorporate={linkedCorporate} user={user as CorporateUser} />}
+					{checkAccess(user, ["mastercorporate"]) && <MasterCorporateDashboard user={user as MasterCorporateUser} />}
+					{checkAccess(user, ["agent"]) && <AgentDashboard user={user} />}
+					{checkAccess(user, ["admin"]) && <AdminDashboard user={user} />}
+					{checkAccess(user, ["developer"]) && (
+						<>
+							<Select
+								options={userTypes.map((u) => ({
+									value: u,
+									label: USER_TYPE_LABELS[u],
+								}))}
+								value={{
+									value: selectedScreen,
+									label: USER_TYPE_LABELS[selectedScreen],
+								}}
+								onChange={(value) => (value ? setSelectedScreen(value.value) : setSelectedScreen("admin"))}
+							/>
+
+							{selectedScreen === "student" && <StudentDashboard linkedCorporate={linkedCorporate} user={user} />}
+							{selectedScreen === "teacher" && <TeacherDashboard linkedCorporate={linkedCorporate} user={user} />}
+							{selectedScreen === "corporate" && (
+								<CorporateDashboard linkedCorporate={linkedCorporate} user={user as unknown as CorporateUser} />
+							)}
+							{selectedScreen === "mastercorporate" && <MasterCorporateDashboard user={user as unknown as MasterCorporateUser} />}
+							{selectedScreen === "agent" && <AgentDashboard user={user} />}
+							{selectedScreen === "admin" && <AdminDashboard user={user} />}
+						</>
+					)}
+				</Layout>
+			)}
+		</>
+	);
 }

src/pages/profile.tsx

@@ -12,7 +12,16 @@ import Link from "next/link";
 import axios from "axios";
 import {ErrorMessage} from "@/constants/errors";
 import clsx from "clsx";
-import {CorporateUser, EmploymentStatus, EMPLOYMENT_STATUS, Gender, User, DemographicInformation} from "@/interfaces/user";
+import {
+	CorporateUser,
+	EmploymentStatus,
+	EMPLOYMENT_STATUS,
+	Gender,
+	User,
+	DemographicInformation,
+	MasterCorporateUser,
+	Group,
+} from "@/interfaces/user";
 import CountrySelect from "@/components/Low/CountrySelect";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import moment from "moment";
@@ -34,8 +43,11 @@ import {capitalize} from "lodash";
 import TopicModal from "@/components/Medium/TopicModal";
 import {v4} from "uuid";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
+import {getParticipantGroups, getUserCorporate} from "@/utils/groups.be";
+import {InferGetServerSidePropsType} from "next";
+import {getUsers} from "@/utils/users.be";
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
 	if (!user || !user.isVerified) {
@@ -57,18 +69,26 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	}
 
 	return {
-		props: {user: req.session.user},
+		props: {
+			user,
+			linkedCorporate: (await getUserCorporate(user.id)) || null,
+			groups: await getParticipantGroups(user.id),
+			users: await getUsers(),
+		},
 	};
 }, sessionOptions);
 
 interface Props {
 	user: User;
+	groups: Group[];
+	users: User[];
 	mutateUser: Function;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
 const DoubleColumnRow = ({children}: {children: ReactNode}) => <div className="flex flex-col lg:flex-row gap-8 w-full">{children}</div>;
 
-function UserProfile({user, mutateUser}: Props) {
+function UserProfile({user, mutateUser, linkedCorporate, groups, users}: Props) {
 	const [bio, setBio] = useState(user.bio || "");
 	const [name, setName] = useState(user.name || "");
 	const [email, setEmail] = useState(user.email || "");
@@ -111,9 +131,6 @@ function UserProfile({user, mutateUser}: Props) {
 
 	const [isPreferredTopicsOpen, setIsPreferredTopicsOpen] = useState(false);
 
-	const {groups} = useGroups({});
-	const {users} = useUsers();
-
 	const profilePictureInput = useRef(null);
 	const expirationDateColor = (date: Date) => {
 		const momentDate = moment(date);
@@ -245,7 +262,7 @@ function UserProfile({user, mutateUser}: Props) {
 						<h1 className="text-4xl font-bold mb-6 -md:hidden">Edit Profile</h1>
 						<form className="flex flex-col items-center gap-6 w-full" onSubmit={(e) => e.preventDefault()}>
 							<DoubleColumnRow>
-								{user.type !== "corporate" ? (
+								{user.type !== "corporate" && user.type !== "mastercorporate" ? (
 									<Input
 										label={user.type === "agent" ? "English name" : "Name"}
 										type="text"
@@ -260,6 +277,7 @@ function UserProfile({user, mutateUser}: Props) {
 										label="Company name"
 										type="text"
 										name="name"
+										disabled={!!linkedCorporate}
 										onChange={(e) =>
 											setCorporateInformation((prev) => ({
 												...prev!,
@@ -499,9 +517,10 @@ function UserProfile({user, mutateUser}: Props) {
 											onChange={setPosition}
 											defaultValue={position}
 											type="text"
-											label="Position"
+											label="Department"
 											placeholder="CEO, Head of Marketing..."
 											required
+											disabled={!!linkedCorporate}
 										/>
 									</DoubleColumnRow>
 								</>
@@ -638,7 +657,7 @@ function UserProfile({user, mutateUser}: Props) {
 	);
 }
 
-export default function Home() {
+export default function Home(props: {linkedCorporate?: CorporateUser | MasterCorporateUser; groups: Group[]; users: User[]}) {
 	const {user, mutateUser} = useUser({redirectTo: "/login"});
 
 	return (
@@ -653,7 +672,7 @@ export default function Home() {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<ToastContainer />
-			{user && <UserProfile user={user} mutateUser={mutateUser} />}
+			{user && <UserProfile user={user} mutateUser={mutateUser} {...props} />}
 		</>
 	);
 }

src/pages/record.tsx

@@ -1,28 +1,31 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import { withIronSessionSsr } from "iron-session/next";
-import { sessionOptions } from "@/lib/session";
-import { Stat, User } from "@/interfaces/user";
-import { useEffect, useRef, useState } from "react";
+import {withIronSessionSsr} from "iron-session/next";
+import {sessionOptions} from "@/lib/session";
+import {Stat, User} from "@/interfaces/user";
+import {useEffect, useRef, useState} from "react";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import { groupByDate } from "@/utils/stats";
+import {groupByDate} from "@/utils/stats";
 import moment from "moment";
 import useUsers from "@/hooks/useUsers";
 import useExamStore from "@/stores/examStore";
-import { ToastContainer } from "react-toastify";
+import {ToastContainer} from "react-toastify";
 import Layout from "@/components/High/Layout";
 import clsx from "clsx";
-import { shouldRedirectHome } from "@/utils/navigation.disabled";
+import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import useAssignments from "@/hooks/useAssignments";
-import { uuidv4 } from "@firebase/util";
-import { usePDFDownload } from "@/hooks/usePDFDownload";
+import {uuidv4} from "@firebase/util";
+import {usePDFDownload} from "@/hooks/usePDFDownload";
 import useRecordStore from "@/stores/recordStore";
 import StatsGridItem from "@/components/Medium/StatGridItem";
 import RecordFilter from "@/components/Medium/RecordFilter";
-import { useRouter } from "next/router";
+import {useRouter} from "next/router";
 import useTrainingContentStore from "@/stores/trainingContentStore";
+import {Assignment} from "@/interfaces/results";
+import {getUsers} from "@/utils/users.be";
+import {getAssignments, getAssignmentsByAssigner} from "@/utils/assignments.be";
 
-export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
 	if (!user || !user.isVerified) {
@@ -43,14 +46,23 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 		};
 	}
 
+	const users = await getUsers();
+	const assignments = await getAssignments();
+
 	return {
-		props: { user: req.session.user },
+		props: {user, users, assignments},
 	};
 }, sessionOptions);
 
 type Filter = "months" | "weeks" | "days" | "assignments" | undefined;
 
-export default function History({ user }: { user: User }) {
+interface Props {
+	user: User;
+	users: User[];
+	assignments: Assignment[];
+}
+
+export default function History({user, users, assignments}: Props) {
 	const router = useRouter();
 	const [statsUserId, setStatsUserId, training, setTraining] = useRecordStore((state) => [
 		state.selectedUser,
@@ -60,12 +72,10 @@ export default function History({ user }: { user: User }) {
 	]);
 
 	// const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
-	const [groupedStats, setGroupedStats] = useState<{ [key: string]: Stat[] }>();
+	const [groupedStats, setGroupedStats] = useState<{[key: string]: Stat[]}>();
 	const [filter, setFilter] = useState<Filter>();
-	const { assignments } = useAssignments({});
 
-	const { users } = useUsers();
-	const { data: stats, isLoading: isStatsLoading } = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);
+	const {data: stats, isLoading: isStatsLoading} = useFilterRecordsByUser<Stat[]>(statsUserId || user?.id);
 
 	const setExams = useExamStore((state) => state.setExams);
 	const setShowSolutions = useExamStore((state) => state.setShowSolutions);
@@ -100,12 +110,12 @@ export default function History({ user }: { user: User }) {
 	//     if (!statsUserId) setStatsUserId(user.id);
 	//   }, []);
 
-	const filterStatsByDate = (stats: { [key: string]: Stat[] }) => {
+	const filterStatsByDate = (stats: {[key: string]: Stat[]}) => {
 		if (filter && filter !== "assignments") {
 			const filterDate = moment()
-				.subtract({ [filter as string]: 1 })
+				.subtract({[filter as string]: 1})
 				.format("x");
-			const filteredStats: { [key: string]: Stat[] } = {};
+			const filteredStats: {[key: string]: Stat[]} = {};
 
 			Object.keys(stats).forEach((timestamp) => {
 				if (timestamp >= filterDate) filteredStats[timestamp] = stats[timestamp];
@@ -114,7 +124,7 @@ export default function History({ user }: { user: User }) {
 		}
 
 		if (filter && filter === "assignments") {
-			const filteredStats: { [key: string]: Stat[] } = {};
+			const filteredStats: {[key: string]: Stat[]} = {};
 
 			Object.keys(stats).forEach((timestamp) => {
 				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
@@ -127,7 +137,6 @@ export default function History({ user }: { user: User }) {
 		return stats;
 	};
 
-
 	const MAX_TRAINING_EXAMS = 10;
 	const [selectedTrainingExams, setSelectedTrainingExams] = useState<string[]>([]);
 	const setTrainingStats = useTrainingContentStore((state) => state.setStats);
@@ -200,7 +209,7 @@ export default function History({ user }: { user: User }) {
 			<ToastContainer />
 			{user && (
 				<Layout user={user}>
-					<RecordFilter user={user} filterState={{ filter: filter, setFilter: setFilter }} >
+					<RecordFilter user={user} filterState={{filter: filter, setFilter: setFilter}}>
 						{training && (
 							<div className="flex flex-row">
 								<div className="font-semibold text-2xl mr-4">

src/pages/settings.tsx

@@ -24,8 +24,12 @@ import UserCreator from "./(admin)/UserCreator";
 import CorporateGradingSystem from "./(admin)/CorporateGradingSystem";
 import useGradingSystem from "@/hooks/useGrading";
 import {CEFR_STEPS} from "@/resources/grading";
+import {User} from "@/interfaces/user";
+import {getUserPermissions} from "@/utils/permissions.be";
+import {Permission, PermissionType} from "@/interfaces/permissions";
+import {getUsers} from "@/utils/users.be";
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 	if (!user || !user.isVerified) {
 		return {
@@ -45,14 +49,21 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 		};
 	}
 
+	const permissions = await getUserPermissions(user.id);
+	const users = await getUsers();
+
 	return {
-		props: {user: req.session.user},
+		props: {user, permissions, users},
 	};
 }, sessionOptions);
 
-export default function Admin() {
-	const {user} = useUser({redirectTo: "/login"});
-	const {permissions} = usePermissions(user?.id || "");
+interface Props {
+	user: User;
+	users: User[];
+	permissions: PermissionType[];
+}
+
+export default function Admin({user, users, permissions}: Props) {
 	const {gradingSystem, mutate} = useGradingSystem();
 
 	const [modalOpen, setModalOpen] = useState<string>();
@@ -69,80 +80,78 @@ export default function Admin() {
 				<link rel="icon" href="/favicon.ico" />
 			</Head>
 			<ToastContainer />
-			{user && (
-				<Layout user={user} className="gap-6">
-					<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)}>
-						<BatchCreateUser user={user} onFinish={() => setModalOpen(undefined)} />
-					</Modal>
-					<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
-						<BatchCodeGenerator user={user} onFinish={() => setModalOpen(undefined)} />
-					</Modal>
-					<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
-						<CodeGenerator user={user} onFinish={() => setModalOpen(undefined)} />
-					</Modal>
-					<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
-						<UserCreator user={user} onFinish={() => setModalOpen(undefined)} />
-					</Modal>
-					<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
-						<CorporateGradingSystem
-							user={user}
-							defaultSteps={gradingSystem?.steps || CEFR_STEPS}
-							mutate={(steps) => {
-								mutate({user: user.id, steps});
-								setModalOpen(undefined);
-							}}
-						/>
-					</Modal>
+			<Layout user={user} className="gap-6">
+				<Modal isOpen={modalOpen === "batchCreateUser"} onClose={() => setModalOpen(undefined)}>
+					<BatchCreateUser user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+				</Modal>
+				<Modal isOpen={modalOpen === "batchCreateCode"} onClose={() => setModalOpen(undefined)}>
+					<BatchCodeGenerator user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+				</Modal>
+				<Modal isOpen={modalOpen === "createCode"} onClose={() => setModalOpen(undefined)}>
+					<CodeGenerator user={user} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+				</Modal>
+				<Modal isOpen={modalOpen === "createUser"} onClose={() => setModalOpen(undefined)}>
+					<UserCreator user={user} users={users} permissions={permissions} onFinish={() => setModalOpen(undefined)} />
+				</Modal>
+				<Modal isOpen={modalOpen === "gradingSystem"} onClose={() => setModalOpen(undefined)}>
+					<CorporateGradingSystem
+						user={user}
+						defaultSteps={gradingSystem?.steps || CEFR_STEPS}
+						mutate={(steps) => {
+							mutate({user: user.id, steps});
+							setModalOpen(undefined);
+						}}
+					/>
+				</Modal>
 
-					<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
-						<ExamLoader />
-						{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
-							<div className="w-full grid grid-cols-2 gap-4">
+				<section className="w-full grid grid-cols-2 -md:grid-cols-1 gap-8">
+					<ExamLoader />
+					{checkAccess(user, getTypesOfUser(["teacher"]), permissions, "viewCodes") && (
+						<div className="w-full grid grid-cols-2 gap-4">
+							<IconCard
+								Icon={BsCode}
+								label="Generate Single Code"
+								color="purple"
+								className="w-full h-full"
+								onClick={() => setModalOpen("createCode")}
+							/>
+							<IconCard
+								Icon={BsCodeSquare}
+								label="Generate Codes in Batch"
+								color="purple"
+								className="w-full h-full"
+								onClick={() => setModalOpen("batchCreateCode")}
+							/>
+							<IconCard
+								Icon={BsPersonFill}
+								label="Create Single User"
+								color="purple"
+								className="w-full h-full"
+								onClick={() => setModalOpen("createUser")}
+							/>
+							<IconCard
+								Icon={BsPeopleFill}
+								label="Create Users in Batch"
+								color="purple"
+								className="w-full h-full"
+								onClick={() => setModalOpen("batchCreateUser")}
+							/>
+							{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
 								<IconCard
-									Icon={BsCode}
-									label="Generate Single Code"
+									Icon={BsGearFill}
+									label="Grading System"
 									color="purple"
-									className="w-full h-full"
-									onClick={() => setModalOpen("createCode")}
+									className="w-full h-full col-span-2"
+									onClick={() => setModalOpen("gradingSystem")}
 								/>
-								<IconCard
-									Icon={BsCodeSquare}
-									label="Generate Codes in Batch"
-									color="purple"
-									className="w-full h-full"
-									onClick={() => setModalOpen("batchCreateCode")}
-								/>
-								<IconCard
-									Icon={BsPersonFill}
-									label="Create Single User"
-									color="purple"
-									className="w-full h-full"
-									onClick={() => setModalOpen("createUser")}
-								/>
-								<IconCard
-									Icon={BsPeopleFill}
-									label="Create Users in Batch"
-									color="purple"
-									className="w-full h-full"
-									onClick={() => setModalOpen("batchCreateUser")}
-								/>
-								{checkAccess(user, ["admin", "corporate", "developer", "mastercorporate"]) && (
-									<IconCard
-										Icon={BsGearFill}
-										label="Grading System"
-										color="purple"
-										className="w-full h-full col-span-2"
-										onClick={() => setModalOpen("gradingSystem")}
-									/>
-								)}
-							</div>
-						)}
-					</section>
-					<section className="w-full">
-						<Lists user={user} />
-					</section>
-				</Layout>
-			)}
+							)}
+						</div>
+					)}
+				</section>
+				<section className="w-full">
+					<Lists user={user} users={users} permissions={permissions} />
+				</section>
+			</Layout>
 		</>
 	);
 }

src/utils/assignments.be.ts

@@ -1,58 +1,36 @@
-import { app } from "@/firebase";
-import { Assignment } from "@/interfaces/results";
-import {
-  collection,
-  getDocs,
-  getFirestore,
-  query,
-  where,
-} from "firebase/firestore";
+import {app} from "@/firebase";
+import {Assignment} from "@/interfaces/results";
+import {collection, getDocs, getFirestore, query, where} from "firebase/firestore";
 
 const db = getFirestore(app);
 
-export const getAssignmentsByAssigner = async (
-  id: string,
-  startDate?: Date,
-  endDate?: Date
-) => {
-  const { docs } = await getDocs(
-    query(
-      collection(db, "assignments"),
-      ...[
-        where("assigner", "==", id),
-        ...(startDate ? [where("startDate", ">=", startDate.toISOString())] : []),
-        // firebase doesnt accept compound queries so we have to filter on the server
-        // ...endDate ? [where("endDate", "<=", endDate)] : [],
-      ]
-    )
-  );
-  if (endDate) {
-    return docs
-      .map((x) => ({ ...(x.data() as Assignment), id: x.id }))
-      .filter((x) => new Date(x.endDate) <= endDate) as Assignment[];
-  }
-  return docs.map((x) => ({ ...x.data(), id: x.id })) as Assignment[];
+export const getAssignmentsByAssigner = async (id: string, startDate?: Date, endDate?: Date) => {
+	const {docs} = await getDocs(
+		query(
+			collection(db, "assignments"),
+			...[
+				where("assigner", "==", id),
+				...(startDate ? [where("startDate", ">=", startDate.toISOString())] : []),
+				// firebase doesnt accept compound queries so we have to filter on the server
+				// ...endDate ? [where("endDate", "<=", endDate)] : [],
+			],
+		),
+	);
+	if (endDate) {
+		return docs.map((x) => ({...(x.data() as Assignment), id: x.id})).filter((x) => new Date(x.endDate) <= endDate) as Assignment[];
+	}
+	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
+};
+export const getAssignments = async () => {
+	const {docs} = await getDocs(collection(db, "assignments"));
+	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
 };
 
-export const getAssignmentsByAssignerBetweenDates = async (
-  id: string,
-  startDate: Date,
-  endDate: Date
-) => {
-  const { docs } = await getDocs(
-    query(collection(db, "assignments"), where("assigner", "==", id))
-  );
-  return docs.map((x) => ({ ...x.data(), id: x.id })) as Assignment[];
+export const getAssignmentsByAssignerBetweenDates = async (id: string, startDate: Date, endDate: Date) => {
+	const {docs} = await getDocs(query(collection(db, "assignments"), where("assigner", "==", id)));
+	return docs.map((x) => ({...x.data(), id: x.id})) as Assignment[];
 };
 
-export const getAssignmentsByAssigners = async (
-  ids: string[],
-  startDate?: Date,
-  endDate?: Date
-) => {
-  return (
-    await Promise.all(
-      ids.map((id) => getAssignmentsByAssigner(id, startDate, endDate))
-    )
-  ).flat();
+export const getAssignmentsByAssigners = async (ids: string[], startDate?: Date, endDate?: Date) => {
+	return (await Promise.all(ids.map((id) => getAssignmentsByAssigner(id, startDate, endDate)))).flat();
 };

src/utils/groups.be.ts

@@ -1,5 +1,5 @@
 import {app} from "@/firebase";
-import {CorporateUser, Group, StudentUser, TeacherUser} from "@/interfaces/user";
+import {CorporateUser, Group, MasterCorporateUser, StudentUser, TeacherUser} from "@/interfaces/user";
 import {collection, doc, getDoc, getDocs, getFirestore, query, setDoc, where} from "firebase/firestore";
 import moment from "moment";
 import {getUser} from "./users.be";
@@ -35,14 +35,14 @@ export const updateExpiryDateOnGroup = async (participantID: string, corporateID
 
 export const getUserCorporate = async (id: string) => {
 	const user = await getUser(id);
-	if (user.type === "corporate" || user.type === "mastercorporate") return user;
+	if (user.type === "mastercorporate") return user;
 
 	const groups = await getParticipantGroups(id);
 	const admins = await Promise.all(groups.map((x) => x.admin).map(getUser));
-	const corporates = admins.filter((x) => x.type === "corporate");
+	const corporates = admins.filter((x) => x.type === "corporate" || x.type === "mastercorporate");
 
 	if (corporates.length === 0) return undefined;
-	return corporates.shift() as CorporateUser;
+	return corporates.shift() as CorporateUser | MasterCorporateUser;
 };
 
 export const getGroups = async () => {

src/utils/permissions.be.ts

@@ -1,99 +1,89 @@
-import { app, adminApp } from "@/firebase";
-import { getAuth } from "firebase-admin/auth";
+import {app, adminApp} from "@/firebase";
+import {getAuth} from "firebase-admin/auth";
 
-import {
-  collection,
-  deleteDoc,
-  doc,
-  getDoc,
-  getDocs,
-  getFirestore,
-  query,
-  setDoc,
-  where,
-} from "firebase/firestore";
-import {
-  Permission,
-  PermissionType,
-  permissions,
-  PermissionTopic,
-} from "@/interfaces/permissions";
-import { v4 } from "uuid";
+import {collection, deleteDoc, doc, getDoc, getDocs, getFirestore, query, setDoc, where} from "firebase/firestore";
+import {Permission, PermissionType, permissions, PermissionTopic} from "@/interfaces/permissions";
+import {v4} from "uuid";
 
 const db = getFirestore(app);
 
 async function createPermission(topic: string, type: string) {
-  const permData = doc(db, "permissions", v4());
-  const permDoc = await getDoc(permData);
-  if (permDoc.exists()) {
-    return true;
-  }
+	const permData = doc(db, "permissions", v4());
+	const permDoc = await getDoc(permData);
+	if (permDoc.exists()) {
+		return true;
+	}
 
-  await setDoc(permData, {
-    type,
-    topic,
-    users: [],
-  });
+	await setDoc(permData, {
+		type,
+		topic,
+		users: [],
+	});
 }
 interface PermissionsHelperList {
-  topic: string;
-  type: string;
+	topic: string;
+	type: string;
 }
 export function getPermissions(userId: string | undefined, docs: Permission[]) {
-  if (!userId) {
-    return [];
-  }
-  // the concept is like a blacklist
-  // if the user exists in the list, he can't access this permission
-  // even if his profile allows
-  const permissions = docs.reduce((acc: PermissionType[], doc: Permission) => {
-    //  typescript was complaining even with the validation on the top
-    if (doc.users.includes(userId)) {
-      return acc;
-    }
+	if (!userId) {
+		return [];
+	}
+	// the concept is like a blacklist
+	// if the user exists in the list, he can't access this permission
+	// even if his profile allows
+	const permissions = docs.reduce((acc: PermissionType[], doc: Permission) => {
+		//  typescript was complaining even with the validation on the top
+		if (doc.users.includes(userId)) {
+			return acc;
+		}
 
-    return [...acc, doc.type];
-  }, []) as PermissionType[];
-  return permissions;
+		return [...acc, doc.type];
+	}, []) as PermissionType[];
+	return permissions;
+}
+
+export async function getUserPermissions(id: string) {
+	const permissions = await getPermissionDocs();
+	return getPermissions(id, permissions);
 }
 
 export async function bootstrap() {
-  await permissions
-    .reduce((accm: PermissionsHelperList[], permissionData) => {
-      return [
-        ...accm,
-        ...permissionData.list.map((type) => ({
-          topic: permissionData.topic,
-          type,
-        })),
-      ];
-    }, [])
-    .forEach(async ({ topic, type }) => {
-      await createPermission(topic, type);
-    });
+	await permissions
+		.reduce((accm: PermissionsHelperList[], permissionData) => {
+			return [
+				...accm,
+				...permissionData.list.map((type) => ({
+					topic: permissionData.topic,
+					type,
+				})),
+			];
+		}, [])
+		.forEach(async ({topic, type}) => {
+			await createPermission(topic, type);
+		});
 }
 
 export async function getPermissionDoc(id: string) {
-  const docRef = doc(db, "permissions", id);
-  const docSnap = await getDoc(docRef);
+	const docRef = doc(db, "permissions", id);
+	const docSnap = await getDoc(docRef);
 
-  if (docSnap.exists()) {
-    return docSnap.data() as Permission;
-  }
+	if (docSnap.exists()) {
+		return docSnap.data() as Permission;
+	}
 
-  throw new Error("Permission not found");
+	throw new Error("Permission not found");
 }
 
 export async function getPermissionDocs() {
-  const q = query(collection(db, "permissions"));
-  // firebase is missing something like array-not-contains
+	const q = query(collection(db, "permissions"));
+	// firebase is missing something like array-not-contains
 
-  const snapshot = await getDocs(q);
+	const snapshot = await getDocs(q);
 
-  const docs = snapshot.docs.map((doc) => ({
-    id: doc.id,
-    ...doc.data(),
-  })) as Permission[];
+	const docs = snapshot.docs.map((doc) => ({
+		id: doc.id,
+		...doc.data(),
+	})) as Permission[];
 
-  return docs;
+	return docs;
 }

src/utils/users.be.ts

@@ -5,21 +5,23 @@ import {CorporateUser, Group, User} from "@/interfaces/user";
 import {getGroupsForUser} from "./groups.be";
 import {uniq, uniqBy} from "lodash";
 import {getUserCodes} from "./codes.be";
+import moment from "moment";
 const db = getFirestore(app);
 
 export async function getUsers() {
 	const snapshot = await getDocs(collection(db, "users"));
 
 	return snapshot.docs.map((doc) => ({
-		id: doc.id,
 		...doc.data(),
-	})) as User[];
+		id: doc.id,
+		registrationDate: moment(doc.data().registrationDate).toISOString(),
+	})) as unknown as User[];
 }
 
 export async function getUser(id: string) {
 	const userDoc = await getDoc(doc(db, "users", id));
 
-	return {...userDoc.data(), id} as User;
+	return {...userDoc.data(), id, registrationDate: moment(userDoc.data()?.registrationDate).toISOString()} as unknown as User;
 }
 
 export async function getSpecificUsers(ids: string[]) {
@@ -28,9 +30,10 @@ export async function getSpecificUsers(ids: string[]) {
 	const snapshot = await getDocs(query(collection(db, "users"), where("id", "in", ids)));
 
 	const groups = snapshot.docs.map((doc) => ({
-		id: doc.id,
 		...doc.data(),
-	})) as User[];
+		id: doc.id,
+		registrationDate: moment(doc.data().registrationDate).toISOString(),
+	})) as unknown as User[];
 
 	return groups;
 }

src/utils/users.ts

@@ -32,7 +32,7 @@ export const exportListToExcel = (rowUsers: User[], users: User[], groups: Group
 		gender: user.demographicInformation?.gender ? capitalize(user.demographicInformation.gender) : "N/A",
 		verified: user.isVerified?.toString() || "FALSE",
 	}));
-	const header = "Name,Email,Type,Company Name,Expiry Date,Country,Phone,Employment/Position,Gender,Verification";
+	const header = "Name,Email,Type,Company Name,Expiry Date,Country,Phone,Employment/Department,Gender,Verification";
 	const rowsString = rows.map((x) => Object.values(x).join(",")).join("\n");
 
 	return `${header}\n${rowsString}`;