summaryrefslogtreecommitdiffhomepage
path: root/app/components/Login.js
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-03-08 16:53:38 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-03-08 16:53:38 +0000
commita4aa1cec332fa8903dd66582a0ff1df903343450 (patch)
treec8f49d498167255a3db4d9c82bd814054342e33f /app/components/Login.js
parent9db201013ed2f0e43be5ed9e09430cfdde5a5dcd (diff)
downloadmullvadvpn-a4aa1cec332fa8903dd66582a0ff1df903343450.tar.xz
mullvadvpn-a4aa1cec332fa8903dd66582a0ff1df903343450.zip
Add AccountInput component
Diffstat (limited to 'app/components/Login.js')
-rw-r--r--app/components/Login.js21
1 files changed, 6 insertions, 15 deletions
diff --git a/app/components/Login.js b/app/components/Login.js
index 43cccf3f69..5dbce441c8 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -1,8 +1,8 @@
import React, { Component, PropTypes } from 'react';
import { If, Then } from 'react-if';
import { Layout, Container, Header } from './Layout';
-import { formatAccount } from '../lib/formatters';
import { LoginState } from '../enums';
+import AccountInput from './AccountInput';
export default class Login extends Component {
static propTypes = {
@@ -39,24 +39,16 @@ export default class Login extends Component {
this.props.onExternalLink('createAccount');
}
- onInputChange(e) {
- const val = e.target.value.replace(/[^0-9]/g, '');
-
+ onInputChange(val) {
+ console.log('VAL: ' + val);
// notify delegate on first change after login failure
if(this.state.notifyOnFirstChangeAfterFailure) {
this.setState({ notifyOnFirstChangeAfterFailure: false });
this.props.onFirstChangeAfterFailure();
}
-
this.props.onChange(val);
}
- onInputKeyUp(e) {
- if(e.which === 13) {
- this.onLogin();
- }
- }
-
formTitle(s) {
switch(s) {
case LoginState.connecting: return 'Logging in...';
@@ -117,7 +109,6 @@ export default class Login extends Component {
const { account, status, error } = this.props.user;
const title = this.formTitle(status);
const subtitle = this.formSubtitle(status, error);
- const displayAccount = formatAccount(account || '');
const isConnecting = status === LoginState.connecting;
const isFailed = status === LoginState.failed;
const isLoggedIn = status === LoginState.ok;
@@ -169,12 +160,12 @@ export default class Login extends Component {
<div className={ 'login-form__fields' + (isLoggedIn ? ' login-form__fields--invisible' : '') }>
<div className="login-form__subtitle">{ subtitle }</div>
<div className={ inputWrapClass }>
- <input className="login-form__input-field"
+ <AccountInput className="login-form__input-field"
type="text"
placeholder="e.g 0000 0000 0000"
onChange={ ::this.onInputChange }
- onKeyUp={ ::this.onInputKeyUp }
- value={ displayAccount }
+ onEnter={ ::this.onLogin }
+ value={ account }
disabled={ isConnecting }
autoFocus={ true }
ref={ autoFocusRef } />