reorganize packages, start converting overall app to react (very broken at the moment)

This commit is contained in:
Erik Ziegler committed 2018-12-12 18:06:25 +01:00
1 parent 024fe1a448
commit 5f30f7bd35
479 files changed
+5364 -11611

No files matched your search

+30 -32
View File
@@ -1,9 +1,9 @@
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";
import Viewer from "./viewer/viewer";
import './App.css';
const reload = () => window.location.reload();
const Studylist = OHIF.studylist.components.StudyList;
@@ -30,36 +30,34 @@ class App extends Component {
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>
<Switch>
<Route
exact
path="/studylist"
component={Studylist}
/*auth={this.props.auth}*/
store={this.props.store}
/>
<Route
exact
path="/"
component={Studylist}
/*auth={this.props.auth}*/
store={this.props.store}
/>
<Route
exact
path="/viewer"
component={Viewer}
/*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>
);
}
}