Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/js/Routes.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';

import React from 'react';
import {Router, Route, IndexRoute} from 'react-router';
import CreateBrowserHistory from 'history/lib/createBrowserHistory';
import {Router, Route, IndexRoute, browserHistory } from 'react-router';

import App from './App';
import HomePage from './pages/HomePage';
import SearchPage from './pages/SearchPage';
import NotFoundPage from './pages/NotFoundPage';

export default (
<Router history={CreateBrowserHistory()}>
<Router history={browserHistory}>
<Route path="/" component={App}>

<IndexRoute component={HomePage} />
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
"jsdom": "^8.0.2",
"lodash": "^3.10.0",
"mocha": "^2.3.3",
"react": "^0.14.x",
"react-addons-test-utils": "^0.14.0",
"react": "^15.3.2",
"react-addons-test-utils": "^15.3.2",
"react-document-title": "^2.0.1",
"react-dom": "^0.14.0",
"react-router": "^1.0.0-rc1",
"reflux": "^0.3.0",
"react-dom": "^15.3.2",
"react-router": "^2.8.1",
"reflux": "^0.4.1",
"run-sequence": "^1.1.1",
"sinon": "^1.17.1",
"sinon-as-promised": "^4.0.0",
Expand Down