yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New user store structure and updated packages

Browse Source
This commit is contained in:
Jori Lallo
2016-06-25 23:31:22 -07:00
parent 3bbdaecbf2
commit a2a642c16c
11 changed files with 167 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/index.js
View File

@@ -1,11 +1,13 @@
import React from 'react';
import { render } from 'react-dom';
import { Provider } from 'mobx-react';
import Router from 'react-router/lib/Router';
import Route from 'react-router/lib/Route';
import IndexRoute from 'react-router/lib/IndexRoute';
import History from 'utils/History';
import userStore from 'stores/UserStore';
import stores from 'stores';
window.stores = stores;
import 'normalize.css/normalize.css';
import 'utils/base-styles.scss';
@@ -28,7 +30,7 @@ if (__DEV__) {
}
function requireAuth(nextState, replace) {
if (!userStore.authenticated) {
if (!stores.user.authenticated) {
replace({
pathname: '/',
state: { nextPathname: nextState.location.pathname },
@@ -38,20 +40,22 @@ function requireAuth(nextState, replace) {
render((
<div style={{ display: 'flex', flex: 1, }}>
<Router history={History}>
<Route path="/" component={ Application }>
<IndexRoute component={Home} />
<Provider user={ stores.user }>
<Router history={History}>
<Route path="/" component={ Application }>
<IndexRoute component={Home} />
<Route path="/dashboard" component={ Dashboard } onEnter={ requireAuth } />
<Route path="/atlas/:id" component={ Atlas } onEnter={ requireAuth } />
<Route path="/atlas/:id/new" component={ DocumentEdit } onEnter={ requireAuth } newDocument={ true } />
<Route path="/documents/:id" component={ DocumentScene } onEnter={ requireAuth } />
<Route path="/documents/:id/edit" component={ DocumentEdit } onEnter={ requireAuth } />
<Route path="/documents/:id/new" component={ DocumentEdit } onEnter={ requireAuth } newChildDocument={ true } />
<Route path="/dashboard" component={ Dashboard } onEnter={ requireAuth } />
<Route path="/atlas/:id" component={ Atlas } onEnter={ requireAuth } />
<Route path="/atlas/:id/new" component={ DocumentEdit } onEnter={ requireAuth } newDocument={ true } />
<Route path="/documents/:id" component={ DocumentScene } onEnter={ requireAuth } />
<Route path="/documents/:id/edit" component={ DocumentEdit } onEnter={ requireAuth } />
<Route path="/documents/:id/new" component={ DocumentEdit } onEnter={ requireAuth } newChildDocument={ true } />
<Route path="/auth/slack" component={SlackAuth} />
</Route>
</Router>
<Route path="/auth/slack" component={SlackAuth} />
</Route>
</Router>
</Provider>
{ __DEV__ ? <DevTools position={{ bottom: 0, right: 0 }} /> : null }
</div>
), document.getElementById('root'));