# HG changeset patch # User ymh # Date 1541517566 -3600 # Node ID 7da1d5137b0ba7403f87622a6f8874d345173fd8 # Parent f98efa1bddd13e5acc503c5560fe3d6d20056ff8 Upgrade dependencies and correct theme colors diff -r f98efa1bddd1 -r 7da1d5137b0b client/package.json --- a/client/package.json Thu Oct 11 11:05:04 2018 +0200 +++ b/client/package.json Tue Nov 06 16:19:26 2018 +0100 @@ -36,7 +36,7 @@ "slate-plain-serializer": "^0.6.2", "slate-react": "^0.18.5", "uuid": "^3.0.1", - "yarn": "^1.6.0" + "yarn": "^1.12.1" }, "devDependencies": { "enzyme": "^3.6.0", diff -r f98efa1bddd1 -r 7da1d5137b0b client/src/components/Clock.js --- a/client/src/components/Clock.js Thu Oct 11 11:05:04 2018 +0200 +++ b/client/src/components/Clock.js Tue Nov 06 16:19:26 2018 +0100 @@ -23,7 +23,7 @@ render() { return ( - { this.state.time } + { this.state.time } ); } } diff -r f98efa1bddd1 -r 7da1d5137b0b client/src/components/CreateGroup.js --- a/client/src/components/CreateGroup.js Thu Oct 11 11:05:04 2018 +0200 +++ b/client/src/components/CreateGroup.js Tue Nov 06 16:19:26 2018 +0100 @@ -80,7 +80,7 @@
Nouveau groupe
-
+
@@ -94,7 +94,7 @@ {/* { this.renderNonFieldErrors(errorMessages) } */}
- +
diff -r f98efa1bddd1 -r 7da1d5137b0b client/src/components/Login.js --- a/client/src/components/Login.js Thu Oct 11 11:05:04 2018 +0200 +++ b/client/src/components/Login.js Tue Nov 06 16:19:26 2018 +0100 @@ -5,6 +5,8 @@ import './Login.css'; // import Navbar from './Navbar'; import * as authActions from '../actions/authActions'; +import { getLoginErrorMessages } from '../selectors/authSelectors'; +import * as R from 'ramda'; class Login extends Component { @@ -49,10 +51,11 @@ } renderNonFieldErrors(errorMessages) { - if (errorMessages && errorMessages.has('non_field_errors')) { - const errors = errorMessages.non_field_errors; + console.log(errorMessages); + const errors = R.path(['data','non_field_errors'], errorMessages); + if (errors) { return ( -