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

chore: prettier on UI

Browse source
This commit is contained in:
Katie Thornhill 2019-11-19 23:04:09 -05:00
parent 912b40c383
commit 4b75eaa0ab
No known key found for this signature in database
GPG key ID: F76EDC6541A99644
49 changed files with 1703 additions and 1267 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,55 +1,57 @@
import React, { Component, Fragment } from 'react'
import { Route, Switch, Redirect } from 'react-router-dom'
import { connect } from 'react-redux'
import { withRouter } from 'react-router'
import React, { Component, Fragment } from 'react';
import { Route, Switch, Redirect } from 'react-router-dom';
import { connect } from 'react-redux';
import { withRouter } from 'react-router';
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 } from '../pages'
import ServerLanding from '../components/servers/ServerLanding'
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 } from '../pages';
import ServerLanding from '../components/servers/ServerLanding';
const aaa = (props) => (<div>{ JSON.stringify(props) }</div>)
const aaa = props => <div>{JSON.stringify(props)}</div>;
export default
@withRouter
@connect(({ appState, user }) => ({ ready: appState.ready, user }))
export default
@withRouter
@connect(({ appState, user }) => ({ ready: appState.ready, user }))
class AppRouter extends Component {
render () {
const isLoggedIn = this.props.user.get('isLoggedIn')
render() {
const isLoggedIn = this.props.user.get('isLoggedIn');
if (!this.props.ready) {
return null
return null;
}
return <Switch>
{ (isLoggedIn === true)
return (
<Switch>
{isLoggedIn === true ? (
// YES LOGGED IN
? <Route path='/s' component={Servers} />
<Route path="/s" component={Servers} />
) : (
// NOT LOGGED IN
: [<Route path='/s/:server' key={1} component={ServerLanding} />, <Route path='/s' key={2} render={() => <Redirect to="/" />} />]
[
<Route path="/s/:server" key={1} component={ServerLanding} />,
<Route path="/s" key={2} render={() => <Redirect to="/" />} />,
]
)}
}
{/* GENERAL ROUTES */}
<Route path='/oauth/callback' component={OauthCallback} />
<Route path='/oauth/flow' component={OauthFlow} />
<Route path='/oauth/bot/flow' component={OauthBotFlow} />
<Route path="/p/landing" exact component={Landing} />
<Route path='/p' component={Pages} />
<Route path='/help' component={Pages} />
{/* GENERAL ROUTES */}
<Route path="/oauth/callback" component={OauthCallback} />
<Route path="/oauth/flow" component={OauthFlow} />
<Route path="/oauth/bot/flow" component={OauthBotFlow} />
<Route path="/p/landing" exact component={Landing} />
<Route path="/p" component={Pages} />
<Route path="/help" component={Pages} />
<Route exact path='/' render={() =>
isLoggedIn
? <Redirect to="/s" />
: <Landing root={true} />
} />
<Route
exact
path="/"
render={() => (isLoggedIn ? <Redirect to="/s" /> : <Landing root={true} />)}
/>
<Route component={Error404} />
</Switch>
<Route component={Error404} />
</Switch>
);
}
}