Skip to content

Commit

Permalink
chore: fix initiating data for server
Browse files Browse the repository at this point in the history
  • Loading branch information
bacali95 committed Sep 13, 2024
1 parent d8c95b7 commit 8e229e0
Show file tree
Hide file tree
Showing 304 changed files with 4,268 additions and 1,973 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ REDIS_URL="redis://localhost:6379"

LOG_LEVEL="debug"

SYSTEM_STORAGE_DIRECTORY_PATH=./dist/files-storage/tun-judge
SYSTEM_STORAGE_DIRECTORY_PATH=./dist/files-storage
5 changes: 4 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
/dist
/coverage
/.nx/cache
/.nx/workspace-data
/.nx/workspace-data
/.yarnrc.yml
/.yarn
/README.md
6 changes: 0 additions & 6 deletions .prettierrc

This file was deleted.

9 changes: 9 additions & 0 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
printWidth: 100,
singleQuote: true,
importOrder: ['^ace-builds/(.*)$', '^@prisma/(.*)$', '^@(core|shared)/(.*)$', '^[./]'],
importOrderSeparation: true,
importOrderSortSpecifiers: true,
importOrderParserPlugins: ['typescript', 'jsx', 'decorators-legacy'],
plugins: ['@trivago/prettier-plugin-sort-imports', 'prettier-plugin-tailwindcss'],
};
77 changes: 37 additions & 40 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ All notable changes to this project will be documented in this file. See [standa

### [0.0.43](https://github.com/NaN-Projects/tun-judge/compare/v0.0.42...v0.0.43) (2021-10-22)


### Bug Fixes

* update languages docker images names ([2c441d5](https://github.com/NaN-Projects/tun-judge/commit/2c441d5de701ac190e89b8b7d416a9ebd2226e4b))
- update languages docker images names ([2c441d5](https://github.com/NaN-Projects/tun-judge/commit/2c441d5de701ac190e89b8b7d416a9ebd2226e4b))

### [0.0.42](https://github.com/NaN-Projects/tun-judge/compare/v0.0.41...v0.0.42) (2021-10-21)

Expand All @@ -17,46 +16,44 @@ All notable changes to this project will be documented in this file. See [standa

### 0.0.39 (2021-10-21)


### Features

* add clarification messaging system between teams and judges ([540cbec](https://github.com/NaN-Projects/tun-judge/commit/540cbec3e02533476ce111354f1062f79d7ad28b))
* add dark mode and fix several bugs ([31608de](https://github.com/NaN-Projects/tun-judge/commit/31608de25ec5f40752d5ee6a1632ea00c3ff9c51))
* add diff viewer for team and judge outputs ([ada5080](https://github.com/NaN-Projects/tun-judge/commit/ada5080d7eced38cd76a7cec2f73cf04cdeeb4fb))
* add initial data and implement database initializers ([3fd4b1b](https://github.com/NaN-Projects/tun-judge/commit/3fd4b1b9a2a508ac50b30a9719cacbcf7761f0f5))
* add swagger api docs and swagger-stats ([9bd479e](https://github.com/NaN-Projects/tun-judge/commit/9bd479e228d86b4f78cf857ffbc151fdf3e1a5f2))
* add the ability to attach multiple users to a single team ([996aed5](https://github.com/NaN-Projects/tun-judge/commit/996aed5d6ad852ad7bc228b1e8da6fe56c6cd7cb))
* add tooltips ([aa83c7e](https://github.com/NaN-Projects/tun-judge/commit/aa83c7eb3d628d710194bfaf21675c70f53a3e9e))
* redesign the client using TailwindCSS ([4573ba2](https://github.com/NaN-Projects/tun-judge/commit/4573ba2f63db1976c4c523c584782b6caa93f9b1))
* update testlib.h ([e9561aa](https://github.com/NaN-Projects/tun-judge/commit/e9561aa9c1bf82c3b931f3c29c235b928ad86e3c))

- add clarification messaging system between teams and judges ([540cbec](https://github.com/NaN-Projects/tun-judge/commit/540cbec3e02533476ce111354f1062f79d7ad28b))
- add dark mode and fix several bugs ([31608de](https://github.com/NaN-Projects/tun-judge/commit/31608de25ec5f40752d5ee6a1632ea00c3ff9c51))
- add diff viewer for team and judge outputs ([ada5080](https://github.com/NaN-Projects/tun-judge/commit/ada5080d7eced38cd76a7cec2f73cf04cdeeb4fb))
- add initial data and implement database initializers ([3fd4b1b](https://github.com/NaN-Projects/tun-judge/commit/3fd4b1b9a2a508ac50b30a9719cacbcf7761f0f5))
- add swagger api docs and swagger-stats ([9bd479e](https://github.com/NaN-Projects/tun-judge/commit/9bd479e228d86b4f78cf857ffbc151fdf3e1a5f2))
- add the ability to attach multiple users to a single team ([996aed5](https://github.com/NaN-Projects/tun-judge/commit/996aed5d6ad852ad7bc228b1e8da6fe56c6cd7cb))
- add tooltips ([aa83c7e](https://github.com/NaN-Projects/tun-judge/commit/aa83c7eb3d628d710194bfaf21675c70f53a3e9e))
- redesign the client using TailwindCSS ([4573ba2](https://github.com/NaN-Projects/tun-judge/commit/4573ba2f63db1976c4c523c584782b6caa93f9b1))
- update testlib.h ([e9561aa](https://github.com/NaN-Projects/tun-judge/commit/e9561aa9c1bf82c3b931f3c29c235b928ad86e3c))

### Bug Fixes

* add contest query param to submissions endpoint and refactor code ([905a13b](https://github.com/NaN-Projects/tun-judge/commit/905a13bbfa0c68ffbcbf33242885fb829b7742ae))
* better handeling and reporting errors for judge ([cd31676](https://github.com/NaN-Projects/tun-judge/commit/cd31676f4bbf353fec1359cfde089ddbdc2cb500))
* enable strict mode for judge ([abd601c](https://github.com/NaN-Projects/tun-judge/commit/abd601c8ebdd2de0d6e433aca6cc6450749ed0e0))
* fix accepting not allowed submissions ([0c1bf2f](https://github.com/NaN-Projects/tun-judge/commit/0c1bf2f041b1e148bc64a6e41b0792c187d4c7c1))
* fix bug in judge ([6612d56](https://github.com/NaN-Projects/tun-judge/commit/6612d5695683b2a76f717d1d4273ce781168e56c))
* fix deleting contest bug ([5bc22a7](https://github.com/NaN-Projects/tun-judge/commit/5bc22a7303aa044770b0dee12d085105c3440dbf))
* fix design flaws ([1f2ff3e](https://github.com/NaN-Projects/tun-judge/commit/1f2ff3ee3179d5cda1e19cb478c8a24cdb337ff8))
* fix handeling login errors for judge ([62f749a](https://github.com/NaN-Projects/tun-judge/commit/62f749a8498110c8895d8b5545ef4d0ecc348460))
* fix refreshing submission list when filters changes ([cf00ef5](https://github.com/NaN-Projects/tun-judge/commit/cf00ef5c76c4be1818e8c38d48177646806bff7f))
* fix scorecache calculation bug ([9e79ce3](https://github.com/NaN-Projects/tun-judge/commit/9e79ce3053dca8f5016437e6030c85ec8992e5b1))
* fix server loading client ([77b81ed](https://github.com/NaN-Projects/tun-judge/commit/77b81ed4ad610e9f654444cb22acbf5c49ded0a0))
* fix server start script ([e73d830](https://github.com/NaN-Projects/tun-judge/commit/e73d830f3bc47a60410f55a5766cd0b123e8e083))
* fix Snyk vulnerabilities ([d4e87f4](https://github.com/NaN-Projects/tun-judge/commit/d4e87f42efa5e3ec51b093c2784647bafecce61a))
* fix Snyk vulnerabilities ([e3f20b2](https://github.com/NaN-Projects/tun-judge/commit/e3f20b2c179cbd23cf09b15914231a8a8b6720ce))
* fix Snyk vulnerabilities and prettier issues ([3fdf401](https://github.com/NaN-Projects/tun-judge/commit/3fdf401a7098febb5953779b167f2ad9a12d6b53))
* fix Spinner ([1fbf8f5](https://github.com/NaN-Projects/tun-judge/commit/1fbf8f5883e8f5f0d3ce2ac9103fb9efde5bf132))
* fix submission view testcases view ([6b5e779](https://github.com/NaN-Projects/tun-judge/commit/6b5e779896192a2744b5f507b984005d4dd44d4e))
* fix time formatting ([29535d4](https://github.com/NaN-Projects/tun-judge/commit/29535d4e9a8f1d1e1d2f6b8286e05f6fbfda3480))
* fix vulnerabilities ([a33ecf4](https://github.com/NaN-Projects/tun-judge/commit/a33ecf46f9a1c8f381911456d476688eea150dec))
* refactor form controls ([d70d15e](https://github.com/NaN-Projects/tun-judge/commit/d70d15ef8eaae6cf8fcdd15aa741cb36aa221c9b))
* refactor judge code part1 ([b93908c](https://github.com/NaN-Projects/tun-judge/commit/b93908ccbc81252f8be193db14dcd61a42a88430))
* refactor judge code part2 ([01d67b7](https://github.com/NaN-Projects/tun-judge/commit/01d67b74d72bacae5e55ffd9a01fc114717654d6))
* replace judge pinging server to server sending events when new submissions are available ([ded90f3](https://github.com/NaN-Projects/tun-judge/commit/ded90f30a1356e35bd990eb0703aec8330d4f118))
* ui fixes ([dd3705d](https://github.com/NaN-Projects/tun-judge/commit/dd3705d4a5e2011fd1a8add8c7a78762d9373da7))
* update docker image tags ([2bda93e](https://github.com/NaN-Projects/tun-judge/commit/2bda93e813a087751ec1977f98f70e6e1832b675))
* update docker image tags ([0cc99a3](https://github.com/NaN-Projects/tun-judge/commit/0cc99a398e8aa8c2874ac38b0e33d164e77e096f))
* write implictaly tailwindcss classnames ([e738850](https://github.com/NaN-Projects/tun-judge/commit/e7388507ac97dbe49fa89f5614b3a6f83c1b3800))
- add contest query param to submissions endpoint and refactor code ([905a13b](https://github.com/NaN-Projects/tun-judge/commit/905a13bbfa0c68ffbcbf33242885fb829b7742ae))
- better handeling and reporting errors for judge ([cd31676](https://github.com/NaN-Projects/tun-judge/commit/cd31676f4bbf353fec1359cfde089ddbdc2cb500))
- enable strict mode for judge ([abd601c](https://github.com/NaN-Projects/tun-judge/commit/abd601c8ebdd2de0d6e433aca6cc6450749ed0e0))
- fix accepting not allowed submissions ([0c1bf2f](https://github.com/NaN-Projects/tun-judge/commit/0c1bf2f041b1e148bc64a6e41b0792c187d4c7c1))
- fix bug in judge ([6612d56](https://github.com/NaN-Projects/tun-judge/commit/6612d5695683b2a76f717d1d4273ce781168e56c))
- fix deleting contest bug ([5bc22a7](https://github.com/NaN-Projects/tun-judge/commit/5bc22a7303aa044770b0dee12d085105c3440dbf))
- fix design flaws ([1f2ff3e](https://github.com/NaN-Projects/tun-judge/commit/1f2ff3ee3179d5cda1e19cb478c8a24cdb337ff8))
- fix handeling login errors for judge ([62f749a](https://github.com/NaN-Projects/tun-judge/commit/62f749a8498110c8895d8b5545ef4d0ecc348460))
- fix refreshing submission list when filters changes ([cf00ef5](https://github.com/NaN-Projects/tun-judge/commit/cf00ef5c76c4be1818e8c38d48177646806bff7f))
- fix scorecache calculation bug ([9e79ce3](https://github.com/NaN-Projects/tun-judge/commit/9e79ce3053dca8f5016437e6030c85ec8992e5b1))
- fix server loading client ([77b81ed](https://github.com/NaN-Projects/tun-judge/commit/77b81ed4ad610e9f654444cb22acbf5c49ded0a0))
- fix server start script ([e73d830](https://github.com/NaN-Projects/tun-judge/commit/e73d830f3bc47a60410f55a5766cd0b123e8e083))
- fix Snyk vulnerabilities ([d4e87f4](https://github.com/NaN-Projects/tun-judge/commit/d4e87f42efa5e3ec51b093c2784647bafecce61a))
- fix Snyk vulnerabilities ([e3f20b2](https://github.com/NaN-Projects/tun-judge/commit/e3f20b2c179cbd23cf09b15914231a8a8b6720ce))
- fix Snyk vulnerabilities and prettier issues ([3fdf401](https://github.com/NaN-Projects/tun-judge/commit/3fdf401a7098febb5953779b167f2ad9a12d6b53))
- fix Spinner ([1fbf8f5](https://github.com/NaN-Projects/tun-judge/commit/1fbf8f5883e8f5f0d3ce2ac9103fb9efde5bf132))
- fix submission view testcases view ([6b5e779](https://github.com/NaN-Projects/tun-judge/commit/6b5e779896192a2744b5f507b984005d4dd44d4e))
- fix time formatting ([29535d4](https://github.com/NaN-Projects/tun-judge/commit/29535d4e9a8f1d1e1d2f6b8286e05f6fbfda3480))
- fix vulnerabilities ([a33ecf4](https://github.com/NaN-Projects/tun-judge/commit/a33ecf46f9a1c8f381911456d476688eea150dec))
- refactor form controls ([d70d15e](https://github.com/NaN-Projects/tun-judge/commit/d70d15ef8eaae6cf8fcdd15aa741cb36aa221c9b))
- refactor judge code part1 ([b93908c](https://github.com/NaN-Projects/tun-judge/commit/b93908ccbc81252f8be193db14dcd61a42a88430))
- refactor judge code part2 ([01d67b7](https://github.com/NaN-Projects/tun-judge/commit/01d67b74d72bacae5e55ffd9a01fc114717654d6))
- replace judge pinging server to server sending events when new submissions are available ([ded90f3](https://github.com/NaN-Projects/tun-judge/commit/ded90f30a1356e35bd990eb0703aec8330d4f118))
- ui fixes ([dd3705d](https://github.com/NaN-Projects/tun-judge/commit/dd3705d4a5e2011fd1a8add8c7a78762d9373da7))
- update docker image tags ([2bda93e](https://github.com/NaN-Projects/tun-judge/commit/2bda93e813a087751ec1977f98f70e6e1832b675))
- update docker image tags ([0cc99a3](https://github.com/NaN-Projects/tun-judge/commit/0cc99a398e8aa8c2874ac38b0e33d164e77e096f))
- write implictaly tailwindcss classnames ([e738850](https://github.com/NaN-Projects/tun-judge/commit/e7388507ac97dbe49fa89f5614b3a6f83c1b3800))
2 changes: 1 addition & 1 deletion apps/client/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
1 change: 0 additions & 1 deletion apps/client/src/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { BrowserRouter, Route, Switch } from 'react-router-dom';

import { Role } from '@core/models';
import { RootStore, useStore } from '@core/stores';

import Logout from '@shared/Logout';
import Spinner from '@shared/Spinner';
import ToastContainer from '@shared/ToastContainer';
Expand Down
8 changes: 4 additions & 4 deletions apps/client/src/core/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ let interval: NodeJS.Timeout | undefined = undefined;

export function updateLeftTimeToContest(
contest?: Contest,
setLeftToContest?: (value: number) => void
setLeftToContest?: (value: number) => void,
): void {
// eslint-disable-next-line react-hooks/rules-of-hooks
useEffect(() => {
Expand Down Expand Up @@ -140,7 +140,7 @@ export function getRandomHexColor(): string {

export function getJudgingRunColor(
testcase: Testcase,
judging?: Judging
judging?: Judging,
): 'gray' | 'green' | 'red' {
if (!judging) return 'gray';
const judgeRun = judging.runs.find((r) => r.testcase.id === testcase.id);
Expand All @@ -149,7 +149,7 @@ export function getJudgingRunColor(

export function useLongPress(
callback: () => void,
ms = 100
ms = 100,
): {
onMouseDown: () => void;
onMouseUp: () => void;
Expand Down Expand Up @@ -199,7 +199,7 @@ export function countUnseenMessages(clarification: Clarification, currentUser: U
return clarification.messages.filter(
(message) =>
!compareRoles(currentUser, message.sentBy) &&
!message.seenBy.some((u) => u.id === currentUser.id)
!message.seenBy.some((u) => u.id === currentUser.id),
).length;
}

Expand Down
8 changes: 4 additions & 4 deletions apps/client/src/core/stores/ClarificationsStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ export class ClarificationsStore {
@action
sendClarification = async (
contestId: number,
clarification: Clarification
clarification: Clarification,
): Promise<Clarification> => {
return (this.item = await http.post<Clarification>(
`api/contests/${contestId}/clarifications`,
clarification
clarification,
));
};

@action
setClarificationMessageAsSeen = async (
contestId: number,
clarificationId: number,
messageId: number
messageId: number,
): Promise<void> => {
await http.patch<Clarification>(
`api/contests/${contestId}/clarifications/${clarificationId}/message/${messageId}/set-as-seen`
`api/contests/${contestId}/clarifications/${clarificationId}/message/${messageId}/set-as-seen`,
);
};
}
10 changes: 5 additions & 5 deletions apps/client/src/core/stores/PublicStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ export class PublicStore {
autorun(() => rootStore.updatesCount.contests && this.fetchContests());
reaction(
() => [this.currentContest, rootStore.updatesCount.scoreboard],
() => this.currentContest && this.fetchScoreCaches(this.currentContest.id)
() => this.currentContest && this.fetchScoreCaches(this.currentContest.id),
);
reaction(
() => [this.currentContest, rootStore.connected],
() => this.currentContest && this.fetchProblems(this.currentContest.id)
() => this.currentContest && this.fetchProblems(this.currentContest.id),
);
reaction(
() => rootStore.connected,
() => this.currentContest && this.fetchScoreCaches(this.currentContest.id)
() => this.currentContest && this.fetchScoreCaches(this.currentContest.id),
);
}

Expand All @@ -41,7 +41,7 @@ export class PublicStore {
@action
fetchProblems = async (contestId: number): Promise<ContestProblem[]> => {
return (this.problems = await http.get<ContestProblem[]>(
`api/public/contest/${contestId}/problems`
`api/public/contest/${contestId}/problems`,
));
};

Expand All @@ -62,7 +62,7 @@ export class PublicStore {
get totalSubmissions(): number {
return this.scoreCaches.reduce<number>(
(acc, scoreCache) => acc + scoreCache.restrictedSubmissions + scoreCache.restrictedPending,
0
0,
);
}

Expand Down
6 changes: 3 additions & 3 deletions apps/client/src/core/stores/RootStore.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { action, autorun, computed, observable } from 'mobx';
import { io, Socket } from 'socket.io-client';
import { Socket, io } from 'socket.io-client';

import { ToastsStore } from '@core/stores/ToastsStore';
import { TooltipStore } from '@core/stores/TooltipStore';
Expand All @@ -17,7 +17,7 @@ const updateEvents = [
'judgeRuns',
'clarifications',
] as const;
type UpdateEvents = typeof updateEvents[number];
type UpdateEvents = (typeof updateEvents)[number];

type AppLocalCache = {
connected?: number;
Expand Down Expand Up @@ -62,7 +62,7 @@ export class RootStore {
autorun(
() =>
this.connected && http.get<User>(`api/current`).then(this.setProfile).catch(this.logout),
{ delay: 10 }
{ delay: 10 },
);

autorun(() => localStorage.setItem('settings', JSON.stringify(this.appLocalCache)));
Expand Down
4 changes: 2 additions & 2 deletions apps/client/src/core/stores/SubmissionsStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class SubmissionsStore {
fetchAll = async (): Promise<Submission[]> => {
this.filters.contest = this.publicStore.currentContest?.id ?? -1;
[this.data, this.totalItems] = await http.get<[Submission[], number]>(
`api/submissions?page=${this.currentPage}&${buildSearchQuery(this.filters)}`
`api/submissions?page=${this.currentPage}&${buildSearchQuery(this.filters)}`,
);
return this.data;
};
Expand Down Expand Up @@ -81,7 +81,7 @@ export class SubmissionsStore {
}

function buildSearchQuery(
filters: Record<string, string | boolean | number | string[] | boolean[] | number[]>
filters: Record<string, string | boolean | number | string[] | boolean[] | number[]>,
): string {
return Object.entries(filters)
.filter(([, value]) => !isEmpty(value))
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/core/stores/TeamStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class TeamStore {
sendSubmission = async (
contestId: number,
teamId: number,
submission: Submission
submission: Submission,
): Promise<void> => {
await http.post(`api/contests/${contestId}/team/${teamId}/submit`, submission);
};
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/core/stores/TestcasesStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class TestcasesStore {
this.problemId && this.fetchAll();
!this.problemId && (this.data = []);
},
{ delay: 10 }
{ delay: 10 },
);
}

Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/core/utils/http-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export class HttpClient {
export async function request<T>(
path: string,
method: Method = 'GET',
options?: AxiosRequestConfig
options?: AxiosRequestConfig,
): Promise<T> {
try {
return (
Expand Down
4 changes: 2 additions & 2 deletions apps/client/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ code {
}

::-webkit-scrollbar {
@apply rounded-lg h-4 w-4 bg-gray-200 dark:bg-gray-900;
@apply h-4 w-4 rounded-lg bg-gray-200 dark:bg-gray-900;
}

::-webkit-scrollbar-thumb {
@apply border-4 border-solid rounded-lg bg-gray-400 border-gray-200 hover:bg-gray-500 dark:border-gray-900 dark:bg-gray-700 dark:hover:bg-gray-600;
@apply rounded-lg border-4 border-solid border-gray-200 bg-gray-400 hover:bg-gray-500 dark:border-gray-900 dark:bg-gray-700 dark:hover:bg-gray-600;
}

/* Chrome, Safari, Edge, Opera */
Expand Down
7 changes: 3 additions & 4 deletions apps/client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,14 @@ import {
LanguagesStore,
ProblemsStore,
PublicStore,
rootStore,
SubmissionsStore,
TeamCategoriesStore,
TeamsStore,
TeamStore,
TeamsStore,
TestcasesStore,
UsersStore,
rootStore,
} from '@core/stores';

import Spinner from '@shared/Spinner';

import Root from './Root';
Expand Down Expand Up @@ -51,5 +50,5 @@ ReactDOM.render(
<Root />
</Provider>
</Suspense>,
document.getElementById('root')
document.getElementById('root'),
);
3 changes: 1 addition & 2 deletions apps/client/src/pages/admin/AdminLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React from 'react';
import { Redirect, Route, Switch } from 'react-router-dom';

import { RootStore, useStore } from '@core/stores';

import Scoreboard from '@shared/Scoreboard';

import AdminNavbar from './AdminNavbar';
Expand All @@ -28,7 +27,7 @@ const AdminLayout: React.FC = observer(() => {
return (
<div className="flex h-screen bg-gray-100 dark:bg-gray-900" test-id="admin-page">
<AdminSideBar visible={!appLocalCache.menuCollapsed} />
<div className="flex flex-col w-full overflow-hidden">
<div className="flex w-full flex-col overflow-hidden">
<AdminNavbar
toggleSidebar={() => (appLocalCache.menuCollapsed = !appLocalCache.menuCollapsed)}
/>
Expand Down
Loading

0 comments on commit 8e229e0

Please sign in to comment.