Merge pull request #30 from liady/patch-1

Add basic routing transition, upgrade react-router v2.0.0

Author: pheuter

package.json

@@ -55,9 +55,8 @@
     "babel-polyfill": "^6.3.14",
     "babel-runtime": "^6.3.19",
     "express": "^4.12.3",
-    "history": "^1.17.0",
     "react": "^0.14.6",
     "react-dom": "^0.14.6",
-    "react-router": "^1.0.3"
+    "react-router": "^2.0.0"
   }
 }

src/main.js

@@ -8,8 +8,7 @@ import "babel-polyfill";
 // Libraries
 import React from "react";
 import ReactDOM from "react-dom";
-import { Router } from "react-router";
-import createBrowserHistory from 'history/lib/createBrowserHistory'
+import { Router, browserHistory } from "react-router";
 
 // Routes
 import Routes from './common/components/Routes';
@@ -25,7 +24,7 @@ const DOM_APP_EL_ID = "app";
 
 // Render the router
 ReactDOM.render((
-  <Router history={createBrowserHistory()}>
+  <Router history={browserHistory}>
     {Routes}
   </Router>
 ), document.getElementById(DOM_APP_EL_ID));

src/pages/login/page.js

@@ -1,8 +1,14 @@
 import React from "react";
+import { browserHistory } from "react-router";
 import styles from "./style.css";
 
 
 export default class LoginPage extends React.Component {
+  
+  signUp() {
+    browserHistory.push("/home");
+  }
+  
   render() {
     return (
       <div className={styles.content}>