diff --git a/app/index.jsx b/app/index.jsx index ef20d6c..7b8a4b8 100644 --- a/app/index.jsx +++ b/app/index.jsx @@ -1,9 +1,10 @@ -import React, {PropTypes, Component} from 'react' -import {Router, Route, Link} from "react-router"; -import createHashHistory from 'history/lib/createHashHistory'; -import {Provider} from "react-redux"; -import renderRoutes from "app/views/routes"; -import configureStore from 'app/store'; +import React, {Component} from "react"; +import ReactDOM from "react-dom"; +import {Router, Route, Link} from "react-router"; +import createHashHistory from "history/lib/createHashHistory"; +import {Provider} from "react-redux"; +import renderRoutes from "app/views/routes"; +import configureStore from "app/store"; // Apply the base styles for ALL the app import "app/assets/stylesheets/base"; @@ -25,11 +26,11 @@ class Root extends Component { render () { return ( - {() => renderRoutes(store, this.history)} + {renderRoutes(store, this.history)} ) } } -React.render(, document.getElementById("reactApplication")) +ReactDOM.render(, document.getElementById("reactApplication")) diff --git a/app/views/auth/login.jsx b/app/views/auth/login.jsx index 3018e45..867ce1b 100644 --- a/app/views/auth/login.jsx +++ b/app/views/auth/login.jsx @@ -37,7 +37,7 @@ export default class Login extends Component { _renderAuthenticationErrors () { if (this.props.authenticationError) { - return
{this.props.authenticationError}
+ return
{this.props.authenticationError.errorMessage}
} } diff --git a/package.json b/package.json index 2fbf4ec..635566c 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,11 @@ "history": "1.9.1", "lodash": "3.10.1", "platform": "^1.3.0", - "react": "0.13.3", "react-redux": "2.1.2", "react-router": "1.0.0-rc1", "redux": "3.0.0", + "react": "0.14.0-rc1", + "react-dom": "0.14.0-rc1", "redux-logger": "1.0.8", "superagent": "1.3.0" },