X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dcebdbfbd2d54d580932681a7ce182d27d0f98d8..22152102405a1407355d42a32385efd0d83bbc9c:/src/index.tsx diff --git a/src/index.tsx b/src/index.tsx index 67de95fb..10224967 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -6,42 +6,47 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import { Provider } from "react-redux"; import Workbench from './views/workbench/workbench'; -import ProjectList from './components/project-list/project-list'; import './index.css'; import { Route } from "react-router"; 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 ApiToken from "./views-components/api-token/api-token"; import authActions from "./store/auth/auth-action"; -import { projectService } from "./services/services"; - -const history = createBrowserHistory(); -const store = configureStore({ - projects: [ - ], - router: { - location: null - }, - auth: { - user: undefined - } -}, history); - -store.dispatch(authActions.INIT()); -store.dispatch(projectService.getTopProjectList()); - -const App = () => - - -
- - -
-
-
; - -ReactDOM.render( - , - document.getElementById('root') as HTMLElement -); +import { authService } from "./services/services"; +import { getProjectList } from "./store/project/project-action"; +import { MuiThemeProvider } from '@material-ui/core/styles'; +import { CustomTheme } from './common/custom-theme'; +import { fetchConfig } from './common/config'; +import { setBaseUrl } from './common/api/server-api'; + +fetchConfig() + .then(config => { + + setBaseUrl(config.API_HOST); + + const history = createBrowserHistory(); + const store = configureStore(history); + + store.dispatch(authActions.INIT()); + store.dispatch(getProjectList(authService.getUuid())); + + const App = () => + + + +
+ + +
+
+
+
; + + ReactDOM.render( + , + document.getElementById('root') as HTMLElement + ); + }); + +