From 40d7b3781ed11174fdda90570e2a56f66389ef78 Mon Sep 17 00:00:00 2001
From: bmodee <bjomo323@student.liu.se>
Date: Fri, 30 Apr 2021 11:56:14 +0200
Subject: [PATCH] add correct redirect when starting competition

---
 .../admin/competitions/CompetitionManager.tsx | 36 +++++++++++--------
 client/src/pages/views/OperatorViewPage.tsx   |  1 -
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/src/pages/admin/competitions/CompetitionManager.tsx b/client/src/pages/admin/competitions/CompetitionManager.tsx
index b7184d55..5230c704 100644
--- a/client/src/pages/admin/competitions/CompetitionManager.tsx
+++ b/client/src/pages/admin/competitions/CompetitionManager.tsx
@@ -1,17 +1,17 @@
 import {
+  Box,
   Button,
-  Menu,
-  ListItem,
-  TablePagination,
-  TextField,
-  Typography,
   Dialog,
-  DialogTitle,
-  DialogContent,
   DialogActions,
+  DialogContent,
+  DialogTitle,
+  ListItem,
   ListItemText,
+  Menu,
+  TablePagination,
+  TextField,
   Tooltip,
-  Box,
+  Typography,
 } from '@material-ui/core'
 import FormControl from '@material-ui/core/FormControl'
 import InputLabel from '@material-ui/core/InputLabel'
@@ -25,7 +25,9 @@ import TableCell from '@material-ui/core/TableCell'
 import TableContainer from '@material-ui/core/TableContainer'
 import TableHead from '@material-ui/core/TableHead'
 import TableRow from '@material-ui/core/TableRow'
+import FileCopyIcon from '@material-ui/icons/FileCopy'
 import MoreHorizIcon from '@material-ui/icons/MoreHoriz'
+import RefreshIcon from '@material-ui/icons/Refresh'
 import axios from 'axios'
 import React, { useEffect } from 'react'
 import { Link, useHistory } from 'react-router-dom'
@@ -35,8 +37,6 @@ import { Team } from '../../../interfaces/ApiModels'
 import { CompetitionFilterParams } from '../../../interfaces/FilterParams'
 import { FilterContainer, RemoveMenuItem, TopBar, YearFilterTextField } from '../styledComp'
 import AddCompetition from './AddCompetition'
-import FileCopyIcon from '@material-ui/icons/FileCopy'
-import RefreshIcon from '@material-ui/icons/Refresh'
 
 /**
  * Component description:
@@ -128,15 +128,21 @@ const CompetitionManager: React.FC = (props: any) => {
     }
   }
 
-  const handleStartCompetition = () => {
-    history.push(`/operator/id=${activeId}&code=123123`)
+  const handleStartCompetition = async () => {
+    await axios
+      .get(`/api/competitions/${activeId}/codes`)
+      .then((response) => {
+        console.log(response.data.items[2].code)
+        const operatorCode = response.data.items[2].code
+        history.push(`/operator/id=${activeId}&code=${operatorCode}`)
+      })
+      .catch(console.log)
   }
 
   const getCodes = async () => {
     await axios
       .get(`/api/competitions/${activeId}/codes`)
       .then((response) => {
-        console.log(response.data)
         setCodes(response.data.items)
       })
       .catch(console.log)
@@ -146,7 +152,7 @@ const CompetitionManager: React.FC = (props: any) => {
     await axios
       .get(`/api/competitions/${activeId}/teams`)
       .then((response) => {
-        console.log(response.data.items)
+        // console.log(response.data.items)
         setTeams(response.data.items)
       })
       .catch((err) => {
@@ -158,7 +164,7 @@ const CompetitionManager: React.FC = (props: any) => {
     await axios
       .get(`/api/competitions/${activeId}`)
       .then((response) => {
-        console.log(response.data.name)
+        // console.log(response.data.name)
         setCompetitionName(response.data.name)
       })
       .catch((err) => {
diff --git a/client/src/pages/views/OperatorViewPage.tsx b/client/src/pages/views/OperatorViewPage.tsx
index efbb8354..2dd8fb23 100644
--- a/client/src/pages/views/OperatorViewPage.tsx
+++ b/client/src/pages/views/OperatorViewPage.tsx
@@ -62,7 +62,6 @@ import {
  *  TODO:
  *  - Instead of copying code for others to join the competition, copy URL.
  *
- *  
  *
  *  - Fix scoreboard
  *
-- 
GitLab