From 5d6164973e92fa8a3e3c18a0eb2e29494aea4f48 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sun, 9 Dec 2018 20:48:25 +0100 Subject: Fix linting issues --- src/components/auth/AuthLayout.js | 6 ++--- src/components/auth/Invite.js | 26 ++++++++++++--------- src/components/auth/Login.js | 6 ++--- src/components/auth/Pricing.js | 23 ++++++++++-------- src/components/auth/Signup.js | 3 ++- src/components/layout/AppLayout.js | 6 +++-- src/components/layout/Sidebar.js | 3 +++ .../content/ErrorHandlers/WebviewErrorHandler.js | 9 +++++++- src/components/services/content/ServiceDisabled.js | 1 + src/components/services/content/ServiceWebview.js | 9 ++++---- src/components/services/content/Services.js | 3 +-- .../services/content/WebviewCrashHandler.js | 24 +++++++++++-------- src/components/services/tabs/Tabbar.js | 2 +- src/components/settings/SettingsLayout.js | 2 ++ .../settings/account/AccountDashboard.js | 4 +++- .../settings/navigation/SettingsNavigation.js | 5 ++-- src/components/settings/recipes/RecipeItem.js | 1 + .../settings/recipes/RecipesDashboard.js | 10 ++++++-- .../settings/services/EditServiceForm.js | 1 + src/components/settings/services/ServiceItem.js | 1 + .../settings/settings/EditSettingsForm.js | 8 +++++-- src/components/settings/user/EditUserForm.js | 4 ---- src/components/subscription/SubscriptionForm.js | 3 +-- src/components/subscription/SubscriptionPopup.js | 4 +++- src/components/ui/AppLoader/index.js | 11 ++++----- src/components/ui/Button.js | 3 +++ src/components/ui/FullscreenLoader/index.js | 7 +++--- src/components/ui/ImageUpload.js | 4 ++-- src/components/ui/InfoBar.js | 4 +++- src/components/ui/Infobox.js | 2 ++ src/components/ui/Input.js | 6 ++--- src/components/ui/Link.js | 1 - src/components/ui/PremiumFeatureContainer/index.js | 1 - src/components/ui/Radio.js | 4 ++-- src/components/ui/SearchInput.js | 27 +++++++++++----------- src/components/ui/Select.js | 1 - src/components/ui/StatusBarTargetUrl.js | 3 +-- src/components/util/ErrorBoundary/index.js | 18 ++++++++++----- src/components/util/ErrorBoundary/styles.js | 4 ++-- 39 files changed, 155 insertions(+), 105 deletions(-) (limited to 'src/components') diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 4e1b0c52e..ac8fdbe5b 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -15,7 +15,6 @@ import { isWindows } from '../../environment'; export default @observer class AuthLayout extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, - pathname: PropTypes.string.isRequired, error: globalErrorPropType.isRequired, isOnline: PropTypes.bool.isRequired, isAPIHealthy: PropTypes.bool.isRequired, @@ -32,7 +31,6 @@ export default @observer class AuthLayout extends Component { render() { const { children, - pathname, error, isOnline, isAPIHealthy, @@ -45,8 +43,8 @@ export default @observer class AuthLayout extends Component { return (
- {isWindows && !isFullScreen && } -
+ {isWindows && !isFullScreen && } +
{!isOnline && ( this.submit(e)}> - {!embed && ()} + {!embed && ( + + )}

{intl.formatMessage(messages.headline)}

@@ -164,12 +166,14 @@ export default @observer class Invite extends Component { label={intl.formatMessage(messages.submitButtonLabel)} loaded={!isLoadingInvite} /> - {!embed && ( - {intl.formatMessage(messages.skipButtonLabel)} - )} + {!embed && ( + + {intl.formatMessage(messages.skipButtonLabel)} + + )} ); diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 2cf614041..5d21f8b60 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -83,18 +83,18 @@ export default @observer class Login extends Component { }, }, this.context.intl); + emailField = null; + submit(e) { e.preventDefault(); this.form.submit({ onSuccess: (form) => { this.props.onSubmit(form.values()); }, - onError: () => {}, + onError: () => { }, }); } - emailField = null; - render() { const { form } = this; const { intl } = this.context; diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js index f08129568..7ab14f429 100644 --- a/src/components/auth/Pricing.js +++ b/src/components/auth/Pricing.js @@ -69,18 +69,29 @@ export default @observer class Signup extends Component { donor.amount ? (

- Thank you so much for your previous donation of $ {donor.amount}. + Thank you so much for your previous donation of + {' '} + + $ + {donor.amount} + + .
Your support allowed us to get where we are today.

- As an early supporter, you get a lifetime premium supporter license without any + As an early supporter, you get + {' '} + a lifetime premium supporter license + {' '} + without any additional charges.

However, If you want to keep supporting us, you are more than welcome to subscribe to a plan. -

+
+

) : ( @@ -113,12 +124,6 @@ export default @observer class Signup extends Component { hideInfo={Boolean(donor.amount)} skipButtonLabel={intl.formatMessage(messages.skipPayment)} /> - {/* - {intl.formatMessage(messages.skipPayment)} - */} diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index bbcad8b67..d9b83eeb8 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -199,7 +199,8 @@ export default @observer class Signup extends Component { className="link" > {intl.formatMessage(messages.privacy)} - . + + .

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index e526f6b1f..dbe0bb4b6 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -99,7 +99,7 @@ export default @observer class AppLayout extends Component {
- {isWindows && !isFullScreen && } + {isWindows && !isFullScreen && }
{sidebar}
@@ -153,7 +153,9 @@ export default @observer class AppLayout extends Component { sticky > - {intl.formatMessage(messages.updateAvailable)} + {intl.formatMessage(messages.updateAvailable)} + {' '} + {intl.formatMessage(messages.changelog)} diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 6ea95bf88..609a3b604 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -65,6 +65,7 @@ export default @observer class Sidebar extends Component { disableToolTip={() => this.disableToolTip()} />
); } diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index 27f555428..dd5c2140f 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js @@ -1,4 +1,4 @@ -import React, { Component, Fragment } from 'react'; +import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index d5d8f0bb0..72ba7b2e3 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -39,6 +39,7 @@ export default @observer class SettingsLayout extends Component {
{/* )} */} diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index a7c656acd..fac25c160 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -130,6 +130,7 @@ export default @observer class EditServiceForm extends Component { static defaultProps = { service: {}, }; + static contextTypes = { intl: intlShape, }; diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index 84080519b..ebc618a00 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -27,6 +27,7 @@ export default @observer class ServiceItem extends Component { service: PropTypes.instanceOf(ServiceModel).isRequired, goToServiceForm: PropTypes.func.isRequired, }; + static contextTypes = { intl: intlShape, }; diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index df3197520..a92e559f3 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -185,7 +185,9 @@ export default @observer class EditSettingsForm extends Component { target="_blank" className="link" > - {intl.formatMessage(messages.translationHelp)} + {intl.formatMessage(messages.translationHelp)} + {' '} + {/* Advanced */} @@ -233,7 +235,9 @@ export default @observer class EditSettingsForm extends Component { )}
- {intl.formatMessage(messages.currentVersion)} {remote.app.getVersion()} + {intl.formatMessage(messages.currentVersion)} + {' '} + {remote.app.getVersion()}
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index b825f844a..0e3ac6b10 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -48,10 +48,6 @@ export default @observer class EditServiceForm extends Component { isEnterprise: PropTypes.bool.isRequired, }; - static defaultProps = { - service: {}, - }; - static contextTypes = { intl: intlShape, }; diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index 6b60c2af0..90da8ddc3 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js @@ -81,8 +81,7 @@ export default @observer class SubscriptionForm extends Component { hideInfo: PropTypes.bool.isRequired, }; - static defaultProps ={ - content: '', + static defaultProps = { showSkipOption: false, skipAction: () => null, skipButtonLabel: '', diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js index f3c63e7ee..b5d7c4b2d 100644 --- a/src/components/subscription/SubscriptionPopup.js +++ b/src/components/subscription/SubscriptionPopup.js @@ -46,7 +46,9 @@ export default @observer class SubscriptionPopup extends Component { } render() { - const { url, closeWindow, completeCheck, isCompleted } = this.props; + const { + url, closeWindow, completeCheck, isCompleted, + } = this.props; const { intl } = this.context; return ( diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js index 31db3d52c..1b9d044f4 100644 --- a/src/components/ui/AppLoader/index.js +++ b/src/components/ui/AppLoader/index.js @@ -28,11 +28,13 @@ export default @injectSheet(styles) class AppLoader extends Component { step: 0, } + interval = null; + componentDidMount() { this.interval = setInterval(() => { - this.setState({ - step: this.state.step === textList.length - 1 ? 0 : this.state.step + 1, - }); + this.setState(prevState => ({ + step: prevState.step === textList.length - 1 ? 0 : prevState.step + 1, + })); }, 2500); } @@ -40,8 +42,6 @@ export default @injectSheet(styles) class AppLoader extends Component { clearInterval(this.interval); } - interval = null; - render() { const { classes } = this.props; const { step } = this.state; @@ -66,4 +66,3 @@ export default @injectSheet(styles) class AppLoader extends Component { ); } } - diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index 309e05bb4..ffc7f7051 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js @@ -62,6 +62,8 @@ export default @observer class Button extends Component { } return ( + // disabling rule as button has type defined in `buttonProps` + /* eslint-disable react/button-has-type */ + /* eslint-enable react/button-has-type */ ); } } diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index 36cd32d2a..e0a24a527 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js @@ -7,7 +7,9 @@ import Loader from '../Loader'; import styles from './styles'; -export default inject('stores')(injectSheet(styles)(({ stores, classes, className, title, children }) => ( +export default inject('stores')(injectSheet(styles)(({ + stores, classes, className, title, children, +}) => (
-), -)); +))); diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index cbe70ac88..83a05554b 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -23,6 +23,8 @@ export default @observer class ImageUpload extends Component { path: null, } + dropzoneRef = null; + onDrop(acceptedFiles) { const { field } = this.props; @@ -36,8 +38,6 @@ export default @observer class ImageUpload extends Component { field.set(''); } - dropzoneRef = null; - render() { const { field, diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index 94a1ddf76..612399e9f 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js @@ -5,7 +5,7 @@ import classnames from 'classnames'; import Loader from 'react-loader'; // import { oneOrManyChildElements } from '../../prop-types'; -import Appear from '../ui/effects/Appear'; +import Appear from './effects/Appear'; export default @observer class InfoBar extends Component { static propTypes = { @@ -64,6 +64,7 @@ export default @observer class InfoBar extends Component { {children} {ctaLabel && (
{!sticky && (
); @@ -51,4 +57,4 @@ export default @injectSheet(styles) class ErrorBoundary extends Component { return this.props.children; } -} \ No newline at end of file +} diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.js index 8d62767f6..0960546ff 100644 --- a/src/components/util/ErrorBoundary/styles.js +++ b/src/components/util/ErrorBoundary/styles.js @@ -1,4 +1,4 @@ -export default (theme) => ({ +export default theme => ({ component: { display: 'flex', width: '100%', @@ -9,5 +9,5 @@ export default (theme) => ({ title: { fontSize: 20, color: theme.colorText, - } + }, }); -- cgit v1.2.3-70-g09d2