From f7bd078bcce2d6cad419fceb55ab71415cda4d33 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 21 Feb 2017 13:51:41 -0300 Subject: [#907] Display error message for mobile version with @anikarni --- web-ui/src/login/app.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'web-ui/src/login/app.js') diff --git a/web-ui/src/login/app.js b/web-ui/src/login/app.js index 07099c60..54f5fd66 100644 --- a/web-ui/src/login/app.js +++ b/web-ui/src/login/app.js @@ -19,18 +19,21 @@ import React from 'react'; import { translate } from 'react-i18next'; import InputField from 'src/common/input_field/input_field'; import SubmitButton from 'src/common/submit_button/submit_button'; +import AuthError from 'src/login/error/auth_error'; +import GenericError from 'src/login/error/generic_error'; import './app.scss'; -const errorMessage = (t, authError) => { - if (authError) return

{t('error.auth')}

; +const errorMessage = (t, authError, error) => { + if (authError) return ; + else if (error) return ; return
; }; -export const App = ({ t, authError }) => ( +export const App = ({ t, authError, error }) => (
Pixelated logo - {errorMessage(t, authError)} + {errorMessage(t, authError, error)}
@@ -41,7 +44,8 @@ export const App = ({ t, authError }) => ( App.propTypes = { t: React.PropTypes.func.isRequired, - authError: React.PropTypes.bool + authError: React.PropTypes.bool, + error: React.PropTypes.bool }; export default translate('', { wait: true })(App); -- cgit v1.2.3