summaryrefslogtreecommitdiff
path: root/web-ui/src/login/app.js
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2017-02-22 10:52:52 -0300
committerAnike Arni <aarni@thoughtworks.com>2017-02-22 15:22:55 -0300
commit38c73f2e67173d5358dd4bb7e17b1e5b9c283f22 (patch)
treeb7fc2c890eb7242877e47cf926a4aa45a171bcce /web-ui/src/login/app.js
parentf7bd078bcce2d6cad419fceb55ab71415cda4d33 (diff)
[#907] Add pixelated welcome message to login
with @tuliocasagrande and @thaissiqueira
Diffstat (limited to 'web-ui/src/login/app.js')
-rw-r--r--web-ui/src/login/app.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/web-ui/src/login/app.js b/web-ui/src/login/app.js
index 54f5fd66..7502c442 100644
--- a/web-ui/src/login/app.js
+++ b/web-ui/src/login/app.js
@@ -21,20 +21,26 @@ 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 PixelatedWelcome from 'src/login/about/pixelated_welcome';
import './app.scss';
-const errorMessage = (t, authError, error) => {
+const errorMessage = (t, authError) => {
if (authError) return <AuthError />;
- else if (error) return <GenericError />;
return <div />;
};
+const rightPanel = (t, error) => {
+ if (error) return <GenericError />;
+ return <PixelatedWelcome />;
+};
+
export const App = ({ t, authError, error }) => (
<div className='login'>
<img className='logo' src='/public/images/logo-orange.svg' alt='Pixelated logo' />
- {errorMessage(t, authError, error)}
+ {rightPanel(t, error)}
<form className='standard' id='login_form' action='/login' method='post'>
+ {errorMessage(t, authError)}
<InputField name='username' label={t('login.email')} />
<InputField type='password' name='password' label={t('login.password')} />
<SubmitButton buttonText={t('login.submit')} />