From d4292e108d536520c7fa531a133d466a7f9c0f2f Mon Sep 17 00:00:00 2001 From: szheng31 Date: Thu, 4 Apr 2024 19:12:27 +0000 Subject: [PATCH 1/5] Run Prettier --- components/judges/ScoreInput.tsx | 35 +++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/components/judges/ScoreInput.tsx b/components/judges/ScoreInput.tsx index dcc8d857..a87648c1 100644 --- a/components/judges/ScoreInput.tsx +++ b/components/judges/ScoreInput.tsx @@ -1,4 +1,4 @@ -import { Slider, Radio , InputNumber, Row, Col } from 'antd'; +import { Slider, Radio, InputNumber, Row, Col } from 'antd'; import { RadioChangeEvent } from 'antd/lib'; import { IntegerType } from 'mongodb'; import React from 'react'; @@ -11,22 +11,33 @@ export default function ScoreInput(props: ScoreInputProps) { const { value, onChange } = props; const [min, max] = [0, 7]; const onRadioChange = (e: RadioChangeEvent) => { - onChange(e.target.value); - }; - + onChange(e.target.value); + }; + return ( - 1 - 2 - 3 - 4 - 5 - 6 - 7 + + 1 + + + 2 + + + 3 + + + 4 + + + 5 + + + 6 + + 7 - Date: Fri, 5 Apr 2024 16:22:01 -0500 Subject: [PATCH 2/5] Added table column to judge dashboard (#463) --- components/judges/schedule.tsx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/components/judges/schedule.tsx b/components/judges/schedule.tsx index 86f0056a..3391f3d1 100644 --- a/components/judges/schedule.tsx +++ b/components/judges/schedule.tsx @@ -89,7 +89,7 @@ export default function OrganizerSchedule(props: ScheduleProps) { .filter(x => x.team !== null && x.team.name !== null) .find(x => x.team.name === teamName)?.team.locationNum; return { - title: (teamName as string) + ' (Table ' + locationNum + ')', + title: teamName as string, dataIndex: teamName as string, key: teamName as string, render: TableCell, @@ -194,16 +194,21 @@ export function JudgeSchedule({ data, cutoffIndex, handleChange }: ScheduleProps width: '10%', render: (date: string) => DateTime.fromISO(date).toLocaleString(DateTime.TIME_SIMPLE), }, + { + title: 'Table', + dataIndex: 'table', + key: 'table', + width: '10%', + render: (locationNum: number) => locationNum, + }, { title: 'Project', dataIndex: 'project', key: 'project', - width: '40%', - render: ({ name, link, locationNum }: { name: string; link: URL; locationNum: number }) => ( + width: '30%', + render: ({ name, link }: { name: string; link: URL }) => ( <> - - {name} (Table {locationNum}) - + {name} { return { time: item.time, - project: { name: item.team.name, link: new URL(item.team.devpost), locationNum: item.team.locationNum }, + table: item.team.locationNum, + project: { name: item.team.name, link: new URL(item.team.devpost) }, teamMembers: item.team.members, judge: item.judge, teamId: item.team._id, From d78adac2000d7f08322cfebff5f46cda5397bd75 Mon Sep 17 00:00:00 2001 From: draw-n Date: Fri, 5 Apr 2024 16:25:35 -0500 Subject: [PATCH 3/5] switched past session switch to radio button (#459) Co-authored-by: draw-n Co-authored-by: Isaac Liu <69013063+xnscdev@users.noreply.github.com> --- components/judges/schedule.tsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/components/judges/schedule.tsx b/components/judges/schedule.tsx index 3391f3d1..b49bb613 100644 --- a/components/judges/schedule.tsx +++ b/components/judges/schedule.tsx @@ -1,4 +1,4 @@ -import { Space, Table, Collapse, Tag, Switch, Button, notification, Upload, Spin, theme } from 'antd'; +import { Space, Table, Collapse, Tag, Switch, Button, notification, Upload, Spin, theme, Radio } from 'antd'; import React, { useContext, useMemo, useState } from 'react'; import { DateTime } from 'luxon'; import Link from 'next/link'; @@ -183,7 +183,7 @@ export default function OrganizerSchedule(props: ScheduleProps) { } export function JudgeSchedule({ data, cutoffIndex, handleChange }: ScheduleProps) { - const [showPast, setShowPast] = useState(true); + const [showPast, setShowPast] = useState(false); const { accentColor, baseTheme } = useContext(ThemeContext); const columns = [ @@ -275,13 +275,8 @@ export function JudgeSchedule({ data, cutoffIndex, handleChange }: ScheduleProps - { - setShowPast(checked); - }} - /> + setShowPast(!showPast)} /> + Show Past Sessions From d5aabaa9af4f4800ceeeea0e004be8e5e7c72511 Mon Sep 17 00:00:00 2001 From: carolhe134 <89999830+carolhe134@users.noreply.github.com> Date: Fri, 5 Apr 2024 16:28:50 -0500 Subject: [PATCH 4/5] Added search by login name to Organizer's manage applications tab (#453) Co-authored-by: Isaac Liu <69013063+xnscdev@users.noreply.github.com> --- components/Organizer/ApplicantsTab/ApplicantsTab.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/Organizer/ApplicantsTab/ApplicantsTab.tsx b/components/Organizer/ApplicantsTab/ApplicantsTab.tsx index 6138036c..1ec1d4e0 100644 --- a/components/Organizer/ApplicantsTab/ApplicantsTab.tsx +++ b/components/Organizer/ApplicantsTab/ApplicantsTab.tsx @@ -258,6 +258,7 @@ export const ApplicantsTab = () => { { title: 'Login Name', dataIndex: 'name', + ...getColumnSearchProps('name'), }, { title: 'First Name', From 472ff1f1a9d3bcec284dc32453aa817379e3e115 Mon Sep 17 00:00:00 2001 From: Stanley Zheng Date: Fri, 5 Apr 2024 17:39:18 -0400 Subject: [PATCH 5/5] fixed slider and button spacing (#454) * fixed slider and button spacing * Run Prettier --------- Co-authored-by: Stanley Zheng Co-authored-by: szheng31 Co-authored-by: Isaac Liu <69013063+xnscdev@users.noreply.github.com> --- components/Organizer/ScheduleTab/ScheduleTab.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/components/Organizer/ScheduleTab/ScheduleTab.tsx b/components/Organizer/ScheduleTab/ScheduleTab.tsx index 387d856a..e54de269 100644 --- a/components/Organizer/ScheduleTab/ScheduleTab.tsx +++ b/components/Organizer/ScheduleTab/ScheduleTab.tsx @@ -123,7 +123,13 @@ const ScheduleTab = () => { /> - +
@@ -135,7 +141,7 @@ const ScheduleTab = () => { {potentialSchedule && ( )}