merge-conflicts

[arvados-workbench2.git] / src / index.tsx

diff --git a/src/index.tsx b/src/index.tsx
index 351ed2e04b7df755e29fc8131fac218bee9921e9..ba395e8b785ab49dd6255427ff90382b43ff6191 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -6,15 +6,15 @@ 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";
+import { authService } from "./services/services";
+import { getProjectList } from "./store/project/project-action";
 
 const history = createBrowserHistory();
 
@@ -26,11 +26,13 @@ const store = configureStore({
     },
     auth: {
         user: undefined
-    }
+    },
+    sidePanel: []
 }, history);
 
 store.dispatch(authActions.INIT());
-store.dispatch<any>(projectService.getProjectList());
+const rootUuid = authService.getRootUuid();
+store.dispatch<any>(getProjectList(rootUuid));
 
 const App = () =>
     <Provider store={store}>