From 6d499a447041faf8af25fec5702d2e01bacac7cc Mon Sep 17 00:00:00 2001
From: JihengLi <jiheng.li.1@vanderbilt.edu>
Date: Mon, 23 Sep 2024 17:48:02 -0500
Subject: [PATCH 1/5] improve the readablity for judging page; create assigned
 and all teams tab; fix the bug in organizer's scoreboard

---
 .../Organizer/JudgingTab/Scoreboard.tsx       |  17 +-
 .../ScheduleTab/OrganizerSchedule.tsx}        | 107 +-----------
 .../Organizer/ScheduleTab/ScheduleTab.tsx     |   2 +-
 components/judges/AllTeamsTab/AllTeamsTab.tsx | 157 ++++++++++++++++++
 components/judges/AssignedTab/AssignedTab.tsx | 141 ++++++++++++++++
 .../judges/{ => AssignedTab}/JudgingForm.tsx  |   2 +-
 .../judges/AssignedTab/JudgingSchedule.tsx    | 103 ++++++++++++
 .../judges/{ => AssignedTab}/ScoreInput.tsx   |   5 +-
 .../judges/{ => AssignedTab}/TeamSelect.tsx   |   4 +-
 components/judges/JudgeDash.tsx               | 151 ++++-------------
 pages/api/teams-all.ts                        |  28 ++++
 11 files changed, 472 insertions(+), 245 deletions(-)
 rename components/{judges/schedule.tsx => Organizer/ScheduleTab/OrganizerSchedule.tsx} (63%)
 create mode 100644 components/judges/AllTeamsTab/AllTeamsTab.tsx
 create mode 100644 components/judges/AssignedTab/AssignedTab.tsx
 rename components/judges/{ => AssignedTab}/JudgingForm.tsx (96%)
 create mode 100644 components/judges/AssignedTab/JudgingSchedule.tsx
 rename components/judges/{ => AssignedTab}/ScoreInput.tsx (89%)
 rename components/judges/{ => AssignedTab}/TeamSelect.tsx (93%)
 create mode 100644 pages/api/teams-all.ts

diff --git a/components/Organizer/JudgingTab/Scoreboard.tsx b/components/Organizer/JudgingTab/Scoreboard.tsx
index 64e99b6f..456c8b29 100644
--- a/components/Organizer/JudgingTab/Scoreboard.tsx
+++ b/components/Organizer/JudgingTab/Scoreboard.tsx
@@ -32,17 +32,6 @@ export default function Scoreboard(props: AllScoresProps) {
 		setSearchText('');
 	};
 
-	const handleSearch = (
-		selectedKeys: string[],
-		confirm: (param?: FilterConfirmProps) => void,
-		dataIndex: string,
-		closeDropDown: boolean
-	) => {
-		confirm({ closeDropdown: closeDropDown });
-		setSearchText(selectedKeys[0]);
-		setSearchedColumn(dataIndex);
-	};
-
 	const handleReset = (clearFilters: () => void) => {
 		clearFilters();
 		setSearchText('');
@@ -67,9 +56,11 @@ export default function Scoreboard(props: AllScoresProps) {
 					value={selectedKeys[0]}
 					onChange={e => {
 						setSelectedKeys(e.target.value ? [e.target.value] : []);
-						handleSearch(selectedKeys as string[], confirm, dataIndex, false);
+						confirm({ closeDropdown: false });
+						setSearchText(e.target.value);
+						setSearchedColumn(dataIndex);
 					}}
-					onPressEnter={() => handleSearch(selectedKeys as string[], confirm, dataIndex, true)}
+					onPressEnter={() => confirm({ closeDropdown: true })}
 					style={{ marginBottom: 8, display: 'block' }}
 				/>
 				<Button
diff --git a/components/judges/schedule.tsx b/components/Organizer/ScheduleTab/OrganizerSchedule.tsx
similarity index 63%
rename from components/judges/schedule.tsx
rename to components/Organizer/ScheduleTab/OrganizerSchedule.tsx
index 66313bfc..3096afb7 100644
--- a/components/judges/schedule.tsx
+++ b/components/Organizer/ScheduleTab/OrganizerSchedule.tsx
@@ -1,10 +1,7 @@
-import { Space, Table, Collapse, Tag, Switch, Button, notification, Upload, Spin, theme, Radio } from 'antd';
-import React, { useContext, useMemo, useState } from 'react';
+import { Space, Table, Tag } from 'antd';
+import React, { useMemo, useState } from 'react';
 import { DateTime } from 'luxon';
-import Link from 'next/link';
-import { JudgingSessionData } from '../../types/database';
-import { User } from 'next-auth';
-import { ThemeContext, getAccentColor } from '../../theme/themeProvider';
+import { JudgingSessionData } from '../../../types/database';
 
 interface ScheduleProps {
 	data: JudgingSessionData[];
@@ -181,101 +178,3 @@ export default function OrganizerSchedule(props: ScheduleProps) {
 		</div>
 	);
 }
-
-export function JudgeSchedule({ data, handleChange }: ScheduleProps) {
-	const [isJudged, setIsJudged] = useState(false);
-	const { accentColor, baseTheme } = useContext(ThemeContext);
-
-	const columns = [
-		{
-			title: 'Table',
-			dataIndex: 'table',
-			key: 'table',
-			width: '10%',
-			render: (locationNum: number) => locationNum,
-		},
-		{
-			title: 'Project',
-			dataIndex: 'project',
-			key: 'project',
-			width: '40%',
-			render: ({ name, link }: { name: string; link: URL }) => (
-				<>
-					<td>{name}</td>
-					<Link href={link} passHref>
-						<a
-							style={{ color: getAccentColor(accentColor, baseTheme), textDecoration: 'underline' }}
-							target="_blank">
-							Devpost
-						</a>
-					</Link>
-				</>
-			),
-		},
-		{
-			title: 'Team Members',
-			dataIndex: 'teamMembers',
-			key: 'teamMembers',
-			width: '40%',
-			render: (members: User[]) => members.map(member => <Tag key={member.id}>{member.name}</Tag>),
-		},
-		{
-			title: 'Judgement State',
-			dataIndex: 'haveJudged',
-			key: 'haveJudged',
-			width: '10%',
-			render: (haveJudged: []) => <Tag>{haveJudged ? 'Judged' : 'Without Judgement'}</Tag>,
-		},
-	];
-
-	const dataSource = data
-		.filter(item => (isJudged ? item.haveJudged : !item.haveJudged))
-		.map(item => ({
-			table: item.team.locationNum,
-			project: { name: item.team.name, link: new URL(item.team.devpost) },
-			teamMembers: item.team.members,
-			teamId: item.team._id,
-			haveJudged: item.haveJudged,
-		}));
-
-	const handleRowClick = (record: any) => {
-		handleChange(record.teamId);
-	};
-
-	return (
-		<Table
-			locale={{
-				emptyText: (
-					<div style={{ paddingTop: '50px', paddingBottom: '50px' }}>
-						<h3>
-							{data.length == 0
-								? 'Stay tuned! You will see your teams that you will judge soon!'
-								: isJudged
-								? "You haven't started judging yet."
-								: "Hurraaaaarrgh! You're off duty!"}
-						</h3>
-					</div>
-				),
-			}}
-			dataSource={dataSource}
-			columns={columns}
-			pagination={false}
-			bordered
-			scroll={{ x: true }}
-			summary={_ => (
-				<Table.Summary fixed={true}>
-					<Table.Summary.Row>
-						<Table.Summary.Cell index={0} colSpan={6}>
-							<Button type="primary" onClick={() => setIsJudged(!isJudged)} style={{ marginLeft: 8 }}>
-								{isJudged ? 'Judged' : 'Without Judgement'}
-							</Button>
-						</Table.Summary.Cell>
-					</Table.Summary.Row>
-				</Table.Summary>
-			)}
-			onRow={record => ({
-				onClick: () => handleRowClick(record),
-			})}
-		/>
-	);
-}
diff --git a/components/Organizer/ScheduleTab/ScheduleTab.tsx b/components/Organizer/ScheduleTab/ScheduleTab.tsx
index 01bb5ea8..e254416c 100644
--- a/components/Organizer/ScheduleTab/ScheduleTab.tsx
+++ b/components/Organizer/ScheduleTab/ScheduleTab.tsx
@@ -1,7 +1,7 @@
 import { Button, InputNumber, Slider, Row, Col } from 'antd';
 import { SetStateAction, useContext, useEffect, useState } from 'react';
 import { matchTeams, handleConfirmSchedule } from '../../../utils/organizer-utils';
-import OrganizerSchedule, { generateTimes } from '../../judges/schedule';
+import OrganizerSchedule, { generateTimes } from './OrganizerSchedule';
 import { ResponseError, JudgingSessionData, UserData, TeamData, HackathonSettingsData } from '../../../types/database';
 import Title from 'antd/lib/typography/Title';
 import { RequestType, useCustomSWR } from '../../../utils/request-utils';
diff --git a/components/judges/AllTeamsTab/AllTeamsTab.tsx b/components/judges/AllTeamsTab/AllTeamsTab.tsx
new file mode 100644
index 00000000..971b66bb
--- /dev/null
+++ b/components/judges/AllTeamsTab/AllTeamsTab.tsx
@@ -0,0 +1,157 @@
+import useSWR from 'swr';
+import { ResponseError, TeamData } from '../../../types/database';
+import { Button, Input, InputRef, Table } from 'antd';
+import Link from 'next/link';
+import { getAccentColor, ThemeContext } from '../../../theme/themeProvider';
+import { useContext, useRef, useState } from 'react';
+import { FilterConfirmProps, FilterValue, SorterResult } from 'antd/es/table/interface';
+import { SearchOutlined } from '@ant-design/icons';
+import Highlighter from 'react-highlight-words';
+
+export const AllTeamsTab = () => {
+	// Get data for all teams
+	const { data: teamsData, error: teamsError } = useSWR('/api/teams-all', async url => {
+		const res = await fetch(url, { method: 'GET' });
+		if (!res.ok) {
+			const error = new Error('Failed to get list of teams.') as ResponseError;
+			error.status = res.status;
+			throw error;
+		}
+		return (await res.json()) as TeamData[];
+	});
+
+	const [filteredInfo, setFilteredInfo] = useState<Record<string, FilterValue | null>>({});
+	const [sortedInfo, setSortedInfo] = useState<SorterResult<TeamData>>({});
+	const [searchedColumn, setSearchedColumn] = useState('');
+	const [searchText, setSearchText] = useState('');
+	const searchInput = useRef<InputRef>(null);
+	const { accentColor, baseTheme } = useContext(ThemeContext);
+
+	const teams = teamsData?.map(x => ({ ...x, key: x._id })) || ([] as TeamData[]);
+
+	const handleChange = (pagination: any, filters: any, sorter: any) => {
+		setSortedInfo(sorter as SorterResult<TeamData>);
+		setFilteredInfo(filters);
+	};
+
+	const handleReset = (clearFilters: () => void) => {
+		clearFilters();
+		setSearchText('');
+	};
+
+	const getColumnSearchProps = (dataIndex: string) => ({
+		filterDropdown: ({
+			setSelectedKeys,
+			selectedKeys,
+			confirm,
+			clearFilters,
+		}: {
+			setSelectedKeys: (selectedKeys: React.Key[]) => void;
+			selectedKeys: React.Key[];
+			confirm: (param?: FilterConfirmProps) => void;
+			clearFilters: () => void;
+		}) => (
+			<div style={{ padding: 8 }}>
+				<Input
+					ref={searchInput}
+					placeholder={`Search ${dataIndex}`}
+					value={selectedKeys[0]}
+					onChange={e => {
+						setSelectedKeys(e.target.value ? [e.target.value] : []);
+						confirm({ closeDropdown: false });
+						setSearchText(e.target.value);
+						setSearchedColumn(dataIndex);
+					}}
+					onPressEnter={() => confirm({ closeDropdown: true })}
+					style={{ marginBottom: 8, display: 'block' }}
+				/>
+				<Button
+					onClick={() => {
+						clearFilters && handleReset(clearFilters);
+						confirm({ closeDropdown: false });
+					}}
+					style={{ width: '100%' }}>
+					Reset
+				</Button>
+			</div>
+		),
+		filterIcon: (filtered: boolean) => <SearchOutlined style={{ color: filtered ? '#1890ff' : undefined }} />,
+		onFilter: (value: string | number | boolean, record: any): boolean => {
+			const recordValue = dataIndex in record ? record[dataIndex] : record.application?.[dataIndex];
+			if (recordValue === undefined || recordValue === null) {
+				return false;
+			}
+			return recordValue.toString().toLowerCase().includes(value.toString().toLowerCase());
+		},
+		filteredValue:
+			(dataIndex in filteredInfo ? filteredInfo[dataIndex] : filteredInfo['application.' + dataIndex]) || null,
+		onFilterDropdownOpenChange: (open: boolean) => {
+			if (open) {
+				setTimeout(() => searchInput.current?.select(), 100);
+			}
+		},
+		render: (text: string) =>
+			searchedColumn === dataIndex ? (
+				<Highlighter
+					highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
+					searchWords={[searchText]}
+					autoEscape
+					textToHighlight={text?.toString() ?? ''}
+				/>
+			) : (
+				text
+			),
+	});
+
+	const columns = [
+		{
+			title: 'Table',
+			dataIndex: 'locationNum',
+			key: 'locationNum',
+			width: '20%',
+			sorter: (a: any, b: any) => a.locationNum - b.locationNum,
+			sortOrder: sortedInfo.columnKey === 'locationNum' ? sortedInfo.order : null,
+		},
+		{
+			title: 'Team',
+			dataIndex: 'name',
+			key: 'name',
+			width: '40%',
+			...getColumnSearchProps('name'),
+		},
+		{
+			title: 'Devpost',
+			dataIndex: 'devpost',
+			key: 'devpost',
+			width: '40%',
+			render: (link: URL) => {
+				return (
+					<>
+						<Link href={link} passHref>
+							<a
+								style={{ color: getAccentColor(accentColor, baseTheme), textDecoration: 'underline' }}
+								target="_blank">
+								{link}
+							</a>
+						</Link>
+					</>
+				);
+			},
+		},
+	];
+
+	return (
+		<>
+			{teamsError ? (
+				<div>{teamsError ? (teamsError as ResponseError).message : 'Failed to get data.'}</div>
+			) : (
+				<Table
+					dataSource={teams}
+					columns={columns}
+					onChange={handleChange}
+					sortDirections={['descend', 'ascend']}
+				/>
+			)}
+		</>
+	);
+};
diff --git a/components/judges/AssignedTab/AssignedTab.tsx b/components/judges/AssignedTab/AssignedTab.tsx
new file mode 100644
index 00000000..4d60b420
--- /dev/null
+++ b/components/judges/AssignedTab/AssignedTab.tsx
@@ -0,0 +1,141 @@
+import { Divider, Skeleton } from 'antd';
+import { Dispatch, SetStateAction, useContext, useEffect, useState } from 'react';
+import useSWR, { useSWRConfig } from 'swr';
+import JudgingForm from '../AssignedTab/JudgingForm';
+import { JudgeSchedule } from '../AssignedTab/JudgingSchedule';
+import TeamSelect from '../AssignedTab/TeamSelect';
+import { JudgingFormFields, TeamSelectData } from '../../../types/client';
+import { JudgingSessionData, ResponseError, UserData } from '../../../types/database';
+import { ScopedMutator } from 'swr/dist/types';
+import { AccentColor, Theme, ThemeContext } from '../../../theme/themeProvider';
+import { handleSubmitSuccess, handleSubmitFailure } from '../../../lib/helpers';
+import { useCustomSWR, RequestType } from '../../../utils/request-utils';
+
+async function handleSubmit(
+	formData: JudgingFormFields,
+	mutate: ScopedMutator,
+	teamId: string,
+	isNewForm: boolean,
+	setIsNewForm: React.Dispatch<React.SetStateAction<boolean>>
+) {
+	const res = await fetch(`/api/judging-form?id=${teamId}`, {
+		method: isNewForm ? 'POST' : 'PATCH',
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		body: JSON.stringify(formData),
+	});
+
+	if (res.ok) {
+		mutate('/api/teams');
+		mutate('/api/judging-form');
+		handleSubmitSuccess(`Successfully ${isNewForm ? 'submitted' : 'updated'}!`);
+		if (isNewForm) window.location.reload();
+		setIsNewForm(false);
+	} else {
+		handleSubmitFailure(await res.text());
+	}
+}
+
+export const AssignedTab = () => {
+	const [teamID, setTeamID] = useState('');
+	const [isNewForm, setIsNewForm] = useState(false);
+	const { mutate } = useSWRConfig();
+
+	const { setAccentColor, setBaseTheme } = useContext(ThemeContext);
+
+	// Get data for teams dropdown
+	const { data: teamsData, error: teamsError } = useSWR('/api/teams', async url => {
+		const res = await fetch(url, { method: 'GET' });
+		if (!res.ok) {
+			const error = new Error('Failed to get list of teams.') as ResponseError;
+			error.status = res.status;
+			throw error;
+		}
+		return (await res.json()) as TeamSelectData[];
+	});
+
+	// User data
+	const { data: userData, error: judgeError } = useCustomSWR<UserData>({
+		url: '/api/user-data',
+		method: RequestType.GET,
+		errorMessage: 'Failed to get judge object.',
+	});
+
+	// Set theme
+	useEffect(() => {
+		if (userData && userData.settings && userData.settings.accentColor && userData.settings.baseTheme) {
+			setAccentColor(userData.settings.accentColor as AccentColor);
+			setBaseTheme(userData.settings.baseTheme as Theme);
+		}
+
+		if (judgeError) {
+			setAccentColor(AccentColor.MONOCHROME);
+			setBaseTheme(Theme.DARK);
+		}
+	}, [userData, setAccentColor, setBaseTheme, judgeError]);
+
+	// Get data for form component, formData will be false if teamId is not yet set.
+	const { data: formData, error: formError } = useSWR(
+		() => (teamID ? ['/api/judging-form', teamID] : null),
+		async (url: any, id: any) => {
+			const res = await fetch(`${url}?id=${id}`, { method: 'GET' });
+			if (!res.ok) {
+				if (res.status === 404) {
+					const emptyJudgeForm: JudgingFormFields = {
+						technicalAbility: 0,
+						creativity: 0,
+						utility: 0,
+						presentation: 0,
+						wowFactor: 0,
+						comments: '',
+						feedback: '',
+					};
+					setIsNewForm(true);
+					return emptyJudgeForm;
+				}
+				const error = new Error('Failed to get form information.') as ResponseError;
+				error.status = res.status;
+				throw error;
+			}
+			setIsNewForm(false);
+			return (await res.json()) as JudgingFormFields;
+		}
+	);
+
+	const { data: scheduleData, error: scheduleError } = useSWR('/api/judging-sessions', async url => {
+		const res = await fetch(url, { method: 'GET' });
+		if (!res.ok) {
+			const error = new Error('Failed to get schedule.') as ResponseError;
+			error.status = res.status;
+			throw error;
+		}
+		return (await res.json()) as JudgingSessionData[];
+	});
+
+	const handleTeamChange: Dispatch<SetStateAction<string>> = e => {
+		setTeamID(e);
+		setTimeout(() => {
+			window.scrollTo({ top: document.body.scrollHeight, behavior: 'smooth' });
+		}, 200);
+	};
+
+	return (
+		<>
+			{scheduleData && <JudgeSchedule data={scheduleData} handleChange={handleTeamChange} />}
+			<br />
+			<br />
+			{teamsData && <TeamSelect teamsData={teamsData} currentTeamID={teamID} handleChange={handleTeamChange} />}
+			{(!scheduleData || !teamsData) && <Skeleton />}
+			<Divider />
+			{formData && (
+				<JudgingForm
+					formData={formData}
+					isNewForm={isNewForm}
+					onSubmit={formData => handleSubmit(formData, mutate, teamID, isNewForm, setIsNewForm)}
+				/>
+			)}
+			{!formData && teamID && <Skeleton />}
+		</>
+	);
+};
diff --git a/components/judges/JudgingForm.tsx b/components/judges/AssignedTab/JudgingForm.tsx
similarity index 96%
rename from components/judges/JudgingForm.tsx
rename to components/judges/AssignedTab/JudgingForm.tsx
index 2f4ee528..1e2a0e70 100644
--- a/components/judges/JudgingForm.tsx
+++ b/components/judges/AssignedTab/JudgingForm.tsx
@@ -1,6 +1,6 @@
 import ScoreInput from './ScoreInput';
 import { Form, Input, Button } from 'antd';
-import { JudgingFormFields } from '../../types/client';
+import { JudgingFormFields } from '../../../types/client';
 import { useEffect } from 'react';
 const { TextArea } = Input;
 
diff --git a/components/judges/AssignedTab/JudgingSchedule.tsx b/components/judges/AssignedTab/JudgingSchedule.tsx
new file mode 100644
index 00000000..4deb09d5
--- /dev/null
+++ b/components/judges/AssignedTab/JudgingSchedule.tsx
@@ -0,0 +1,103 @@
+import { Table, Tag, Button } from 'antd';
+import React, { useContext, useState } from 'react';
+import Link from 'next/link';
+import { JudgingSessionData } from '../../../types/database';
+import { ThemeContext, getAccentColor } from '../../../theme/themeProvider';
+
+interface ScheduleProps {
+	data: JudgingSessionData[];
+	TimeForJudgeToScoreOneTeam?: number;
+	handleChange: (teamId: string) => void;
+	sessionTimeStart?: Date;
+	sessionTimeEnd?: Date;
+}
+
+export function JudgeSchedule({ data, handleChange }: ScheduleProps) {
+	const [isJudged, setIsJudged] = useState(false);
+	const { accentColor, baseTheme } = useContext(ThemeContext);
+
+	const columns = [
+		{
+			title: 'Table',
+			dataIndex: 'table',
+			key: 'table',
+			width: '20%',
+			render: (locationNum: number) => locationNum,
+		},
+		{
+			title: 'Project',
+			dataIndex: 'project',
+			key: 'project',
+			width: '60%',
+			render: ({ name, link }: { name: string; link: URL }) => (
+				<>
+					<td>{name}</td>
+					<Link href={link} passHref>
+						<a
+							style={{ color: getAccentColor(accentColor, baseTheme), textDecoration: 'underline' }}
+							target="_blank">
+							Devpost
+						</a>
+					</Link>
+				</>
+			),
+		},
+		{
+			title: 'Judgement State',
+			dataIndex: 'haveJudged',
+			key: 'haveJudged',
+			width: '20%',
+			render: (haveJudged: []) => <Tag>{haveJudged ? 'Judged' : 'Without Judgement'}</Tag>,
+		},
+	];
+
+	const dataSource = data
+		.filter(item => (isJudged ? item.haveJudged : !item.haveJudged))
+		.map(item => ({
+			table: item.team.locationNum,
+			project: { name: item.team.name, link: new URL(item.team.devpost) },
+			teamId: item.team._id,
+			haveJudged: item.haveJudged,
+		}));
+
+	const handleRowClick = (record: any) => {
+		handleChange(record.teamId);
+	};
+
+	return (
+		<Table
+			locale={{
+				emptyText: (
+					<div style={{ paddingTop: '50px', paddingBottom: '50px' }}>
+						<h3>
+							{data.length == 0
+								? 'Stay tuned! You will see your teams that you will judge soon!'
+								: isJudged
+								? "You haven't started judging yet."
+								: "Hurraaaaarrgh! You're off duty!"}
+						</h3>
+					</div>
+				),
+			}}
+			dataSource={dataSource}
+			columns={columns}
+			pagination={false}
+			bordered
+			scroll={{ x: true }}
+			summary={_ => (
+				<Table.Summary fixed={true}>
+					<Table.Summary.Row>
+						<Table.Summary.Cell index={0} colSpan={6}>
+							<Button type="primary" onClick={() => setIsJudged(!isJudged)} style={{ marginLeft: 8 }}>
+								{isJudged ? 'Judged' : 'Without Judgement'}
+							</Button>
+						</Table.Summary.Cell>
+					</Table.Summary.Row>
+				</Table.Summary>
+			)}
+			onRow={record => ({
+				onClick: () => handleRowClick(record),
+			})}
+		/>
+	);
+}
diff --git a/components/judges/ScoreInput.tsx b/components/judges/AssignedTab/ScoreInput.tsx
similarity index 89%
rename from components/judges/ScoreInput.tsx
rename to components/judges/AssignedTab/ScoreInput.tsx
index 9f59d8b2..07aef99a 100644
--- a/components/judges/ScoreInput.tsx
+++ b/components/judges/AssignedTab/ScoreInput.tsx
@@ -1,7 +1,6 @@
-import { Slider, Radio, InputNumber, Row, Col } from 'antd';
+import { Radio, InputNumber, Row, Col } from 'antd';
 import { RadioChangeEvent } from 'antd/lib';
-import { IntegerType } from 'mongodb';
-import styles from '../../styles/Judge.module.css';
+import styles from '../../../styles/Judge.module.css';
 import React from 'react';
 
 interface ScoreInputProps {
diff --git a/components/judges/TeamSelect.tsx b/components/judges/AssignedTab/TeamSelect.tsx
similarity index 93%
rename from components/judges/TeamSelect.tsx
rename to components/judges/AssignedTab/TeamSelect.tsx
index cc662f35..6155bd87 100644
--- a/components/judges/TeamSelect.tsx
+++ b/components/judges/AssignedTab/TeamSelect.tsx
@@ -1,9 +1,9 @@
 import { CheckCircleOutlined } from '@ant-design/icons';
 import { Row, Select, Space } from 'antd';
 import React, { Dispatch, SetStateAction, useContext } from 'react';
-import { TeamSelectData } from '../../types/client';
+import { TeamSelectData } from '../../../types/client';
 import { useSession } from 'next-auth/react';
-import { ThemeContext, getBaseColor } from '../../theme/themeProvider';
+import { ThemeContext, getBaseColor } from '../../../theme/themeProvider';
 const { Option, OptGroup } = Select;
 
 interface TeamSelectProps {
diff --git a/components/judges/JudgeDash.tsx b/components/judges/JudgeDash.tsx
index ac8009ff..741e392e 100644
--- a/components/judges/JudgeDash.tsx
+++ b/components/judges/JudgeDash.tsx
@@ -1,78 +1,21 @@
-import { Divider, Skeleton } from 'antd';
-import { Dispatch, SetStateAction, useContext, useEffect, useState } from 'react';
-import useSWR, { useSWRConfig } from 'swr';
-import JudgingForm from './JudgingForm';
-import { JudgeSchedule } from './schedule';
-import TeamSelect from './TeamSelect';
-import { JudgingFormFields, TeamSelectData } from '../../types/client';
-import { JudgingSessionData, ResponseError, UserData } from '../../types/database';
+import { Space, Tabs } from 'antd';
+import { useContext, useEffect } from 'react';
+import { UserData } from '../../types/database';
 import { signOut, useSession } from 'next-auth/react';
-import { ScopedMutator } from 'swr/dist/types';
 import ThemeControl from '../Organizer/SettingsTab/ThemeControl';
-import {
-	AccentColor,
-	getAccentColor,
-	getBaseColor,
-	getThemedClass,
-	Theme,
-	ThemeContext,
-} from '../../theme/themeProvider';
+import { AccentColor, getAccentColor, getThemedClass, Theme, ThemeContext } from '../../theme/themeProvider';
 import styles from '../../styles/Judge.module.css';
-import { handleSubmitSuccess, handleSubmitFailure } from '../../lib/helpers';
 import Link from 'next/link';
 import { BugOutlined } from '@ant-design/icons';
 import { useCustomSWR, RequestType } from '../../utils/request-utils';
-
-// let { JUDGING_LENGTH } = process.env;
-const JUDGING_LENGTH = '600000';
-
-async function handleSubmit(
-	formData: JudgingFormFields,
-	mutate: ScopedMutator,
-	teamId: string,
-	isNewForm: boolean,
-	setIsNewForm: React.Dispatch<React.SetStateAction<boolean>>
-) {
-	const res = await fetch(`/api/judging-form?id=${teamId}`, {
-		method: isNewForm ? 'POST' : 'PATCH',
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		body: JSON.stringify(formData),
-	});
-
-	if (res.ok) {
-		mutate('/api/teams');
-		mutate('/api/judging-form');
-		handleSubmitSuccess(`Successfully ${isNewForm ? 'submitted' : 'updated'}!`);
-		if (isNewForm) window.location.reload();
-		setIsNewForm(false);
-	} else {
-		handleSubmitFailure(await res.text());
-	}
-}
+import { AssignedTab } from './AssignedTab/AssignedTab';
+import { AllTeamsTab } from './AllTeamsTab/AllTeamsTab';
 
 export default function JudgeDash() {
 	const { data: session, status } = useSession();
-	const [teamID, setTeamID] = useState('');
-	const [isNewForm, setIsNewForm] = useState(false);
-	const [nextIndex, setNextIndex] = useState(-1);
-	const { mutate } = useSWRConfig();
-	const judgingLength = parseInt(JUDGING_LENGTH || '0');
 
 	const { baseTheme, accentColor, setAccentColor, setBaseTheme } = useContext(ThemeContext);
 
-	// Get data for teams dropdown
-	const { data: teamsData, error: teamsError } = useSWR('/api/teams', async url => {
-		const res = await fetch(url, { method: 'GET' });
-		if (!res.ok) {
-			const error = new Error('Failed to get list of teams.') as ResponseError;
-			error.status = res.status;
-			throw error;
-		}
-		return (await res.json()) as TeamSelectData[];
-	});
-
 	// User data
 	const { data: userData, error: judgeError } = useCustomSWR<UserData>({
 		url: '/api/user-data',
@@ -93,51 +36,6 @@ export default function JudgeDash() {
 		}
 	}, [userData, setAccentColor, setBaseTheme, judgeError]);
 
-	// Get data for form component, formData will be false if teamId is not yet set.
-	const { data: formData, error: formError } = useSWR(
-		() => (teamID ? ['/api/judging-form', teamID] : null),
-		async (url: any, id: any) => {
-			const res = await fetch(`${url}?id=${id}`, { method: 'GET' });
-			if (!res.ok) {
-				if (res.status === 404) {
-					const emptyJudgeForm: JudgingFormFields = {
-						technicalAbility: 0,
-						creativity: 0,
-						utility: 0,
-						presentation: 0,
-						wowFactor: 0,
-						comments: '',
-						feedback: '',
-					};
-					setIsNewForm(true);
-					return emptyJudgeForm;
-				}
-				const error = new Error('Failed to get form information.') as ResponseError;
-				error.status = res.status;
-				throw error;
-			}
-			setIsNewForm(false);
-			return (await res.json()) as JudgingFormFields;
-		}
-	);
-
-	const { data: scheduleData, error: scheduleError } = useSWR('/api/judging-sessions', async url => {
-		const res = await fetch(url, { method: 'GET' });
-		if (!res.ok) {
-			const error = new Error('Failed to get schedule.') as ResponseError;
-			error.status = res.status;
-			throw error;
-		}
-		return (await res.json()) as JudgingSessionData[];
-	});
-
-	const handleTeamChange: Dispatch<SetStateAction<string>> = e => {
-		setTeamID(e);
-		setTimeout(() => {
-			window.scrollTo({ top: document.body.scrollHeight, behavior: 'smooth' });
-		}, 200);
-	};
-
 	return (
 		<div>
 			<div className={styles[getThemedClass('judgeHeader', baseTheme)]}>
@@ -158,20 +56,31 @@ export default function JudgeDash() {
 					</div>
 				</div>
 			</div>
-			{scheduleData && <JudgeSchedule data={scheduleData} handleChange={handleTeamChange} />}
-			<br />
-			<br />
-			{teamsData && <TeamSelect teamsData={teamsData} currentTeamID={teamID} handleChange={handleTeamChange} />}
-			{(!scheduleData || !teamsData) && <Skeleton />}
-			<Divider />
-			{formData && (
-				<JudgingForm
-					formData={formData}
-					isNewForm={isNewForm}
-					onSubmit={formData => handleSubmit(formData, mutate, teamID, isNewForm, setIsNewForm)}
+			<Space direction="vertical">
+				<Tabs
+					defaultActiveKey="1"
+					style={{
+						color: getAccentColor(accentColor, baseTheme),
+						width: '95vw',
+					}}
+					tabBarStyle={{
+						fontFamily: 'Arial, sans-serif',
+						fontWeight: 'bold',
+					}}
+					items={[
+						{
+							label: `Assigned`,
+							key: '1',
+							children: <AssignedTab />,
+						},
+						{
+							label: `All Teams`,
+							key: '2',
+							children: <AllTeamsTab />,
+						},
+					]}
 				/>
-			)}
-			{!formData && teamID && <Skeleton />}
+			</Space>
 			<div className={styles['theme-control-container']}>
 				<ThemeControl />
 			</div>
diff --git a/pages/api/teams-all.ts b/pages/api/teams-all.ts
new file mode 100644
index 00000000..dec61bef
--- /dev/null
+++ b/pages/api/teams-all.ts
@@ -0,0 +1,28 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { getSession } from 'next-auth/react';
+import { TeamData } from '../../types/database';
+import Team from '../../models/team';
+
+/**
+ * gets all team information to judges
+ * @param req request
+ * @param res response
+ * @returns response containing relevant team information
+ */
+export default async function handler(
+	req: NextApiRequest,
+	// TeamData[] for data, string for error
+	res: NextApiResponse<TeamData[] | string>
+): Promise<void> {
+	const session = await getSession({ req });
+	if (session?.userType !== 'JUDGE') return res.status(403).send('Forbidden');
+
+	if (req.method === 'GET') {
+		let teams = await Team.find();
+		if (req.query.submitted) {
+			teams = teams.filter(team => team.devpost !== '' && team.devpost !== undefined);
+		}
+		return res.status(200).send(teams);
+	}
+	return res.status(405).send('Method not supported brother');
+}

From 1455b041e0fabcc9e2640c1c325c418d40602856 Mon Sep 17 00:00:00 2001
From: JihengLi <jiheng.li.1@vanderbilt.edu>
Date: Mon, 23 Sep 2024 19:48:22 -0500
Subject: [PATCH 2/5] fix the bugs in model and database; add form to all teams
 tag in judging page

---
 .../judges/AllTeamsTab/AllTeamsForm.tsx       | 148 ++++++++++++
 components/judges/AllTeamsTab/AllTeamsTab.tsx | 220 +++++++-----------
 models/team.ts                                |   8 +-
 pages/api/judging-form.ts                     |   4 +-
 types/database.ts                             |   6 +-
 5 files changed, 247 insertions(+), 139 deletions(-)
 create mode 100644 components/judges/AllTeamsTab/AllTeamsForm.tsx

diff --git a/components/judges/AllTeamsTab/AllTeamsForm.tsx b/components/judges/AllTeamsTab/AllTeamsForm.tsx
new file mode 100644
index 00000000..c0e67d9c
--- /dev/null
+++ b/components/judges/AllTeamsTab/AllTeamsForm.tsx
@@ -0,0 +1,148 @@
+import { FilterConfirmProps, FilterValue, SorterResult } from 'antd/es/table/interface';
+import { useContext, useRef, useState } from 'react';
+import { TeamData } from '../../../types/database';
+import { Button, Input, InputRef, Table } from 'antd';
+import { getAccentColor, ThemeContext } from '../../../theme/themeProvider';
+import { SearchOutlined } from '@ant-design/icons';
+import Highlighter from 'react-highlight-words';
+import Link from 'next/link';
+
+interface AllTeamsProps {
+	teamsData: TeamData[];
+	teamId: string;
+	handleTeamChange: (teamId: string) => void;
+}
+
+export const AllTeamsForm = ({ teamsData, teamId, handleTeamChange }: AllTeamsProps) => {
+	const [filteredInfo, setFilteredInfo] = useState<Record<string, FilterValue | null>>({});
+	const [sortedInfo, setSortedInfo] = useState<SorterResult<TeamData>>({});
+	const [searchedColumn, setSearchedColumn] = useState('');
+	const [searchText, setSearchText] = useState('');
+	const searchInput = useRef<InputRef>(null);
+	const { accentColor, baseTheme } = useContext(ThemeContext);
+
+	const handleChange = (pagination: any, filters: any, sorter: any) => {
+		setSortedInfo(sorter as SorterResult<TeamData>);
+		setFilteredInfo(filters);
+	};
+
+	const handleReset = (clearFilters: () => void) => {
+		clearFilters();
+		setSearchText('');
+	};
+
+	const getColumnSearchProps = (dataIndex: string) => ({
+		filterDropdown: ({
+			setSelectedKeys,
+			selectedKeys,
+			confirm,
+			clearFilters,
+		}: {
+			setSelectedKeys: (selectedKeys: React.Key[]) => void;
+			selectedKeys: React.Key[];
+			confirm: (param?: FilterConfirmProps) => void;
+			clearFilters: () => void;
+		}) => (
+			<div style={{ padding: 8 }}>
+				<Input
+					ref={searchInput}
+					placeholder={`Search ${dataIndex}`}
+					value={selectedKeys[0]}
+					onChange={e => {
+						setSelectedKeys(e.target.value ? [e.target.value] : []);
+						confirm({ closeDropdown: false });
+						setSearchText(e.target.value);
+						setSearchedColumn(dataIndex);
+					}}
+					onPressEnter={() => confirm({ closeDropdown: true })}
+					style={{ marginBottom: 8, display: 'block' }}
+				/>
+				<Button
+					onClick={() => {
+						clearFilters && handleReset(clearFilters);
+						confirm({ closeDropdown: false });
+					}}
+					style={{ width: '100%' }}>
+					Reset
+				</Button>
+			</div>
+		),
+		filterIcon: (filtered: boolean) => <SearchOutlined style={{ color: filtered ? '#1890ff' : undefined }} />,
+		onFilter: (value: string | number | boolean, record: any): boolean => {
+			const recordValue = dataIndex in record ? record[dataIndex] : record.application?.[dataIndex];
+			if (recordValue === undefined || recordValue === null) {
+				return false;
+			}
+			return recordValue.toString().toLowerCase().includes(value.toString().toLowerCase());
+		},
+		filteredValue:
+			(dataIndex in filteredInfo ? filteredInfo[dataIndex] : filteredInfo['application.' + dataIndex]) || null,
+		onFilterDropdownOpenChange: (open: boolean) => {
+			if (open) {
+				setTimeout(() => searchInput.current?.select(), 100);
+			}
+		},
+		render: (text: string) =>
+			searchedColumn === dataIndex ? (
+				<Highlighter
+					highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
+					searchWords={[searchText]}
+					autoEscape
+					textToHighlight={text?.toString() ?? ''}
+				/>
+			) : (
+				text
+			),
+	});
+
+	const columns = [
+		{
+			title: 'Table',
+			dataIndex: 'locationNum',
+			key: 'locationNum',
+			width: '20%',
+			sorter: (a: any, b: any) => a.locationNum - b.locationNum,
+			sortOrder: sortedInfo.columnKey === 'locationNum' ? sortedInfo.order : null,
+		},
+		{
+			title: 'Team',
+			dataIndex: 'name',
+			key: 'name',
+			width: '40%',
+			...getColumnSearchProps('name'),
+		},
+		{
+			title: 'Devpost',
+			dataIndex: 'devpost',
+			key: 'devpost',
+			width: '40%',
+			render: (link: URL) => {
+				return (
+					<>
+						<Link href={link} passHref>
+							<a
+								style={{ color: getAccentColor(accentColor, baseTheme), textDecoration: 'underline' }}
+								target="_blank">
+								{link}
+							</a>
+						</Link>
+					</>
+				);
+			},
+		},
+	];
+
+	return (
+		<>
+			<Table
+				dataSource={teamsData}
+				columns={columns}
+				onChange={handleChange}
+				sortDirections={['descend', 'ascend']}
+				onRow={record => ({
+					onClick: () => handleTeamChange(teamId !== String(record._id) ? String(record._id) : ''),
+				})}
+			/>
+		</>
+	);
+};
diff --git a/components/judges/AllTeamsTab/AllTeamsTab.tsx b/components/judges/AllTeamsTab/AllTeamsTab.tsx
index 971b66bb..5ca7280c 100644
--- a/components/judges/AllTeamsTab/AllTeamsTab.tsx
+++ b/components/judges/AllTeamsTab/AllTeamsTab.tsx
@@ -1,14 +1,42 @@
-import useSWR from 'swr';
+import useSWR, { useSWRConfig } from 'swr';
 import { ResponseError, TeamData } from '../../../types/database';
-import { Button, Input, InputRef, Table } from 'antd';
-import Link from 'next/link';
-import { getAccentColor, ThemeContext } from '../../../theme/themeProvider';
-import { useContext, useRef, useState } from 'react';
-import { FilterConfirmProps, FilterValue, SorterResult } from 'antd/es/table/interface';
-import { SearchOutlined } from '@ant-design/icons';
-import Highlighter from 'react-highlight-words';
+import { AllTeamsForm } from './AllTeamsForm';
+import { Dispatch, SetStateAction, useState } from 'react';
+import { JudgingFormFields } from '../../../types/client';
+import JudgingForm from '../AssignedTab/JudgingForm';
+import { ScopedMutator } from 'swr/dist/types';
+import { handleSubmitFailure, handleSubmitSuccess } from '../../../lib/helpers';
+
+async function handleSubmit(
+	formData: JudgingFormFields,
+	mutate: ScopedMutator,
+	teamId: string,
+	isNewForm: boolean,
+	setIsNewForm: React.Dispatch<React.SetStateAction<boolean>>
+) {
+	const res = await fetch(`/api/judging-form?id=${teamId}`, {
+		method: isNewForm ? 'POST' : 'PATCH',
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		body: JSON.stringify(formData),
+	});
+
+	if (res.ok) {
+		mutate('/api/teams');
+		mutate('/api/judging-form');
+		handleSubmitSuccess(`Successfully ${isNewForm ? 'submitted' : 'updated'}!`);
+		setIsNewForm(false);
+	} else {
+		handleSubmitFailure(await res.text());
+	}
+}
 
 export const AllTeamsTab = () => {
+	const [teamID, setTeamID] = useState('');
+	const [isNewForm, setIsNewForm] = useState(false);
+	const { mutate } = useSWRConfig();
+
 	// Get data for all teams
 	const { data: teamsData, error: teamsError } = useSWR('/api/teams-all', async url => {
 		const res = await fetch(url, { method: 'GET' });
@@ -20,137 +48,69 @@ export const AllTeamsTab = () => {
 		return (await res.json()) as TeamData[];
 	});
 
-	const [filteredInfo, setFilteredInfo] = useState<Record<string, FilterValue | null>>({});
-	const [sortedInfo, setSortedInfo] = useState<SorterResult<TeamData>>({});
-	const [searchedColumn, setSearchedColumn] = useState('');
-	const [searchText, setSearchText] = useState('');
-	const searchInput = useRef<InputRef>(null);
-	const { accentColor, baseTheme } = useContext(ThemeContext);
+	// Get data for form component, formData will be false if teamId is not yet set.
+	const { data: formData, error: formError } = useSWR(
+		() => (teamID ? ['/api/judging-form', teamID] : null),
+		async (url: any, id: any) => {
+			const res = await fetch(`${url}?id=${id}`, { method: 'GET' });
+			if (!res.ok) {
+				if (res.status === 404) {
+					const emptyJudgeForm: JudgingFormFields = {
+						technicalAbility: 0,
+						creativity: 0,
+						utility: 0,
+						presentation: 0,
+						wowFactor: 0,
+						comments: '',
+						feedback: '',
+					};
+					setIsNewForm(true);
+					return emptyJudgeForm;
+				}
+				const error = new Error('Failed to get form information.') as ResponseError;
+				error.status = res.status;
+				throw error;
+			}
+			setIsNewForm(false);
+			return (await res.json()) as JudgingFormFields;
+		}
+	);
 
 	const teams = teamsData?.map(x => ({ ...x, key: x._id })) || ([] as TeamData[]);
+	const currentTeam = teams.find(team => String(team._id) === teamID);
 
-	const handleChange = (pagination: any, filters: any, sorter: any) => {
-		setSortedInfo(sorter as SorterResult<TeamData>);
-		setFilteredInfo(filters);
+	const handleTeamChange: Dispatch<SetStateAction<string>> = e => {
+		setTeamID(e);
+		setTimeout(() => {
+			window.scrollTo({ top: document.body.scrollHeight, behavior: 'smooth' });
+		}, 200);
 	};
 
-	const handleReset = (clearFilters: () => void) => {
-		clearFilters();
-		setSearchText('');
-	};
-
-	const getColumnSearchProps = (dataIndex: string) => ({
-		filterDropdown: ({
-			setSelectedKeys,
-			selectedKeys,
-			confirm,
-			clearFilters,
-		}: {
-			setSelectedKeys: (selectedKeys: React.Key[]) => void;
-			selectedKeys: React.Key[];
-			confirm: (param?: FilterConfirmProps) => void;
-			clearFilters: () => void;
-		}) => (
-			<div style={{ padding: 8 }}>
-				<Input
-					ref={searchInput}
-					placeholder={`Search ${dataIndex}`}
-					value={selectedKeys[0]}
-					onChange={e => {
-						setSelectedKeys(e.target.value ? [e.target.value] : []);
-						confirm({ closeDropdown: false });
-						setSearchText(e.target.value);
-						setSearchedColumn(dataIndex);
-					}}
-					onPressEnter={() => confirm({ closeDropdown: true })}
-					style={{ marginBottom: 8, display: 'block' }}
-				/>
-				<Button
-					onClick={() => {
-						clearFilters && handleReset(clearFilters);
-						confirm({ closeDropdown: false });
-					}}
-					style={{ width: '100%' }}>
-					Reset
-				</Button>
-			</div>
-		),
-		filterIcon: (filtered: boolean) => <SearchOutlined style={{ color: filtered ? '#1890ff' : undefined }} />,
-		onFilter: (value: string | number | boolean, record: any): boolean => {
-			const recordValue = dataIndex in record ? record[dataIndex] : record.application?.[dataIndex];
-			if (recordValue === undefined || recordValue === null) {
-				return false;
-			}
-			return recordValue.toString().toLowerCase().includes(value.toString().toLowerCase());
-		},
-		filteredValue:
-			(dataIndex in filteredInfo ? filteredInfo[dataIndex] : filteredInfo['application.' + dataIndex]) || null,
-		onFilterDropdownOpenChange: (open: boolean) => {
-			if (open) {
-				setTimeout(() => searchInput.current?.select(), 100);
-			}
-		},
-		render: (text: string) =>
-			searchedColumn === dataIndex ? (
-				<Highlighter
-					highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
-					searchWords={[searchText]}
-					autoEscape
-					textToHighlight={text?.toString() ?? ''}
-				/>
-			) : (
-				text
-			),
-	});
-
-	const columns = [
-		{
-			title: 'Table',
-			dataIndex: 'locationNum',
-			key: 'locationNum',
-			width: '20%',
-			sorter: (a: any, b: any) => a.locationNum - b.locationNum,
-			sortOrder: sortedInfo.columnKey === 'locationNum' ? sortedInfo.order : null,
-		},
-		{
-			title: 'Team',
-			dataIndex: 'name',
-			key: 'name',
-			width: '40%',
-			...getColumnSearchProps('name'),
-		},
-		{
-			title: 'Devpost',
-			dataIndex: 'devpost',
-			key: 'devpost',
-			width: '40%',
-			render: (link: URL) => {
-				return (
-					<>
-						<Link href={link} passHref>
-							<a
-								style={{ color: getAccentColor(accentColor, baseTheme), textDecoration: 'underline' }}
-								target="_blank">
-								{link}
-							</a>
-						</Link>
-					</>
-				);
-			},
-		},
-	];
-
 	return (
 		<>
 			{teamsError ? (
-				<div>{teamsError ? (teamsError as ResponseError).message : 'Failed to get data.'}</div>
+				<div>{(teamsError as ResponseError).message || 'Failed to get data.'}</div>
 			) : (
-				<Table
-					dataSource={teams}
-					columns={columns}
-					onChange={handleChange}
-					sortDirections={['descend', 'ascend']}
-				/>
+				<>
+					<AllTeamsForm teamsData={teams} handleTeamChange={handleTeamChange} teamId={teamID} />
+					{formData && (
+						<>
+							<p
+								style={{
+									fontSize: '1.5rem',
+									fontWeight: 'bold',
+									color: 'black',
+								}}>
+								{currentTeam?.name}
+							</p>
+							<JudgingForm
+								formData={formData}
+								isNewForm={isNewForm}
+								onSubmit={formData => handleSubmit(formData, mutate, teamID, isNewForm, setIsNewForm)}
+							/>
+						</>
+					)}
+				</>
 			)}
 		</>
 	);
diff --git a/models/team.ts b/models/team.ts
index 22a568a8..5de204db 100644
--- a/models/team.ts
+++ b/models/team.ts
@@ -14,7 +14,7 @@ const TeamSchema = new Schema(
 		},
 		joinCode: {
 			type: String,
-			required: true,
+			required: false,
 			unique: true,
 		},
 		devpost: {
@@ -23,18 +23,18 @@ const TeamSchema = new Schema(
 		members: {
 			type: [Schema.Types.ObjectId],
 			ref: 'User',
-			required: true,
+			required: false,
 			validate: {
 				// check team size
 				validator: (arr: Array<Schema.Types.ObjectId>) => arr.length <= 4,
 				message: 'Max team size is 4 members.',
 			},
 		},
-		scores: { type: [Schema.Types.ObjectId], ref: 'Scores' },
+		scores: { type: [Schema.Types.ObjectId], ref: 'Scores', required: false },
 		locationNum: { type: Number, reqiured: false },
 	},
 	{
-		timestamps: true,
+		timestamps: false,
 	}
 );
 
diff --git a/pages/api/judging-form.ts b/pages/api/judging-form.ts
index 45b5e0a0..d28b3915 100644
--- a/pages/api/judging-form.ts
+++ b/pages/api/judging-form.ts
@@ -59,7 +59,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 			// update the scores for the team
 			const team = await Team.findById(teamID);
 			team.scores = scores.id;
-			await log(judgeID, `Submitted scores for team ${team.name} (join code ${team.joinCode})`);
+			await log(judgeID, `Submitted scores for team ${team.name}`);
 			await team.save();
 			return res.status(201).send(scores);
 		}
@@ -77,7 +77,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 			);
 
 			const team = await Team.findById(teamID);
-			await log(judgeID, `Update scores for team ${team.name} (join code ${team.joinCode})`);
+			await log(judgeID, `Update scores for team ${team.name}`);
 			if (scores) {
 				return res.status(200).send(scores);
 			} else {
diff --git a/types/database.ts b/types/database.ts
index e9cfef32..267993d2 100644
--- a/types/database.ts
+++ b/types/database.ts
@@ -71,10 +71,10 @@ export interface PreAddData {
 export interface TeamData {
 	_id: mongoose.Schema.Types.ObjectId;
 	name: string;
-	joinCode: string;
+	joinCode?: string;
 	devpost: string;
-	members: mongoose.Schema.Types.ObjectId[];
-	scores: mongoose.Schema.Types.ObjectId[];
+	members?: mongoose.Schema.Types.ObjectId[];
+	scores?: mongoose.Schema.Types.ObjectId[];
 	locationNum?: number;
 	createdAt: Date;
 }

From ca8f3750b01c88fb0ae0d37577f798bb78ec3186 Mon Sep 17 00:00:00 2001
From: JihengLi <jiheng.li.1@vanderbilt.edu>
Date: Mon, 23 Sep 2024 20:03:27 -0500
Subject: [PATCH 3/5] fix bug in confirm judging sessions api

---
 pages/api/confirm-judging-sessions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/api/confirm-judging-sessions.ts b/pages/api/confirm-judging-sessions.ts
index 55172686..c269e892 100644
--- a/pages/api/confirm-judging-sessions.ts
+++ b/pages/api/confirm-judging-sessions.ts
@@ -22,7 +22,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
 				teamsByID.set(judgingSession.team._id.toString(), judgingSession.team);
 			});
 			const allTeams = [...teamsByID.values()];
-			allTeams.sort(team => new Date(team.createdAt).getTime());
+			// allTeams.sort(team => new Date(team.createdAt).getTime());
 
 			const promises: any[] = [];
 			[...allTeams.entries()].forEach(async ([i, team]) => {

From dc4275807d930b1e0e7bf663ce4ef30e8c233249 Mon Sep 17 00:00:00 2001
From: JihengLi <jiheng.li.1@vanderbilt.edu>
Date: Mon, 23 Sep 2024 20:04:00 -0500
Subject: [PATCH 4/5] fix bug in types/database.ts

---
 types/database.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/database.ts b/types/database.ts
index 267993d2..122a0ef1 100644
--- a/types/database.ts
+++ b/types/database.ts
@@ -76,7 +76,7 @@ export interface TeamData {
 	members?: mongoose.Schema.Types.ObjectId[];
 	scores?: mongoose.Schema.Types.ObjectId[];
 	locationNum?: number;
-	createdAt: Date;
+	createdAt?: Date;
 }
 
 export interface ScoreData {

From 77baf17557de289a80e8d9f11875f0f670b725c1 Mon Sep 17 00:00:00 2001
From: JihengLi <jiheng.li.1@vanderbilt.edu>
Date: Mon, 23 Sep 2024 20:15:24 -0500
Subject: [PATCH 5/5] fix bugs of changing database and model in script

---
 scripts/cli-util/get-team.ts    |  46 ++++----
 scripts/cli-util/modify-team.ts | 188 ++++++++++++++++----------------
 2 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/scripts/cli-util/get-team.ts b/scripts/cli-util/get-team.ts
index e1816ea0..1a9a46b7 100644
--- a/scripts/cli-util/get-team.ts
+++ b/scripts/cli-util/get-team.ts
@@ -38,10 +38,10 @@ export const handleGetTeam = async () => {
 				name: 'Get schedule',
 				value: 'get-schedule',
 			},
-			{
-				name: 'Get members',
-				value: 'get-members',
-			},
+			// {
+			// 	name: 'Get members',
+			// 	value: 'get-members',
+			// },
 			{
 				name: 'Get document',
 				value: 'get-document',
@@ -53,9 +53,9 @@ export const handleGetTeam = async () => {
 		case 'get-schedule':
 			await getSchedule(team);
 			break;
-		case 'get-members':
-			await getMembers(team);
-			break;
+		// case 'get-members':
+		// 	await getMembers(team);
+		// 	break;
 		case 'get-document':
 			await getDocument(team);
 			break;
@@ -85,24 +85,24 @@ const getSchedule = async (team: TeamData) => {
 	return promptAction();
 };
 
-const getMembers = async (team: TeamData) => {
-	const memberIds = team.members;
+// const getMembers = async (team: TeamData) => {
+// 	const memberIds = team.members;
 
-	let count = 1;
-	for (const memberId of memberIds) {
-		const member: UserData | null = await User.findOne({ _id: memberId });
-		if (!member) {
-			console.log(`Member ${count++}:`);
-			console.log('Member not found');
-		} else {
-			console.log(`Member ${count++}:`);
-			console.log(`Name: ${member.name}`);
-			console.log(`Email: ${member.email}`);
-		}
-	}
+// 	let count = 1;
+// 	for (const memberId of memberIds) {
+// 		const member: UserData | null = await User.findOne({ _id: memberId });
+// 		if (!member) {
+// 			console.log(`Member ${count++}:`);
+// 			console.log('Member not found');
+// 		} else {
+// 			console.log(`Member ${count++}:`);
+// 			console.log(`Name: ${member.name}`);
+// 			console.log(`Email: ${member.email}`);
+// 		}
+// 	}
 
-	return promptAction();
-};
+// 	return promptAction();
+// };
 
 const getDocument = async (team: TeamData) => {
 	console.log('Team Document:');
diff --git a/scripts/cli-util/modify-team.ts b/scripts/cli-util/modify-team.ts
index 4f531b10..fe2e3256 100644
--- a/scripts/cli-util/modify-team.ts
+++ b/scripts/cli-util/modify-team.ts
@@ -37,18 +37,18 @@ export const handleModifyTeam = async () => {
 				name: 'Change Team Name',
 				value: 'change-name',
 			},
-			{
-				name: 'Remove a member',
-				value: 'remove-member',
-			},
-			{
-				name: 'Add a member',
-				value: 'add-member',
-			},
-			{
-				name: 'Change invite code',
-				value: 'change-invite-code',
-			},
+			// {
+			// 	name: 'Remove a member',
+			// 	value: 'remove-member',
+			// },
+			// {
+			// 	name: 'Add a member',
+			// 	value: 'add-member',
+			// },
+			// {
+			// 	name: 'Change invite code',
+			// 	value: 'change-invite-code',
+			// },
 			{
 				name: 'Change devpost link',
 				value: 'change-devpost-link',
@@ -64,15 +64,15 @@ export const handleModifyTeam = async () => {
 		case 'change-name':
 			await changeName(team);
 			break;
-		case 'remove-member':
-			await removeMember(team);
-			break;
-		case 'add-member':
-			await addMember(team);
-			break;
-		case 'change-invite-code':
-			await changeInviteCode(team);
-			break;
+		// case 'remove-member':
+		// 	await removeMember(team);
+		// 	break;
+		// case 'add-member':
+		// 	await addMember(team);
+		// 	break;
+		// case 'change-invite-code':
+		// 	await changeInviteCode(team);
+		// 	break;
 		case 'change-devpost-link':
 			await changeDevpostLink(team);
 			break;
@@ -92,79 +92,79 @@ const changeName = async (team: TeamData) => {
 	return promptAction();
 };
 
-const removeMember = async (team: TeamData) => {
-	const memberIds = team.members;
-
-	if (memberIds.length === 0) {
-		console.log('Team has no members');
-		return promptAction();
-	}
-
-	const members: UserData[] = await User.find({ _id: { $in: memberIds } });
-
-	const member = await select({
-		message: `Select member to remove from ${team.name}`,
-		choices: [
-			{
-				name: '⏪ Back',
-				value: null,
-			},
-			...members.map((mem, index) => ({
-				name: `${index + 1}) ${mem.name}`,
-				value: mem._id,
-			})),
-		],
-	});
-
-	if (!member) {
-		return promptAction();
-	}
-
-	await Team.updateOne({ _id: team._id }, { $pull: { members: member } });
-
-	console.log(`Member [${member}] removed from team [${team.name}]`);
-	return promptAction();
-};
-
-const addMember = async (team: TeamData) => {
-	const memberIds = team.members;
-
-	const members: UserData[] = await User.find({ _id: { $nin: memberIds }, team: null });
-
-	const member = await select({
-		message: `Select member to add to ${team.name}`,
-		choices: [
-			{
-				name: '⏪ Back',
-				value: null,
-			},
-			...members.map((mem, index) => ({
-				name: `${index}) ${mem.name}`,
-				value: mem._id,
-			})),
-		],
-	});
-
-	if (!member) {
-		return promptAction();
-	}
-
-	await Team.updateOne({ _id: team._id }, { $push: { members: member } });
-
-	console.log(`Member [${member}] added to team [${team.name}]`);
-	return promptAction();
-};
-
-const changeInviteCode = async (team: TeamData) => {
-	const newInviteCode = await input({
-		message: `Enter new invite code for ${team.name}`,
-	});
-
-	await Team.updateOne({ _id: team._id }, { joinCode: newInviteCode });
-
-	console.log('Invite code changed successfully');
-	return promptAction();
-};
+// const removeMember = async (team: TeamData) => {
+// 	const memberIds = team.members;
+
+// 	if (memberIds.length === 0) {
+// 		console.log('Team has no members');
+// 		return promptAction();
+// 	}
+
+// 	const members: UserData[] = await User.find({ _id: { $in: memberIds } });
+
+// 	const member = await select({
+// 		message: `Select member to remove from ${team.name}`,
+// 		choices: [
+// 			{
+// 				name: '⏪ Back',
+// 				value: null,
+// 			},
+// 			...members.map((mem, index) => ({
+// 				name: `${index + 1}) ${mem.name}`,
+// 				value: mem._id,
+// 			})),
+// 		],
+// 	});
+
+// 	if (!member) {
+// 		return promptAction();
+// 	}
+
+// 	await Team.updateOne({ _id: team._id }, { $pull: { members: member } });
+
+// 	console.log(`Member [${member}] removed from team [${team.name}]`);
+// 	return promptAction();
+// };
+
+// const addMember = async (team: TeamData) => {
+// 	const memberIds = team.members;
+
+// 	const members: UserData[] = await User.find({ _id: { $nin: memberIds }, team: null });
+
+// 	const member = await select({
+// 		message: `Select member to add to ${team.name}`,
+// 		choices: [
+// 			{
+// 				name: '⏪ Back',
+// 				value: null,
+// 			},
+// 			...members.map((mem, index) => ({
+// 				name: `${index}) ${mem.name}`,
+// 				value: mem._id,
+// 			})),
+// 		],
+// 	});
+
+// 	if (!member) {
+// 		return promptAction();
+// 	}
+
+// 	await Team.updateOne({ _id: team._id }, { $push: { members: member } });
+
+// 	console.log(`Member [${member}] added to team [${team.name}]`);
+// 	return promptAction();
+// };
+
+// const changeInviteCode = async (team: TeamData) => {
+// 	const newInviteCode = await input({
+// 		message: `Enter new invite code for ${team.name}`,
+// 	});
+
+// 	await Team.updateOne({ _id: team._id }, { joinCode: newInviteCode });
+
+// 	console.log('Invite code changed successfully');
+// 	return promptAction();
+// };
 
 const changeDevpostLink = async (team: TeamData) => {
 	const newDevpostLink = await input({