From 5a8c72b05caff2871c192fe938ae44eb5f90324f Mon Sep 17 00:00:00 2001
From: Nasreddine Bac Ali <nasreddine.bacali95@gmail.com>
Date: Sun, 27 Oct 2024 21:48:32 +0000
Subject: [PATCH] chore: fix contest submissions table

---
 .gitignore                                    |   2 +
 .../src/core/components/PageTemplate.tsx      |   6 +-
 .../src/core/components/SubmissionResult.tsx  |  30 ++
 apps/client/src/core/components/index.ts      |   1 +
 apps/client/src/core/constants.ts             |  12 +
 .../client/src/core/contexts/auth/context.tsx |   2 +-
 apps/client/src/core/utils/dateComparator.ts  |   5 +
 apps/client/src/core/utils/formatRestTime.ts  |  15 +
 apps/client/src/core/utils/index.ts           |   3 +
 .../client/src/core/utils/isContestRunning.ts |  11 +
 apps/client/src/pages/admin/AdminLayout.tsx   |  66 ++--
 .../src/pages/admin/ContestsSection.tsx       |  92 ++++++
 .../admin/views/contests/ContestView.tsx      |  36 +++
 .../views/submissions/SubmissionsList.tsx     | 130 ++++----
 .../src/pages/team/views/SubmissionsList.tsx  |  99 +++---
 apps/server/src/auth/auth.service.ts          |   2 +-
 package.json                                  |  26 +-
 yarn.lock                                     | 293 +++++++++---------
 18 files changed, 501 insertions(+), 330 deletions(-)
 create mode 100644 apps/client/src/core/components/SubmissionResult.tsx
 create mode 100644 apps/client/src/core/constants.ts
 create mode 100644 apps/client/src/core/utils/dateComparator.ts
 create mode 100644 apps/client/src/core/utils/formatRestTime.ts
 create mode 100644 apps/client/src/core/utils/isContestRunning.ts
 create mode 100644 apps/client/src/pages/admin/ContestsSection.tsx
 create mode 100644 apps/client/src/pages/admin/views/contests/ContestView.tsx

diff --git a/.gitignore b/.gitignore
index 110fc0e..736d5a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,5 @@ Thumbs.db
 
 .nx/cache
 .nx/workspace-data
+
+**/vite.config.{js,ts,mjs,mts,cjs,cts}.timestamp*
\ No newline at end of file
diff --git a/apps/client/src/core/components/PageTemplate.tsx b/apps/client/src/core/components/PageTemplate.tsx
index 7066ee1..f0a24f2 100644
--- a/apps/client/src/core/components/PageTemplate.tsx
+++ b/apps/client/src/core/components/PageTemplate.tsx
@@ -45,7 +45,7 @@ export const PageTemplate = forwardRef<HTMLDivElement, Props>(
           justify="between"
           fullWidth
         >
-          <Flex className="gap-2 text-xl" align="center">
+          <Flex className="gap-2 text-xl" align="center" fullWidth>
             {!isSubSection && (
               <>
                 <Sidebar.Trigger />
@@ -58,11 +58,11 @@ export const PageTemplate = forwardRef<HTMLDivElement, Props>(
             {title}
             {filtersProps && <FiltersTrigger {...filtersProps} />}
           </Flex>
-          {
+          {actions && (
             <Flex className="gap-2" align="center">
               {actions}
             </Flex>
-          }
+          )}
         </Flex>
         {filtersProps && <FiltersContent {...filtersProps} />}
         <Flex
diff --git a/apps/client/src/core/components/SubmissionResult.tsx b/apps/client/src/core/components/SubmissionResult.tsx
new file mode 100644
index 0000000..cdd6cb9
--- /dev/null
+++ b/apps/client/src/core/components/SubmissionResult.tsx
@@ -0,0 +1,30 @@
+import { FC } from 'react';
+import { cn } from 'tw-react-components';
+
+import { Judging, Prisma } from '@prisma/client';
+
+import { dateComparator } from '@core/utils';
+
+import { JUDGING_RESULT_LABELS } from '../constants';
+
+type Props = {
+  submission: Prisma.SubmissionGetPayload<{ include: { judgings: true } }>;
+};
+
+export const SubmissionResult: FC<Props> = ({ submission }) => {
+  const judging = submission.judgings
+    .slice()
+    .sort(dateComparator<Judging>('startTime', true))
+    .shift();
+  return (
+    <b
+      className={cn({
+        'text-green-700 dark:text-green-400': judging?.result === 'ACCEPTED',
+        'text-red-700 dark:text-red-400': judging?.result && judging.result !== 'ACCEPTED',
+        'text-gray-500 dark:text-gray-400': !judging?.result,
+      })}
+    >
+      {JUDGING_RESULT_LABELS[judging?.result ?? 'PENDING']}
+    </b>
+  );
+};
diff --git a/apps/client/src/core/components/index.ts b/apps/client/src/core/components/index.ts
index b238c31..84e5d6c 100644
--- a/apps/client/src/core/components/index.ts
+++ b/apps/client/src/core/components/index.ts
@@ -6,3 +6,4 @@ export * from './Login';
 export * from './Logout';
 export * from './NavBar';
 export * from './PageTemplate';
+export * from './SubmissionResult';
diff --git a/apps/client/src/core/constants.ts b/apps/client/src/core/constants.ts
new file mode 100644
index 0000000..ddbedf0
--- /dev/null
+++ b/apps/client/src/core/constants.ts
@@ -0,0 +1,12 @@
+import { JudgingResult } from '@prisma/client';
+
+export const JUDGING_RESULT_LABELS: Record<JudgingResult | 'PENDING', string> = {
+  ACCEPTED: 'Accepted',
+  WRONG_ANSWER: 'Wrong Answer',
+  TIME_LIMIT_EXCEEDED: 'Time Limit Exceeded',
+  MEMORY_LIMIT_EXCEEDED: 'Memory Limit Exceeded',
+  RUNTIME_ERROR: 'Runtime Error',
+  COMPILATION_ERROR: 'Compile Error',
+  SYSTEM_ERROR: 'System Error',
+  PENDING: 'Pending',
+};
diff --git a/apps/client/src/core/contexts/auth/context.tsx b/apps/client/src/core/contexts/auth/context.tsx
index ac5d10b..69548bf 100644
--- a/apps/client/src/core/contexts/auth/context.tsx
+++ b/apps/client/src/core/contexts/auth/context.tsx
@@ -12,7 +12,7 @@ import { Prisma } from '@prisma/client';
 
 import { request } from '../../utils';
 
-export type User = Prisma.UserGetPayload<{ include: { role: true } }>;
+export type User = Prisma.UserGetPayload<{ include: { role: true; team: true } }>;
 
 export const AuthContext = createContext<AuthContext<User>>({
   connected: false,
diff --git a/apps/client/src/core/utils/dateComparator.ts b/apps/client/src/core/utils/dateComparator.ts
new file mode 100644
index 0000000..d194830
--- /dev/null
+++ b/apps/client/src/core/utils/dateComparator.ts
@@ -0,0 +1,5 @@
+export function dateComparator<T>(field: keyof T, inv = false): (a: T, b: T) => number {
+  return (a, b) =>
+    new Date((inv ? b : a)[field] as Date).getTime() -
+    new Date((inv ? a : b)[field] as Date).getTime();
+}
diff --git a/apps/client/src/core/utils/formatRestTime.ts b/apps/client/src/core/utils/formatRestTime.ts
new file mode 100644
index 0000000..e46ac05
--- /dev/null
+++ b/apps/client/src/core/utils/formatRestTime.ts
@@ -0,0 +1,15 @@
+export function formatRestTime(time: number, withSeconds = true): string {
+  if (time <= 0) return 'contest over';
+  const days = Math.floor(time / 86400);
+  const hours = Math.floor((time % 86400) / 3600);
+  const minutes = Math.floor((time % 3600) / 60);
+  const seconds = Math.floor(time % 60);
+
+  let result = '';
+  days && (result += `${days}d `);
+  (days || hours) && (result += `${hours.toString().padStart(2, '0')}:`);
+  result += minutes.toString().padStart(2, '0');
+  withSeconds && (result += `:${seconds.toString().padStart(2, '0')}`);
+
+  return result;
+}
diff --git a/apps/client/src/core/utils/index.ts b/apps/client/src/core/utils/index.ts
index fc01ed0..23be52f 100644
--- a/apps/client/src/core/utils/index.ts
+++ b/apps/client/src/core/utils/index.ts
@@ -1,8 +1,11 @@
 export * from './files';
 
+export * from './dateComparator';
 export * from './formatBytes';
+export * from './formatRestTime';
 export * from './getDisplayDate';
 export * from './getRandomHexColor';
 export * from './getRGBColorContrast';
+export * from './isContestRunning';
 export * from './queryParser';
 export * from './request';
diff --git a/apps/client/src/core/utils/isContestRunning.ts b/apps/client/src/core/utils/isContestRunning.ts
new file mode 100644
index 0000000..d6f3cd8
--- /dev/null
+++ b/apps/client/src/core/utils/isContestRunning.ts
@@ -0,0 +1,11 @@
+import { Contest } from '@prisma/client';
+
+export function isContestRunning(contest?: Contest): boolean {
+  const now = Date.now();
+  return (
+    !!contest &&
+    !!contest.endTime &&
+    new Date(contest.startTime).getTime() < now &&
+    now < new Date(contest.endTime).getTime()
+  );
+}
diff --git a/apps/client/src/pages/admin/AdminLayout.tsx b/apps/client/src/pages/admin/AdminLayout.tsx
index 7f9a87d..070ab7c 100644
--- a/apps/client/src/pages/admin/AdminLayout.tsx
+++ b/apps/client/src/pages/admin/AdminLayout.tsx
@@ -8,16 +8,19 @@ import {
   UsersRoundIcon,
 } from 'lucide-react';
 import { FC, useMemo } from 'react';
-import { Route, Routes } from 'react-router-dom';
+import { Navigate, Route, Routes } from 'react-router-dom';
 import { Layout, Sidebar, SidebarProps } from 'tw-react-components';
 
+import { ContestsSection } from './ContestsSection';
 import { NavUser } from './NavUser';
+import { ContestView } from './views/contests/ContestView';
 import { ContestsList } from './views/contests/ContestsList';
 import { ExecutablesList } from './views/executables/ExecutablesList';
 import { JudgeHostsList } from './views/judge-hosts/JudgeHostsList';
 import { LanguagesList } from './views/languages/LanguagesList';
 import { ProblemView } from './views/problems/ProblemView';
 import { ProblemsList } from './views/problems/ProblemsList';
+import { SubmissionsList } from './views/submissions/SubmissionsList';
 import { TeamCategoriesList } from './views/team-category/TeamCategoriesList';
 import { TeamsList } from './views/teams/TeamsList';
 import { UsersList } from './views/users/UsersList';
@@ -86,57 +89,40 @@ export const AdminLayout: FC = () => {
               title: 'Judge Hosts',
               Icon: ServerIcon,
             },
-            // {
-            //   pathname: 'submissions',
-            //   title: 'Submissions',
-            //   Icon: PaperAirplaneIcon,
-            //   label:
-            //     totalPendingSubmissions > 0 ? (
-            //       <div className="rounded-md bg-yellow-500 px-2 py-0.5 text-white">
-            //         {totalPendingSubmissions}
-            //       </div>
-            //     ) : undefined,
-            // },
-            // {
-            //   pathname: 'clarifications',
-            //   title: 'Clarifications',
-            //   Icon: ChatIcon,
-            // },
-            // {
-            //   pathname: 'scoreboard',
-            //   title: 'Scoreboard',
-            //   Icon: ChartBarIcon,
-            // },
           ],
         },
       ],
+      extraContent: <ContestsSection />,
       footer: <NavUser />,
     }),
     [],
   );
 
   return (
-    <Layout
-      className="p-0"
-      sidebarProps={sidebarProps}
-      // <ActiveContestSelector className="rounded-md p-2 hover:bg-gray-200 dark:hover:bg-gray-700" />
-    >
+    <Layout className="p-0" sidebarProps={sidebarProps}>
       <Routes>
         {/* <Route exact path="/" component={Dashboard} />*/}
-        <Route path="/users" element={<UsersList />} />
-        <Route path="/teams" element={<TeamsList />} />
-        <Route path="/teams/categories" element={<TeamCategoriesList />} />
-        <Route path="/contests" element={<ContestsList />} />
-        <Route path="/problems" element={<ProblemsList />} />
-        <Route path="/problems/:id" element={<ProblemView />} />
-        <Route path="/languages" element={<LanguagesList />} />
-        <Route path="/executables" element={<ExecutablesList />} />
-        <Route path="/judge-hosts" element={<JudgeHostsList />} />
+        <Route path="users" element={<UsersList />} />
+        <Route path="teams" element={<TeamsList />} />
+        <Route path="teams/categories" element={<TeamCategoriesList />} />
+        <Route path="contests" element={<ContestsList />} />
+        <Route path="contests/:id" element={<ContestView />}>
+          <Route path="submissions" element={<SubmissionsList />} />
+          <Route path="clarifications" element={'Clarifications'} />
+          <Route path="scoreboard" element={'Scoreboard'} />
+          <Route path="*" element={<Navigate to="submissions" replace />} />
+        </Route>
+        <Route path="problems" element={<ProblemsList />} />
+        <Route path="problems/:id" element={<ProblemView />} />
+        <Route path="languages" element={<LanguagesList />} />
+        <Route path="executables" element={<ExecutablesList />} />
+        <Route path="judge-hosts" element={<JudgeHostsList />} />
+        <Route path="*" element={<Navigate to="" replace />} />
         {/*
-        <Route exact path="/submissions" component={SubmissionsList} />
-        <Route path="/submissions/:id" component={SubmissionsView} />
-        <Route exact path="/clarifications" component={ClarificationsList} />
-        <Route exact path="/scoreboard" component={Scoreboard} />
+        <Route exact path="submissions" component={SubmissionsList} />
+        <Route path="submissions/:id" component={SubmissionsView} />
+        <Route exact path="clarifications" component={ClarificationsList} />
+        <Route exact path="scoreboard" component={Scoreboard} />
         <Route render={() => <Redirect to="/" />} />
         */}
       </Routes>
diff --git a/apps/client/src/pages/admin/ContestsSection.tsx b/apps/client/src/pages/admin/ContestsSection.tsx
new file mode 100644
index 0000000..3c6ed1c
--- /dev/null
+++ b/apps/client/src/pages/admin/ContestsSection.tsx
@@ -0,0 +1,92 @@
+import { MessagesSquareIcon, PresentationIcon, SendIcon, StarsIcon } from 'lucide-react';
+import { FC, useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+import { DropdownMenu, Flex, Sidebar, useSidebar } from 'tw-react-components';
+
+import { useFindManyContest } from '@models';
+
+export const ContestsSection: FC = () => {
+  const { isMobile } = useSidebar();
+  const [now, setNow] = useState(new Date());
+
+  const { data: contests } = useFindManyContest({
+    where: {
+      enabled: true,
+      activateTime: { lte: now },
+    },
+    select: { id: true, name: true, scoreCaches: { select: { restrictedPending: true } } },
+    orderBy: { activateTime: 'asc' },
+  });
+
+  useEffect(() => {
+    if (import.meta.env.MODE === 'development') return;
+
+    const interval = setInterval(() => {
+      setNow(new Date());
+    }, 5000);
+
+    return () => clearInterval(interval);
+  }, []);
+
+  return (
+    <Sidebar.Group>
+      <Sidebar.GroupLabel>Active Contests</Sidebar.GroupLabel>
+      <Sidebar.GroupContent>
+        <Sidebar.Menu>
+          {contests?.map((contest) => {
+            const totalPendingSubmissions = contest.scoreCaches.reduce(
+              (acc, { restrictedPending }) => acc + restrictedPending,
+              0,
+            );
+
+            return (
+              <DropdownMenu key={contest.id}>
+                <Sidebar.MenuItem>
+                  <DropdownMenu.Trigger asChild>
+                    <Sidebar.MenuButton>
+                      <StarsIcon />
+                      {contest.name}
+                      {totalPendingSubmissions > 0 && (
+                        <Flex
+                          className="ml-auto h-5 w-5 rounded bg-orange-500"
+                          align="center"
+                          justify="center"
+                        >
+                          {totalPendingSubmissions}
+                        </Flex>
+                      )}
+                    </Sidebar.MenuButton>
+                  </DropdownMenu.Trigger>
+                  <DropdownMenu.Content
+                    className="min-w-56 rounded-lg text-sm"
+                    side={isMobile ? 'bottom' : 'right'}
+                    align={isMobile ? 'end' : 'start'}
+                  >
+                    <Link to={`/contests/${contest.id}/submissions`}>
+                      <DropdownMenu.Item className="cursor-pointer">
+                        <DropdownMenu.Icon icon={SendIcon} />
+                        Submissions
+                      </DropdownMenu.Item>
+                    </Link>
+                    <Link to={`/contests/${contest.id}/clarifications`}>
+                      <DropdownMenu.Item className="cursor-pointer">
+                        <DropdownMenu.Icon icon={MessagesSquareIcon} />
+                        Clarifications
+                      </DropdownMenu.Item>
+                    </Link>
+                    <Link to={`/contests/${contest.id}/scoreboard`}>
+                      <DropdownMenu.Item className="cursor-pointer">
+                        <DropdownMenu.Icon icon={PresentationIcon} />
+                        Scoreboard
+                      </DropdownMenu.Item>
+                    </Link>
+                  </DropdownMenu.Content>
+                </Sidebar.MenuItem>
+              </DropdownMenu>
+            );
+          })}
+        </Sidebar.Menu>
+      </Sidebar.GroupContent>
+    </Sidebar.Group>
+  );
+};
diff --git a/apps/client/src/pages/admin/views/contests/ContestView.tsx b/apps/client/src/pages/admin/views/contests/ContestView.tsx
new file mode 100644
index 0000000..f0b5704
--- /dev/null
+++ b/apps/client/src/pages/admin/views/contests/ContestView.tsx
@@ -0,0 +1,36 @@
+import { GraduationCapIcon } from 'lucide-react';
+import { FC } from 'react';
+import { Outlet, useLocation, useNavigate, useParams } from 'react-router-dom';
+import { Flex, Tabs } from 'tw-react-components';
+
+import { PageTemplate } from '@core/components';
+import { useFindFirstContest } from '@models';
+
+export const ContestView: FC = () => {
+  const location = useLocation();
+  const navigate = useNavigate();
+  const { id: contestId } = useParams();
+  const currentTab = location.pathname.split('/').pop();
+
+  const { data: contest } = useFindFirstContest({ where: { id: parseInt(contestId ?? '-1') } });
+
+  return (
+    <Tabs className="w-full" value={currentTab} onValueChange={(tab) => navigate(tab)}>
+      <PageTemplate
+        icon={GraduationCapIcon}
+        title={
+          <Flex align="center" justify="between" fullWidth>
+            {contest?.name}
+            <Tabs.List className="ml-2 w-fit text-sm [&>button]:h-6">
+              <Tabs.Trigger value="submissions">Submissions</Tabs.Trigger>
+              <Tabs.Trigger value="clarifications">Clarifications</Tabs.Trigger>
+              <Tabs.Trigger value="scoreboard">Scoreboard</Tabs.Trigger>
+            </Tabs.List>
+          </Flex>
+        }
+      >
+        <Outlet />
+      </PageTemplate>
+    </Tabs>
+  );
+};
diff --git a/apps/client/src/pages/admin/views/submissions/SubmissionsList.tsx b/apps/client/src/pages/admin/views/submissions/SubmissionsList.tsx
index cd0abd7..2accf00 100644
--- a/apps/client/src/pages/admin/views/submissions/SubmissionsList.tsx
+++ b/apps/client/src/pages/admin/views/submissions/SubmissionsList.tsx
@@ -1,89 +1,94 @@
-import { CheckCircleIcon, MinusCircleIcon, XCircleIcon } from '@heroicons/react/outline';
-import SubmissionResult from '@shared/SubmissionResult';
-import DataTable, { ListPageTableColumn } from '@shared/data-table/DataTable';
-import { observer } from 'mobx-react';
-import React from 'react';
-import { useHistory } from 'react-router-dom';
+import { CheckCircleIcon, MinusCircleIcon, XCircleIcon } from 'lucide-react';
+import { FC } from 'react';
+import { Link, useParams } from 'react-router-dom';
+import { DataTable, DataTableColumn } from 'tw-react-components';
 
-import { dateComparator, formatRestTime, getJudgingRunColor } from '@core/helpers';
-import { Judging, Submission } from '@core/models';
-import { PublicStore, RootStore, SubmissionsStore, useStore } from '@core/stores';
+import { Judging, Prisma, Testcase } from '@prisma/client';
 
-import SubmissionsFilters from './SubmissionsFilters';
-import SubmissionsListPagination from './SubmissionsListPagination';
+import { SubmissionResult } from '@core/components';
+import { useAuthContext } from '@core/contexts';
+import { dateComparator, formatRestTime } from '@core/utils';
+import { useFindFirstContest, useFindManySubmission } from '@models';
 
-const SubmissionsList: React.FC = observer(() => {
-  const { profile, updatesCount } = useStore<RootStore>('rootStore');
-  const { currentContest } = useStore<PublicStore>('publicStore');
-  const { totalItems, currentPage, setCurrentPage, filters, fetchAll, claim, unClaim } =
-    useStore<SubmissionsStore>('submissionsStore');
+type Submission = Prisma.SubmissionGetPayload<{
+  include: {
+    team: true;
+    problem: { include: { testcases: true } };
+    language: true;
+    judgings: { include: { juryMember: true; runs: { include: { testcase: true } } } };
+  };
+}>;
 
-  const history = useHistory();
+export const SubmissionsList: FC = () => {
+  const { profile } = useAuthContext();
+  const { id: contestId } = useParams();
 
-  const columns: ListPageTableColumn<Submission>[] = [
+  const { data: contest } = useFindFirstContest({ where: { id: parseInt(contestId ?? '-1') } });
+
+  const { data: submissions = [], isLoading } = useFindManySubmission({
+    where: { contestId: parseInt(contestId ?? '-1') },
+    include: {
+      team: true,
+      problem: { include: { testcases: true } },
+      language: true,
+      judgings: { include: { juryMember: true, runs: { include: { testcase: true } } } },
+    },
+    orderBy: { submitTime: 'desc' },
+  });
+
+  const columns: DataTableColumn<Submission>[] = [
     {
       header: 'Time',
       field: 'submitTime',
-      textAlign: 'center',
       render: (submission) => (
-        <div
-          className="cursor-pointer text-blue-700"
-          onClick={() => history.push(`/submissions/${submission.id}`)}
-        >
+        <Link className="cursor-pointer text-blue-700" to={`submissions/${submission.id}`}>
           {formatRestTime(
             (new Date(submission.submitTime).getTime() -
-              new Date(currentContest?.startTime ?? 0).getTime()) /
+              new Date(contest?.startTime ?? 0).getTime()) /
               1000,
           )}
-        </div>
+        </Link>
       ),
     },
     {
       header: 'Team',
       field: 'team',
-      disabled: (submission) => !submission.valid,
       render: (submission) => submission.team.name,
     },
     {
       header: 'Problem',
       field: 'problem',
-      textAlign: 'center',
-      disabled: (submission) => !submission.valid,
       render: ({ problem }) => (
-        <a
+        <Link
           className="cursor-pointer text-blue-700"
-          href={`/problems/${problem.id}`}
+          to={`/problems/${problem.id}`}
           target="_blank"
           rel="noreferrer"
         >
           {problem.name}
-        </a>
+        </Link>
       ),
     },
     {
       header: 'Language',
       field: 'language',
-      textAlign: 'center',
-      disabled: (submission) => !submission.valid,
       render: (submission) => submission.language.name,
     },
     {
       header: 'Result',
-      field: 'language',
-      textAlign: 'center',
+      field: 'judgings',
       render: (submission) => <SubmissionResult submission={submission} />,
     },
     {
       header: 'Verified by',
       field: 'judgings',
-      textAlign: 'center',
-      disabled: (submission) => !submission.valid,
       render: (submission) => {
         const judging = submission.judgings
           .slice()
           .filter((j) => j.valid)
           .sort(dateComparator<Judging>('startTime', true))
           .shift();
+
         return judging?.result ? (
           judging.verified ? (
             `Yes by ${judging.juryMember.username}`
@@ -92,8 +97,8 @@ const SubmissionsList: React.FC = observer(() => {
               <div
                 className="hover:bg-grey-100 cursor-pointer rounded-md bg-gray-200 p-2 text-center font-medium text-gray-600"
                 onClick={async () => {
-                  await unClaim(submission.id);
-                  await fetchAll();
+                  // await unClaim(submission.id);
+                  // await fetchAll();
                 }}
               >
                 UnClaim
@@ -105,8 +110,8 @@ const SubmissionsList: React.FC = observer(() => {
             <div
               className="hover:bg-grey-100 cursor-pointer rounded-md bg-gray-200 p-2 text-center font-medium text-gray-600"
               onClick={async () => {
-                await claim(submission.id);
-                history.push(`/submissions/${submission.id}`);
+                // await claim(submission.id);
+                // history.push(`/submissions/${submission.id}`);
               }}
             >
               Claim
@@ -157,35 +162,16 @@ const SubmissionsList: React.FC = observer(() => {
     },
   ];
 
-  return (
-    <div className="p-4">
-      <DataTable<Submission>
-        header="Submissions"
-        dataFetcher={fetchAll}
-        dataDependencies={[
-          currentContest,
-          currentPage,
-          filters.problems,
-          filters.teams,
-          filters.languages,
-          filters.status,
-          updatesCount.judgings,
-          updatesCount.judgeRuns,
-          fetchAll,
-        ]}
-        columns={columns}
-        filters={<SubmissionsFilters filters={filters} />}
-        pagination={
-          <SubmissionsListPagination
-            totalItems={totalItems}
-            currentPage={currentPage}
-            setCurrentPage={setCurrentPage}
-          />
-        }
-        withoutActions
-      />
-    </div>
-  );
-});
+  return <DataTable rows={submissions} columns={columns} isLoading={isLoading} />;
+};
+
+export function getJudgingRunColor(
+  testcase: Testcase,
+  judging?: Prisma.JudgingGetPayload<{ include: { runs: { include: { testcase: true } } } }>,
+): 'gray' | 'green' | 'red' {
+  if (!judging) return 'gray';
+
+  const judgeRun = judging.runs.find((r) => r.testcase.id === testcase.id);
 
-export default SubmissionsList;
+  return !judgeRun ? 'gray' : judgeRun.result === 'ACCEPTED' ? 'green' : 'red';
+}
diff --git a/apps/client/src/pages/team/views/SubmissionsList.tsx b/apps/client/src/pages/team/views/SubmissionsList.tsx
index a81e021..a0556dc 100644
--- a/apps/client/src/pages/team/views/SubmissionsList.tsx
+++ b/apps/client/src/pages/team/views/SubmissionsList.tsx
@@ -1,79 +1,84 @@
-import SubmissionResult from '@shared/SubmissionResult';
-import DataTable, { ListPageTableColumn } from '@shared/data-table/DataTable';
-import { observer } from 'mobx-react';
-import React from 'react';
+import { FC } from 'react';
+import { useParams } from 'react-router-dom';
+import { DataTable, DataTableColumn } from 'tw-react-components';
 
-import { contestStartedAndNotOver, dateComparator, formatRestTime } from '@core/helpers';
-import { Judging, Submission } from '@core/models';
-import { PublicStore, RootStore, TeamStore, useStore } from '@core/stores';
+import { Judging, Prisma } from '@prisma/client';
 
-const SubmissionsList: React.FC = observer(() => {
-  const { profile, updatesCount } = useStore<RootStore>('rootStore');
-  const { currentContest } = useStore<PublicStore>('publicStore');
-  const { fetchSubmissions } = useStore<TeamStore>('teamStore');
+import { useAuthContext } from '@core/contexts';
+import { dateComparator, formatRestTime, isContestRunning } from '@core/utils';
+import { useFindFirstContest, useFindManySubmission } from '@models';
 
-  const columns: ListPageTableColumn<Submission>[] = [
+type Submission = Prisma.SubmissionGetPayload<{
+  include: { problem: true; language: true; judgings: true };
+}>;
+
+export const SubmissionsList: FC = () => {
+  const { profile } = useAuthContext();
+  const { id: contestId } = useParams();
+
+  const { data: contest } = useFindFirstContest({
+    where: { id: parseInt(contestId ?? '-1') },
+    include: { problems: { include: { problem: true } } },
+  });
+
+  const { data: submissions, isLoading } = useFindManySubmission(
+    {
+      where: { contestId: contest?.id, teamId: profile?.team?.id },
+      include: { problem: true, language: true, judgings: true },
+    },
+    {
+      enabled: isContestRunning(contest),
+    },
+  );
+
+  const columns: DataTableColumn<Submission>[] = [
     {
       header: 'Time',
       field: 'submitTime',
-      textAlign: 'center',
+      align: 'center',
       render: (submission) =>
         formatRestTime(
           (new Date(submission.submitTime).getTime() -
-            new Date(currentContest?.startTime ?? 0).getTime()) /
+            new Date(contest?.startTime ?? 0).getTime()) /
             1000,
         ),
     },
     {
       header: 'Problem',
       field: 'problem',
-      textAlign: 'center',
+      align: 'center',
       render: (submission) =>
-        currentContest?.problems?.find((p) => p.problem.id === submission.problem.id)?.shortName ??
-        '-',
+        contest?.problems?.find((p) => p.problem.id === submission.problem.id)?.shortName ?? '-',
     },
     {
       header: 'Language',
-      field: 'language',
-      textAlign: 'center',
-      render: (submission) => submission.language.name,
-    },
-    {
-      header: 'Result',
-      field: 'language',
-      textAlign: 'center',
-      render: (submission) => <SubmissionResult submission={submission} />,
+      field: 'language.name',
+      align: 'center',
     },
+    // {
+    //   header: 'Result',
+    //   field: 'language',
+    //   align: 'center',
+    //   render: (submission) => <SubmissionResult submission={submission} />,
+    // },
   ];
 
-  const fetchAll = () =>
-    currentContest && contestStartedAndNotOver(currentContest) && profile?.team
-      ? fetchSubmissions(currentContest.id, profile.team.id)
-      : Promise.all([]);
-
   return (
-    <DataTable<Submission>
-      header="Submissions"
-      emptyMessage="No Submissions"
-      dataFetcher={fetchAll}
-      dataDependencies={[currentContest, profile, updatesCount.submissions]}
+    <DataTable
+      rows={submissions ?? []}
       columns={columns}
-      withoutActions
-      rowBackgroundColor={(submission) => {
+      isLoading={isLoading}
+      rowClassName={(submission) => {
         const judging = submission.judgings
           .slice()
           .sort(dateComparator<Judging>('startTime', true))
           .shift();
-        if (
-          !judging ||
-          !judging.result ||
-          (currentContest!.verificationRequired && !judging.verified)
-        )
+        if (!judging || !judging.result || (contest?.verificationRequired && !judging.verified))
           return 'yellow';
-        return judging.result == 'AC' ? 'green' : 'red';
+        return judging.result === 'ACCEPTED'
+          ? 'bg-green-400 dark:bg-green-700'
+          : 'bg-red-400 dark:bg-red-700';
       }}
     />
   );
-});
-
-export default SubmissionsList;
+};
diff --git a/apps/server/src/auth/auth.service.ts b/apps/server/src/auth/auth.service.ts
index afd18b9..20d5a59 100644
--- a/apps/server/src/auth/auth.service.ts
+++ b/apps/server/src/auth/auth.service.ts
@@ -16,7 +16,7 @@ export class AuthService {
     const user =
       (await prisma.user.findUnique({
         where: { username },
-        include: { role: true },
+        include: { role: true, team: true },
       })) ?? throwError<User>(new NotFoundException());
 
     if (checkPassword(user, password)) return cleanUser(user);
diff --git a/package.json b/package.json
index 554d5e8..3f588bc 100644
--- a/package.json
+++ b/package.json
@@ -74,18 +74,18 @@
     "@heroicons/react": "^2.1.5",
     "@nestjs/schematics": "^10.0.1",
     "@nestjs/testing": "^10.0.2",
-    "@nx/cypress": "20.0.1",
-    "@nx/eslint": "20.0.1",
-    "@nx/eslint-plugin": "20.0.1",
-    "@nx/jest": "20.0.1",
-    "@nx/js": "20.0.1",
-    "@nx/nest": "20.0.1",
-    "@nx/node": "20.0.1",
-    "@nx/react": "20.0.1",
-    "@nx/vite": "20.0.1",
-    "@nx/web": "20.0.1",
-    "@nx/webpack": "20.0.1",
-    "@nx/workspace": "20.0.1",
+    "@nx/cypress": "20.0.6",
+    "@nx/eslint": "20.0.6",
+    "@nx/eslint-plugin": "20.0.6",
+    "@nx/jest": "20.0.6",
+    "@nx/js": "20.0.6",
+    "@nx/nest": "20.0.6",
+    "@nx/node": "20.0.6",
+    "@nx/react": "20.0.6",
+    "@nx/vite": "20.0.6",
+    "@nx/web": "20.0.6",
+    "@nx/webpack": "20.0.6",
+    "@nx/workspace": "20.0.6",
     "@radix-ui/react-accordion": "^1.2.0",
     "@radix-ui/react-collapsible": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.1",
@@ -141,7 +141,7 @@
     "lucide-react": "^0.441.0",
     "mobx": "^6.13.2",
     "mobx-react": "^9.1.1",
-    "nx": "20.0.1",
+    "nx": "20.0.6",
     "postcss": "8.4.38",
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.6",
diff --git a/yarn.lock b/yarn.lock
index 86ad482..760400a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2069,18 +2069,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/compat@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "@eslint/compat@npm:1.2.0"
-  peerDependencies:
-    eslint: ^9.10.0
-  peerDependenciesMeta:
-    eslint:
-      optional: true
-  checksum: 10c0/ad79bf1ef14462f829288c4e2ca8eeffdf576fa923d3f8a07e752e821bdbe5fd79360fe6254e9ddfe7eada2e4e3d22a7ee09f5d21763e67bc4fbc331efb3c3e9
-  languageName: node
-  linkType: hard
-
 "@eslint/eslintrc@npm:^2.1.4":
   version: 2.1.4
   resolution: "@eslint/eslintrc@npm:2.1.4"
@@ -3443,13 +3431,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/cypress@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/cypress@npm:20.0.1"
+"@nx/cypress@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/cypress@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/eslint": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/eslint": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     detect-port: "npm:^1.5.1"
     tslib: "npm:^2.3.0"
@@ -3458,13 +3446,13 @@ __metadata:
   peerDependenciesMeta:
     cypress:
       optional: true
-  checksum: 10c0/e581fedd1e5833e336dbbdc69dc37981689edadaac368e014a0c3e6b2ae7b54ade73443a43de0dd38a5278b59183469187f4247ca27cdfc8781a2610be9d8577
+  checksum: 10c0/351a7637393ecea96c6a9f997e418e4049de18139bace70642de91d80beb145404cc35f2a5d1d11a525fae16b5566be5b0a8853f4b46942bad6d197de1361f1d
   languageName: node
   linkType: hard
 
-"@nx/devkit@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/devkit@npm:20.0.1"
+"@nx/devkit@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/devkit@npm:20.0.6"
   dependencies:
     ejs: "npm:^3.1.7"
     enquirer: "npm:~2.3.6"
@@ -3476,17 +3464,16 @@ __metadata:
     yargs-parser: "npm:21.1.1"
   peerDependencies:
     nx: ">= 19 <= 21"
-  checksum: 10c0/40da61efd91f984cad564e6198b689492e666c85914ad37256c0e0617c2c4cd80c9c88eac3938dd448af4683ab969e8ebf1169d59e05580a82408bead75ffe33
+  checksum: 10c0/cf1768160a0de434e26424dffd6b9acd436a63c1d89dde0bdf75082daf110efe7961c823a15a70cfbc7f6d1a27bffd82f5de66a8e8d6dfce5e0fd54a725b98b5
   languageName: node
   linkType: hard
 
-"@nx/eslint-plugin@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/eslint-plugin@npm:20.0.1"
+"@nx/eslint-plugin@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/eslint-plugin@npm:20.0.6"
   dependencies:
-    "@eslint/compat": "npm:^1.1.1"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     "@typescript-eslint/type-utils": "npm:^8.0.0"
     "@typescript-eslint/utils": "npm:^8.0.0"
     chalk: "npm:^4.1.0"
@@ -3501,16 +3488,16 @@ __metadata:
   peerDependenciesMeta:
     eslint-config-prettier:
       optional: true
-  checksum: 10c0/00c04f65d071cb8136f24359e62cd1e37faeaecc6db16422dff563a6ebe9b38bd2879192c65e9948c78975593735130fdbf1cf102b35dbabcf62e3aaec8591e1
+  checksum: 10c0/dc3b0536e0c1f95b23dc2e23ac53be82371e03bb70fbbe01294780ff0dbb2579ab7ecadeec1079c4796616617940a895b1ad687cb2f0df9bd75722dfdb6180ae
   languageName: node
   linkType: hard
 
-"@nx/eslint@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/eslint@npm:20.0.1"
+"@nx/eslint@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/eslint@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     semver: "npm:^7.5.3"
     tslib: "npm:^2.3.0"
     typescript: "npm:~5.4.2"
@@ -3520,18 +3507,18 @@ __metadata:
   peerDependenciesMeta:
     "@zkochan/js-yaml":
       optional: true
-  checksum: 10c0/fdf7743d67410a26a2b4fd56b09adfe4be3e20d2ce6903cf401ba040fffe6441eaa02bf06bed0782554f9bd9ef91cdfa1756cf2d76b0fffdc201f2534aa50aec
+  checksum: 10c0/7712b4a7b1264c8a89166f9aebf0998de40beeed092b910edb61f31980f828b9245a23a7d4ab2048bcbea9e6db1706e5f88619538f13393d5e1898c4609d8899
   languageName: node
   linkType: hard
 
-"@nx/jest@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/jest@npm:20.0.1"
+"@nx/jest@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/jest@npm:20.0.6"
   dependencies:
     "@jest/reporters": "npm:^29.4.1"
     "@jest/test-result": "npm:^29.4.1"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     chalk: "npm:^4.1.0"
     identity-obj-proxy: "npm:3.0.0"
@@ -3543,13 +3530,13 @@ __metadata:
     semver: "npm:^7.5.3"
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
-  checksum: 10c0/f96b96fe86520c09bfbe4db82a3dbe4f6e1b618dd5a28e20b59f416ef9a6b3ffa3a2290145798853fcbf674135a7e74db7ec469aa21362714e6d27379257552f
+  checksum: 10c0/3026f738a20a3dcfa7a1bd2555916a636797e1175ea5f371721b6eeacfab8d4c682abce3f53b8e5134b53185dd917396814eeb8ef7fc5e084ea89501fd206e1d
   languageName: node
   linkType: hard
 
-"@nx/js@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/js@npm:20.0.1"
+"@nx/js@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/js@npm:20.0.6"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/plugin-proposal-decorators": "npm:^7.22.7"
@@ -3558,8 +3545,8 @@ __metadata:
     "@babel/preset-env": "npm:^7.23.2"
     "@babel/preset-typescript": "npm:^7.22.5"
     "@babel/runtime": "npm:^7.22.6"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/workspace": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/workspace": "npm:20.0.6"
     "@zkochan/js-yaml": "npm:0.0.7"
     babel-plugin-const-enum: "npm:^1.0.1"
     babel-plugin-macros: "npm:^2.8.0"
@@ -3586,116 +3573,116 @@ __metadata:
   peerDependenciesMeta:
     verdaccio:
       optional: true
-  checksum: 10c0/6b4b91d7e4bb60f969f6a5dea856fd3605e205573294aaf91a690d9fad9ba16b2374cde7bcd659c060d1365f08e495b20956cc48f55b4737579e9ce6eeb18627
+  checksum: 10c0/d9509433f5b5efe12a3d8d881ed4dbb70a9ec299df4857fb8fb64eaccc176e72040d6ba92d8b2efdca734ba298c66468051777eec2f4e7b3c246f4c0e74da2b2
   languageName: node
   linkType: hard
 
-"@nx/nest@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nest@npm:20.0.1"
+"@nx/nest@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nest@npm:20.0.6"
   dependencies:
     "@nestjs/schematics": "npm:^9.1.0"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/eslint": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
-    "@nx/node": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/eslint": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
+    "@nx/node": "npm:20.0.6"
     tslib: "npm:^2.3.0"
-  checksum: 10c0/1d6531f39fc4c8f4a9c6da02c5bb5019d1e1092c93d29dc77572d3d4b7ce9d0431905c9661e8ad24a6682d0b01b65107b199cd58ffd62148e0c7a85e7bc16199
+  checksum: 10c0/7e425e1ce5d22e5fb70400fd0685ca7800bc918a74c173b487c24ec50b345af63bb00035219cc88b3defc3bb92729435be6c87aad0b30b5aed04729cdea9566f
   languageName: node
   linkType: hard
 
-"@nx/node@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/node@npm:20.0.1"
+"@nx/node@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/node@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/eslint": "npm:20.0.1"
-    "@nx/jest": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/eslint": "npm:20.0.6"
+    "@nx/jest": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     tslib: "npm:^2.3.0"
-  checksum: 10c0/ba8c965e35e594557158fd4e77f0051a29bc1470b72972ef387e27ca28a057dc43e655608918a096fc13636a3ef205bf454a433b52283d5586e887738d0a947d
+  checksum: 10c0/61855e34025a4ed521dda4726326fc6be624fd5fd663aba60e99d5aa0a48afc37e552383bcfaf7224f21017e8ee999721979f2f16bae363708bcf48821f8471b
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-arm64@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-darwin-arm64@npm:20.0.1"
+"@nx/nx-darwin-arm64@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-darwin-arm64@npm:20.0.6"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-x64@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-darwin-x64@npm:20.0.1"
+"@nx/nx-darwin-x64@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-darwin-x64@npm:20.0.6"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-freebsd-x64@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-freebsd-x64@npm:20.0.1"
+"@nx/nx-freebsd-x64@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-freebsd-x64@npm:20.0.6"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm-gnueabihf@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-linux-arm-gnueabihf@npm:20.0.1"
+"@nx/nx-linux-arm-gnueabihf@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:20.0.6"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-gnu@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-linux-arm64-gnu@npm:20.0.1"
+"@nx/nx-linux-arm64-gnu@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-linux-arm64-gnu@npm:20.0.6"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-musl@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-linux-arm64-musl@npm:20.0.1"
+"@nx/nx-linux-arm64-musl@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-linux-arm64-musl@npm:20.0.6"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-gnu@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-linux-x64-gnu@npm:20.0.1"
+"@nx/nx-linux-x64-gnu@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-linux-x64-gnu@npm:20.0.6"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-musl@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-linux-x64-musl@npm:20.0.1"
+"@nx/nx-linux-x64-musl@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-linux-x64-musl@npm:20.0.6"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-arm64-msvc@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-win32-arm64-msvc@npm:20.0.1"
+"@nx/nx-win32-arm64-msvc@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-win32-arm64-msvc@npm:20.0.6"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-x64-msvc@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/nx-win32-x64-msvc@npm:20.0.1"
+"@nx/nx-win32-x64-msvc@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/nx-win32-x64-msvc@npm:20.0.6"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/react@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/react@npm:20.0.1"
+"@nx/react@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/react@npm:20.0.6"
   dependencies:
     "@module-federation/enhanced": "npm:0.6.6"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/eslint": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
-    "@nx/web": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/eslint": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
+    "@nx/web": "npm:20.0.6"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     "@svgr/webpack": "npm:^8.0.1"
     express: "npm:^4.19.2"
@@ -3704,16 +3691,16 @@ __metadata:
     minimatch: "npm:9.0.3"
     picocolors: "npm:^1.1.0"
     tslib: "npm:^2.3.0"
-  checksum: 10c0/563563762729de70c16b0e3376881fe0c2a9403ced3812114ca55064a64d5ae984ea30fb4930175883a06ba6c98515a3e07ecf3574040b4e7b53ebabe610e9bf
+  checksum: 10c0/2bda855c586b445601075ea5bb038b3a3af2bd15a4155de0d184e5a4fc0d61644e9d2ddb3b27f84a9b0e58cd846f20df87caf829f552b13610faabb790872e4c
   languageName: node
   linkType: hard
 
-"@nx/vite@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/vite@npm:20.0.1"
+"@nx/vite@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/vite@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     "@swc/helpers": "npm:~0.5.0"
     enquirer: "npm:~2.3.6"
@@ -3722,33 +3709,33 @@ __metadata:
   peerDependencies:
     vite: ^5.0.0
     vitest: ^1.3.1 || ^2.0.0
-  checksum: 10c0/d3ff7f0a08c4bb026bbe6253248fa2073f792330ada23fc803e8e2ca96f46c7bfe38ff8f16a163d85aab45534e3912538cbf968d94e4ba3732d1a9196b63b1fa
+  checksum: 10c0/7797ccab8409e7120a8526cc015002abf17dcb060a9a46e4f81e985d95452b98f851086686ee68b9df2e3a59b715a47881132bebab6e1cb89a7d0c3b12333f67
   languageName: node
   linkType: hard
 
-"@nx/web@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/web@npm:20.0.1"
+"@nx/web@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/web@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     detect-port: "npm:^1.5.1"
     http-server: "npm:^14.1.0"
     picocolors: "npm:^1.1.0"
     tslib: "npm:^2.3.0"
-  checksum: 10c0/c510713c6b52b03d8a2307a65457ca875bde387ad9c04bee0db73b34bec11a21eb9a00e4942334084391136b1804d50fda324f3bc07265988d31395756ec2559
+  checksum: 10c0/0c03ce687bf4ac90e55e827a80f3ca34286aa2e9e5012d39b81304b9ee006fce308b3b6d335013204e8e1a61dfe6210c9e3c4ad8c1b376d0800807d561e852cc
   languageName: node
   linkType: hard
 
-"@nx/webpack@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/webpack@npm:20.0.1"
+"@nx/webpack@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/webpack@npm:20.0.6"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@module-federation/enhanced": "npm:^0.6.0"
     "@module-federation/sdk": "npm:^0.6.0"
-    "@nx/devkit": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     ajv: "npm:^8.12.0"
     autoprefixer: "npm:^10.4.9"
@@ -3785,21 +3772,21 @@ __metadata:
     webpack-dev-server: "npm:^5.0.4"
     webpack-node-externals: "npm:^3.0.0"
     webpack-subresource-integrity: "npm:^5.1.0"
-  checksum: 10c0/861de22701b12366819a1f2b9b076684bf1b6f358711eadf9afdf5f1ea686cd7aa9ae35976f92e6457e89fa33843e0d6350a858ca7cf73dc528f8f86fad1d825
+  checksum: 10c0/e51e84aeb241468e206097cdd429c6c3481128b9d87be2dcb2365f6a9eff58a5371011bdba06bd10b35be149d8eb43d30ce9d064bacb0db0109336f3244f1e7b
   languageName: node
   linkType: hard
 
-"@nx/workspace@npm:20.0.1":
-  version: 20.0.1
-  resolution: "@nx/workspace@npm:20.0.1"
+"@nx/workspace@npm:20.0.6":
+  version: 20.0.6
+  resolution: "@nx/workspace@npm:20.0.6"
   dependencies:
-    "@nx/devkit": "npm:20.0.1"
+    "@nx/devkit": "npm:20.0.6"
     chalk: "npm:^4.1.0"
     enquirer: "npm:~2.3.6"
-    nx: "npm:20.0.1"
+    nx: "npm:20.0.6"
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
-  checksum: 10c0/662814e868de6f2964a15c47f5e3359d9d092cd68eda03ed6e31a17357dd8921385669888741f157700dfbeeaec0323604d55ed2bf5a9e036323357fb91c051a
+  checksum: 10c0/5b8c6b0b132d7e9f691ebeda98db3452e683edf3cb902971f300bc4f58ed196d6c5e23a8a90843a4a2ff03710f0dc889cbb3d724d738420d835f140df376decb
   languageName: node
   linkType: hard
 
@@ -5599,18 +5586,18 @@ __metadata:
     "@nestjs/testing": "npm:^10.0.2"
     "@nestjs/typeorm": "npm:^10.0.2"
     "@nestjs/websockets": "npm:^10.4.1"
-    "@nx/cypress": "npm:20.0.1"
-    "@nx/eslint": "npm:20.0.1"
-    "@nx/eslint-plugin": "npm:20.0.1"
-    "@nx/jest": "npm:20.0.1"
-    "@nx/js": "npm:20.0.1"
-    "@nx/nest": "npm:20.0.1"
-    "@nx/node": "npm:20.0.1"
-    "@nx/react": "npm:20.0.1"
-    "@nx/vite": "npm:20.0.1"
-    "@nx/web": "npm:20.0.1"
-    "@nx/webpack": "npm:20.0.1"
-    "@nx/workspace": "npm:20.0.1"
+    "@nx/cypress": "npm:20.0.6"
+    "@nx/eslint": "npm:20.0.6"
+    "@nx/eslint-plugin": "npm:20.0.6"
+    "@nx/jest": "npm:20.0.6"
+    "@nx/js": "npm:20.0.6"
+    "@nx/nest": "npm:20.0.6"
+    "@nx/node": "npm:20.0.6"
+    "@nx/react": "npm:20.0.6"
+    "@nx/vite": "npm:20.0.6"
+    "@nx/web": "npm:20.0.6"
+    "@nx/webpack": "npm:20.0.6"
+    "@nx/workspace": "npm:20.0.6"
     "@prisma/client": "npm:^5.19.1"
     "@radix-ui/react-accordion": "npm:^1.2.0"
     "@radix-ui/react-collapsible": "npm:^1.1.1"
@@ -5688,7 +5675,7 @@ __metadata:
     multistream: "npm:^4.1.0"
     nest-winston: "npm:1.9.7"
     nestjs-cls: "npm:^4.4.1"
-    nx: "npm:20.0.1"
+    nx: "npm:20.0.6"
     passport: "npm:^0.7.0"
     passport-local: "npm:^1.0.0"
     postcss: "npm:8.4.38"
@@ -15618,21 +15605,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:20.0.1":
-  version: 20.0.1
-  resolution: "nx@npm:20.0.1"
+"nx@npm:20.0.6":
+  version: 20.0.6
+  resolution: "nx@npm:20.0.6"
   dependencies:
     "@napi-rs/wasm-runtime": "npm:0.2.4"
-    "@nx/nx-darwin-arm64": "npm:20.0.1"
-    "@nx/nx-darwin-x64": "npm:20.0.1"
-    "@nx/nx-freebsd-x64": "npm:20.0.1"
-    "@nx/nx-linux-arm-gnueabihf": "npm:20.0.1"
-    "@nx/nx-linux-arm64-gnu": "npm:20.0.1"
-    "@nx/nx-linux-arm64-musl": "npm:20.0.1"
-    "@nx/nx-linux-x64-gnu": "npm:20.0.1"
-    "@nx/nx-linux-x64-musl": "npm:20.0.1"
-    "@nx/nx-win32-arm64-msvc": "npm:20.0.1"
-    "@nx/nx-win32-x64-msvc": "npm:20.0.1"
+    "@nx/nx-darwin-arm64": "npm:20.0.6"
+    "@nx/nx-darwin-x64": "npm:20.0.6"
+    "@nx/nx-freebsd-x64": "npm:20.0.6"
+    "@nx/nx-linux-arm-gnueabihf": "npm:20.0.6"
+    "@nx/nx-linux-arm64-gnu": "npm:20.0.6"
+    "@nx/nx-linux-arm64-musl": "npm:20.0.6"
+    "@nx/nx-linux-x64-gnu": "npm:20.0.6"
+    "@nx/nx-linux-x64-musl": "npm:20.0.6"
+    "@nx/nx-win32-arm64-msvc": "npm:20.0.6"
+    "@nx/nx-win32-x64-msvc": "npm:20.0.6"
     "@yarnpkg/lockfile": "npm:^1.1.0"
     "@yarnpkg/parsers": "npm:3.0.0-rc.46"
     "@zkochan/js-yaml": "npm:0.0.7"
@@ -15696,7 +15683,7 @@ __metadata:
   bin:
     nx: bin/nx.js
     nx-cloud: bin/nx-cloud.js
-  checksum: 10c0/6a0fbe0b438b30a3bb0eefde685377bdc2a5547509e3273cf20d97d1acdde2aba190560739ccf419452f312e90dc4abeba9dcee01348aa6d6378d39137fc47e1
+  checksum: 10c0/b5413b84507e37056b7ded24eaeed26e583883f6e7f64c6ee374c41fc1c7b7a8537ab23f338f12df92e30b1860a89f9f3ec828dcc11fe22797512df3aa12f135
   languageName: node
   linkType: hard