roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-06-17 02:29:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix redirects, fix server syncs on join

Browse source
This commit is contained in:
Katalina / stardust 2018-01-17 23:12:11 -06:00
parent 032831aff1
commit f7238ab091
14 changed files with 132 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/src/router/index.js
View file

@ -7,7 +7,8 @@ import Servers from '../components/servers'
import OauthCallback from '../components/oauth-callback'
import OauthFlow from '../components/oauth-flow'
import OauthBotFlow from '../components/oauth-bot-flow'
import Pages, { Landing, Error404, ServerLanding } from '../pages'
import Pages, { Landing, Error404 } from '../pages'
import ServerLanding from '../components/servers/ServerLanding'
const aaa = (props) => (<div>{ JSON.stringify(props) }</div>)
@ -22,18 +23,15 @@ export default class AppRouter extends Component {
}
return <Switch>
{ (isLoggedIn)
{ (isLoggedIn === true)
// YES LOGGED IN
? <Fragment>
<Route path='/s' component={Servers} />
<Route path='/root' component={aaa} />
</Fragment>
? <Route path='/s' component={Servers} />
// NOT LOGGED IN
: <Fragment>
<Route path='/s' component={ServerLanding} />
</Fragment>
: [<Route path='/s/:server' key={1} component={ServerLanding} />, <Route path='/s' key={2} render={() => <Redirect to="/" />} />]
}
{/* GENERAL ROUTES */}