WIP reorganization

OHIFViewer/.meteor/versions

@@ -5,7 +5,6 @@ aldeed:schema-index@1.1.1
 aldeed:simple-schema@1.5.4
 aldeed:template-extension@4.1.0
 allow-deny@1.1.0
-amplify@1.0.0
 autoupdate@1.6.0-beta181.7
 babel-compiler@7.2.3
 babel-runtime@1.3.0
@@ -36,6 +35,7 @@ ecmascript-runtime-client@0.8.0
 ecmascript-runtime-server@0.7.1
 ejson@1.1.0
 es5-shim@4.8.0
+fastclick@1.0.13
 fetch@0.1.0
 fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10

OHIFViewer/client/components/App.js

@@ -0,0 +1,67 @@
+import React, { Component } from 'react';
+import { withRouter } from 'react-router';
+import { Route, Switch } from 'react-router-dom';
+import SecretRoute from './SecretRoute.js';
+import { OHIF } from 'meteor/ohif:core';
+import Provider from "react-redux/es/components/Provider";
+
+const reload = () => window.location.reload();
+const Studylist = OHIF.studylist.components.StudyList;
+
+function setContext(context) {
+    /*Rollbar.configure({
+        payload: {
+            context
+        }
+    });*/
+    console.log(context);
+}
+
+class App extends Component {
+    componentDidMount() {
+        this.unlisten = this.props.history.listen((location, action) => {
+            setContext(window.location.pathname);
+        });
+    }
+
+    componentWillUnmount() {
+        this.unlisten();
+    }
+
+    render() {
+        return (
+            <Provider store={window.store}>
+                <Switch>
+                    <SecretRoute
+                        exact
+                        path="/studylist"
+                        component={Studylist}
+                        auth={this.props.auth}
+                        store={this.props.store}
+                    />
+                    <SecretRoute
+                        exact
+                        path="/"
+                        component={Studylist}
+                        auth={this.props.auth}
+                        store={this.props.store}
+                    />
+                    <SecretRoute
+                        exact
+                        path="/viewer"
+                        component={ConnectedViewer}
+                        auth={this.props.auth}
+                        store={this.props.store}
+                    />
+                    {/*<Route path="/silent-refresh.html" onEnter={reload} />
+                    <Route path="/logout-redirect.html" onEnter={reload} />*/}
+                    <Route render={() =>
+                        <div> Sorry, this page does not exist. </div>}
+                    />
+                </Switch>
+            </Provider>
+        );
+    }
+}
+
+export default withRouter(App);

OHIFViewer/client/components/viewer/viewer.js

@@ -123,7 +123,7 @@ class Viewer extends Component {
     }
 
     render() {
-        return (<Provider store={window.store}>
+        return (<>
                 <div className='viewerDialogs'>
                     <CineDialog/>
                 </div>
@@ -131,7 +131,7 @@ class Viewer extends Component {
                     {/*<ToolbarSection/>*/}
                     <FlexboxLayout studies={this.state.studies}/>
                 </div>
-            </Provider>
+            </>
         );
     }
 }