Had the type hardcoded

Bug fixing 8 sep 24

Approved-by: Tiago Ribeiro

Dockerfile

@@ -23,6 +23,8 @@ COPY . .
 # Uncomment the following line in case you want to disable telemetry during the build.
 # ENV NEXT_TELEMETRY_DISABLED 1
 
+ENV MONGODB_URI "mongodb+srv://user:JKpFBymv0WLv3STj@encoach.lz18a.mongodb.net/?retryWrites=true&w=majority&appName=EnCoach"
+
 RUN yarn build
 
 # If using npm comment out above and use below instead

src/components/DemographicInformationInput.tsx

@@ -42,7 +42,7 @@ export default function DemographicInformationInput({user, mutateUser}: Props) {
 		setIsLoading(true);
 
 		axios
-			.patch("/api/users/update", {
+			.patch<{user: User}>("/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 as {user: User}).user))
+			.then((response) => mutateUser(response.data.user))
 			.catch(() => {
 				toast.error("Something went wrong, please try again later!", {toastId: "user-update-error"});
 			})
@@ -89,7 +89,15 @@ 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 type="tel" name="phone" label="Phone number" onChange={(e) => setPhone(e)} value={phone} placeholder="Enter phone number" required />
+					<Input
+						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 >= user.desiredLevels.reading,
+			achieved: user.levels?.reading || 0 >= user.desiredLevels?.reading || 9,
 		},
 
 		{
 			module: "listening",
 			icon: () => <BsHeadphones className="h-4 w-4 text-white" />,
-			achieved: user.levels.listening >= user.desiredLevels.listening,
+			achieved: user.levels?.listening || 0 >= user.desiredLevels?.listening || 9,
 		},
 		{
 			module: "writing",
 			icon: () => <BsPen className="h-4 w-4 text-white" />,
-			achieved: user.levels.writing >= user.desiredLevels.writing,
+			achieved: user.levels?.writing || 0 >= user.desiredLevels?.writing || 9,
 		},
 		{
 			module: "speaking",
 			icon: () => <BsMegaphone className="h-4 w-4 text-white" />,
-			achieved: user.levels.speaking >= user.desiredLevels.speaking,
+			achieved: user.levels?.speaking || 0 >= user.desiredLevels?.speaking || 9,
 		},
 		{
 			module: "level",
 			icon: () => <BsClipboard className="h-4 w-4 text-white" />,
-			achieved: user.levels.level >= user.desiredLevels.level,
+			achieved: user.levels?.level || 0 >= user.desiredLevels?.level || 9,
 		},
 	];
 

src/dashboards/Corporate/index.tsx

@@ -1,8 +1,18 @@
 /* eslint-disable @next/next/no-img-element */
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useUsers, {userHashStudent, userHashTeacher, userHashCorporate} from "@/hooks/useUsers";
+import useUsers, {
-import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
+  userHashStudent,
+  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 moment from "moment";
@@ -26,10 +36,15 @@ import {
   BsArrowRepeat,
   BsPlus,
   BsEnvelopePaper,
+  BsDatabase,
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
+import {
+  averageLevelCalculator,
+  calculateAverageLevel,
+  calculateBandScore,
+} from "@/utils/score";
 import { MODULE_ARRAY } from "@/utils/moduleUtils";
 import { Module } from "@/interfaces";
 import { groupByExam } from "@/utils/stats";
@@ -49,7 +64,12 @@ import {createColumnHelper} from "@tanstack/react-table";
 import Checkbox from "@/components/Low/Checkbox";
 import List from "@/components/List";
 import { getUserCompanyName } from "@/resources/user";
-import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
+import {
+  futureAssignmentFilter,
+  pastAssignmentFilter,
+  archivedAssignmentFilter,
+  activeAssignmentFilter,
+} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";
 import AssignmentsPage from "../views/AssignmentsPage";
 import StudentPerformancePage from "./StudentPerformancePage";
@@ -78,16 +98,36 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
 
   const { data: stats } = useFilterRecordsByUser<Stat[]>();
   const { groups } = useGroups({ admin: user.id });
-	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
+  const {
+    assignments,
+    isLoading: isAssignmentsLoading,
+    reload: reloadAssignments,
+  } = useAssignments({ corporate: user.id });
   const { balance } = useUserBalance();
 
-	const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
+  const {
-	const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
+    users: students,
+    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 router = useRouter();
 
-	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
+  const assignmentsGroups = useMemo(
+    () =>
+      groups.filter(
+        (x) => x.admin === user.id || x.participants.includes(user.id)
+      ),
+    [groups, user.id]
+  );
 
   const assignmentsUsers = useMemo(
     () =>
@@ -97,22 +137,28 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
               .filter((g) => g.admin === selectedUser.id)
               .flatMap((g) => g.participants)
               .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(() => {
     setShowModal(!!selectedUser && router.asPath === "/#");
   }, [selectedUser, router.asPath]);
 
-	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
+  const getStatsByStudent = (user: User) =>
+    stats.filter((s) => s.user === user.id);
 
   const UserDisplay = (displayUser: User) => (
     <div
       onClick={() => setSelectedUser(displayUser)}
-			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
+      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
+        src={displayUser.profilePicture}
+        alt={displayUser.name}
+        className="rounded-full w-10 h-10"
+      />
       <div className="flex flex-col gap-1 items-start">
         <span>{displayUser.name}</span>
         <span className="text-sm opacity-75">{displayUser.email}</span>
@@ -120,19 +166,59 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
     </div>
   );
 
+  // this workaround will allow us toreuse the master statistical due to master corporate restraints
+  // while still being able to use the corporate user
+  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 = () => {
-		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
+    const filter = (x: Group) =>
+      x.admin === user.id || x.participants.includes(user.id);
 
     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">
+            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>
+          <h2 className="text-2xl font-semibold">
+            Groups ({groups.filter(filter).length})
+          </h2>
         </div>
 
         <GroupList user={user} />
@@ -150,7 +236,12 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
       .filter((f) => !!f.focus);
     const bandScores = formattedStats.map((s) => ({
       module: s.module,
-			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
+      level: calculateBandScore(
+        s.score.correct,
+        s.score.total,
+        s.module,
+        s.focus!
+      ),
     }));
 
     const levels: { [key in Module]: number } = {
@@ -174,7 +265,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
           <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">
+              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>
@@ -193,7 +285,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
           <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">
+              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>
@@ -204,7 +297,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
     );
 
   if (router.asPath === "/#groups") return <GroupsList />;
-	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
+  if (router.asPath === "/#studentsPerformance")
+    return <StudentPerformancePage user={user} />;
 
   if (router.asPath === "/#assignments")
     return (
@@ -218,6 +312,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
       />
     );
 
+  if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
+
   return (
     <>
       <Modal isOpen={showModal} onClose={() => setSelectedUser(undefined)}>
@@ -228,11 +324,14 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
                 loggedInUser={user}
                 onClose={(shouldReload) => {
                   setSelectedUser(undefined);
-									if (shouldReload && selectedUser!.type === "student") reloadStudents();
+                  if (shouldReload && selectedUser!.type === "student")
-									if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
+                    reloadStudents();
+                  if (shouldReload && selectedUser!.type === "teacher")
+                    reloadTeachers();
                 }}
                 onViewStudents={
-									selectedUser.type === "corporate" || selectedUser.type === "teacher"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "teacher"
                     ? () => {
                         appendUserFilters({
                           id: "view-students",
@@ -242,7 +341,11 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });
@@ -252,7 +355,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
                     : undefined
                 }
                 onViewTeachers={
-									selectedUser.type === "corporate" || selectedUser.type === "student"
+                  selectedUser.type === "corporate" ||
+                  selectedUser.type === "student"
                     ? () => {
                         appendUserFilters({
                           id: "view-teachers",
@@ -262,7 +366,11 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
                           id: "belongs-to-admin",
                           filter: (x: User) =>
                             groups
-															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
+                              .filter(
+                                (g) =>
+                                  g.admin === selectedUser.id ||
+                                  g.participants.includes(selectedUser.id)
+                              )
                               .flatMap((g) => g.participants)
                               .includes(x.id),
                         });
@@ -281,7 +389,11 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
       <>
         {!!linkedCorporate && (
           <div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-						Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
+            Linked to:{" "}
+            <b>
+              {linkedCorporate?.corporateInformation?.companyInformation.name ||
+                linkedCorporate.name}
+            </b>
           </div>
         )}
         <section className="grid grid-cols-5 -md:grid-cols-2 gap-4 text-center">
@@ -304,27 +416,47 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
           <IconCard
             Icon={BsClipboard2Data}
             label="Exams Performed"
-						value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
+            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)}
+            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 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}`}
+            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"}
+            value={
+              user.subscriptionExpirationDate
+                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
+                : "Unlimited"
+            }
             color="rose"
           />
           <IconCard
@@ -335,15 +467,24 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
             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">
+            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}
+                {isAssignmentsLoading
+                  ? "Loading..."
+                  : assignments.filter((a) => !a.archived).length}
               </span>
             </span>
           </button>
@@ -374,7 +515,11 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
             <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))
+                .sort(
+                  (a, b) =>
+                    calculateAverageLevel(b.levels) -
+                    calculateAverageLevel(a.levels)
+                )
                 .map((x) => (
                   <UserDisplay key={x.id} {...x} />
                 ))}
@@ -386,7 +531,8 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
               {students
                 .sort(
                   (a, b) =>
-										Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
+                    Object.keys(groupByExam(getStatsByStudent(b))).length -
+                    Object.keys(groupByExam(getStatsByStudent(a))).length
                 )
                 .map((x) => (
                   <UserDisplay key={x.id} {...x} />

src/dashboards/MasterCorporate/MasterStatisticalPage.tsx

@@ -7,23 +7,14 @@ import {BsArrowLeft} from "react-icons/bs";
 import MasterStatistical from "./MasterStatistical";
 
 interface Props {
-	user: User;
+	groupedByNameCorporates: Record<string, CorporateUser[]>;
 }
 
-const MasterStatisticalPage = () => {
+const MasterStatisticalPage = ({ groupedByNameCorporates }: Props) => {
 	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,6 +129,20 @@ 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 (
 			<>
@@ -148,7 +162,7 @@ export default function MasterCorporateDashboard({user}: Props) {
 	};
 
 	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
-	if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
+	if (router.asPath === "/#statistical") return <MasterStatisticalPage groupedByNameCorporates={groupedByNameCorporates} />;
 	if (router.asPath === "/#groups") return <GroupsList />;
 
 	if (router.asPath === "/#students")
@@ -360,7 +374,7 @@ export default function MasterCorporateDashboard({user}: Props) {
 						color="purple"
 						onClick={() => router.push("/#corporate")}
 					/>
-					<IconCard Icon={BsBank} label="Corporate" value={totalCorporate} isLoading={isCorporatesLoading} color="purple" />
+					<IconCard Icon={BsBank} label="Corporate" value={groupedByNameCorporatesKeys.length} 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 {Variant} from "@/interfaces/exam";
+import {ShuffleMap, Shuffles, Variant} from "@/interfaces/exam";
 import useSessions, {Session} from "@/hooks/useSessions";
 import SessionCard from "@/components/Medium/SessionCard";
 import useExamStore from "@/stores/examStore";
@@ -41,6 +41,7 @@ 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 && user.isVerified) ||
+			(redirectIfFound && user) ||
 			// If redirectTo is set, redirect if the user was not found.
-			(redirectTo && !redirectIfFound && (!user || (user && !user.isVerified)))
+			(redirectTo && !redirectIfFound && !user)
 		) {
 			Router.push(redirectTo);
 		}

src/lib/mongodb.ts

@@ -4,7 +4,7 @@ if (!process.env.MONGODB_URI) {
 	throw new Error('Invalid/Missing environment variable: "MONGODB_URI"');
 }
 
-const uri = process.env.MONGODB_URI;
+const uri = process.env.MONGODB_URI || "";
 const options = {};
 
 let client: MongoClient;

src/pages/api/users/update.ts

@@ -81,10 +81,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	const updatedUser = req.body as User & {password?: string; newPassword?: string};
 
 	if (!!queryId) {
-		await db.collection("users").updateOne(
+		await db.collection("users").updateOne({id: queryId}, {$set: updatedUser});
-			{ id: queryId },
-			{ $set: updatedUser }
-		);
 
 		await managePaymentRecords(updatedUser, updatedUser.id);
 		if (updatedUser.status || updatedUser.type === "corporate") {
@@ -133,16 +130,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 			if (req.session.user.type === "student") {
 				const corporateAdmins = (await db.collection("users").find<User>({type: "corporate"}).toArray()).map((x) => x.id);
 
-				const groups = await db.collection("groups").find<Group>({
+				const groups = await db
+					.collection("groups")
+					.find<Group>({
 						participants: req.session.user!.id,
-					admin: { $in: corporateAdmins }
+						admin: {$in: corporateAdmins},
-				}).toArray();
+					})
+					.toArray();
 
 				groups.forEach(async (group) => {
-					await db.collection("groups").updateOne(
+					await db
-						{ id: group.id },
+						.collection("groups")
-						{ $set: { participants: group.participants.filter((x) => x !== req.session.user!.id) } }
+						.updateOne({id: group.id}, {$set: {participants: group.participants.filter((x) => x !== req.session.user!.id)}});
-					);
 				});
 			}
 		} catch {
@@ -159,22 +158,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	delete updatedUser.password;
 	delete updatedUser.newPassword;
 
-	await db.collection("users").updateOne(
+	await db.collection("users").updateOne({id: queryId}, {$set: updatedUser});
-		{ id: queryId },
-		{ $set: updatedUser }
-	);
-
-	user = await db.collection("users").findOne<User>({ id: req.session.user.id });
 
 	if (!queryId) {
-		req.session.user = user ? user : null;
+		req.session.user = updatedUser ? {...updatedUser, id: req.session.user.id} : null;
 		await req.session.save();
 	}
 
-	if (user) {
+	if ({...updatedUser, id: req.session.user!.id}) {
-		await managePaymentRecords(user, queryId);
+		await managePaymentRecords({...updatedUser, id: req.session.user!.id}, 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 || !user.isVerified) {
+	if (!user) {
 		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 || !user.isVerified) {
+	if (!user) {
 		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 || !user.isVerified) {
+	if (!user) {
 		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 || !user.isVerified) {
+	if (!user) {
 		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 || !user.isVerified) {
+	if (!user) {
 		return {
 			redirect: {
 				destination: "/login",
@@ -78,12 +78,8 @@ export default function Home({linkedCorporate}: Props) {
 
 	useEffect(() => {
 		if (user) {
-			setShowDemographicInput(
+			console.log(user.demographicInformation);
-				!user.demographicInformation ||
+			setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone);
-					!user.demographicInformation.country ||
-					!user.demographicInformation.gender ||
-					!user.demographicInformation.phone,
-			);
 			setShowDiagnostics(user.isFirstLogin && user.type === "student");
 		}
 	}, [user]);

src/pages/list/users.tsx

@@ -21,7 +21,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 			envVariables[x] = process.env[x]!;
 		});
 
-	if (!user || !user.isVerified) {
+	if (!user) {
 		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 && user.isVerified) {
+	if (user) {
 		return {
 			redirect: {
 				destination: "/",
@@ -56,7 +56,7 @@ export default function Login() {
 	});
 
 	useEffect(() => {
-		if (user && user.isVerified) router.push("/");
+		if (user) 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-record.tsx

@@ -9,15 +9,7 @@ import { shouldRedirectHome } from "@/utils/navigation.disabled";
 import usePayments from "@/hooks/usePayments";
 import usePaypalPayments from "@/hooks/usePaypalPayments";
 import {Payment, PaypalPayment} from "@/interfaces/paypal";
-import {
+import {CellContext, createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable} from "@tanstack/react-table";
-  CellContext,
-  createColumnHelper,
-  flexRender,
-  getCoreRowModel,
-  HeaderGroup,
-  Table,
-  useReactTable,
-} from "@tanstack/react-table";
 import {CURRENCIES} from "@/resources/paypal";
 import {BsTrash} from "react-icons/bs";
 import axios from "axios";
@@ -43,7 +35,7 @@ import { checkAccess, getTypesOfUser } from "@/utils/permissions";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-  if (!user || !user.isVerified) {
+	if (!user) {
 		return {
 			redirect: {
 				destination: "/login",
@@ -52,19 +44,7 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 		};
 	}
 
-  if (
+	if (shouldRedirectHome(user) || checkAccess(user, getTypesOfUser(["admin", "developer", "agent", "corporate", "mastercorporate"]))) {
-    shouldRedirectHome(user) ||
-    checkAccess(
-      user,
-      getTypesOfUser([
-        "admin",
-        "developer",
-        "agent",
-        "corporate",
-        "mastercorporate",
-      ])
-    )
-  ) {
 		return {
 			redirect: {
 				destination: "/",
@@ -81,15 +61,7 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 const columnHelper = createColumnHelper<Payment>();
 const paypalColumnHelper = createColumnHelper<PaypalPaymentWithUserData>();
 
-const PaymentCreator = ({
+const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () => void; reload: () => void; showComission: boolean}) => {
-  onClose,
-  reload,
-  showComission = false,
-}: {
-  onClose: () => void;
-  reload: () => void;
-  showComission: boolean;
-}) => {
 	const [corporate, setCorporate] = useState<CorporateUser>();
 	const [date, setDate] = useState<Date>(new Date());
 
@@ -101,9 +73,7 @@ const PaymentCreator = ({
 
 	const referralAgent = useMemo(() => {
 		if (corporate?.corporateInformation?.referralAgent) {
-      return users.find(
+			return users.find((u) => u.id === corporate.corporateInformation.referralAgent);
-        (u) => u.id === corporate.corporateInformation.referralAgent
-      );
 		}
 
 		return undefined;
@@ -136,24 +106,16 @@ const PaymentCreator = ({
 			<h1 className="text-2xl font-semibold">New Payment</h1>
 			<div className="flex flex-col gap-4">
 				<div className="flex flex-col gap-3">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Corporate account *</label>
-            Corporate account *
-          </label>
 					<Select
 						className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
-            options={(
+						options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
-              users.filter((u) => u.type === "corporate") as CorporateUser[]
-            ).map((user) => ({
 							value: user.id,
 							meta: user,
-              label: `${
+							label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${user.email}`,
-                user.corporateInformation?.companyInformation?.name || user.name
-              } - ${user.email}`,
 						}))}
 						defaultValue={{value: "undefined", label: "Select an account"}}
-            onChange={(value) =>
+						onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
-              setCorporate((value as any)?.meta ?? undefined)
-            }
 						menuPortalTarget={document?.body}
 						styles={{
 							menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -168,11 +130,7 @@ const PaymentCreator = ({
 							}),
 							option: (styles, state) => ({
 								...styles,
-                backgroundColor: state.isFocused
+								backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                  ? "#D5D9F0"
-                  : state.isSelected
-                  ? "#7872BF"
-                  : "white",
 								color: state.isFocused ? "black" : styles.color,
 							}),
 						}}
@@ -180,19 +138,9 @@ const PaymentCreator = ({
 				</div>
 
 				<div className="flex flex-col gap-3 w-full">
-          <label className="font-normal text-base text-mti-gray-dim">
+					<label className="font-normal text-base text-mti-gray-dim">Price *</label>
-            Price *
-          </label>
 					<div className="w-full grid grid-cols-5 gap-2">
-            <Input
+						<Input name="paymentValue" onChange={() => {}} type="number" value={price} defaultValue={0} className="col-span-3" disabled />
-              name="paymentValue"
-              onChange={() => {}}
-              type="number"
-              value={price}
-              defaultValue={0}
-              className="col-span-3"
-              disabled
-            />
 						<Select
 							className="px-4 col-span-2 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-mti-gray-platinum/40 text-mti-gray-dim cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
 							options={CURRENCIES.map(({label, currency}) => ({
@@ -201,16 +149,12 @@ const PaymentCreator = ({
 							}))}
 							defaultValue={{
 								value: currency || "EUR",
-                label:
+								label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro",
-                  CURRENCIES.find((c) => c.currency === currency)?.label ||
-                  "Euro",
 							}}
 							onChange={() => {}}
 							value={{
 								value: currency || "EUR",
-                label:
+								label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro",
-                  CURRENCIES.find((c) => c.currency === currency)?.label ||
-                  "Euro",
 							}}
 							menuPortalTarget={document?.body}
 							styles={{
@@ -226,11 +170,7 @@ const PaymentCreator = ({
 								}),
 								option: (styles, state) => ({
 									...styles,
-                  backgroundColor: state.isFocused
+									backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                    ? "#D5D9F0"
-                    : state.isSelected
-                    ? "#7872BF"
-                    : "white",
 									color: state.isFocused ? "black" : styles.color,
 								}),
 							}}
@@ -241,27 +181,14 @@ const PaymentCreator = ({
 				{showComission && (
 					<div className="flex gap-4 w-full">
 						<div className="flex flex-col w-full gap-3">
-              <label className="font-normal text-base text-mti-gray-dim">
+							<label className="font-normal text-base text-mti-gray-dim">Commission *</label>
-                Commission *
+							<Input name="commission" onChange={() => {}} type="number" defaultValue={0} value={commission} disabled />
-              </label>
-              <Input
-                name="commission"
-                onChange={() => {}}
-                type="number"
-                defaultValue={0}
-                value={commission}
-                disabled
-              />
 						</div>
 						<div className="flex flex-col w-full gap-3">
-              <label className="font-normal text-base text-mti-gray-dim">
+							<label className="font-normal text-base text-mti-gray-dim">Commission Value*</label>
-                Commission Value*
-              </label>
 							<Input
 								name="commissionValue"
-                value={`${(commission! / 100) * price!} ${
+								value={`${(commission! / 100) * price!} ${CURRENCIES.find((c) => c.currency === currency)?.label}`}
-                  CURRENCIES.find((c) => c.currency === currency)?.label
-                }`}
 								onChange={() => null}
 								type="text"
 								defaultValue={0}
@@ -273,14 +200,12 @@ const PaymentCreator = ({
 
 				<div className="flex gap-4">
 					<div className="flex flex-col w-full gap-3">
-            <label className="font-normal text-base text-mti-gray-dim">
+						<label className="font-normal text-base text-mti-gray-dim">Date *</label>
-              Date *
-            </label>
 						<ReactDatePicker
 							className={clsx(
 								"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
 								"hover:border-mti-purple tooltip",
-                "transition duration-300 ease-in-out"
+								"transition duration-300 ease-in-out",
 							)}
 							dateFormat="dd/MM/yyyy"
 							selected={moment(date).toDate()}
@@ -289,16 +214,10 @@ const PaymentCreator = ({
 					</div>
 
 					<div className="flex flex-col w-full gap-3">
-            <label className="font-normal text-base text-mti-gray-dim">
+						<label className="font-normal text-base text-mti-gray-dim">Country Manager *</label>
-              Country Manager *
-            </label>
 						<Input
 							name="referralAgent"
-              value={
+							value={referralAgent ? `${referralAgent.name} - ${referralAgent.email}` : "No country manager"}
-                referralAgent
-                  ? `${referralAgent.name} - ${referralAgent.email}`
-                  : "No country manager"
-              }
 							onChange={() => null}
 							type="text"
 							defaultValue={"No country manager"}
@@ -307,19 +226,10 @@ const PaymentCreator = ({
 					</div>
 				</div>
 				<div className="flex w-full justify-end items-center gap-8 mt-4">
-          <Button
+					<Button variant="outline" color="red" className="w-full max-w-[200px]" onClick={onClose}>
-            variant="outline"
-            color="red"
-            className="w-full max-w-[200px]"
-            onClick={onClose}
-          >
 						Cancel
 					</Button>
-          <Button
+					<Button className="w-full max-w-[200px]" onClick={submit} disabled={!corporate || !price}>
-            className="w-full max-w-[200px]"
-            onClick={submit}
-            disabled={!corporate || !price}
-          >
 						Submit
 					</Button>
 				</div>
@@ -358,26 +268,9 @@ const IS_FILE_SUBMITTED_OPTIONS = [
 	},
 ];
 
-const CSV_PAYMENTS_WHITELISTED_KEYS = [
+const CSV_PAYMENTS_WHITELISTED_KEYS = ["corporateId", "corporate", "date", "amount", "agent", "agentCommission", "agentValue", "isPaid"];
-  "corporateId",
-  "corporate",
-  "date",
-  "amount",
-  "agent",
-  "agentCommission",
-  "agentValue",
-  "isPaid",
-];
 
-const CSV_PAYPAL_WHITELISTED_KEYS = [
+const CSV_PAYPAL_WHITELISTED_KEYS = ["orderId", "status", "name", "email", "value", "createdAt", "subscriptionExpirationDate"];
-  "orderId",
-  "status",
-  "name",
-  "email",
-  "value",
-  "createdAt",
-  "subscriptionExpirationDate",
-];
 
 interface SimpleCSVColumn {
 	key: string;
@@ -395,9 +288,7 @@ export default function PaymentRecord() {
 	const [selectedCorporateUser, setSelectedCorporateUser] = useState<User>();
 	const [selectedAgentUser, setSelectedAgentUser] = useState<User>();
 	const [isCreatingPayment, setIsCreatingPayment] = useState(false);
-  const [filters, setFilters] = useState<
+	const [filters, setFilters] = useState<{filter: (p: Payment) => boolean; id: string}[]>([]);
-    { filter: (p: Payment) => boolean; id: string }[]
-  >([]);
 	const [displayPayments, setDisplayPayments] = useState<Payment[]>([]);
 
 	const [corporate, setCorporate] = useState<User>();
@@ -406,29 +297,16 @@ export default function PaymentRecord() {
 	const {user} = useUser({redirectTo: "/login"});
 	const {users, reload: reloadUsers} = useUsers();
 	const {payments: originalPayments, reload: reloadPayment} = usePayments();
-  const { payments: paypalPayments, reload: reloadPaypalPayment } =
+	const {payments: paypalPayments, reload: reloadPaypalPayment} = usePaypalPayments();
-    usePaypalPayments();
+	const [startDate, setStartDate] = useState<Date | null>(moment("01/01/2023").toDate());
-  const [startDate, setStartDate] = useState<Date | null>(
+	const [endDate, setEndDate] = useState<Date | null>(moment().endOf("day").toDate());
-    moment("01/01/2023").toDate()
-  );
-  const [endDate, setEndDate] = useState<Date | null>(
-    moment().endOf("day").toDate()
-  );
 
-  const [startDatePaymob, setStartDatePaymob] = useState<Date | null>(
+	const [startDatePaymob, setStartDatePaymob] = useState<Date | null>(moment("01/01/2023").toDate());
-    moment("01/01/2023").toDate()
+	const [endDatePaymob, setEndDatePaymob] = useState<Date | null>(moment().endOf("day").toDate());
-  );
-  const [endDatePaymob, setEndDatePaymob] = useState<Date | null>(
-    moment().endOf("day").toDate()
-  );
 
 	const [paid, setPaid] = useState<Boolean | null>(IS_PAID_OPTIONS[0].value);
-  const [commissionTransfer, setCommissionTransfer] = useState<Boolean | null>(
+	const [commissionTransfer, setCommissionTransfer] = useState<Boolean | null>(IS_FILE_SUBMITTED_OPTIONS[0].value);
-    IS_FILE_SUBMITTED_OPTIONS[0].value
+	const [corporateTransfer, setCorporateTransfer] = useState<Boolean | null>(IS_FILE_SUBMITTED_OPTIONS[0].value);
-  );
-  const [corporateTransfer, setCorporateTransfer] = useState<Boolean | null>(
-    IS_FILE_SUBMITTED_OPTIONS[0].value
-  );
 	const reload = () => {
 		reloadUsers();
 		reloadPayment();
@@ -448,7 +326,7 @@ export default function PaymentRecord() {
 			filters
 				.map((f) => f.filter)
 				.reduce((d, f) => d.filter(f), payments)
-        .sort((a, b) => moment(b.date).diff(moment(a.date)))
+				.sort((a, b) => moment(b.date).diff(moment(a.date))),
 		);
 	}, [payments, filters]);
 
@@ -489,9 +367,7 @@ export default function PaymentRecord() {
 	useEffect(() => {
 		setFilters((prev) => [
 			...prev.filter((x) => x.id !== "paid"),
-      ...(typeof paid !== "boolean"
+			...(typeof paid !== "boolean" ? [] : [{id: "paid", filter: (p: Payment) => p.isPaid === paid}]),
-        ? []
-        : [{ id: "paid", filter: (p: Payment) => p.isPaid === paid }]),
 		]);
 	}, [paid]);
 
@@ -503,8 +379,7 @@ export default function PaymentRecord() {
 				: [
 						{
 							id: "commissionTransfer",
-              filter: (p: Payment) =>
+							filter: (p: Payment) => !p.commissionTransfer === commissionTransfer,
-                !p.commissionTransfer === commissionTransfer,
 						},
 				  ]),
 		]);
@@ -518,8 +393,7 @@ export default function PaymentRecord() {
 				: [
 						{
 							id: "corporateTransfer",
-              filter: (p: Payment) =>
+							filter: (p: Payment) => !p.corporateTransfer === corporateTransfer,
-                !p.corporateTransfer === corporateTransfer,
 						},
 				  ]),
 		]);
@@ -550,9 +424,7 @@ export default function PaymentRecord() {
 				}
 
 				if (reason.response.status === 403) {
-          toast.error(
+					toast.error("You do not have permission to delete an approved payment record!");
-            "You do not have permission to delete an approved payment record!"
-          );
 					return;
 				}
 
@@ -563,8 +435,7 @@ export default function PaymentRecord() {
 
 	const getFileAssetsColumns = () => {
 		if (user) {
-      const containerClassName =
+			const containerClassName = "flex gap-2 text-mti-purple-light hover:text-mti-purple-dark ease-in-out duration-300 cursor-pointer";
-        "flex gap-2 text-mti-purple-light hover:text-mti-purple-dark ease-in-out duration-300 cursor-pointer";
 			switch (user.type) {
 				case "corporate":
 					return [
@@ -683,9 +554,7 @@ export default function PaymentRecord() {
 				return {value: `${value}%`};
 			}
 			case "agent": {
-        const user = users.find(
+				const user = users.find((x) => x.id === info.row.original.agent) as AgentUser;
-          (x) => x.id === info.row.original.agent
-        ) as AgentUser;
 				return {
 					value: user?.name,
 					user,
@@ -706,8 +575,7 @@ export default function PaymentRecord() {
 				const user = users.find((x) => x.id === specificValue) as CorporateUser;
 				return {
 					user,
-          value:
+					value: user?.corporateInformation.companyInformation.name || user?.name,
-            user?.corporateInformation.companyInformation.name || user?.name,
 				};
 			}
 			case "currency": {
@@ -735,10 +603,9 @@ export default function PaymentRecord() {
 						return (
 							<div
 								className={clsx(
-                  "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
+									"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
 								)}
-                onClick={() => setSelectedAgentUser(user)}
+								onClick={() => setSelectedAgentUser(user)}>
-              >
 								{value}
 							</div>
 						);
@@ -782,10 +649,9 @@ export default function PaymentRecord() {
 				return (
 					<div
 						className={clsx(
-              "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
+							"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
 						)}
-            onClick={() => setSelectedCorporateUser(user)}
+						onClick={() => setSelectedCorporateUser(user)}>
-          >
 						{value}
 					</div>
 				);
@@ -804,9 +670,7 @@ export default function PaymentRecord() {
 			id: "amount",
 			cell: (info) => {
 				const {value} = columHelperValue(info.column.id, info);
-        const currency = CURRENCIES.find(
+				const currency = CURRENCIES.find((x) => x.currency === info.row.original.currency)?.label;
-          (x) => x.currency === info.row.original.currency
-        )?.label;
 				const finalValue = `${value} ${currency}`;
 				return <span>{finalValue}</span>;
 			},
@@ -822,23 +686,13 @@ export default function PaymentRecord() {
 					<Checkbox
 						isChecked={value}
 						onChange={(e) => {
-              if (user?.type === agent || user?.type === "corporate" || value)
+							if (user?.type === agent || user?.type === "corporate" || value) return null;
-                return null;
+							if (!info.row.original.commissionTransfer || !info.row.original.corporateTransfer)
-              if (
+								return alert("All files need to be uploaded to consider it paid!");
-                !info.row.original.commissionTransfer ||
+							if (!confirm(`Are you sure you want to consider this payment paid?`)) return null;
-                !info.row.original.corporateTransfer
-              )
-                return alert(
-                  "All files need to be uploaded to consider it paid!"
-                );
-              if (
-                !confirm(`Are you sure you want to consider this payment paid?`)
-              )
-                return null;
 
 							return updatePayment(info.row.original, "isPaid", e);
-            }}
+						}}>
-          >
 						<span></span>
 					</Checkbox>
 				);
@@ -852,11 +706,7 @@ export default function PaymentRecord() {
 				return (
 					<div className="flex gap-4">
 						{user?.type !== "agent" && (
-              <div
+							<div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deletePayment(row.original.id)}>
-                data-tip="Delete"
-                className="cursor-pointer tooltip"
-                onClick={() => deletePayment(row.original.id)}
-              >
 								<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
 							</div>
 						)}
@@ -883,7 +733,7 @@ export default function PaymentRecord() {
 					const user = users.find((x) => x.id === p.userId) as User;
 					return {...p, name: user?.name, email: user?.email};
 				}),
-    [paypalPayments, users, startDatePaymob, endDatePaymob]
+		[paypalPayments, users, startDatePaymob, endDatePaymob],
 	);
 
 	const paypalColumns = [
@@ -946,15 +796,10 @@ export default function PaymentRecord() {
 		}),
 	];
 
-  const { rows: filteredRows, renderSearch } = useListSearch(
+	const {rows: filteredRows, renderSearch} = useListSearch(paypalFilterRows, updatedPaypalPayments);
-    paypalFilterRows,
-    updatedPaypalPayments
-  );
 
 	const paypalTable = useReactTable({
-    data: filteredRows.sort((a, b) =>
+		data: filteredRows.sort((a, b) => moment(b.createdAt).diff(moment(a.createdAt), "second")),
-      moment(b.createdAt).diff(moment(a.createdAt), "second")
-    ),
 		columns: paypalColumns,
 		getCoreRowModel: getCoreRowModel(),
 	});
@@ -963,10 +808,7 @@ export default function PaymentRecord() {
 		if (user) {
 			if (selectedCorporateUser) {
 				return (
-          <Modal
+					<Modal isOpen={!!selectedCorporateUser} onClose={() => setSelectedCorporateUser(undefined)}>
-            isOpen={!!selectedCorporateUser}
-            onClose={() => setSelectedCorporateUser(undefined)}
-          >
 						<>
 							{selectedCorporateUser && (
 								<div className="w-full flex flex-col gap-8">
@@ -989,10 +831,7 @@ export default function PaymentRecord() {
 
 			if (selectedAgentUser) {
 				return (
-          <Modal
+					<Modal isOpen={!!selectedAgentUser} onClose={() => setSelectedAgentUser(undefined)}>
-            isOpen={!!selectedAgentUser}
-            onClose={() => setSelectedAgentUser(undefined)}
-          >
 						<>
 							{selectedAgentUser && (
 								<div className="w-full flex flex-col gap-8">
@@ -1017,17 +856,11 @@ export default function PaymentRecord() {
 
 	const getCSVData = () => {
 		const tables = [table, paypalTable];
-    const whitelists = [
+		const whitelists = [CSV_PAYMENTS_WHITELISTED_KEYS, CSV_PAYPAL_WHITELISTED_KEYS];
-      CSV_PAYMENTS_WHITELISTED_KEYS,
-      CSV_PAYPAL_WHITELISTED_KEYS,
-    ];
 		const currentTable = tables[selectedIndex];
 		const whitelist = whitelists[selectedIndex];
-    const columns = (currentTable.getHeaderGroups() as any[]).reduce(
+		const columns = (currentTable.getHeaderGroups() as any[]).reduce((accm: any[], group: any) => {
-      (accm: any[], group: any) => {
+			const whitelistedColumns = group.headers.filter((header: any) => whitelist.includes(header.id));
-        const whitelistedColumns = group.headers.filter((header: any) =>
-          whitelist.includes(header.id)
-        );
 
 			const data = whitelistedColumns.map((data: any) => ({
 				key: data.column.columnDef.id,
@@ -1035,9 +868,7 @@ export default function PaymentRecord() {
 			})) as SimpleCSVColumn[];
 
 			return [...accm, ...data];
-      },
+		}, []);
-      []
-    );
 
 		const {rows} = currentTable.getRowModel();
 
@@ -1075,12 +906,7 @@ export default function PaymentRecord() {
 					<tr key={headerGroup.id}>
 						{headerGroup.headers.map((header) => (
 							<th className="p-4 text-left" key={header.id}>
-                {header.isPlaceholder
+								{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
-                  ? null
-                  : flexRender(
-                      header.column.columnDef.header,
-                      header.getContext()
-                    )}
 							</th>
 						))}
 					</tr>
@@ -1088,10 +914,7 @@ export default function PaymentRecord() {
 			</thead>
 			<tbody className="px-2">
 				{table.getRowModel().rows.map((row) => (
-          <tr
+					<tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
-            className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
-            key={row.id}
-          >
 						{row.getVisibleCells().map((cell) => (
 							<td className="px-4 py-2" key={cell.id}>
 								{flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -1118,10 +941,7 @@ export default function PaymentRecord() {
 			{user && (
 				<Layout user={user} className="gap-6">
 					{getUserModal()}
-          <Modal
+					<Modal isOpen={isCreatingPayment} onClose={() => setIsCreatingPayment(false)}>
-            isOpen={isCreatingPayment}
-            onClose={() => setIsCreatingPayment(false)}
-          >
 						<PaymentCreator
 							onClose={() => setIsCreatingPayment(false)}
 							reload={reload}
@@ -1132,29 +952,15 @@ export default function PaymentRecord() {
 					<div className="w-full flex flex-end justify-between p-2">
 						<h1 className="text-2xl font-semibold">Payment Record</h1>
 						<div className="flex justify-end gap-2">
-              {checkAccess(user, [
+							{checkAccess(user, ["developer", "admin", "agent", "corporate", "mastercorporate"]) && (
-                "developer",
-                "admin",
-                "agent",
-                "corporate",
-                "mastercorporate",
-              ]) && (
 								<Button className="max-w-[200px]" variant="outline">
-                  <CSVLink
+									<CSVLink data={csvRows} headers={csvColumns} filename="payment-records.csv">
-                    data={csvRows}
-                    headers={csvColumns}
-                    filename="payment-records.csv"
-                  >
 										Download CSV
 									</CSVLink>
 								</Button>
 							)}
 							{checkAccess(user, ["developer", "admin"]) && (
-                <Button
+								<Button className="max-w-[200px]" variant="outline" onClick={() => setIsCreatingPayment(true)}>
-                  className="max-w-[200px]"
-                  variant="outline"
-                  onClick={() => setIsCreatingPayment(true)}
-                >
 									New Payment
 								</Button>
 							)}
@@ -1168,12 +974,9 @@ export default function PaymentRecord() {
 										"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light",
 										"ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2",
 										"transition duration-300 ease-in-out",
-                    selected
+										selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark",
-                      ? "bg-white shadow"
-                      : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark"
 									)
-                }
+								}>
-              >
 								Payments
 							</Tab>
 							{checkAccess(user, ["developer", "admin"]) && (
@@ -1183,63 +986,42 @@ export default function PaymentRecord() {
 											"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light",
 											"ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2",
 											"transition duration-300 ease-in-out",
-                      selected
+											selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark",
-                        ? "bg-white shadow"
-                        : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark"
 										)
-                  }
+									}>
-                >
 									Paymob
 								</Tab>
 							)}
 						</Tab.List>
 						<Tab.Panels>
 							<Tab.Panel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide gap-8 flex flex-col">
-                <div
+								<div className={clsx("grid grid-cols-1 md:grid-cols-2 gap-8 w-full", user.type !== "corporate" && "lg:grid-cols-3")}>
-                  className={clsx(
-                    "grid grid-cols-1 md:grid-cols-2 gap-8 w-full",
-                    user.type !== "corporate" && "lg:grid-cols-3"
-                  )}
-                >
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
+										<label className="font-normal text-base text-mti-gray-dim">Corporate account *</label>
-                      Corporate account *
-                    </label>
 										<Select
 											isClearable={user.type !== "corporate"}
 											className={clsx(
 												"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
-                        user.type === "corporate" &&
+												user.type === "corporate" && "!bg-mti-gray-platinum/40 !text-mti-gray-dim !cursor-not-allowed",
-                          "!bg-mti-gray-platinum/40 !text-mti-gray-dim !cursor-not-allowed"
 											)}
-                      options={(
+											options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
-                        users.filter(
-                          (u) => u.type === "corporate"
-                        ) as CorporateUser[]
-                      ).map((user) => ({
 												value: user.id,
 												meta: user,
-                        label: `${
+												label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${user.email}`,
-                          user.corporateInformation?.companyInformation?.name ||
-                          user.name
-                        } - ${user.email}`,
 											}))}
 											defaultValue={
 												user.type === "corporate"
 													? {
 															value: user.id,
 															meta: user,
-                              label: `${
+															label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${
-                                user.corporateInformation?.companyInformation
+																user.email
-                                  ?.name || user.name
+															}`,
-                              } - ${user.email}`,
 													  }
 													: undefined
 											}
 											isDisabled={user.type === "corporate"}
-                      onChange={(value) =>
+											onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
-                        setCorporate((value as any)?.meta ?? undefined)
-                      }
 											menuPortalTarget={document?.body}
 											styles={{
 												menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -1254,11 +1036,7 @@ export default function PaymentRecord() {
 												}),
 												option: (styles, state) => ({
 													...styles,
-                          backgroundColor: state.isFocused
+													backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                            ? "#D5D9F0"
-                            : state.isSelected
-                            ? "#7872BF"
-                            : "white",
 													color: state.isFocused ? "black" : styles.color,
 												}),
 											}}
@@ -1266,21 +1044,15 @@ export default function PaymentRecord() {
 									</div>
 									{user.type !== "corporate" && (
 										<div className="flex flex-col gap-3 w-full">
-                      <label className="font-normal text-base text-mti-gray-dim">
+											<label className="font-normal text-base text-mti-gray-dim">Country manager *</label>
-                        Country manager *
-                      </label>
 											<Select
 												isClearable
 												isDisabled={user.type === "agent"}
 												className={clsx(
 													"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
-                          user.type === "agent"
+													user.type === "agent" ? "bg-mti-gray-platinum/40" : "bg-white",
-                            ? "bg-mti-gray-platinum/40"
-                            : "bg-white"
 												)}
-                        options={(
+												options={(users.filter((u) => u.type === "agent") as AgentUser[]).map((user) => ({
-                          users.filter((u) => u.type === "agent") as AgentUser[]
-                        ).map((user) => ({
 													value: user.id,
 													meta: user,
 													label: `${user.name} - ${user.email}`,
@@ -1293,11 +1065,7 @@ export default function PaymentRecord() {
 														  }
 														: undefined
 												}
-                        onChange={(value) =>
+												onChange={(value) => setAgent(value !== null ? (value as any).meta : undefined)}
-                          setAgent(
-                            value !== null ? (value as any).meta : undefined
-                          )
-                        }
 												menuPortalTarget={document?.body}
 												styles={{
 													menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -1312,11 +1080,7 @@ export default function PaymentRecord() {
 													}),
 													option: (styles, state) => ({
 														...styles,
-                            backgroundColor: state.isFocused
+														backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                              ? "#D5D9F0"
-                              : state.isSelected
-                              ? "#7872BF"
-                              : "white",
 														color: state.isFocused ? "black" : styles.color,
 													}),
 												}}
@@ -1324,16 +1088,12 @@ export default function PaymentRecord() {
 										</div>
 									)}
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
+										<label className="font-normal text-base text-mti-gray-dim">Paid</label>
-                      Paid
-                    </label>
 										<Select
 											isClearable
 											className={clsx(
 												"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
-                        user.type === "agent"
+												user.type === "agent" ? "bg-mti-gray-platinum/40" : "bg-white",
-                          ? "bg-mti-gray-platinum/40"
-                          : "bg-white"
 											)}
 											options={IS_PAID_OPTIONS}
 											value={IS_PAID_OPTIONS.find((e) => e.value === paid)}
@@ -1355,20 +1115,14 @@ export default function PaymentRecord() {
 												}),
 												option: (styles, state) => ({
 													...styles,
-                          backgroundColor: state.isFocused
+													backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                            ? "#D5D9F0"
-                            : state.isSelected
-                            ? "#7872BF"
-                            : "white",
 													color: state.isFocused ? "black" : styles.color,
 												}),
 											}}
 										/>
 									</div>
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
+										<label className="font-normal text-base text-mti-gray-dim">Date</label>
-                      Date
-                    </label>
 										<ReactDatePicker
 											dateFormat="dd/MM/yyyy"
 											className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
@@ -1377,13 +1131,9 @@ export default function PaymentRecord() {
 											endDate={endDate}
 											selectsRange
 											showMonthDropdown
-                      filterDate={(date: Date) =>
+											filterDate={(date: Date) => moment(date).isSameOrBefore(moment(new Date()))}
-                        moment(date).isSameOrBefore(moment(new Date()))
-                      }
 											onChange={([initialDate, finalDate]: [Date, Date]) => {
-                        setStartDate(
+												setStartDate(initialDate ?? moment("01/01/2023").toDate());
-                          initialDate ?? moment("01/01/2023").toDate()
-                        );
 												if (finalDate) {
 													// basicly selecting a final day works as if I'm selecting the first
 													// minute of that day. this way it covers the whole day
@@ -1396,18 +1146,14 @@ export default function PaymentRecord() {
 									</div>
 									{user.type !== "corporate" && (
 										<div className="flex flex-col gap-3 w-full">
-                      <label className="font-normal text-base text-mti-gray-dim">
+											<label className="font-normal text-base text-mti-gray-dim">Commission transfer</label>
-                        Commission transfer
-                      </label>
 											<Select
 												isClearable
 												className={clsx(
-                          "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
+													"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
 												)}
 												options={IS_FILE_SUBMITTED_OPTIONS}
-                        value={IS_FILE_SUBMITTED_OPTIONS.find(
+												value={IS_FILE_SUBMITTED_OPTIONS.find((e) => e.value === commissionTransfer)}
-                          (e) => e.value === commissionTransfer
-                        )}
 												onChange={(value) => {
 													if (value) return setCommissionTransfer(value.value);
 													setCommissionTransfer(null);
@@ -1426,11 +1172,7 @@ export default function PaymentRecord() {
 													}),
 													option: (styles, state) => ({
 														...styles,
-                            backgroundColor: state.isFocused
+														backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                              ? "#D5D9F0"
-                              : state.isSelected
-                              ? "#7872BF"
-                              : "white",
 														color: state.isFocused ? "black" : styles.color,
 													}),
 												}}
@@ -1438,18 +1180,14 @@ export default function PaymentRecord() {
 										</div>
 									)}
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
+										<label className="font-normal text-base text-mti-gray-dim">Corporate transfer</label>
-                      Corporate transfer
-                    </label>
 										<Select
 											isClearable
 											className={clsx(
-                        "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
+												"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
 											)}
 											options={IS_FILE_SUBMITTED_OPTIONS}
-                      value={IS_FILE_SUBMITTED_OPTIONS.find(
+											value={IS_FILE_SUBMITTED_OPTIONS.find((e) => e.value === corporateTransfer)}
-                        (e) => e.value === corporateTransfer
-                      )}
 											onChange={(value) => {
 												if (value) return setCorporateTransfer(value.value);
 												setCorporateTransfer(null);
@@ -1468,11 +1206,7 @@ export default function PaymentRecord() {
 												}),
 												option: (styles, state) => ({
 													...styles,
-                          backgroundColor: state.isFocused
+													backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
-                            ? "#D5D9F0"
-                            : state.isSelected
-                            ? "#7872BF"
-                            : "white",
 													color: state.isFocused ? "black" : styles.color,
 												}),
 											}}
@@ -1482,16 +1216,9 @@ export default function PaymentRecord() {
 								{renderTable(table as Table<Payment>)}
 							</Tab.Panel>
 							<Tab.Panel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide flex flex-col gap-8">
-                <div
+								<div className={clsx("grid grid-cols-1 md:grid-cols-2 gap-8 w-full", user.type !== "corporate" && "lg:grid-cols-3")}>
-                  className={clsx(
-                    "grid grid-cols-1 md:grid-cols-2 gap-8 w-full",
-                    user.type !== "corporate" && "lg:grid-cols-3"
-                  )}
-                >
 									<div className="flex flex-col gap-3 w-full">
-                    <label className="font-normal text-base text-mti-gray-dim">
+										<label className="font-normal text-base text-mti-gray-dim">Date</label>
-                      Date
-                    </label>
 										<ReactDatePicker
 											dateFormat="dd/MM/yyyy"
 											className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
@@ -1500,19 +1227,13 @@ export default function PaymentRecord() {
 											endDate={endDatePaymob}
 											selectsRange
 											showMonthDropdown
-                      filterDate={(date: Date) =>
+											filterDate={(date: Date) => moment(date).isSameOrBefore(moment(new Date()))}
-                        moment(date).isSameOrBefore(moment(new Date()))
-                      }
 											onChange={([initialDate, finalDate]: [Date, Date]) => {
-                        setStartDatePaymob(
+												setStartDatePaymob(initialDate ?? moment("01/01/2023").toDate());
-                          initialDate ?? moment("01/01/2023").toDate()
-                        );
 												if (finalDate) {
 													// basicly selecting a final day works as if I'm selecting the first
 													// minute of that day. this way it covers the whole day
-                          setEndDatePaymob(
+													setEndDatePaymob(moment(finalDate).endOf("day").toDate());
-                            moment(finalDate).endOf("day").toDate()
-                          );
 													return;
 												}
 												setEndDatePaymob(null);

src/pages/payment.tsx

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

src/pages/training/index.tsx

@@ -24,7 +24,7 @@ import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
 
-	if (!user || !user.isVerified) {
+	if (!user) {
 		return {
 			redirect: {
 				destination: "/login",
@@ -48,17 +48,18 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
 }, sessionOptions);
 
 const Training: React.FC<{user: User}> = ({user}) => {
-	const [recordUserId, setRecordTraining] = useRecordStore((state) => [
+	const [recordUserId, setRecordTraining] = useRecordStore((state) => [state.selectedUser, state.setTraining]);
-		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 { data: trainingContent, isLoading: areRecordsLoading } = useFilterRecordsByUser<ITrainingContent[]>(recordUserId || user?.id, undefined, "training");
+	const {data: trainingContent, isLoading: areRecordsLoading} = useFilterRecordsByUser<ITrainingContent[]>(
+		recordUserId || user?.id,
+		undefined,
+		"training",
+	);
 
 	useEffect(() => {
 		const handleRouteChange = (url: string) => {

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.13.0", "@emotion/cache@^11.4.0":
   version "11.13.1"
   resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
   integrity sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==
@@ -202,27 +202,16 @@
     "@emotion/weak-memoize" "^0.4.0"
     stylis "4.2.0"
 
-"@emotion/cache@^11.4.0":
-  version "11.13.1"
-  resolved "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz"
-  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/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/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"
@@ -230,16 +219,16 @@
   dependencies:
     "@emotion/memoize" "0.7.4"
 
-"@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/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/react@^11.8.1":
   version "11.13.0"
   resolved "https://registry.npmjs.org/@emotion/react/-/react-11.13.0.tgz"
@@ -265,7 +254,7 @@
     "@emotion/utils" "0.11.3"
     csstype "^2.5.7"
 
-"@emotion/serialize@^1.2.0":
+"@emotion/serialize@^1.2.0", "@emotion/serialize@^1.3.0":
   version "1.3.0"
   resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
   integrity sha512-jACuBa9SlYajnpIVXB+XOXnfJHyckDfe6fOpORIM6yhBDlqGuExvDdZYHDQGoDf3bZXGv7tNr+LpLjJqiEQ6EA==
@@ -276,67 +265,56 @@
     "@emotion/utils" "^1.4.0"
     csstype "^3.0.2"
 
-"@emotion/serialize@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.0.tgz"
-  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/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/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.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/unitless@^0.9.0":
+  version "0.9.0"
+  resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.9.0.tgz"
+  integrity sha512-TP6GgNZtmtFaFcsOgExdnfxLLpRDla4Q66tnenA9CktvVSdNKDvMVuUah4QvWPIpNjrWsGg3qeGo9a43QooGZQ==
+
 "@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@^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/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/weak-memoize@^0.4.0":
+"@emotion/utils@^1.4.0":
-  version "0.4.0"
+  version "1.4.0"
-  resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz"
+  resolved "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.0.tgz"
-  integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==
+  integrity sha512-spEnrA1b6hDR/C68lC2M7m6ALPUHZC0lIY7jAS/B/9DuuO1ZP04eov8SMv/6fwRd8pzmsn2AuJEznRREWlQrlQ==
 
 "@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==
 
+"@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==
+
 "@eslint/eslintrc@^1.4.1":
   version "1.4.1"
   resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"
@@ -511,7 +489,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==
@@ -523,7 +501,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==
@@ -744,13 +722,6 @@
     node-fetch "2.6.7"
     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"
-  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
-  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"
@@ -758,6 +729,13 @@
   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"
+  integrity sha512-fBVNH/8bRbYjqlbIhZ+lBtdAAS4WqZumx03K06/u7fJSpz1TGjEMm1ImvKD47w+xaFKIP2ori6z8BrbakRfjJA==
+  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"
@@ -1020,6 +998,46 @@
   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"
@@ -1033,7 +1051,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -1591,6 +1609,14 @@
   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"
@@ -1605,14 +1631,6 @@
   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"
@@ -1826,7 +1844,7 @@
   resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
-"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0", "@types/node@18.13.0":
+"@types/node@*", "@types/node@18.13.0", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
   version "18.13.0"
   resolved "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz"
   integrity sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==
@@ -2652,7 +2670,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==
@@ -2675,20 +2693,16 @@ 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"
@@ -2699,11 +2713,6 @@ 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"
@@ -2718,16 +2727,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-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-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-string@^1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -2953,6 +2962,13 @@ 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"
@@ -2960,13 +2976,6 @@ 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"
@@ -3141,7 +3150,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==
@@ -3894,6 +3903,11 @@ 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"
@@ -3996,7 +4010,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==
@@ -4010,12 +4024,29 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob-parent@~5.1.2:
+glob@7.1.6:
-  version "5.1.2"
+  version "7.1.6"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
-    is-glob "^4.0.1"
+    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.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"
@@ -4029,18 +4060,6 @@ 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"
@@ -4064,18 +4083,6 @@ 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"
@@ -4374,7 +4381,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3, inherits@2:
+inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5062,18 +5069,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@^10.2.0:
+lru-cache@6.0.0, lru-cache@^6.0.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"
@@ -5149,7 +5156,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
-"mime-db@>= 1.43.0 < 2", mime-db@1.52.0:
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
   resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
@@ -5173,14 +5180,7 @@ 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.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==
-  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,11 +5224,6 @@ 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"
@@ -5236,6 +5231,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   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.1, ms@2.1.2:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -5327,21 +5327,14 @@ 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.1, node-fetch@^2.6.7, node-fetch@2.6.7:
+node-fetch@2.6.7, node-fetch@^2.6.1, 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.12, 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==
-  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==
@@ -5702,7 +5695,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, postcss@^8.0.9, postcss@^8.4.21, postcss@8.4.31:
+postcss@8.4.31, postcss@^8, postcss@^8.0.9, postcss@^8.4.21:
   version "8.4.31"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -5744,15 +5737,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.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"
-  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
-  dependencies:
-    loose-envify "^1.4.0"
-    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"
@@ -5762,6 +5746,15 @@ prop-types@15.7.2:
     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"
+  integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
+  dependencies:
+    loose-envify "^1.4.0"
+    object-assign "^4.1.1"
+    react-is "^16.13.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"
@@ -5785,6 +5778,24 @@ 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"
@@ -5840,24 +5851,6 @@ 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"
@@ -6159,33 +6152,7 @@ read-excel-file@^5.7.1:
     fflate "^0.7.3"
     unzipper "^0.12.2"
 
-readable-stream@^2.0.0:
+readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, 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"
-
-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==
@@ -6207,19 +6174,6 @@ 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"
@@ -6326,13 +6280,6 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@2:
   version "2.7.1"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"
@@ -6340,6 +6287,13 @@ rimraf@2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  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"
@@ -6347,7 +6301,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@^5.0.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, 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==
@@ -6554,20 +6508,6 @@ 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"
@@ -6627,6 +6567,20 @@ 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"
@@ -7081,7 +7035,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==
@@ -7091,12 +7045,7 @@ 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.0.0, 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==
-
-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==
@@ -7331,11 +7280,6 @@ 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"
@@ -7366,19 +7310,6 @@ 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"