Judging Schedule
+
+ You will be assigned a table and judge for judging. Please be at your table at the time indicated below.
+
{judgingSessionData?.length === 0 ? (
Schedule will show up here when hacking ends!
) : (
diff --git a/components/hacker/Leaderboard.tsx b/components/hacker/Leaderboard.tsx
index e7452225..1174fa2a 100644
--- a/components/hacker/Leaderboard.tsx
+++ b/components/hacker/Leaderboard.tsx
@@ -16,7 +16,10 @@ const Leaderboard = () => {
return (
- Leaderboard
+ Points Leaderboard
+
+ Participate and check in to events to earn points. Points can be used to redeem prizes!
+
{leaderboardError ? (
Failed to load data.
) : !leaderboardData ? (
diff --git a/components/hacker/TeamCard.tsx b/components/hacker/TeamCard.tsx
deleted file mode 100644
index aa1cc808..00000000
--- a/components/hacker/TeamCard.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Button, Card, Form, Input } from 'antd';
-import { NewTeamFields } from '../../types/client';
-
-interface Props {
- title: string;
- fields: { name: string; label: string }[];
- submitText: string;
- onSubmit: (value: NewTeamFields | { joinCode: string }) => Promise
;
-}
-
-export default function TeamCard(props: Props) {
- const { title, fields, submitText, onSubmit } = props;
- const layout = {
- labelCol: { span: 8 },
- wrapperCol: { span: 16 },
- };
- return (
-
-
-
- );
-}
diff --git a/components/hacker/TeamManager.tsx b/components/hacker/TeamManager.tsx
deleted file mode 100644
index 384658e6..00000000
--- a/components/hacker/TeamManager.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { Button, Collapse, Descriptions, Divider, Form, Input, notification, Tag } from 'antd';
-import { Content } from 'antd/lib/layout/layout';
-import { useSWRConfig } from 'swr';
-import { handleSubmitFailure, handleSubmitSuccess } from '../../lib/helpers';
-import { TeamProfile } from '../../types/client';
-import LeaveButton from './LeaveButton';
-import { ScopedMutator } from 'swr/dist/types';
-const { Panel } = Collapse;
-
-async function handleSubmit(formData: { teamName: string } | { devpost: string }, mutate: ScopedMutator) {
- const res = await fetch('/api/team-management', {
- method: 'PATCH',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify(formData),
- });
-
- if (res.ok) {
- console.log('Received:', await res.text());
- mutate('/api/team-management');
- return true;
- } else handleSubmitFailure(await res.text());
- return false;
-}
-
-async function handleLeaveTeam(mutate: ScopedMutator) {
- const res = await fetch('/api/team-management', {
- method: 'DELETE',
- headers: {
- 'Content-Type': 'application/json',
- },
- });
-
- if (res.ok) {
- console.log('Received:', await res.text());
- mutate('/api/team-management');
- } else handleSubmitFailure(await res.text());
-}
-
-export default function TeamManager({ profile }: { profile: TeamProfile }) {
- // TODO: STYLE THIS!
- const { name, joinCode, devpost, members } = profile;
- const onFormFinish = async (data: { teamName: string } | { devpost: string }, mutate: ScopedMutator) => {
- const success = await handleSubmit(data, mutate);
- if (success) {
- handleSubmitSuccess('Successfully Changed!');
- } else {
- handleSubmitFailure('Failed to Change!');
- }
- };
- const { mutate } = useSWRConfig();
- const layout = {
- labelCol: { span: 4 },
- wrapperCol: { span: 20 },
- };
- return (
-
-
- {name}
-
- {joinCode}
-
-
-
- {devpost}
-
-
- {/* empty */}
-
- {members.map((member, i) => (
-
- {member}
-
- ))}
-
-
- {/* TODO: validation of team name on server side */}
-
-
-
-
-
-
-
-
-
-
-
-
- );
-}
diff --git a/components/hacker/TeamSetup.tsx b/components/hacker/TeamSetup.tsx
deleted file mode 100644
index 8454ac5d..00000000
--- a/components/hacker/TeamSetup.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Col, Divider, Row } from 'antd';
-import { Content } from 'antd/lib/layout/layout';
-import { useSWRConfig } from 'swr';
-import { handleSubmitFailure } from '../../lib/helpers';
-import { NewTeamFields } from '../../types/client';
-import TeamCard from './TeamCard';
-import { ScopedMutator } from 'swr/dist/types';
-
-async function handleSubmit(formData: NewTeamFields | { joinCode: string }, mutate: ScopedMutator) {
- const res = await fetch('/api/team-management', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- },
- body: JSON.stringify(formData),
- });
-
- if (res.ok) {
- console.log('Received:', await res.text());
- mutate('/api/team-management');
- } else handleSubmitFailure(await res.text());
-}
-
-export default function TeamSetup() {
- const { mutate } = useSWRConfig();
- return (
-
-
-
- handleSubmit(formData, mutate)}
- />
-
-
-
-
- Or
-
-
-
-
- handleSubmit(formData, mutate)}
- />
-
-
-
- );
-}
diff --git a/components/hacker/hacking-start/Header.tsx b/components/hacker/hacking-start/Header.tsx
index 088e03b5..29eb704a 100644
--- a/components/hacker/hacking-start/Header.tsx
+++ b/components/hacker/hacking-start/Header.tsx
@@ -7,31 +7,31 @@ import HackingBeginSoon from '../../../public/hacking-begin-soon.svg';
const Header = ({ user, signOut }: { user: UserData; signOut: () => void }) => {
return (
- <>
-
-
-
-
- {user.email}
-
-
-
-
-
- Hello,
- {user.name}
- Your currently have {user.nfcPoints} points
-
-
- Current Event
-
- Hacking Begins Soon
-
-
+
+
+
+
+ {user.email}
+
+
-
+
+
+ Hello,
+ {user.name}
+
+ You currently have {user.nfcPoints} points. Participate in events to start earning more!
+
+
+
+ Current Event
+
+ Hacking Begins Soon
+
+
+
);
};
diff --git a/components/hacker/hacking-start/TeamManagement.tsx b/components/hacker/hacking-start/TeamManagement.tsx
new file mode 100644
index 00000000..72ccaa6d
--- /dev/null
+++ b/components/hacker/hacking-start/TeamManagement.tsx
@@ -0,0 +1,253 @@
+import React, { useState } from 'react';
+import { TeamProfile } from '../../../types/client';
+import styles from '../../../styles/hacker/Table.module.css';
+import { Button, Input, Modal } from 'antd';
+import useSWR, { mutate } from 'swr';
+import { handleSubmitFailure, handleSubmitSuccess } from '../../../lib/helpers';
+
+const isDevpostURL = (input: string): boolean => {
+ if (!input) return false;
+
+ return input.startsWith('https://devpost.com/') || input.startsWith('http://www.devpost.com/');
+};
+
+const TeamManagement = () => {
+ // Team to join
+ const [teamName, setTeamName] = useState
(undefined);
+ const [joinCode, setTeamCode] = useState(undefined);
+ const [showRenameTeam, setShowRenameTeam] = useState(false);
+ const [showChangeDevpost, setShowChangeDevpost] = useState(false);
+ // New team name to update
+ const [newTeamName, setNewTeamName] = useState('');
+ const [newDevPost, setNewDevPost] = useState('');
+ const [showLeaveModal, setShowLeaveModal] = useState(false);
+ const [showRenameTeamModal, setShowRenameTeamModal] = useState(false);
+
+ const {
+ data: teamData,
+ error: teamError,
+ mutate,
+ } = useSWR('/api/team', async url => {
+ const res = await fetch(url, { method: 'GET' });
+ if (!res.ok) return;
+ const { members, ...rest } = await res.json();
+ return { members: members.map((member: any) => member.name), ...rest } as TeamProfile;
+ });
+
+ // handle create/join team
+ const handleAction = async (action: 'CREATE' | 'JOIN') => {
+ const endpoint = action === 'CREATE' ? '/api/team-create' : '/api/team-join';
+ const method = action === 'CREATE' ? 'POST' : 'PATCH';
+ const headers = { 'Content-Type': 'application/json' };
+ const body = JSON.stringify(action === 'CREATE' ? { teamName } : { joinCode });
+
+ const res = await fetch(endpoint, { method, headers, body });
+
+ if (res.ok) {
+ // mutate(endpoint);
+ handleSubmitSuccess(`Successfully ${action === 'CREATE' ? 'created' : 'joined'} a team!`);
+ window.location.reload();
+ } else {
+ handleSubmitFailure('There was an error. Are you sure the team is not filled up already?');
+ }
+ };
+
+ const handleUpdateTeam = async () => {
+ if (!newTeamName) {
+ // Empty team name
+ handleSubmitFailure('Team name cannot be empty!');
+ setShowRenameTeam(false);
+ return;
+ }
+ const endpoint = '/api/team-update';
+ const method = 'PATCH';
+ const headers = { 'Content-Type': 'application/json' };
+ const body = JSON.stringify({ teamName: newTeamName });
+
+ const res = await fetch(endpoint, { method, headers, body });
+ const message = await res.text();
+
+ if (res.ok) {
+ // mutate(endpoint);
+ setShowRenameTeam(false);
+ // Update the teamData
+ mutate();
+ handleSubmitSuccess(`Successfully Changed Team Name!`);
+
+ // Reset state
+ setNewTeamName('');
+ } else {
+ // handle submit failure the resupose message
+ handleSubmitFailure(message);
+ }
+ };
+
+ const handleUpdateDevpost = async () => {
+ if (!newDevPost) {
+ // Empty team name
+ handleSubmitFailure('Devpost link cannot be empty!');
+ setShowChangeDevpost(false);
+ return;
+ }
+
+ if (!isDevpostURL(newDevPost)) {
+ // Valid Devpost URL
+ handleSubmitFailure(
+ 'Devpost link is invalid. Must start with https://devpost.com/ or https://www.devpost.com/'
+ );
+ setShowChangeDevpost(false);
+ return;
+ }
+
+ const endpoint = '/api/team-update';
+ const method = 'PATCH';
+ const headers = { 'Content-Type': 'application/json' };
+ const body = JSON.stringify({ teamName: '', devpost: newDevPost });
+
+ const res = await fetch(endpoint, { method, headers, body });
+ const message = await res.text();
+
+ if (res.ok) {
+ // mutate(endpoint);
+ setShowChangeDevpost(false);
+ // Update the teamData
+ mutate();
+ handleSubmitSuccess(`Successfully Changed Devpost Link!`);
+
+ // Reset state
+ setNewDevPost('');
+ } else {
+ handleSubmitFailure(message);
+ }
+ };
+
+ const handleLeaveTeam = async () => {
+ const endpoint = '/api/team-leave';
+ const method = 'PATCH';
+ const headers = { 'Content-Type': 'application/json' };
+
+ const res = await fetch(endpoint, { method, headers });
+ const message = await res.text();
+
+ if (res.ok) {
+ handleSubmitSuccess(`You have left the team`);
+
+ // Reset state
+ setShowLeaveModal(false);
+
+ window.location.reload();
+ } else {
+ handleSubmitFailure(message);
+ }
+ };
+
+ return (
+
+ Team
+
+ You can create a team or join a team (1 - 4 people per team). Devpost link must be submitted by 12:30 PM
+ on October 29th.
+
+ {!teamData && (
+ <>
+
You are not in a team yet.
+
+
+
Create a Team
+
+ setTeamName(e.target.value)} />
+
+
+
+
+
Or
+
+
+
Join a Team
+
+ setTeamCode(e.target.value)} />
+
+
+
+
+
+ )}
+ {teamData && (
+ <>
+
+
+
Team Name:
+
{teamData.name}
+
+
+
Members:
+
+ {teamData.members.map(member => {
+ return (
+
+ {member}
+
+ );
+ })}
+
+
+
+
Join Code:
+
{teamData.joinCode}
+
+
+
Devpost:
+
{teamData.devpost}
+
+
+
+
+
+
+
+
+
+
setShowRenameTeam(false)}
+ onOk={handleUpdateTeam}
+ destroyOnClose={true}>
+ setNewTeamName(event.target.value)} defaultValue={teamData.name} />
+
+
+
setShowChangeDevpost(false)}
+ onOk={handleUpdateDevpost}
+ destroyOnClose={true}>
+ setNewDevPost(event.target.value)}
+ defaultValue={teamData.devpost && teamData.devpost.toString()}
+ />
+
+
+
setShowLeaveModal(false)}
+ />
+
+ )}
+