merge-conflicts

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

diff --git a/src/index.tsx b/src/index.tsx
index 9cc33feb8eba3de42328434b80fea6253dd14814..ba395e8b785ab49dd6255427ff90382b43ff6191 100644 (file)
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -6,67 +6,45 @@ 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, 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 { TreeItem } from "./components/tree/tree";
-import { Project } from "./models/project";
-
-const sampleProjects = [
-    [
-        'Project 1', [
-            ['Project 1.1', [['Project 1.1.1'], ['Project 1.1.2']]],
-            ['Project 1.2', [['Project 1.2.1'], ['Project 1.2.2'], ['Project 1.2.3']]]
-        ]
-    ],
-    [
-        'Project 2'
-    ],
-    [
-        'Project 3', [['Project 3.1'], ['Project 3.2']]
-    ]
-];
-
-
-function buildProjectTree(tree: any[], level = 0): Array<TreeItem<Project>> {
-    const projects = tree.map((t, idx) => ({
-        id: `l${level}i${idx}${t[0]}`,
-        open: false,
-        active: false,
-        data: {
-            name: t[0],
-            icon: level === 0 ? <i className="fas fa-th"/> : <i className="fas fa-folder"/>,
-            createdAt: '2018-05-05',
-        },
-        items: t.length > 1 ? buildProjectTree(t[1], level + 1) : []
-    }));
-    return projects;
-}
-
+import ApiToken from "./views-components/api-token/api-token";
+import authActions from "./store/auth/auth-action";
+import { authService } from "./services/services";
+import { getProjectList } from "./store/project/project-action";
 
 const history = createBrowserHistory();
-const projects = buildProjectTree(sampleProjects);
 
 const store = configureStore({
-    projects,
+    projects: [
+    ],
     router: {
         location: null
-    }
+    },
+    auth: {
+        user: undefined
+    },
+    sidePanel: []
 }, history);
 
+store.dispatch(authActions.INIT());
+const rootUuid = authService.getRootUuid();
+store.dispatch<any>(getProjectList(rootUuid));
+
 const App = () =>
     <Provider store={store}>
         <ConnectedRouter history={history}>
             <div>
-                <Route path="/" component={Workbench} />
+                <Route path="/" component={Workbench}/>
+                <Route path="/token" component={ApiToken}/>
             </div>
         </ConnectedRouter>
     </Provider>;
 
 ReactDOM.render(
-    <App />,
+    <App/>,
     document.getElementById('root') as HTMLElement
 );