summaryrefslogtreecommitdiffstats
path: root/webapp/components/login
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-05-18 09:28:18 -0400
committerGitHub <noreply@github.com>2017-05-18 09:28:18 -0400
commit2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch)
treec97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/login
parent63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff)
downloadchat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2
chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip
Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json
Diffstat (limited to 'webapp/components/login')
-rw-r--r--webapp/components/login/components/login_mfa.jsx8
-rw-r--r--webapp/components/login/login_controller.jsx6
2 files changed, 9 insertions, 5 deletions
diff --git a/webapp/components/login/components/login_mfa.jsx b/webapp/components/login/components/login_mfa.jsx
index f945d3e07..3d8d1edc4 100644
--- a/webapp/components/login/components/login_mfa.jsx
+++ b/webapp/components/login/components/login_mfa.jsx
@@ -5,6 +5,8 @@ import * as Utils from 'utils/utils.jsx';
import {FormattedMessage} from 'react-intl';
+import PropTypes from 'prop-types';
+
import React from 'react';
export default class LoginMfa extends React.Component {
@@ -87,7 +89,7 @@ LoginMfa.defaultProps = {
};
LoginMfa.propTypes = {
- loginId: React.PropTypes.string.isRequired,
- password: React.PropTypes.string.isRequired,
- submit: React.PropTypes.func.isRequired
+ loginId: PropTypes.string.isRequired,
+ password: PropTypes.string.isRequired,
+ submit: PropTypes.func.isRequired
};
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 4b6757294..c9930c406 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -21,14 +21,16 @@ import Constants from 'utils/constants.jsx';
import {FormattedMessage} from 'react-intl';
import {browserHistory, Link} from 'react-router/es6';
+import PropTypes from 'prop-types';
+
import React from 'react';
import logoImage from 'images/logo.png';
export default class LoginController extends React.Component {
static get propTypes() {
return {
- location: React.PropTypes.object.isRequired,
- params: React.PropTypes.object.isRequired
+ location: PropTypes.object.isRequired,
+ params: PropTypes.object.isRequired
};
}