Fixed routing

This commit is contained in:
Spectralitree 2020-12-09 09:32:20 +01:00
parent fe13aaa9e2
commit 1ed5405652
4 changed files with 5 additions and 4 deletions

File diff suppressed because one or more lines are too long

2
.gitignore vendored
View File

@ -21,3 +21,5 @@
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
.eslintcache

View File

@ -65,10 +65,10 @@ export default function App() {
<BS.Container> <BS.Container>
<Switch> <Switch>
<Route path="/dash" > <Route path="/dash" >
{ !localStorage.getItem('token') || isInvalid ? <Redirect to="/"/> : <Dash/> { !localStorage.getItem('token') || isInvalid ? <Redirect to="/pk-webs"/> : <Dash/>
} }
</Route> </Route>
<Route exact path="/"> <Route exact path="/pk-webs">
{ isLoading ? <Loading /> : { isLoading ? <Loading /> :
<BS.Card className="mb-3 mt-3"> <BS.Card className="mb-3 mt-3">
<BS.Card.Header className="d-flex align-items-center justify-content-between"> <BS.Card.Header className="d-flex align-items-center justify-content-between">

View File

@ -1,5 +1,4 @@
import React from 'react'; import React from 'react';
import * as BS from 'react-bootstrap'
import System from './System.js' import System from './System.js'
import Memberlist from './Memberlist.js' import Memberlist from './Memberlist.js'