useUsers refactor

src/components/DemographicInformationInput.tsx

@@ -42,7 +42,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 		setIsLoading(true);
 
 		axios
-			.patch<{user: User}>("/api/users/update", {
+			.patch("/api/users/update", {
 				demographicInformation: {
 					country,
 					phone: `+${countryCodes.findOne("countryCode" as any, country!).countryCallingCode}${phone}`,
@@ -54,7 +54,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 				},
 				agentInformation: user.type === "agent" ? {companyName, commercialRegistration} : undefined,
 			})
-			.then((response) => mutateUser(response.data.user))
+			.then((response) => mutateUser((response.data as {user: User}).user))
 			.catch(() => {
 				toast.error("Something went wrong, please try again later!", {toastId: "user-update-error"});
 			})
@@ -89,15 +89,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 						<label className="font-normal text-base text-mti-gray-dim">Country *</label>
 						<CountrySelect value={country} onChange={setCountry} />
 					</div>
-					<Input
+					<Input type="tel" name="phone" label="Phone number" onChange={(e) => setPhone(e)} value={phone} placeholder="Enter phone number" required />
-						type="tel"
-						name="phone"
-						label="Phone number"
-						onChange={(e) => setPhone(e)}
-						value={phone}
-						placeholder="Enter phone number"
-						required
-					/>
 				</div>
 				{user.type === "student" && (
 					<Input

src/components/Navbar.tsx

@@ -65,28 +65,28 @@ export default function Navbar({user, path, navDisabled = false, focusMode = fal
 		{
 			module: "reading",
 			icon: () => <BsBook className="h-4 w-4 text-white" />,
-			achieved: user.levels?.reading || 0 >= user.desiredLevels?.reading || 9,
+			achieved: user.levels.reading >= user.desiredLevels.reading,
 		},
 
 		{
 			module: "listening",
 			icon: () => <BsHeadphones className="h-4 w-4 text-white" />,
-			achieved: user.levels?.listening || 0 >= user.desiredLevels?.listening || 9,
+			achieved: user.levels.listening >= user.desiredLevels.listening,
 		},
 		{
 			module: "writing",
 			icon: () => <BsPen className="h-4 w-4 text-white" />,
-			achieved: user.levels?.writing || 0 >= user.desiredLevels?.writing || 9,
+			achieved: user.levels.writing >= user.desiredLevels.writing,
 		},
 		{
 			module: "speaking",
 			icon: () => <BsMegaphone className="h-4 w-4 text-white" />,
-			achieved: user.levels?.speaking || 0 >= user.desiredLevels?.speaking || 9,
+			achieved: user.levels.speaking >= user.desiredLevels.speaking,
 		},
 		{
 			module: "level",
 			icon: () => <BsClipboard className="h-4 w-4 text-white" />,
-			achieved: user.levels?.level || 0 >= user.desiredLevels?.level || 9,
+			achieved: user.levels.level >= user.desiredLevels.level,
 		},
 	];
 

src/dashboards/Corporate/index.tsx

@@ -1,546 +1,400 @@
 /* eslint-disable @next/next/no-img-element */
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useUsers, {
+import useUsers, {userHashStudent, userHashTeacher, userHashCorporate} from "@/hooks/useUsers";
-  userHashStudent,
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
-  userHashTeacher,
-  userHashCorporate,
-} from "@/hooks/useUsers";
-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, useMemo, useState } from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
-  BsArrowLeft,
+	BsArrowLeft,
-  BsClipboard2Data,
+	BsClipboard2Data,
-  BsClipboard2DataFill,
+	BsClipboard2DataFill,
-  BsClock,
+	BsClock,
-  BsGlobeCentralSouthAsia,
+	BsGlobeCentralSouthAsia,
-  BsPaperclip,
+	BsPaperclip,
-  BsPerson,
+	BsPerson,
-  BsPersonAdd,
+	BsPersonAdd,
-  BsPersonFill,
+	BsPersonFill,
-  BsPersonFillGear,
+	BsPersonFillGear,
-  BsPersonGear,
+	BsPersonGear,
-  BsPencilSquare,
+	BsPencilSquare,
-  BsPersonBadge,
+	BsPersonBadge,
-  BsPersonCheck,
+	BsPersonCheck,
-  BsPeople,
+	BsPeople,
-  BsArrowRepeat,
+	BsArrowRepeat,
-  BsPlus,
+	BsPlus,
-  BsEnvelopePaper,
+	BsEnvelopePaper,
-  BsDatabase,
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {
+import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
-  averageLevelCalculator,
+import {MODULE_ARRAY} from "@/utils/moduleUtils";
-  calculateAverageLevel,
+import {Module} from "@/interfaces";
-  calculateBandScore,
+import {groupByExam} from "@/utils/stats";
-} from "@/utils/score";
-import { MODULE_ARRAY } from "@/utils/moduleUtils";
-import { Module } from "@/interfaces";
-import { groupByExam } from "@/utils/stats";
 import IconCard from "../IconCard";
 import GroupList from "@/pages/(admin)/Lists/GroupList";
 import useFilterStore from "@/stores/listFilterStore";
-import { useRouter } from "next/router";
+import {useRouter} from "next/router";
 import useCodes from "@/hooks/useCodes";
-import { getUserCorporate } from "@/utils/groups";
+import {getUserCorporate} from "@/utils/groups";
 import useAssignments from "@/hooks/useAssignments";
-import { Assignment } from "@/interfaces/results";
+import {Assignment} from "@/interfaces/results";
 import AssignmentView from "../AssignmentView";
 import AssignmentCreator from "../AssignmentCreator";
 import clsx from "clsx";
 import AssignmentCard from "../AssignmentCard";
-import { createColumnHelper } from "@tanstack/react-table";
+import {createColumnHelper} from "@tanstack/react-table";
 import Checkbox from "@/components/Low/Checkbox";
 import List from "@/components/List";
-import { getUserCompanyName } from "@/resources/user";
+import {getUserCompanyName} from "@/resources/user";
-import {
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
-  futureAssignmentFilter,
-  pastAssignmentFilter,
-  archivedAssignmentFilter,
-  activeAssignmentFilter,
-} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";
 import AssignmentsPage from "../views/AssignmentsPage";
 import StudentPerformancePage from "./StudentPerformancePage";
 import MasterStatistical from "../MasterCorporate/MasterStatistical";
 
 interface Props {
-  user: CorporateUser;
+	user: CorporateUser;
-  linkedCorporate?: CorporateUser | MasterCorporateUser;
+	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
 const studentHash = {
-  type: "student",
+	type: "student",
-  orderBy: "registrationDate",
+	orderBy: "registrationDate",
-  size: 25,
+	size: 25,
 };
 
 const teacherHash = {
-  type: "teacher",
+	type: "teacher",
-  orderBy: "registrationDate",
+	orderBy: "registrationDate",
-  size: 25,
+	size: 25,
 };
 
-export default function CorporateDashboard({ user, linkedCorporate }: Props) {
+export default function CorporateDashboard({user, linkedCorporate}: Props) {
-  const [selectedUser, setSelectedUser] = useState<User>();
+	const [selectedUser, setSelectedUser] = useState<User>();
-  const [showModal, setShowModal] = useState(false);
+	const [showModal, setShowModal] = useState(false);
 
-  const { data: stats } = useFilterRecordsByUser<Stat[]>();
+	const {data: stats} = useFilterRecordsByUser<Stat[]>();
-  const { groups } = useGroups({ admin: user.id });
+	const {groups} = useGroups({admin: user.id});
-  const {
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
-    assignments,
+	const {balance} = useUserBalance();
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ corporate: user.id });
-  const { balance } = useUserBalance();
 
-  const {
+	const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
-    users: students,
+	const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
-    total: totalStudents,
-    reload: reloadStudents,
-    isLoading: isStudentsLoading,
-  } = useUsers(studentHash);
-  const {
-    users: teachers,
-    total: totalTeachers,
-    reload: reloadTeachers,
-    isLoading: isTeachersLoading,
-  } = useUsers(teacherHash);
 
-  const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
+	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
-  const router = useRouter();
+	const router = useRouter();
 
-  const assignmentsGroups = useMemo(
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
-    () =>
-      groups.filter(
-        (x) => x.admin === user.id || x.participants.includes(user.id)
-      ),
-    [groups, user.id]
-  );
 
-  const assignmentsUsers = useMemo(
+	const assignmentsUsers = useMemo(
-    () =>
+		() =>
-      [...teachers, ...students].filter((x) =>
+			[...teachers, ...students].filter((x) =>
-        !!selectedUser
+				!!selectedUser
-          ? groups
+					? groups
-              .filter((g) => g.admin === selectedUser.id)
+							.filter((g) => g.admin === selectedUser.id)
-              .flatMap((g) => g.participants)
+							.flatMap((g) => g.participants)
-              .includes(x.id) || false
+							.includes(x.id) || false
-          : groups.flatMap((g) => g.participants).includes(x.id)
+					: groups.flatMap((g) => g.participants).includes(x.id),
-      ),
+			),
-    [groups, teachers, students, selectedUser]
+		[groups, teachers, students, selectedUser],
-  );
+	);
 
-  useEffect(() => {
+	useEffect(() => {
-    setShowModal(!!selectedUser && router.asPath === "/#");
+		setShowModal(!!selectedUser && router.asPath === "/#");
-  }, [selectedUser, router.asPath]);
+	}, [selectedUser, router.asPath]);
 
-  const getStatsByStudent = (user: User) =>
+	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
-    stats.filter((s) => s.user === user.id);
 
-  const UserDisplay = (displayUser: User) => (
+	const UserDisplay = (displayUser: User) => (
-    <div
+		<div
-      onClick={() => setSelectedUser(displayUser)}
+			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"
+			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" />
-      <img
+			<div className="flex flex-col gap-1 items-start">
-        src={displayUser.profilePicture}
+				<span>{displayUser.name}</span>
-        alt={displayUser.name}
+				<span className="text-sm opacity-75">{displayUser.email}</span>
-        className="rounded-full w-10 h-10"
+			</div>
-      />
+		</div>
-      <div className="flex flex-col gap-1 items-start">
+	);
-        <span>{displayUser.name}</span>
-        <span className="text-sm opacity-75">{displayUser.email}</span>
-      </div>
-    </div>
-  );
 
-  // this workaround will allow us toreuse the master statistical due to master corporate restraints
+	const GroupsList = () => {
-  // while still being able to use the corporate user
+		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
-  const groupedByNameCorporateIds = useMemo(
-    () => ({
-      [user.corporateInformation?.companyInformation?.name || user.name]: [
-        user.id,
-      ],
-    }),
-    [user]
-  );
-  const teachersAndStudents = useMemo(
-    () => [...students, ...teachers],
-    [students, teachers]
-  );
-  const MasterStatisticalPage = () => {
-    return (
-      <>
-        <div className="flex flex-col gap-4">
-          <div
-            onClick={() => router.push("/")}
-            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">Master Statistical</h2>
-        </div>
-        <MasterStatistical
-          users={teachersAndStudents}
-          corporateUsers={groupedByNameCorporateIds}
-          displaySelection={false}
-        />
-      </>
-    );
-  };
 
-  const GroupsList = () => {
+		return (
-    const filter = (x: Group) =>
+			<>
-      x.admin === user.id || x.participants.includes(user.id);
+				<div className="flex flex-col gap-4">
+					<div
+						onClick={() => router.push("/")}
+						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>
 
-    return (
+				<GroupList user={user} />
-      <>
+			</>
-        <div className="flex flex-col gap-4">
+		);
-          <div
+	};
-            onClick={() => router.push("/")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-          >
-            <BsArrowLeft className="text-xl" />
-            <span>Back</span>
-          </div>
-          <h2 className="text-2xl font-semibold">
-            Groups ({groups.filter(filter).length})
-          </h2>
-        </div>
 
-        <GroupList user={user} />
+	const averageLevelCalculator = (studentStats: Stat[]) => {
-      </>
+		const formattedStats = studentStats
-    );
+			.map((s) => ({
-  };
+				focus: students.find((u) => u.id === s.user)?.focus,
+				score: s.score,
+				module: s.module,
+			}))
+			.filter((f) => !!f.focus);
+		const bandScores = formattedStats.map((s) => ({
+			module: s.module,
+			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
+		}));
 
-  const averageLevelCalculator = (studentStats: Stat[]) => {
+		const levels: {[key in Module]: number} = {
-    const formattedStats = studentStats
+			reading: 0,
-      .map((s) => ({
+			listening: 0,
-        focus: students.find((u) => u.id === s.user)?.focus,
+			writing: 0,
-        score: s.score,
+			speaking: 0,
-        module: s.module,
+			level: 0,
-      }))
+		};
-      .filter((f) => !!f.focus);
+		bandScores.forEach((b) => (levels[b.module] += b.level));
-    const bandScores = formattedStats.map((s) => ({
-      module: s.module,
-      level: calculateBandScore(
-        s.score.correct,
-        s.score.total,
-        s.module,
-        s.focus!
-      ),
-    }));
 
-    const levels: { [key in Module]: number } = {
+		return calculateAverageLevel(levels);
-      reading: 0,
+	};
-      listening: 0,
-      writing: 0,
-      speaking: 0,
-      level: 0,
-    };
-    bandScores.forEach((b) => (levels[b.module] += b.level));
 
-    return calculateAverageLevel(levels);
+	if (router.asPath === "/#students")
-  };
+		return (
+			<UserList
+				user={user}
+				type="student"
+				renderHeader={(total) => (
+					<div className="flex flex-col gap-4">
+						<div
+							onClick={() => router.push("/")}
+							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>
+				)}
+			/>
+		);
 
-  if (router.asPath === "/#students")
+	if (router.asPath === "/#teachers")
-    return (
+		return (
-      <UserList
+			<UserList
-        user={user}
+				user={user}
-        type="student"
+				type="teacher"
-        renderHeader={(total) => (
+				renderHeader={(total) => (
-          <div className="flex flex-col gap-4">
+					<div className="flex flex-col gap-4">
-            <div
+						<div
-              onClick={() => router.push("/")}
+							onClick={() => router.push("/")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+							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" />
-              <BsArrowLeft className="text-xl" />
+							<span>Back</span>
-              <span>Back</span>
+						</div>
-            </div>
+						<h2 className="text-2xl font-semibold">Teachers ({total})</h2>
-            <h2 className="text-2xl font-semibold">Students ({total})</h2>
+					</div>
-          </div>
+				)}
-        )}
+			/>
-      />
+		);
-    );
 
-  if (router.asPath === "/#teachers")
+	if (router.asPath === "/#groups") return <GroupsList />;
-    return (
+	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
-      <UserList
-        user={user}
-        type="teacher"
-        renderHeader={(total) => (
-          <div className="flex flex-col gap-4">
-            <div
-              onClick={() => router.push("/")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
-            >
-              <BsArrowLeft className="text-xl" />
-              <span>Back</span>
-            </div>
-            <h2 className="text-2xl font-semibold">Teachers ({total})</h2>
-          </div>
-        )}
-      />
-    );
 
-  if (router.asPath === "/#groups") return <GroupsList />;
+	if (router.asPath === "/#assignments")
-  if (router.asPath === "/#studentsPerformance")
+		return (
-    return <StudentPerformancePage user={user} />;
+			<AssignmentsPage
+				assignments={assignments}
+				user={user}
+				groups={assignmentsGroups}
+				reloadAssignments={reloadAssignments}
+				isLoading={isAssignmentsLoading}
+				onBack={() => router.push("/")}
+			/>
+		);
 
-  if (router.asPath === "/#assignments")
+	return (
-    return (
+		<>
-      <AssignmentsPage
+			<Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
-        assignments={assignments}
+				<>
-        user={user}
+					{selectedUser && (
-        groups={assignmentsGroups}
+						<div className="w-full flex flex-col gap-8">
-        reloadAssignments={reloadAssignments}
+							<UserCard
-        isLoading={isAssignmentsLoading}
+								loggedInUser={user}
-        onBack={() => router.push("/")}
+								onClose={(shouldReload) => {
-      />
+									setSelectedUser(undefined);
-    );
+									if (shouldReload && selectedUser!.type === "student") reloadStudents();
+									if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
+								}}
+								onViewStudents={
+									selectedUser.type === "corporate" || selectedUser.type === "teacher"
+										? () => {
+												appendUserFilters({
+													id: "view-students",
+													filter: (x: User) => x.type === "student",
+												});
+												appendUserFilters({
+													id: "belongs-to-admin",
+													filter: (x: User) =>
+														groups
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+															.flatMap((g) => g.participants)
+															.includes(x.id),
+												});
 
-  if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
+												router.push("/list/users");
+										  }
+										: undefined
+								}
+								onViewTeachers={
+									selectedUser.type === "corporate" || selectedUser.type === "student"
+										? () => {
+												appendUserFilters({
+													id: "view-teachers",
+													filter: (x: User) => x.type === "teacher",
+												});
+												appendUserFilters({
+													id: "belongs-to-admin",
+													filter: (x: User) =>
+														groups
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+															.flatMap((g) => g.participants)
+															.includes(x.id),
+												});
 
-  return (
+												router.push("/list/users");
-    <>
+										  }
-      <Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
+										: undefined
-        <>
+								}
-          {selectedUser && (
+								user={selectedUser}
-            <div className="w-full flex flex-col gap-8">
+							/>
-              <UserCard
+						</div>
-                loggedInUser={user}
+					)}
-                onClose={(shouldReload) => {
+				</>
-                  setSelectedUser(undefined);
+			</Modal>
-                  if (shouldReload && selectedUser!.type === "student")
-                    reloadStudents();
-                  if (shouldReload && selectedUser!.type === "teacher")
-                    reloadTeachers();
-                }}
-                onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
-                    ? () => {
-                        appendUserFilters({
-                          id: "view-students",
-                          filter: (x: User) => x.type === "student",
-                        });
-                        appendUserFilters({
-                          id: "belongs-to-admin",
-                          filter: (x: User) =>
-                            groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
-                              .flatMap((g) => g.participants)
-                              .includes(x.id),
-                        });
 
-                        router.push("/list/users");
+			<>
-                      }
+				{!!linkedCorporate && (
-                    : undefined
+					<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>
-                onViewTeachers={
+					</div>
-                  selectedUser.type === "corporate" ||
+				)}
-                  selectedUser.type === "student"
+				<section className="grid grid-cols-5 -md:grid-cols-2 gap-4 text-center">
-                    ? () => {
+					<IconCard
-                        appendUserFilters({
+						onClick={() => router.push("/#students")}
-                          id: "view-teachers",
+						isLoading={isStudentsLoading}
-                          filter: (x: User) => x.type === "teacher",
+						Icon={BsPersonFill}
-                        });
+						label="Students"
-                        appendUserFilters({
+						value={totalStudents}
-                          id: "belongs-to-admin",
+						color="purple"
-                          filter: (x: User) =>
+					/>
-                            groups
+					<IconCard
-                              .filter(
+						onClick={() => router.push("/#teachers")}
-                                (g) =>
+						isLoading={isTeachersLoading}
-                                  g.admin === selectedUser.id ||
+						Icon={BsPencilSquare}
-                                  g.participants.includes(selectedUser.id)
+						label="Teachers"
-                              )
+						value={totalTeachers}
-                              .flatMap((g) => g.participants)
+						color="purple"
-                              .includes(x.id),
+					/>
-                        });
+					<IconCard
+						Icon={BsClipboard2Data}
+						label="Exams Performed"
+						value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
+						color="purple"
+					/>
+					<IconCard
+						Icon={BsPaperclip}
+						isLoading={isStudentsLoading}
+						label="Average Level"
+						value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
+						color="purple"
+					/>
+					<IconCard onClick={() => router.push("/#groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
+					<IconCard
+						Icon={BsPersonCheck}
+						label="User Balance"
+						value={`${balance}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
+						color="purple"
+					/>
+					<IconCard
+						Icon={BsClock}
+						label="Expiration Date"
+						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
+						color="rose"
+					/>
+					<IconCard
+						Icon={BsPersonFillGear}
+						isLoading={isStudentsLoading}
+						label="Student Performance"
+						value={totalStudents}
+						color="purple"
+						onClick={() => router.push("/#studentsPerformance")}
+					/>
+					<button
+						disabled={isAssignmentsLoading}
+						onClick={() => router.push("/#assignments")}
+						className="bg-white col-span-2 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">
+								{isAssignmentsLoading ? "Loading..." : assignments.filter((a) => !a.archived).length}
+							</span>
+						</span>
+					</button>
+				</section>
 
-                        router.push("/list/users");
+				<section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-                      }
+					<div className="bg-white shadow flex flex-col rounded-xl w-full">
-                    : undefined
+						<span className="p-4">Latest students</span>
-                }
+						<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-                user={selectedUser}
+							{students
-              />
+								.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-            </div>
+								.map((x) => (
-          )}
+									<UserDisplay key={x.id} {...x} />
-        </>
+								))}
-      </Modal>
+						</div>
-
+					</div>
-      <>
+					<div className="bg-white shadow flex flex-col rounded-xl w-full">
-        {!!linkedCorporate && (
+						<span className="p-4">Latest teachers</span>
-          <div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
+						<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-            Linked to:{" "}
+							{teachers
-            <b>
+								.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-              {linkedCorporate?.corporateInformation?.companyInformation.name ||
+								.map((x) => (
-                linkedCorporate.name}
+									<UserDisplay key={x.id} {...x} />
-            </b>
+								))}
-          </div>
+						</div>
-        )}
+					</div>
-        <section className="grid grid-cols-5 -md:grid-cols-2 gap-4 text-center">
+					<div className="bg-white shadow flex flex-col rounded-xl w-full">
-          <IconCard
+						<span className="p-4">Highest level students</span>
-            onClick={() => router.push("/#students")}
+						<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-            isLoading={isStudentsLoading}
+							{students
-            Icon={BsPersonFill}
+								.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
-            label="Students"
+								.map((x) => (
-            value={totalStudents}
+									<UserDisplay key={x.id} {...x} />
-            color="purple"
+								))}
-          />
+						</div>
-          <IconCard
+					</div>
-            onClick={() => router.push("/#teachers")}
+					<div className="bg-white shadow flex flex-col rounded-xl w-full">
-            isLoading={isTeachersLoading}
+						<span className="p-4">Highest exam count students</span>
-            Icon={BsPencilSquare}
+						<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-            label="Teachers"
+							{students
-            value={totalTeachers}
+								.sort(
-            color="purple"
+									(a, b) =>
-          />
+										Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
-          <IconCard
+								)
-            Icon={BsClipboard2Data}
+								.map((x) => (
-            label="Exams Performed"
+									<UserDisplay key={x.id} {...x} />
-            value={
+								))}
-              stats.filter((s) =>
+						</div>
-                groups.flatMap((g) => g.participants).includes(s.user)
+					</div>
-              ).length
+				</section>
-            }
+			</>
-            color="purple"
+		</>
-          />
+	);
-          <IconCard
-            Icon={BsPaperclip}
-            isLoading={isStudentsLoading}
-            label="Average Level"
-            value={averageLevelCalculator(
-              stats.filter((s) =>
-                groups.flatMap((g) => g.participants).includes(s.user)
-              )
-            ).toFixed(1)}
-            color="purple"
-          />
-          <IconCard
-            onClick={() => router.push("/#groups")}
-            Icon={BsPeople}
-            label="Groups"
-            value={groups.length}
-            color="purple"
-          />
-          <IconCard
-            Icon={BsPersonCheck}
-            label="User Balance"
-            value={`${balance}/${
-              user.corporateInformation?.companyInformation?.userAmount || 0
-            }`}
-            color="purple"
-          />
-          <IconCard
-            Icon={BsClock}
-            label="Expiration Date"
-            value={
-              user.subscriptionExpirationDate
-                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-                : "Unlimited"
-            }
-            color="rose"
-          />
-          <IconCard
-            Icon={BsPersonFillGear}
-            isLoading={isStudentsLoading}
-            label="Student Performance"
-            value={totalStudents}
-            color="purple"
-            onClick={() => router.push("/#studentsPerformance")}
-          />
-          <IconCard
-            Icon={BsDatabase}
-            label="Master Statistical"
-            color="purple"
-            onClick={() => router.push("/#statistical")}
-          />
-          <button
-            disabled={isAssignmentsLoading}
-            onClick={() => router.push("/#assignments")}
-            className="bg-white col-span-2 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">
-                {isAssignmentsLoading
-                  ? "Loading..."
-                  : assignments.filter((a) => !a.archived).length}
-              </span>
-            </span>
-          </button>
-        </section>
-
-        <section className="grid grid-cols-1 md:grid-cols-2 gap-4 w-full justify-between">
-          <div className="bg-white shadow flex flex-col rounded-xl w-full">
-            <span className="p-4">Latest students</span>
-            <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-              {students
-                .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
-                .map((x) => (
-                  <UserDisplay key={x.id} {...x} />
-                ))}
-            </div>
-          </div>
-          <div className="bg-white shadow flex flex-col rounded-xl w-full">
-            <span className="p-4">Latest teachers</span>
-            <div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-              {teachers
-                .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">
-              {students
-                .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">
-              {students
-                .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>
-      </>
-    </>
-  );
 }

src/dashboards/MasterCorporate/MasterStatisticalPage.tsx

@@ -7,14 +7,23 @@ import {BsArrowLeft} from "react-icons/bs";
 import MasterStatistical from "./MasterStatistical";
 
 interface Props {
-	groupedByNameCorporates: Record<string, CorporateUser[]>;
+	user: User;
 }
 
-const MasterStatisticalPage = ({ groupedByNameCorporates }: Props) => {
+const MasterStatisticalPage = () => {
 	const {users} = useUsers();
 
 	const router = useRouter();
 
+	const groupedByNameCorporates = useMemo(
+		() =>
+			groupBy(
+				users.filter((x) => x.type === "corporate"),
+				(x: CorporateUser) => x.corporateInformation?.companyInformation?.name || "N/A",
+			),
+		[users],
+	);
+
 	const groupedByNameCorporateIds = useMemo(
 		() =>
 			Object.keys(groupedByNameCorporates).reduce((accm, x) => {

src/dashboards/MasterCorporate/index.tsx

@@ -129,20 +129,6 @@ export default function MasterCorporateDashboard({user}: Props) {
 		</div>
 	);
 
-	const {users} = useUsers();
-
-
-	const groupedByNameCorporates = useMemo(
-		() =>
-			groupBy(
-				users.filter((x) => x.type === "corporate"),
-				(x: CorporateUser) => x.corporateInformation?.companyInformation?.name || "N/A",
-			) as Record<string, CorporateUser[]>,
-		[users],
-	);
-
-	const groupedByNameCorporatesKeys = Object.keys(groupedByNameCorporates);
-
 	const GroupsList = () => {
 		return (
 			<>
@@ -162,7 +148,7 @@ export default function MasterCorporateDashboard({user}: Props) {
 	};
 
 	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
-	if (router.asPath === "/#statistical") return <MasterStatisticalPage groupedByNameCorporates={groupedByNameCorporates} />;
+	if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
 	if (router.asPath === "/#groups") return <GroupsList />;
 
 	if (router.asPath === "/#students")
@@ -374,7 +360,7 @@ export default function MasterCorporateDashboard({user}: Props) {
 						color="purple"
 						onClick={() => router.push("/#corporate")}
 					/>
-					<IconCard Icon={BsBank} label="Corporate" value={groupedByNameCorporatesKeys.length} isLoading={isCorporatesLoading} color="purple" />
+					<IconCard Icon={BsBank} label="Corporate" value={totalCorporate} isLoading={isCorporatesLoading} color="purple" />
 					<IconCard
 						Icon={BsPersonFillGear}
 						isLoading={isStudentsLoading}

src/exams/Selection.tsx

@@ -12,7 +12,7 @@ import {calculateAverageLevel} from "@/utils/score";
 import {sortByModuleName} from "@/utils/moduleUtils";
 import {capitalize} from "lodash";
 import ProfileSummary from "@/components/ProfileSummary";
-import {ShuffleMap, Shuffles, Variant} from "@/interfaces/exam";
+import {Variant} from "@/interfaces/exam";
 import useSessions, {Session} from "@/hooks/useSessions";
 import SessionCard from "@/components/Medium/SessionCard";
 import useExamStore from "@/stores/examStore";
@@ -41,7 +41,6 @@ export default function Selection({user, page, onStart, disableSelection = false
 	};
 
 	const loadSession = async (session: Session) => {
-		state.setShuffles(session.userSolutions.map((x) => ({exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : []})));
 		state.setSelectedModules(session.selectedModules);
 		state.setExam(session.exam);
 		state.setExams(session.exams);

src/hooks/useUser.tsx

@@ -16,9 +16,9 @@ export default function useUser({redirectTo = "", redirectIfFound = false} = {})
 
 		if (
 			// If redirectIfFound is also set, redirect if the user was found
-			(redirectIfFound && user) ||
+			(redirectIfFound && user && user.isVerified) ||
 			// If redirectTo is set, redirect if the user was not found.
-			(redirectTo && !redirectIfFound && !user)
+			(redirectTo && !redirectIfFound && (!user || (user && !user.isVerified)))
 		) {
 			Router.push(redirectTo);
 		}

src/hooks/useUsers.tsx

@@ -1,15 +1,15 @@
-import {Type, User} from "@/interfaces/user";
+import { Type, User } from "@/interfaces/user";
 import Axios from "axios";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
-import {setupCache} from "axios-cache-interceptor";
+import { setupCache } from "axios-cache-interceptor";
 const instance = Axios.create();
 const axios = setupCache(instance);
 
-export const userHashStudent = {type: "student"} as {type: Type};
+export const userHashStudent = { query: { type: "student" } } as { query: { type: Type } };
-export const userHashTeacher = {type: "teacher"} as {type: Type};
+export const userHashTeacher = { query: { type: "teacher" } } as { query: { type: Type } };
-export const userHashCorporate = {type: "corporate"} as {type: Type};
+export const userHashCorporate = { query: { type: "corporate" } } as { query: { type: Type } };
 
-export default function useUsers(props?: {type?: string; page?: number; size?: number; orderBy?: string; direction?: "asc" | "desc"}) {
+export default function useUsers(props?: { query?: Record<string, string>; page?: number; size?: number; orderBy?: string; direction?: "asc" | "desc" }) {
 	const [users, setUsers] = useState<User[]>([]);
 	const [total, setTotal] = useState(0);
 	const [isLoading, setIsLoading] = useState(false);
@@ -18,16 +18,21 @@ export default function useUsers(props?: {type?: string; page?: number; size?: n
 	const getData = () => {
 		const params = new URLSearchParams();
 
-		if (!!props)
+		if (!!props) {
 			Object.keys(props).forEach((key) => {
-				if (props[key as keyof typeof props] !== undefined) params.append(key, props[key as keyof typeof props]!.toString());
+				if (key === 'query' && props.query) {
+					Object.entries(props.query).forEach(([queryKey, queryValue]) => {
+						if (queryValue !== undefined) params.append(queryKey, queryValue);
+					});
+				} else if (props[key as keyof typeof props] !== undefined) {
+					params.append(key, props[key as keyof typeof props]!.toString());
+				}
 			});
-
+		}
-		console.log(params.toString());
 
 		setIsLoading(true);
 		axios
-			.get<{users: User[]; total: number}>(`/api/users/list?${params.toString()}`, {headers: {page: "register"}})
+			.get<{ users: User[]; total: number }>(`/api/users/list?${params.toString()}`, { headers: { page: "register" } })
 			.then((response) => {
 				setUsers(response.data.users);
 				setTotal(response.data.total);
@@ -35,7 +40,7 @@ export default function useUsers(props?: {type?: string; page?: number; size?: n
 			.finally(() => setIsLoading(false));
 	};
 	// eslint-disable-next-line react-hooks/exhaustive-deps
-	useEffect(getData, [props?.page, props?.size, props?.type, props?.orderBy, props?.direction]);
+	useEffect(getData, [props?.page, props?.size, props?.query, props?.orderBy, props?.direction]);
 
-	return {users, total, isLoading, isError, reload: getData};
+	return { users, total, isLoading, isError, reload: getData };
 }

src/pages/api/register.ts

@@ -45,7 +45,7 @@ async function registerIndividual(req: NextApiRequest, res: NextApiResponse) {
 		code?: string;
 	};
 
-	const codeDoc = await db.collection("codes").findOne<Code>({code});
+	const codeDoc = await db.collection("codes").findOne<Code>({id: code});
 
 	if (code && code.length > 0 && !!codeDoc) {
 		res.status(400).json({error: "Invalid Code!"});

src/pages/api/user.ts

@@ -35,7 +35,7 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
 		return;
 	}
 
-	const targetUser = await db.collection("users").findOne<User>({id});
+	const targetUser = await db.collection("users").findOne<User>({id: id});
 	if (!targetUser) {
 		res.status(404).json({ok: false});
 		return;

src/pages/api/users/list.ts

@@ -3,7 +3,6 @@ import type {NextApiRequest, NextApiResponse} from "next";
 import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
 import {getLinkedUsers} from "@/utils/users.be";
-import {Type} from "@/interfaces/user";
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
@@ -15,16 +14,16 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
 	const {
 		size,
-		type,
 		page,
 		orderBy,
 		direction = "desc",
-	} = req.query as {size?: string; type?: Type; page?: string; orderBy?: string; direction?: "asc" | "desc"};
+		...query
+	} = req.query as {size?: string; page?: string; orderBy?: string; direction?: "asc" | "desc"; [key: string]: string | string[] | undefined};
 
 	const {users, total} = await getLinkedUsers(
 		req.session.user?.id,
 		req.session.user?.type,
-		type,
+		query,
 		page !== undefined ? parseInt(page) : undefined,
 		size !== undefined ? parseInt(size) : undefined,
 		orderBy,

src/pages/api/users/update.ts

@@ -1,17 +1,17 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
-import type {NextApiRequest, NextApiResponse} from "next";
+import type { NextApiRequest, NextApiResponse } from "next";
-import {app, storage} from "@/firebase";
+import { app, storage } from "@/firebase";
-import {withIronSessionApiRoute} from "iron-session/next";
+import { withIronSessionApiRoute } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {Group, User} from "@/interfaces/user";
+import { Group, User } from "@/interfaces/user";
-import {getDownloadURL, getStorage, ref, uploadBytes} from "firebase/storage";
+import { getDownloadURL, getStorage, ref, uploadBytes } from "firebase/storage";
-import {getAuth, signInWithEmailAndPassword, updateEmail, updatePassword} from "firebase/auth";
+import { getAuth, signInWithEmailAndPassword, updateEmail, updatePassword } from "firebase/auth";
-import {errorMessages} from "@/constants/errors";
+import { errorMessages } from "@/constants/errors";
 import moment from "moment";
 import ShortUniqueId from "short-unique-id";
-import {Payment} from "@/interfaces/paypal";
+import { Payment } from "@/interfaces/paypal";
-import {toFixedNumber} from "@/utils/number";
+import { toFixedNumber } from "@/utils/number";
-import {propagateExpiryDateChanges, propagateStatusChange} from "@/utils/propagate.user.changes";
+import { propagateExpiryDateChanges, propagateStatusChange } from "@/utils/propagate.user.changes";
 import client from "@/lib/mongodb";
 
 const db = client.db(process.env.MONGODB_DB);
@@ -41,7 +41,7 @@ const managePaymentRecords = async (user: User, userId: string | undefined): Pro
 				date: new Date().toISOString(),
 			};
 
-			const corporatePayments = await db.collection("payments").find({corporate: userId}).toArray();
+			const corporatePayments = await db.collection("payments").find({ corporate: userId }).toArray();
 			if (corporatePayments.length === 0) {
 				await addPaymentRecord(data);
 				return true;
@@ -71,17 +71,20 @@ const managePaymentRecords = async (user: User, userId: string | undefined): Pro
 
 async function handler(req: NextApiRequest, res: NextApiResponse) {
 	if (!req.session.user) {
-		res.status(401).json({ok: false});
+		res.status(401).json({ ok: false });
 		return;
 	}
 
 	const queryId = req.query.id as string;
 
-	let user = await db.collection("users").findOne<User>({id: queryId ? (queryId as string) : req.session.user.id});
+	let user = await db.collection("users").findOne<User>({ id: queryId ? (queryId as string) : req.session.user.id });
-	const updatedUser = req.body as User & {password?: string; newPassword?: string};
+	const updatedUser = req.body as User & { password?: string; newPassword?: string };
 
 	if (!!queryId) {
-		await db.collection("users").updateOne({id: queryId}, {$set: updatedUser});
+		await db.collection("users").updateOne(
+			{ id: queryId },
+			{ $set: updatedUser }
+		);
 
 		await managePaymentRecords(updatedUser, updatedUser.id);
 		if (updatedUser.status || updatedUser.type === "corporate") {
@@ -90,7 +93,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 			propagateExpiryDateChanges(queryId, user?.subscriptionExpirationDate, updatedUser.subscriptionExpirationDate || null);
 		}
 
-		res.status(200).json({ok: true});
+		res.status(200).json({ ok: true });
 		return;
 	}
 
@@ -110,17 +113,17 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 			const credential = await signInWithEmailAndPassword(auth, req.session.user.email, updatedUser.password);
 			await updatePassword(credential.user, updatedUser.newPassword);
 		} catch {
-			res.status(400).json({error: "E001", message: errorMessages.E001});
+			res.status(400).json({ error: "E001", message: errorMessages.E001 });
 			return;
 		}
 	}
 
 	if (updatedUser.email !== req.session.user.email && updatedUser.password) {
 		try {
-			const usersWithSameEmail = await db.collection("users").find({email: updatedUser.email.toLowerCase()}).toArray();
+			const usersWithSameEmail = await db.collection("users").find({ email: updatedUser.email.toLowerCase() }).toArray();
 
 			if (usersWithSameEmail.length > 0) {
-				res.status(400).json({error: "E003", message: errorMessages.E003});
+				res.status(400).json({ error: "E003", message: errorMessages.E003 });
 				return;
 			}
 
@@ -128,24 +131,22 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 			await updateEmail(credential.user, updatedUser.email);
 
 			if (req.session.user.type === "student") {
-				const corporateAdmins = (await db.collection("users").find<User>({type: "corporate"}).toArray()).map((x) => x.id);
+				const corporateAdmins = (await db.collection("users").find<User>({ type: "corporate" }).toArray()).map((x) => x.id);
 
-				const groups = await db
+				const groups = await db.collection("groups").find<Group>({
-					.collection("groups")
+					participants: req.session.user!.id,
-					.find<Group>({
+					admin: { $in: corporateAdmins }
-						participants: req.session.user!.id,
+				}).toArray();
-						admin: {$in: corporateAdmins},
-					})
-					.toArray();
 
 				groups.forEach(async (group) => {
-					await db
+					await db.collection("groups").updateOne(
-						.collection("groups")
+						{ id: group.id },
-						.updateOne({id: group.id}, {$set: {participants: group.participants.filter((x) => x !== req.session.user!.id)}});
+						{ $set: { participants: group.participants.filter((x) => x !== req.session.user!.id) } }
+					);
 				});
 			}
 		} catch {
-			res.status(400).json({error: "E002", message: errorMessages.E002});
+			res.status(400).json({ error: "E002", message: errorMessages.E002 });
 			return;
 		}
 	}
@@ -158,18 +159,22 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	delete updatedUser.password;
 	delete updatedUser.newPassword;
 
-	await db.collection("users").updateOne({id: queryId}, {$set: updatedUser});
+	await db.collection("users").updateOne(
+		{ id: queryId },
+		{ $set: updatedUser }
+	);
+
+	user = await db.collection("users").findOne<User>({ id: req.session.user.id });
 
 	if (!queryId) {
-		req.session.user = updatedUser ? {...updatedUser, id: req.session.user.id} : null;
+		req.session.user = user ? user : null;
 		await req.session.save();
 	}
 
-	if ({...updatedUser, id: req.session.user!.id}) {
+	if (user) {
-		await managePaymentRecords({...updatedUser, id: req.session.user!.id}, queryId);
+		await managePaymentRecords(user, queryId);
 	}
-
+	res.status(200).json({ user });
-	res.status(200).json({user: {...updatedUser, id: req.session.user!.id}});
 }
 
 export const config = {

src/pages/exam.tsx

@@ -10,7 +10,7 @@ import {User} from "@/interfaces/user";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/exercises.tsx

@@ -10,7 +10,7 @@ import {User} from "@/interfaces/user";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/generation.tsx

@@ -27,7 +27,7 @@ import {User} from "@/interfaces/user";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/groups.tsx

@@ -43,7 +43,7 @@ import {getUsers} from "@/utils/users.be";
 export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/index.tsx

@@ -46,7 +46,7 @@ export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 			envVariables[x] = process.env[x]!;
 		});
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",
@@ -78,8 +78,12 @@ export default function Home({linkedCorporate}: Props) {
 
 	useEffect(() => {
 		if (user) {
-			console.log(user.demographicInformation);
+			setShowDemographicInput(
-			setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone);
+				!user.demographicInformation ||
+					!user.demographicInformation.country ||
+					!user.demographicInformation.gender ||
+					!user.demographicInformation.phone,
+			);
 			setShowDiagnostics(user.isFirstLogin && user.type === "student");
 		}
 	}, [user]);

src/pages/list/users.tsx

@@ -1,6 +1,5 @@
 import Layout from "@/components/High/Layout";
 import useUser from "@/hooks/useUser";
-import useUsers from "@/hooks/useUsers";
 import {sessionOptions} from "@/lib/session";
 import useFilterStore from "@/stores/listFilterStore";
 import {withIronSessionSsr} from "iron-session/next";
@@ -21,7 +20,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			envVariables[x] = process.env[x]!;
 		});
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/login.tsx

@@ -28,7 +28,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			envVariables[x] = process.env[x]!;
 		});
 
-	if (user) {
+	if (user && user.isVerified) {
 		return {
 			redirect: {
 				destination: "/",
@@ -56,7 +56,7 @@ export default function Login() {
 	});
 
 	useEffect(() => {
-		if (user) router.push("/");
+		if (user && user.isVerified) router.push("/");
 	}, [router, user]);
 
 	const forgotPassword = () => {
@@ -173,7 +173,7 @@ export default function Login() {
 							</span>
 						</>
 					)}
-					{/* {user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />} */}
+					{user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />}
 				</section>
 			</main>
 		</>

src/pages/payment.tsx

@@ -16,7 +16,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			envVariables[x] = process.env[x]!;
 		});
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/permissions/[id].tsx

@@ -32,7 +32,7 @@ export const getServerSideProps = withIronSessionSsr(async (context) => {
 	const {req, params} = context;
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/permissions/index.tsx

@@ -12,7 +12,7 @@ import PermissionList from "@/components/PermissionList";
 export const getServerSideProps = withIronSessionSsr(async ({req}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/profile.tsx

@@ -50,7 +50,7 @@ import {getUsers} from "@/utils/users.be";
 export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/record.tsx

@@ -29,7 +29,7 @@ import useGradingSystem from "@/hooks/useGrading";
 export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/register.tsx

@@ -121,7 +121,7 @@ export default function Register({code: queryCode}: {code: string}) {
 							</Link>
 						</>
 					)}
-					{/* {user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />} */}
+					{user && !user.isVerified && <EmailVerification user={user} isLoading={isLoading} setIsLoading={setIsLoading} />}
 				</section>
 			</main>
 		</>

src/pages/settings.tsx

@@ -31,7 +31,7 @@ import useUsers from "@/hooks/useUsers";
 
 export const getServerSideProps = withIronSessionSsr(async ({req, res}) => {
 	const user = req.session.user;
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/stats.tsx

@@ -34,7 +34,7 @@ const COLORS = ["#1EB3FF", "#FF790A", "#3D9F11", "#EF5DA8", "#414288"];
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/tickets.tsx

@@ -22,7 +22,7 @@ const columnHelper = createColumnHelper<TicketWithCorporate>();
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/training/[id]/index.tsx

@@ -35,7 +35,7 @@ import {sortByModule} from "@/utils/moduleUtils";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",

src/pages/training/index.tsx

@@ -1,30 +1,30 @@
 /* eslint-disable @next/next/no-img-element */
 import Head from "next/head";
-import {withIronSessionSsr} from "iron-session/next";
+import { withIronSessionSsr } from "iron-session/next";
-import {sessionOptions} from "@/lib/session";
+import { sessionOptions } from "@/lib/session";
-import {User} from "@/interfaces/user";
+import { User } from "@/interfaces/user";
-import {ToastContainer} from "react-toastify";
+import { ToastContainer } from "react-toastify";
 import Layout from "@/components/High/Layout";
-import {shouldRedirectHome} from "@/utils/navigation.disabled";
+import { shouldRedirectHome } from "@/utils/navigation.disabled";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import clsx from "clsx";
-import {FaPlus} from "react-icons/fa";
+import { FaPlus } from "react-icons/fa";
 import useRecordStore from "@/stores/recordStore";
 import router from "next/router";
 import useTrainingContentStore from "@/stores/trainingContentStore";
 import axios from "axios";
-import {ITrainingContent} from "@/training/TrainingInterfaces";
+import { ITrainingContent } from "@/training/TrainingInterfaces";
 import moment from "moment";
-import {uuidv4} from "@firebase/util";
+import { uuidv4 } from "@firebase/util";
 import TrainingScore from "@/training/TrainingScore";
 import ModuleBadge from "@/components/ModuleBadge";
 import RecordFilter from "@/components/Medium/RecordFilter";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 
-export const getServerSideProps = withIronSessionSsr(({req, res}) => {
+export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 	const user = req.session.user;
 
-	if (!user) {
+	if (!user || !user.isVerified) {
 		return {
 			redirect: {
 				destination: "/login",
@@ -43,23 +43,22 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	}
 
 	return {
-		props: {user: req.session.user},
+		props: { user: req.session.user },
 	};
 }, sessionOptions);
 
-const Training: React.FC<{user: User}> = ({user}) => {
+const Training: React.FC<{ user: User }> = ({ user }) => {
-	const [recordUserId, setRecordTraining] = useRecordStore((state) => [state.selectedUser, state.setTraining]);
+	const [recordUserId, setRecordTraining] = useRecordStore((state) => [
+		state.selectedUser,
+		state.setTraining,
+	]);
 	const [filter, setFilter] = useState<"months" | "weeks" | "days" | "assignments">();
 
 	const [stats, setTrainingStats] = useTrainingContentStore((state) => [state.stats, state.setStats]);
 	const [isNewContentLoading, setIsNewContentLoading] = useState(stats.length != 0);
-	const [groupedByTrainingContent, setGroupedByTrainingContent] = useState<{[key: string]: ITrainingContent}>();
+	const [groupedByTrainingContent, setGroupedByTrainingContent] = useState<{ [key: string]: ITrainingContent }>();
 
-	const {data: trainingContent, isLoading: areRecordsLoading} = useFilterRecordsByUser<ITrainingContent[]>(
+	const { data: trainingContent, isLoading: areRecordsLoading } = useFilterRecordsByUser<ITrainingContent[]>(recordUserId || user?.id, undefined, "training");
-		recordUserId || user?.id,
-		undefined,
-		"training",
-	);
 
 	useEffect(() => {
 		const handleRouteChange = (url: string) => {
@@ -75,7 +74,7 @@ const Training: React.FC<{user: User}> = ({user}) => {
 	useEffect(() => {
 		const postStats = async () => {
 			try {
-				const response = await axios.post<{id: string}>(`/api/training`, {userID: user.id, stats: stats});
+				const response = await axios.post<{ id: string }>(`/api/training`, { userID: user.id, stats: stats });
 				return response.data.id;
 			} catch (error) {
 				setIsNewContentLoading(false);
@@ -98,12 +97,12 @@ const Training: React.FC<{user: User}> = ({user}) => {
 		router.push("/record");
 	};
 
-	const filterTrainingContentByDate = (trainingContent: {[key: string]: ITrainingContent}) => {
+	const filterTrainingContentByDate = (trainingContent: { [key: string]: ITrainingContent }) => {
 		if (filter) {
 			const filterDate = moment()
-				.subtract({[filter as string]: 1})
+				.subtract({ [filter as string]: 1 })
 				.format("x");
-			const filteredTrainingContent: {[key: string]: ITrainingContent} = {};
+			const filteredTrainingContent: { [key: string]: ITrainingContent } = {};
 
 			Object.keys(trainingContent).forEach((timestamp) => {
 				if (timestamp >= filterDate) filteredTrainingContent[timestamp] = trainingContent[timestamp];
@@ -118,10 +117,10 @@ const Training: React.FC<{user: User}> = ({user}) => {
 			const grouped = trainingContent.reduce((acc, content) => {
 				acc[content.created_at] = content;
 				return acc;
-			}, {} as {[key: number]: ITrainingContent});
+			}, {} as { [key: number]: ITrainingContent });
 
 			setGroupedByTrainingContent(grouped);
-		} else {
+		}else {
 			setGroupedByTrainingContent(undefined);
 		}
 	}, [trainingContent]);
@@ -193,7 +192,7 @@ const Training: React.FC<{user: User}> = ({user}) => {
 					</div>
 				) : (
 					<>
-						<RecordFilter user={user} filterState={{filter: filter, setFilter: setFilter}} assignments={false}>
+						<RecordFilter user={user} filterState={{ filter: filter, setFilter: setFilter }} assignments={false} >
 							{user.type === "student" && (
 								<>
 									<div className="flex items-center">

src/utils/users.be.ts

@@ -25,17 +25,20 @@ export async function getSpecificUsers(ids: string[]) {
 		.toArray();
 }
 
+type Query = { [key: string]: string | string[] | undefined };
+
+
 export async function getLinkedUsers(
 	userID?: string,
 	userType?: Type,
-	type?: Type,
+	query?: Query,
 	page?: number,
 	size?: number,
 	sort?: string,
 	direction?: "asc" | "desc",
 ) {
 	const filters = {
-		...(!!type ? {type} : {}),
+		...(!!query ? query : {}),
 	};
 
 	if (!userID || userType === "admin" || userType === "developer") {

yarn.lock

@@ -191,7 +191,7 @@
     "@emotion/utils" "0.11.3"
     "@emotion/weak-memoize" "0.2.5"
 
-"@emotion/cache@^11.13.0", "@emotion/cache@^11.4.0":
+"@emotion/cache@^11.13.0":
   version "11.13.1"
   resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
   integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
@@ -202,16 +202,27 @@
     "@emotion/weak-memoize" "^0.4.0"
     stylis "4.2.0"
 
-"@emotion/hash@0.8.0":
+"@emotion/cache@^11.4.0":
-  version "0.8.0"
+  version "11.13.1"
-  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
+  resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
-  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+  integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
+  dependencies:
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/sheet" "^1.4.0"
+    "@emotion/utils" "^1.4.0"
+    "@emotion/weak-memoize" "^0.4.0"
+    stylis "4.2.0"
 
 "@emotion/hash@^0.9.2":
   version "0.9.2"
   resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz"
   integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==
 
+"@emotion/hash@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+
 "@emotion/is-prop-valid@^0.8.2":
   version "0.8.8"
   resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
@@ -219,16 +230,16 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
-"@emotion/memoize@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
-  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
-
 "@emotion/memoize@^0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz"
   integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==
 
+"@emotion/memoize@0.7.4":
+  version "0.7.4"
+  resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
+  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
+
 "@emotion/react@^11.8.1":
   version "11.13.0"
   resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz"
@@ -254,7 +265,7 @@
     "@emotion/utils" "0.11.3"
     csstype "^2.5.7"
 
-"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0":
+"@emotion/serialize@^1.2.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
   integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
@@ -265,56 +276,67 @@
     "@emotion/utils" "^1.4.0"
     csstype "^3.0.2"
 
-"@emotion/sheet@0.9.4":
+"@emotion/serialize@^1.3.0":
-  version "0.9.4"
+  version "1.3.0"
-  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
+  resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
-  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
+  integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
+  dependencies:
+    "@emotion/hash" "^0.9.2"
+    "@emotion/memoize" "^0.9.0"
+    "@emotion/unitless" "^0.9.0"
+    "@emotion/utils" "^1.4.0"
+    csstype "^3.0.2"
 
 "@emotion/sheet@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz"
   integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==
 
+"@emotion/sheet@0.9.4":
+  version "0.9.4"
+  resolved "https://registry.npmjs.org/@emotion/sheet/-/sheet-0.9.4.tgz"
+  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
+
 "@emotion/stylis@0.8.5":
   version "0.8.5"
   resolved "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz"
   integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
 
-"@emotion/unitless@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
-  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
-
 "@emotion/unitless@^0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz"
   integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==
 
+"@emotion/unitless@0.7.5":
+  version "0.7.5"
+  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz"
+  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
+
 "@emotion/use-insertion-effect-with-fallbacks@^1.1.0":
   version "1.1.0"
   resolved "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.1.0.tgz"
   integrity sha512-+wBOcIV5snwGgI2ya3u99D7/FJquOIniQT1IKyDsBmEgwvpxMNeS65Oib7OnE2d2aY+3BU4OiH+0Wchf8yk3Hw==
 
-"@emotion/utils@0.11.3":
-  version "0.11.3"
-  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
-  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
-
 "@emotion/utils@^1.4.0":
   version "1.4.0"
   resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz"
   integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==
 
-"@emotion/weak-memoize@0.2.5":
+"@emotion/utils@0.11.3":
-  version "0.2.5"
+  version "0.11.3"
-  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
+  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz"
-  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
+  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
 
 "@emotion/weak-memoize@^0.4.0":
   version "0.4.0"
   resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
   integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
 
+"@emotion/weak-memoize@0.2.5":
+  version "0.2.5"
+  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"
+  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
+
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
   resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"
@@ -489,7 +511,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.3.4", "@firebase/database-compat@^0.3.4":
+"@firebase/database-compat@^0.3.4", "@firebase/database-compat@0.3.4":
   version "0.3.4"
   resolved "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.3.4.tgz"
   integrity sha512-kuAW+l+sLMUKBThnvxvUZ+Q1ZrF/vFJ58iUY9kAcbX48U03nVzIF6Tmkf0p3WVQwMqiXguSgtOPIB6ZCeF+5Gg==
@@ -501,7 +523,7 @@
     "@firebase/util" "1.9.3"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.10.4", "@firebase/database-types@^0.10.4":
+"@firebase/database-types@^0.10.4", "@firebase/database-types@0.10.4":
   version "0.10.4"
   resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.10.4.tgz"
   integrity sha512-dPySn0vJ/89ZeBac70T+2tWWPiJXWbmRygYv0smT5TfE3hDrQ09eKMF3Y+vMlTdrMWq7mUdYW5REWPSGH4kAZQ==
@@ -722,13 +744,6 @@
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/util@1.9.3":
-  version "1.9.3"
-  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz"
-  integrity sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==
-  dependencies:
-    tslib "^2.1.0"
-
 "@firebase/util@^1.9.7":
   version "1.9.7"
   resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.7.tgz"
@@ -736,6 +751,13 @@
   dependencies:
     tslib "^2.1.0"
 
+"@firebase/util@1.9.3":
+  version "1.9.3"
+  resolved "https://registry.npmjs.org/@firebase/util/-/util-1.9.3.tgz"
+  integrity sha512-DY02CRhOZwpzO36fHpuVysz6JZrscPiBXD0fXp6qSrL9oNOx5KWICKdR95C0lSITzxp0TZosVyHqzatE8JbcjA==
+  dependencies:
+    tslib "^2.1.0"
+
 "@firebase/webchannel-wrapper@0.9.0":
   version "0.9.0"
   resolved "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.9.0.tgz"
@@ -998,46 +1020,6 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz#d0a160cf78c18731c51cc0bff131c706b3e9bb05"
-  integrity sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==
-
-"@next/swc-darwin-x64@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz#eb832a992407f6e6352eed05a073379f1ce0589c"
-  integrity sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==
-
-"@next/swc-linux-arm64-gnu@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz#098fdab57a4664969bc905f5801ef5a89582c689"
-  integrity sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==
-
-"@next/swc-linux-arm64-musl@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz#243a1cc1087fb75481726dd289c7b219fa01f2b5"
-  integrity sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==
-
-"@next/swc-linux-x64-gnu@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz#b8a2e436387ee4a52aa9719b718992e0330c4953"
-  integrity sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==
-
-"@next/swc-linux-x64-musl@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz#cb8a9adad5fb8df86112cfbd363aab5c6d32757b"
-  integrity sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==
-
-"@next/swc-win32-arm64-msvc@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz#81f996c1c38ea0900d4e7719cc8814be8a835da0"
-  integrity sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==
-
-"@next/swc-win32-ia32-msvc@14.2.5":
-  version "14.2.5"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz#f61c74ce823e10b2bc150e648fc192a7056422e0"
-  integrity sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==
-
 "@next/swc-win32-x64-msvc@14.2.5":
   version "14.2.5"
   resolved "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz"
@@ -1051,7 +1033,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -1609,14 +1591,6 @@
   resolved "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz"
   integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
 
-"@swc/helpers@0.5.5":
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz"
-  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
-  dependencies:
-    "@swc/counter" "^0.1.3"
-    tslib "^2.4.0"
-
 "@swc/helpers@^0.4.2":
   version "0.4.14"
   resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz"
@@ -1631,6 +1605,14 @@
   dependencies:
     tslib "^2.4.0"
 
+"@swc/helpers@0.5.5":
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz"
+  integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+    tslib "^2.4.0"
+
 "@tanstack/react-table@^8.10.1":
   version "8.19.3"
   resolved "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.19.3.tgz"
@@ -1844,7 +1826,7 @@
   resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/node@*", "@types/node@18.13.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
+"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@18.13.0":
   version "18.13.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"
   integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
@@ -2670,7 +2652,7 @@ classnames@^2.2.6, classnames@^2.3.0, classnames@^2.5.1:
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
 
-client-only@0.0.1, client-only@^0.0.1:
+client-only@^0.0.1, client-only@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz"
   integrity sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==
@@ -2693,16 +2675,20 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
-clsx@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz"
-  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
-
 clsx@^1.1.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"
@@ -2713,6 +2699,11 @@ clsx@^2.0.0, clsx@^2.1.1:
   resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"
   integrity sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==
 
+clsx@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz"
+  integrity sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==
+
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@@ -2727,16 +2718,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
 color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
 color-string@^1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -2962,13 +2953,6 @@ dayjs@^1.8.34:
   resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-debug@4, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
@@ -2976,6 +2960,13 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@4:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
@@ -3150,7 +3141,7 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecdsa-sig-formatter@1.0.11, ecdsa-sig-formatter@^1.0.11:
+ecdsa-sig-formatter@^1.0.11, ecdsa-sig-formatter@1.0.11:
   version "1.0.11"
   resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"
   integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
@@ -3903,11 +3894,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
-  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-
 fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz"
@@ -4010,7 +3996,7 @@ get-tsconfig@^4.2.0:
   resolved "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.4.0.tgz"
   integrity sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==
 
-glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -4024,29 +4010,12 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@7.1.6:
+glob-parent@~5.1.2:
-  version "7.1.6"
+  version "5.1.2"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
-    fs.realpath "^1.0.0"
+    is-glob "^4.0.1"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.7, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.7"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
 glob@^10.4.2:
   version "10.4.5"
@@ -4060,6 +4029,18 @@ glob@^10.4.2:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
+glob@^7.1.3, glob@^7.1.4, glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.2.3:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
@@ -4083,6 +4064,18 @@ glob@^8.0.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+glob@7.1.6:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
@@ -4381,7 +4374,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:
+inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3, inherits@2:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5069,18 +5062,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lru-cache@6.0.0, lru-cache@^6.0.0:
+lru-cache@^10.2.0:
+  version "10.4.3"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
+  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+
+lru-cache@^6.0.0, lru-cache@6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
-
 lru-memoizer@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.3.0.tgz"
@@ -5156,7 +5149,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
+"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -5180,7 +5173,14 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1, minimatch@^5.1.0:
+minimatch@^5.0.1:
+  version "5.1.6"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^5.1.0:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
   integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
@@ -5224,6 +5224,11 @@ minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 "mkdirp@>=0.5 0":
   version "0.5.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
@@ -5231,11 +5236,6 @@ minizlib@^2.1.1:
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 moment-timezone@^0.5.44:
   version "0.5.45"
   resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz"
@@ -5265,7 +5265,7 @@ mongodb@^6.8.1:
     bson "^6.7.0"
     mongodb-connection-string-url "^3.0.0"
 
-ms@2.1.2, ms@^2.1.1:
+ms@^2.1.1, ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -5327,14 +5327,21 @@ node-addon-api@^5.0.0:
   resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz"
   integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
 
-node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7:
+node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.12, node-fetch@^2.6.9:
+node-fetch@^2.6.12:
+  version "2.7.0"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-fetch@^2.6.9:
   version "2.7.0"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
   integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -5695,7 +5702,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.31, postcss@^8, postcss@^8.0.9, postcss@^8.4.21:
+postcss@^8, postcss@^8.0.9, postcss@^8.4.21, postcss@8.4.31:
   version "8.4.31"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -5737,15 +5744,6 @@ promise-polyfill@^8.3.0:
   resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.3.0.tgz"
   integrity sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==
 
-prop-types@15.7.2:
-  version "15.7.2"
-  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
-  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
-  dependencies:
-    loose-envify "^1.4.0"
-    object-assign "^4.1.1"
-    react-is "^16.8.1"
-
 prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
@@ -5755,6 +5753,15 @@ prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+prop-types@15.7.2:
+  version "15.7.2"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz"
+  integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.8.1"
+
 proto3-json-serializer@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz"
@@ -5778,24 +5785,6 @@ protobufjs-cli@1.1.1:
     tmp "^0.2.1"
     uglify-js "^3.7.7"
 
-protobufjs@7.2.4:
-  version "7.2.4"
-  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
-  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/node" ">=13.7.0"
-    long "^5.0.0"
-
 protobufjs@^6.11.3:
   version "6.11.3"
   resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"
@@ -5851,6 +5840,24 @@ protobufjs@^7.2.5:
     "@types/node" ">=13.7.0"
     long "^5.0.0"
 
+protobufjs@7.2.4:
+  version "7.2.4"
+  resolved "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"
+  integrity sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/node" ">=13.7.0"
+    long "^5.0.0"
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"
@@ -6152,7 +6159,33 @@ read-excel-file@^5.7.1:
     fflate "^0.7.3"
     unzipper "^0.12.2"
 
-readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@~2.3.6:
+readable-stream@^2.0.0:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^2.0.2:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^2.0.5:
   version "2.3.8"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -6174,6 +6207,19 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@~2.3.6:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readdir-glob@^1.1.2:
   version "1.1.3"
   resolved "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz"
@@ -6280,13 +6326,6 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@2:
-  version "2.7.1"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
@@ -6294,6 +6333,13 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@2:
+  version "2.7.1"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -6301,7 +6347,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6508,6 +6554,20 @@ streamsearch@^1.1.0:
   resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"
   integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 "string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -6567,20 +6627,6 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -7035,7 +7081,7 @@ use-sidecar@^1.1.2:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
+use-sync-external-store@^1.2.0, use-sync-external-store@1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
   integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
@@ -7045,7 +7091,12 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-uuid@^8.0.0, uuid@^8.3.0:
+uuid@^8.0.0:
+  version "8.3.2"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
+uuid@^8.3.0:
   version "8.3.2"
   resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -7280,6 +7331,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -7310,6 +7366,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"