projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13618-Tree-compone...
[arvados.git]
/
src
/
index.tsx
diff --git
a/src/index.tsx
b/src/index.tsx
index dacada2e6e2ab496f03de89e835fcab600c39603..ca92c381f3993ddcdc7719d4450b7c8e7b8456a9 100644
(file)
--- a/
src/index.tsx
+++ b/
src/index.tsx
@@
-8,28
+8,37
@@
import { Provider } from "react-redux";
import Workbench from './views/workbench/workbench';
import ProjectList from './components/project-list/project-list';
import './index.css';
import Workbench from './views/workbench/workbench';
import ProjectList from './components/project-list/project-list';
import './index.css';
-import { Route
, Router
} from "react-router";
+import { Route } from "react-router";
import createBrowserHistory from "history/createBrowserHistory";
import configureStore from "./store/store";
import { ConnectedRouter } from "react-router-redux";
import createBrowserHistory from "history/createBrowserHistory";
import configureStore from "./store/store";
import { ConnectedRouter } from "react-router-redux";
+import ApiToken from "./components/api-token/api-token";
+import authActions from "./store/auth/auth-action";
+import { authService, projectService } from "./services/services";
const history = createBrowserHistory();
const history = createBrowserHistory();
+
const store = configureStore({
projects: [
const store = configureStore({
projects: [
- { name: 'Mouse genome', createdAt: '2018-05-01' },
- { name: 'Human body', createdAt: '2018-05-01' },
- { name: 'Secret operation', createdAt: '2018-05-01' }
],
router: {
location: null
],
router: {
location: null
+ },
+ auth: {
+ user: undefined
}
}, history);
}
}, history);
+store.dispatch(authActions.INIT());
+const rootUuid = authService.getRootUuid();
+store.dispatch<any>(projectService.getProjectList(rootUuid));
+
const App = () =>
<Provider store={store}>
<ConnectedRouter history={history}>
<div>
<Route path="/" component={Workbench}/>
const App = () =>
<Provider store={store}>
<ConnectedRouter history={history}>
<div>
<Route path="/" component={Workbench}/>
+ <Route path="/token" component={ApiToken}/>
</div>
</ConnectedRouter>
</Provider>;
</div>
</ConnectedRouter>
</Provider>;