From d7dbc1dc61f74f7bd74464bda5e4e0051f062352 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Wed, 15 Feb 2017 11:43:58 -0200
Subject: [#907] Translates login page to pt_BR

---
 web-ui/src/login/app.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 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 e6ac3192..dda6148c 100644
--- a/web-ui/src/login/app.js
+++ b/web-ui/src/login/app.js
@@ -18,18 +18,22 @@
 import React from 'react';
 import { translate } from 'react-i18next';
 
-const App = () => (
+export const App = ({ t }) => (
   <form className='standard' id='login_form' action='/login' method='post'>
     <input
       type='text' name='username' id='email' className='text-field'
-      placeholder='username' autoFocus=''
+      placeholder={t('login.email')} autoFocus=''
     />
     <input
       type='password' name='password' id='password' className='text-field'
-      placeholder='password' autoComplete='off'
+      placeholder={t('login.password')} autoComplete='off'
     />
-    <input type='submit' name='login' value='Login' className='button' />
+    <input type='submit' name='login' value={t('login.submit')} className='button' />
   </form>
 );
 
+App.propTypes = {
+  t: React.PropTypes.func.isRequired
+};
+
 export default translate('', { wait: true })(App);
-- 
cgit v1.2.3


From bfd85dff6b086abae1c16014e318c89cba929b66 Mon Sep 17 00:00:00 2001
From: Anike Arni <aarni@thoughtworks.com>
Date: Fri, 17 Feb 2017 09:57:19 -0200
Subject: [#907] Makes login page responsive

---
 web-ui/src/login/app.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 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 dda6148c..ee5a7652 100644
--- a/web-ui/src/login/app.js
+++ b/web-ui/src/login/app.js
@@ -17,18 +17,16 @@
 
 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 './app.scss';
 
 export const App = ({ t }) => (
   <form className='standard' id='login_form' action='/login' method='post'>
-    <input
-      type='text' name='username' id='email' className='text-field'
-      placeholder={t('login.email')} autoFocus=''
-    />
-    <input
-      type='password' name='password' id='password' className='text-field'
-      placeholder={t('login.password')} autoComplete='off'
-    />
-    <input type='submit' name='login' value={t('login.submit')} className='button' />
+    <InputField name='username' label={t('login.email')} />
+    <InputField type='password' name='password' label={t('login.password')} />
+    <SubmitButton buttonText={t('login.submit')} />
   </form>
 );
 
-- 
cgit v1.2.3


From fa21608801f8d2ef710d4c28abbb558883afeaf7 Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Mon, 20 Feb 2017 14:37:37 -0300
Subject: [#907] Translate auth error message on login

with @anikarni
---
 web-ui/src/login/app.js | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 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 ee5a7652..07099c60 100644
--- a/web-ui/src/login/app.js
+++ b/web-ui/src/login/app.js
@@ -22,16 +22,26 @@ import SubmitButton from 'src/common/submit_button/submit_button';
 
 import './app.scss';
 
-export const App = ({ t }) => (
-  <form className='standard' id='login_form' action='/login' method='post'>
-    <InputField name='username' label={t('login.email')} />
-    <InputField type='password' name='password' label={t('login.password')} />
-    <SubmitButton buttonText={t('login.submit')} />
-  </form>
+const errorMessage = (t, authError) => {
+  if (authError) return <p className='error'>{t('error.auth')}</p>;
+  return <div />;
+};
+
+export const App = ({ t, authError }) => (
+  <div className='login'>
+    <img className='logo' src='/public/images/logo-orange.svg' alt='Pixelated logo' />
+    {errorMessage(t, authError)}
+    <form className='standard' id='login_form' action='/login' method='post'>
+      <InputField name='username' label={t('login.email')} />
+      <InputField type='password' name='password' label={t('login.password')} />
+      <SubmitButton buttonText={t('login.submit')} />
+    </form>
+  </div>
 );
 
 App.propTypes = {
-  t: React.PropTypes.func.isRequired
+  t: React.PropTypes.func.isRequired,
+  authError: React.PropTypes.bool
 };
 
 export default translate('', { wait: true })(App);
-- 
cgit v1.2.3