Merge pull request #69 from HackDavis/feat/server-connection

Projects connected to db

Author: Austin2Shih

app/(api)/_actions/submissions/getSubmission.ts

@@ -12,6 +12,7 @@ export async function getSubmission(judge_id: string, team_id: string) {
 }
 
 export async function getManySubmissions(query: object = {}) {
-  const submissionRes = await GetManySubmissions(parseAndReplace(query));
+  const newQuery = await parseAndReplace(query);
+  const submissionRes = await GetManySubmissions(newQuery);
   return submissionRes.json();
 }

app/(api)/_actions/teams/getTeams.ts

@@ -0,0 +1,15 @@
+'use server';
+
+import { GetManyTeams, GetTeam } from '@datalib/teams/getTeam';
+import parseAndReplace from '@utils/request/parseAndReplace';
+
+export async function getTeam(id: string) {
+  const teamRes = await GetTeam(id);
+  return teamRes.json();
+}
+
+export async function getManyTeams(query: object = {}) {
+  const newQuery = await parseAndReplace(query);
+  const teamRes = await GetManyTeams(newQuery);
+  return teamRes.json();
+}

app/(pages)/_hooks/useSubmissions.ts

@@ -3,6 +3,7 @@
 import { useState, useEffect } from 'react';
 import { useAuth } from './useAuth';
 import { getManySubmissions } from '@actions/submissions/getSubmission';
+import { getManyTeams } from '@actions/teams/getTeams';
 
 export function useSubmissions(): any {
   const { user, loading: authLoading } = useAuth();
@@ -17,7 +18,23 @@ export function useSubmissions(): any {
           },
         },
       });
-      setSubmssions(submissions);
+      if (submissions.ok) {
+        const team_ids = submissions.body.map(
+          (body: { team_id: string }) => body.team_id
+        );
+        const teams = await getManyTeams({
+          _id: {
+            $in: {
+              '*convertIds': {
+                ids: team_ids,
+              },
+            },
+          },
+        });
+        setSubmssions(teams);
+      } else {
+        setSubmssions(submissions);
+      }
       setLoading(false);
     };
     if (!authLoading && user) {

app/(pages)/judges/projects/_components/ProjectsList.tsx

@@ -1,64 +1,39 @@
 'use client';
 
+import { useSubmissions } from '@hooks/useSubmissions';
 import ProjectsCard from './ProjectsCard';
 import styles from './ProjectsCard.module.scss';
 
+interface Team {
+  number: number;
+  name: string;
+  tracks: string[];
+}
+
 export default function ProjectsList({ activeTab }: { activeTab: number }) {
-  const scoredProjects = [
-    {
-      num: 1,
-      name: 'sc haptic hand',
-      categories: ['not sure', 'something else', 'another category'],
-    },
-    {
-      num: 70,
-      name: 'sc haptic hand',
-      categories: ['not sure', 'something else'],
-    },
-  ];
+  const { loading, submissions } = useSubmissions();
+  if (loading) {
+    return 'loading...';
+  }
+  const teams = submissions.ok ? submissions.body : [];
 
-  const unjudgedProjects = [
-    {
-      num: 75,
-      name: 'unj haptic hand',
-      categories: ['not sure', 'something else'],
-    },
-    {
-      num: 75,
-      name: 'unj haptic hand',
-      categories: ['not', 'something', 'one more', 'another 1'],
-    },
-    {
-      num: 175,
-      name: 'unj haptic hand',
-      categories: ['not sure', 'something else'],
-    },
-    {
-      num: 75,
-      name: 'unj haptic hand',
-      categories: ['not sure', 'something else'],
-    },
-    {
-      num: 75,
-      name: 'unj haptic hand',
-      categories: ['not', 'something', 'one more', 'another 1'],
-    },
-    {
-      num: 75,
-      name: 'unj haptic hand',
-      categories: ['not sure', 'something else'],
-    },
-  ];
+  const scoredProjects = teams.filter((team: { scores?: string[] }) =>
+    team.scores ? true : false
+  );
+
+  const unjudgedProjects = teams.filter((team: { scores?: string[] }) =>
+    team.scores ? false : true
+  );
 
   const renderScoredProjects = () => {
     return (
       <div className={styles.container}>
-        {scoredProjects.map((project, index) => (
+        {scoredProjects.map((project: Team, index: number) => (
           <ProjectsCard
             key={index}
-            num={project.num}
+            num={project.number}
             name={project.name}
-            categories={project.categories}
+            categories={project.tracks}
           />
         ))}
       </div>
@@ -67,12 +42,12 @@ export default function ProjectsList({ activeTab }: { activeTab: number }) {
   const renderuUnjudgedProjects = () => {
     return (
       <div className={styles.container}>
-        {unjudgedProjects.map((project, index) => (
+        {unjudgedProjects.map((project: Team, index: number) => (
           <ProjectsCard
             key={index}
-            num={project.num}
+            num={project.number}
             name={project.name}
-            categories={project.categories}
+            categories={project.tracks}
           />
         ))}
       </div>

app/(pages)/judges/projects/page.tsx

@@ -3,15 +3,12 @@
 import { useState } from 'react';
 import ProjectsHeader from './_components/ProjectsHeader';
 import ProjectsList from './_components/ProjectsList';
-import { useSubmissions } from '@hooks/useSubmissions';
 // import SearchBar from './_components/SearchBar';
 
 export default function Judges() {
   const [activeTab, setActiveTab] = useState(0);
-  const { loading, submissions } = useSubmissions();
   return (
     <div>
-      {!loading && JSON.stringify(submissions)}
       <ProjectsHeader activeTab={activeTab} setActiveTab={setActiveTab} />
       {/* <SearchBar /> */}
       <ProjectsList activeTab={activeTab} />