From c5093ab61bbf8034ce8b3924e088c11013f20184 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 22 Feb 2018 14:24:54 -0700 Subject: [PATCH] linting --- .eslintignore | 34 --------------- .../client/login/containers/Main.js | 43 ------------------- .../client/components/SignIn.js | 4 +- .../client/components/SignUp.js | 4 +- 4 files changed, 2 insertions(+), 83 deletions(-) diff --git a/.eslintignore b/.eslintignore index ba5ef01c6..47a26f579 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,38 +2,4 @@ dist docs node_modules -plugins/* public - -!plugins/talk-plugin-akismet -!plugins/talk-plugin-auth -!plugins/talk-plugin-author-menu -!plugins/talk-plugin-comment-content -!plugins/talk-plugin-deep-reply-count -!plugins/talk-plugin-facebook-auth -!plugins/talk-plugin-featured-comments -!plugins/talk-plugin-flag-details -!plugins/talk-plugin-ignore-user -!plugins/talk-plugin-like -!plugins/talk-plugin-love -!plugins/talk-plugin-member-since -!plugins/talk-plugin-mod -!plugins/talk-plugin-moderation-actions -!plugins/talk-plugin-notifications -!plugins/talk-plugin-notifications-category-reply -!plugins/talk-plugin-offtopic -!plugins/talk-plugin-permalink -!plugins/talk-plugin-profile-settings -!plugins/talk-plugin-remember-sort -!plugins/talk-plugin-respect -!plugins/talk-plugin-sort-most-liked -!plugins/talk-plugin-sort-most-loved -!plugins/talk-plugin-sort-most-replied -!plugins/talk-plugin-sort-most-respected -!plugins/talk-plugin-sort-newest -!plugins/talk-plugin-sort-oldest -!plugins/talk-plugin-subscriber -!plugins/talk-plugin-toxic-comments -!plugins/talk-plugin-viewing-options -public -node_modules diff --git a/plugins/talk-plugin-auth/client/login/containers/Main.js b/plugins/talk-plugin-auth/client/login/containers/Main.js index 05778133a..235bd6cde 100644 --- a/plugins/talk-plugin-auth/client/login/containers/Main.js +++ b/plugins/talk-plugin-auth/client/login/containers/Main.js @@ -4,10 +4,6 @@ import Main from '../components/Main'; import { connect } from 'plugin-api/beta/client/hocs'; import { bindActionCreators } from 'redux'; import { setView } from '../actions'; -import { - setAuthToken, - handleSuccessfulLogin, -} from 'plugin-api/beta/client/actions/auth'; import * as views from '../enums/views'; class MainContainer extends React.Component { @@ -24,7 +20,6 @@ class MainContainer extends React.Component { componentDidMount() { this.resizeHeight(); - this.listenToStorageChanges(); } componentDidUpdate(prevProps) { @@ -33,40 +28,6 @@ class MainContainer extends React.Component { } } - componentWillUnmount() { - this.unlisten(); - } - - listenToStorageChanges() { - window.addEventListener('storage', this.handleAuth); - } - - unlisten() { - window.removeEventListener('storage', this.handleAuth); - } - - // External logins store auth data into `auth`, we use it to detect - // a successful sign in. - handleAuth = e => { - if (e.key === 'auth') { - const { err, data } = JSON.parse(e.newValue); - if (err) { - console.error(err); - } else if (data && data.token) { - if (data.user) { - this.props.handleSuccessfulLogin(data.user, data.token); - } else { - this.props.setAuthToken(data.token); - } - this.unlisten(); - localStorage.removeItem('auth'); - window.close(); - } else { - console.error('auth was set, but did not contain a token'); - } - } - }; - render() { return
; } @@ -75,8 +36,6 @@ class MainContainer extends React.Component { MainContainer.propTypes = { view: PropTypes.string.isRequired, setView: PropTypes.func.isRequired, - handleSuccessfulLogin: PropTypes.func.isRequired, - setAuthToken: PropTypes.func.isRequired, }; const mapStateToProps = ({ talkPluginAuth: state }) => ({ @@ -87,8 +46,6 @@ const mapDispatchToProps = dispatch => bindActionCreators( { setView, - handleSuccessfulLogin, - setAuthToken, }, dispatch ); diff --git a/plugins/talk-plugin-google-auth/client/components/SignIn.js b/plugins/talk-plugin-google-auth/client/components/SignIn.js index 527d41238..a361cfe70 100644 --- a/plugins/talk-plugin-google-auth/client/components/SignIn.js +++ b/plugins/talk-plugin-google-auth/client/components/SignIn.js @@ -3,7 +3,5 @@ import GoogleButton from '../containers/GoogleButton'; import { t } from 'plugin-api/beta/client/services'; export default () => { - return ( - {t('talk-plugin-google-auth.sign_in')} - ); + return {t('talk-plugin-google-auth.sign_in')}; }; diff --git a/plugins/talk-plugin-google-auth/client/components/SignUp.js b/plugins/talk-plugin-google-auth/client/components/SignUp.js index 704cc3963..3193b02fb 100644 --- a/plugins/talk-plugin-google-auth/client/components/SignUp.js +++ b/plugins/talk-plugin-google-auth/client/components/SignUp.js @@ -3,7 +3,5 @@ import GoogleButton from '../containers/GoogleButton'; import { t } from 'plugin-api/beta/client/services'; export default () => { - return ( - {t('talk-plugin-google-auth.sign_up')} - ); + return {t('talk-plugin-google-auth.sign_up')}; };