Skip to content

Commit

Permalink
Merge pull request #258 from Avasam/develop
Browse files Browse the repository at this point in the history
Fixed #250 for real this time
  • Loading branch information
Avasam authored Jul 2, 2021
2 parents f51b522 + 5ae6426 commit 28cd6d0
Show file tree
Hide file tree
Showing 8 changed files with 325 additions and 67 deletions.
21 changes: 11 additions & 10 deletions global-scoreboard/src/Components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import './App.css'

import { StatusCodes } from 'http-status-codes'
import { useEffect, useState } from 'react'
import { Route } from 'react-router-dom'
import { Route, Switch } from 'react-router-dom'

import Dashboard from './Dashboard/Dashboard'
import GameSearch from './GameSearch/GameSearch'
Expand Down Expand Up @@ -49,15 +49,16 @@ const App = () => {
onLogout={() => logout(setCurrentUser)}
/>

<Route
path='/'
exact
render={() => <Dashboard currentUser={currentUser} />}
/>
<Route
path='/game-search'
component={GameSearch}
/>
<Switch>
<Route
exact
path='/game-search'
component={GameSearch}
/>
<Route
render={() => <Dashboard currentUser={currentUser} />}
/>
</Switch>

<footer>
&copy; <a
Expand Down
Loading

0 comments on commit 28cd6d0

Please sign in to comment.