Merge branch 'client' of gitlab.stud.idi.ntnu.no:felixalb/dcst1008-2022-group1 into client
This commit is contained in:
		
						commit
						9526048124
					
				| @ -190,9 +190,11 @@ function Home(props) { | ||||
|             } | ||||
|           </Box> | ||||
|           <TournamentList user={props.user} /> | ||||
|           <Typography variant="h5" color="#555555"> | ||||
|             Finished tournaments are moved to the <Link to="/history">history-page</Link> | ||||
|           </Typography> | ||||
|           {props.user.isLoggedIn && | ||||
|             <Typography variant="h5" color="#555555"> | ||||
|               Finished tournaments are moved to the <Link to="/history">history-page</Link> | ||||
|             </Typography> | ||||
|           } | ||||
|         </Container> | ||||
|     </> | ||||
|   ); | ||||
| @ -223,7 +225,18 @@ export default function App() { | ||||
|         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(() => { | ||||
|     fetchUser(); | ||||
|   }, []); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user