Merge pull request #72 from HackDavis/feat/submissions-team-link

Feat/submissions team link

Author: Austin2Shih

app/(api)/_types/submissions.ts

@@ -1,10 +1,10 @@
 interface SubmissionInt {
+  _id: string;
   judge_id: string;
   team_id: string;
-  scores: object;
-  correlations: object;
+  scores: number[];
+  correlations: object[];
   comments?: string;
-  _id: string;
 }
 
 export default SubmissionInt;

app/(api)/_types/teams.ts

@@ -1,10 +1,8 @@
 interface TeamInt {
+  _id: string;
   number: number;
-  tracks: string[];
   name: string;
-  judge_pair_ids?: string[];
-  submission_ids?: string[];
-  _id: string;
+  tracks: string[];
 }
 
 export default TeamInt;

app/(api)/api/submissions/get.ts

@@ -5,6 +5,5 @@ import { GetManySubmissions } from '@datalib/submissions/getSubmissions';
 
 export async function GET(request: NextRequest) {
   const queries = await getQueries(request);
-  console.log(queries);
   return GetManySubmissions(queries);
 }

app/(pages)/_hooks/useSubmission.ts

@@ -0,0 +1,23 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { useAuth } from './useAuth';
+import { getSubmission } from '@actions/submissions/getSubmission';
+
+export function useSubmission(team_id: string): any {
+  const { user, loading: authLoading } = useAuth();
+  const [submission, setSubmssion] = useState<any>(null);
+  const [loading, setLoading] = useState<boolean>(true);
+  useEffect(() => {
+    const getSubmissionWrapper = async (judge_id: string) => {
+      const submission = await getSubmission(judge_id, team_id);
+      setSubmssion(submission);
+      setLoading(false);
+    };
+    if (!authLoading && user) {
+      getSubmissionWrapper(user._id);
+    }
+  }, [authLoading, user, team_id]);
+
+  return { submission, loading };
+}

app/(pages)/_hooks/useTeam.ts

@@ -0,0 +1,19 @@
+'use client';
+
+import { useState, useEffect } from 'react';
+import { getTeam } from '@actions/teams/getTeams';
+
+export function useTeam(team_id: string): any {
+  const [team, setTeam] = useState<any>(null);
+  const [loading, setLoading] = useState<boolean>(true);
+  useEffect(() => {
+    const getTeamWrapper = async (team_id: string) => {
+      const team = await getTeam(team_id);
+      setTeam(team);
+      setLoading(false);
+    };
+    getTeamWrapper(team_id);
+  }, [team_id]);
+
+  return { team, loading };
+}

app/(pages)/judges/scoring/[team_id]/page.tsx

@@ -0,0 +1,20 @@
+'use client';
+import ScoringForm from '../_components/ScoringForm/ScoringForm';
+import { useTeam } from '@hooks/useTeam';
+import { useSubmission } from '@hooks/useSubmission';
+export default function Scoring({ params }: { params: { team_id: string } }) {
+  const team_id = params.team_id;
+  const { team, loading: teamLoading } = useTeam(team_id as string);
+  const { submission, loading: submissionLoading } = useSubmission(
+    team_id as string
+  );
+  if (submissionLoading || teamLoading) {
+    return 'loading...';
+  }
+
+  if (team.body === null || submission.body === null) {
+    return 'something went wrong.';
+  }
+
+  return <ScoringForm team={team.body} _={submission.body} />;
+}

app/(pages)/judges/_components/ScoringForm/ScoringForm.module.scss renamed to app/(pages)/judges/scoring/_components/ScoringForm/ScoringForm.module.scss

@@ -5,7 +5,16 @@ import TeamBlock from './ScoringSubComponents/TeamBlock';
 import ScoringInput from './ScoringSubComponents/ScoreInput';
 import Comments from './ScoringSubComponents/Comments';
 
-export default function ScoringForm() {
+import TeamInt from '@typeDefs/teams';
+import SubmissionInt from '@typeDefs/submissions';
+
+export default function ScoringForm({
+  team,
+  _,
+}: {
+  team: TeamInt;
+  _: SubmissionInt;
+}) {
   const generalScoreNames = [
     'Social Good',
     'Technical Complexity',
@@ -34,7 +43,7 @@ export default function ScoringForm() {
 
   return (
     <div className={styles.container}>
-      <TeamBlock />
+      <TeamBlock team={team} />
       <ScoringInput
         inputNameHeader="Overall Scoring"
         inputScoreNames={generalScoreNames}

app/(pages)/judges/_components/ScoringForm/ScoringForm.tsx renamed to app/(pages)/judges/scoring/_components/ScoringForm/ScoringForm.tsx

@@ -1,3 +1,4 @@
+import TeamInt from '@typeDefs/teams';
 import styles from './TeamBlock.module.scss';
 import Link from 'next/link';
 
@@ -35,23 +36,20 @@ const NoteBook = () => {
   );
 };
 
-export default function TeamBlock() {
+export default function TeamBlock({ team }: { team: TeamInt }) {
   /* retrieve these from backend */
-  const tableNumber = 117;
-  const teamName = 'Haptic Hand';
-
   return (
     <div className={styles.teamBlock}>
       <div className={styles.topText}>
-        <h2 className={styles.teamTable}>Table {tableNumber}</h2>
+        <h2 className={styles.teamTable}>Table {team.number}</h2>
 
         <div className={styles.mapContent}>
           <h3 className={styles.mapText}>Find on Map</h3>
           <RightArrow />
         </div>
       </div>
 
-      <h1 className={styles.teamName}>{teamName}</h1>
+      <h1 className={styles.teamName}>{team.name}</h1>
       <div className={styles.guideContent}>
         <p className={styles.guideText}>
           Please refer back to our judging guide for each track. Tracks are on a