-
-
-}
\ No newline at end of file
diff --git a/src/client/src/frontpage.js b/src/client/src/frontpage.js
index cd78294..302c5c6 100644
--- a/src/client/src/frontpage.js
+++ b/src/client/src/frontpage.js
@@ -7,8 +7,8 @@ import TournamentAnnouncement from "./tournamentannouncement";
import TournamentMatches from "./tournamentmatches";
import TeamEditor from "./teameditor";
import Appbar from './components/appbar';
-import { Button, Container, Typography, Grid, Box } from "@mui/material";
-import { Card, CardActions,CardACtionsArea, CardContent, CardHeader, CardMedia, Collapse, Paper } from "@mui/material";
+import { Button, Container, Typography, Box } from "@mui/material";
+import { Card, CardContent, CardMedia, Paper } from "@mui/material";
import AddCircleIcon from '@mui/icons-material/AddCircle';
function CreateButton(props) {
@@ -73,16 +73,13 @@ function TournamentListItem(props) {
}
function TournamentList() {
- let [data, setData] = React.useState(null);
let [tournamentList, setTournamentList] = React.useState([]);
React.useEffect(() => {
fetch(process.env.REACT_APP_BACKEND_URL + "/api/tournament/getTournaments")
.then(res => res.json())
.then(data => {
-
- if (data.status != "OK") {
- // Do your error thing
+ if (data.status !== "OK") {
console.error(data);
return;
}
@@ -99,7 +96,6 @@ function TournamentList() {
}, []);
return <>
- {/* {tournamentList && tournamentList.map((tournamentObject, i) => )} */}
{tournamentList && tournamentList.map((tournamentObject) => )}
;
diff --git a/src/client/src/managetournament.js b/src/client/src/managetournament.js
index bab9d7c..bec0d07 100644
--- a/src/client/src/managetournament.js
+++ b/src/client/src/managetournament.js
@@ -16,7 +16,7 @@ function ManageTournament(props) {
.then(res => res.json())
.then(data => {
- if (data.status != "OK") {
+ if (data.status !== "OK") {
// Do your error thing
console.error(data.data);
return;
diff --git a/src/client/src/tournamentoverview.js b/src/client/src/tournamentoverview.js
index e575f48..0a405d1 100644
--- a/src/client/src/tournamentoverview.js
+++ b/src/client/src/tournamentoverview.js
@@ -1,65 +1,120 @@
import * as React from "react";
-import { BrowserRouter as Router, Link, Route, Routes } from "react-router-dom";
+import { Link } from "react-router-dom";
import Appbar from './components/appbar';
import { useParams } from 'react-router-dom'
import { Button } from "@mui/material";
-import TournamentBracket from "./components/tournamentBracket";
+import AddCircleIcon from '@mui/icons-material/AddCircle';
+import "./components/tournamentBracket.css";
-function TournamentTier(props) {
- let roundTypes = ["finals", "semifinals", "quarterfinals", "eighthfinals"];
- let connector;
- if (props.tier != 0) {
- connector =
+function MatchPair(props) {
+ let match1 = ;
+ let match2 = ;
+
+ return
+
+ {match1}
+ {match2}
+
+
-
;
- }
+
+
+}
- return
+function TournamentTier(props) {
+ // One round/tier of the tournament, as used by BracketViewer
+ let roundTypes = ["finals", "semifinals", "quarterfinals", "eighthfinals", "sixteenthfinals", "thirtysecondfinals"];
+
+ if (props.tier === 0) {
+ // The final, just a single match without the bracket lines
+ return (
+
+ );
+ } else {
+ // The rest of the rounds/tiers, divide into pairs of two matches
+ let matchPairCount = props.matches.length / 2;
+ let matchPairs = [];
+ for (let i = 0; i < matchPairCount; i++) {
+ matchPairs.push();
+ }
+ return (
+
+ {matchPairs}
+
+ );
+ }
}
function Match(props) {
- let team1;
- let team2;
- if (props.match.team1Id != null) {
- team1 =
{props.match.team1Id}
;
- } else {
- team1 =
TBA
;
+ // A single match object, as used by MatchPair and TournamentTier
+ let team1Name = "TBA";
+ let team2Name = "TBA";
+ if (props.match.team1Id !== null) {
+ team1Name = props.teams.find(team => team.id === props.match.team1Id).name;
}
-
- if (props.match.team2Id != null) {
- team2 =