Skip to content

Commit

Permalink
Migrating to react 14
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelchiti committed Sep 17, 2015
1 parent 8217038 commit f20772c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
17 changes: 9 additions & 8 deletions app/index.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -25,11 +26,11 @@ class Root extends Component {
render () {
return (
<Provider store={store}>
{() => renderRoutes(store, this.history)}
{renderRoutes(store, this.history)}
</Provider>
)
}
}


React.render(<Root/>, document.getElementById("reactApplication"))
ReactDOM.render(<Root/>, document.getElementById("reactApplication"))
2 changes: 1 addition & 1 deletion app/views/auth/login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class Login extends Component {

_renderAuthenticationErrors () {
if (this.props.authenticationError) {
return <div>{this.props.authenticationError}</div>
return <div>{this.props.authenticationError.errorMessage}</div>
}
}

Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit f20772c

Please sign in to comment.