secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Upgrading everything, especially router

Browse Source
This commit is contained in:
James Barnsley
2019-01-09 16:56:35 +13:00
parent 24d5d7b94e
commit 56587aa6fb
31 changed files with 18516 additions and 17159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/index.js
View File

@ -2,11 +2,12 @@
* Base-level application wrapper
**/
import React, { PropTypes } from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux'
import { createStore } from 'redux'
import { Router, Route, Link, IndexRoute, hashHistory } from 'react-router'
import React, { PropTypes } from 'react';;
import ReactDOM from 'react-dom';;
import { Provider } from 'react-redux';
import { createStore } from 'redux';
//import { Router, Route, Link, IndexRoute, hashHistory } from 'react-router';
import { BrowserRouter, Route, IndexRoute } from "react-router-dom";
import store from './bootstrap.js';
require('../scss/app.scss');
@ -50,7 +51,7 @@ global.baseURL = '/';
ReactDOM.render(
<Provider store={store}>
<Router history={hashHistory}>
<BrowserRouter>
<Route path={global.baseURL} component={App}>
<IndexRoute component={Queue} />
@ -91,7 +92,7 @@ ReactDOM.render(
<Route path="library/browse(/:uri)" component={LibraryBrowse} />
</Route>
</Router>
</BrowserRouter>
</Provider>,
document.getElementById('app')
);