diff --git a/app/(pages)/admin/_components/RankTeams/RankTeamsUI.tsx b/app/(pages)/admin/_components/RankTeams/RankTeamsUI.tsx index 14bdd64d..33492d37 100644 --- a/app/(pages)/admin/_components/RankTeams/RankTeamsUI.tsx +++ b/app/(pages)/admin/_components/RankTeams/RankTeamsUI.tsx @@ -395,17 +395,19 @@ export default function RankTeamsUI() { className="w-full" onValueChange={(value) => setActiveTrack(value)} > - - {trackNames.map((trackName) => ( - - {trackName} - - ))} - +
+ + {trackNames.map((trackName) => ( + + {trackName} + + ))} + +
{trackNames.map((trackName) => ( @@ -427,9 +429,9 @@ export default function RankTeamsUI() { return (
-
+
{index + 1}
@@ -448,7 +450,10 @@ export default function RankTeamsUI() { )}
- + Score: {result.team.final_score.toFixed(2)} @@ -461,20 +466,20 @@ export default function RankTeamsUI() {
{questions.length > 0 && ( -
-

+

+

Question Scores:

{questions.map((question) => (
{question}: - + {questionScores[question] || 0}
@@ -484,17 +489,19 @@ export default function RankTeamsUI() { )} {result.team.comments.length > 0 && ( -
-

+

+

Judge Comments:

    {result.team.comments.map((comment, i) => (
  • - "{comment}" + + "{comment}" +
  • ))}
@@ -505,7 +512,7 @@ export default function RankTeamsUI() { ); }) ) : ( -

+

No teams ranked for this track yet.

)} diff --git a/app/(pages)/admin/dashboard/page.tsx b/app/(pages)/admin/dashboard/page.tsx deleted file mode 100644 index 7ad6b06d..00000000 --- a/app/(pages)/admin/dashboard/page.tsx +++ /dev/null @@ -1,90 +0,0 @@ -'use client'; -import styles from './page.module.scss'; - -import Link from 'next/link'; -import JudgingProgress from '../_components/JudgingProgress/JudgingProgress'; - -const action_links = [ - { - href: '/admin/csv', - body: 'Import Teams', - }, - { - href: '/admin/match', - body: 'Assign Judges to Teams', - }, - { - href: '/admin/panels', - body: 'Create Panels', - }, - { - href: '/admin/invite-link', - body: 'Invite Judges', - }, - { - href: '/admin/randomize-projects', - body: 'Randomize Projects', - }, -]; - -const data_links = [ - { - href: '/admin/teams', - body: 'View Teams', - }, - { - href: '/admin/judges', - body: 'View Judges', - }, - { - href: '/admin/rollouts', - body: 'View Rollouts', - }, -]; - -export default function Dashboard() { - return ( -
-
-
-
-

Navigation

-
-
- {action_links.map(({ href, body }) => ( - - {body} - - ))} -
-
- {data_links.map(({ href, body }) => ( - - {body} - - ))} -
-
-
-
-

Overview

-
- -
-
-
-
-

Problems

-
-
-
- ); -} diff --git a/app/(pages)/admin/dashboard/page.module.scss b/app/(pages)/admin/page.module.scss similarity index 100% rename from app/(pages)/admin/dashboard/page.module.scss rename to app/(pages)/admin/page.module.scss diff --git a/app/(pages)/admin/page.tsx b/app/(pages)/admin/page.tsx index 3c7bb70c..c7a1f1b5 100644 --- a/app/(pages)/admin/page.tsx +++ b/app/(pages)/admin/page.tsx @@ -1,19 +1,98 @@ +'use client'; +import styles from './page.module.scss'; + import Link from 'next/link'; +import JudgingProgress from './_components/JudgingProgress/JudgingProgress'; + +const action_links = [ + { + href: '/admin/csv', + body: 'Import Teams with CSV', + }, + { + href: '/admin/match', + body: 'Assign Judges to Teams', + }, + { + href: '/admin/score', + body: 'Score and Shortlist', + }, + { + href: '/admin/panels', + body: 'Create Panels', + }, + { + href: '/admin/invite-link', + body: 'Invite Judges', + }, + { + href: '/admin/randomize-projects', + body: 'Randomize Projects', + }, + { + href: '/admin/announcements', + body: 'Announcements', + }, +]; + +const data_links = [ + { + href: '/admin/teams', + body: 'View Teams', + }, + { + href: '/admin/judges', + body: 'View Judges', + }, + { + href: '/admin/rollouts', + body: 'View Rollouts', + }, +]; -export default function Admin() { +export default function Dashboard() { return ( -
- Dashboard - Import Teams with CSV - Group Judges and Teams - Create Panels - Invite Users - Score and Shortlist - Randomize Projects - Announcements - Rollouts - View Judges - View Teams +
+
+
+
+

Navigation

+
+
+ {action_links.map(({ href, body }) => ( + + {body} + + ))} +
+
+ {data_links.map(({ href, body }) => ( + + {body} + + ))} +
+
+
+
+

Overview

+
+ +
+
+
+
+

Problems

+
+
); } diff --git a/app/_data/tracks.ts b/app/_data/tracks.ts index 88da0895..7ee0f0c2 100644 --- a/app/_data/tracks.ts +++ b/app/_data/tracks.ts @@ -140,14 +140,6 @@ const nonHDTracks: Tracks = { }; const automaticTracks: Tracks = { - 'Best Hack for Social Good': { - name: 'Best Hack for Social Good', - filter: 'General', - prizes: ['IPad', 'JBL Speaker'], - images: [ipad, jblSpeaker], - eligibility_criteria: - 'Encapsulate your authentic idea of "social good". All entries are automatically considered for this prize category.', - }, "Hacker's Choice Award": { name: "Hacker's Choice Award", filter: 'General', @@ -159,6 +151,14 @@ const automaticTracks: Tracks = { }; const optedHDTracks: Tracks = { + 'Best Hack for Social Good': { + name: 'Best Hack for Social Good', + filter: 'General', + prizes: ['IPad', 'JBL Speaker'], + images: [ipad, jblSpeaker], + eligibility_criteria: + 'Encapsulate your authentic idea of "social good". All entries are automatically considered for this prize category.', + }, 'Most Technically Challenging Hack': { name: 'Most Technically Challenging Hack', filter: 'Technical', diff --git a/package-lock.json b/package-lock.json index ecdfdf27..9e0ca7e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6482,9 +6482,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001701", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001701.tgz", - "integrity": "sha512-faRs/AW3jA9nTwmJBSO1PQ6L/EOgsB5HMQQq4iCu5zhPgVVgO/pZRHlmatwijZKetFw8/Pr4q6dEN8sJuq8qTw==", + "version": "1.0.30001734", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001734.tgz", + "integrity": "sha512-uhE1Ye5vgqju6OI71HTQqcBCZrvHugk0MjLak7Q+HfoBgoq5Bi+5YnwjP4fjDgrtYr/l8MVRBvzz9dPD4KyK0A==", "funding": [ { "type": "opencollective", diff --git a/package.json b/package.json index dc738188..e70bde87 100644 --- a/package.json +++ b/package.json @@ -27,9 +27,9 @@ "@mui/material": "^5.15.4", "@radix-ui/react-accordion": "^1.2.3", "@radix-ui/react-slot": "^1.1.2", - "@szhsin/react-accordion": "^1.4.0", - "@radix-ui/react-tooltip": "^1.1.8", "@radix-ui/react-tabs": "^1.1.3", + "@radix-ui/react-tooltip": "^1.1.8", + "@szhsin/react-accordion": "^1.4.0", "bcryptjs": "^2.4.3", "chart.js": "^4.4.9", "class-variance-authority": "^0.7.1",