Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client

This commit is contained in:
Kristoffer Juelsenn 2022-04-22 10:12:59 +02:00
commit 617d42b957
1 changed files with 3 additions and 1 deletions

View File

@ -12,6 +12,7 @@ import AddCircleIcon from '@mui/icons-material/AddCircle';
import KeyboardDoubleArrowDownIcon from '@mui/icons-material/KeyboardDoubleArrowDown'; import KeyboardDoubleArrowDownIcon from '@mui/icons-material/KeyboardDoubleArrowDown';
import KeyboardDoubleArrowUpIcon from '@mui/icons-material/KeyboardDoubleArrowUp'; import KeyboardDoubleArrowUpIcon from '@mui/icons-material/KeyboardDoubleArrowUp';
import EditIcon from '@mui/icons-material/Edit'; import EditIcon from '@mui/icons-material/Edit';
import EmojiEventsIcon from '@mui/icons-material/EmojiEvents';
function CreateButton(props) { function CreateButton(props) {
return ( return (
@ -124,8 +125,9 @@ function TournamentListItem(props) {
</Grid> </Grid>
</Grid> </Grid>
</Box> </Box>
<Countdown /> <Countdown />
<Typography variant="body" color="text.primary"> <EmojiEventsIcon alt="A trohpy" color="gold" /> Prize: {props.tournament.teamCount} </Typography>
</CardContent> </CardContent>
</Card> </Card>
</Paper> </Paper>