felixalb
/
asura-tmdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Kristoffer Juelsenn 2022-04-24 22:29:15 +02:00
parent 6f9685ea60 116162ec50
commit 9526048124
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/client/src/FrontPage.js
View File

@ -190,9 +190,11 @@ function Home(props) {
} }
</Box> </Box>
<TournamentList user={props.user} /> <TournamentList user={props.user} />
<Typography variant="h5" color="#555555"> {props.user.isLoggedIn &&
Finished tournaments are moved to the <Link to="/history">history-page</Link> <Typography variant="h5" color="#555555">
</Typography> Finished tournaments are moved to the <Link to="/history">history-page</Link>
</Typography>
}
</Container> </Container>
</> </>
); );
@ -223,7 +225,18 @@ export default function App() {
setUser({ isManager: false, isLoggedIn: false }); setUser({ isManager: false, isLoggedIn: false });
}); });
} }
// // Debug mode, allow all:
// let fetchUser = () => {
// setUser({
// name: "TEST USERTEST",
// isManager: true,
// isLoggedIn: true,
// email: "testesen@gmail.com",
// asuraId: "123456789",
// googleId: "234"
// });
// }
React.useEffect(() => { React.useEffect(() => {
fetchUser(); fetchUser();
}, []); }, []);