From 891a7d6642f5e8c4d4f56280e29489524f0d5286 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 15 Nov 2018 22:10:02 +0100 Subject: Fix linting errors --- src/I18n.js | 3 +-- src/components/auth/AuthLayout.js | 3 +-- src/components/auth/Import.js | 3 +-- src/components/auth/Invite.js | 3 +-- src/components/auth/Login.js | 3 +-- src/components/auth/Password.js | 3 +-- src/components/auth/Pricing.js | 3 +-- src/components/auth/Signup.js | 3 +-- src/components/auth/Welcome.js | 3 +-- src/components/layout/AppLayout.js | 3 +-- src/components/layout/Sidebar.js | 3 +-- src/components/services/content/ServiceDisabled.js | 3 +-- src/components/services/content/ServiceWebview.js | 3 +-- src/components/services/content/Services.js | 3 +-- src/components/services/content/WebviewCrashHandler.js | 3 +-- src/components/services/tabs/TabItem.js | 6 +++--- src/components/services/tabs/Tabbar.js | 3 +-- src/components/settings/SettingsLayout.js | 3 +-- src/components/settings/account/AccountDashboard.js | 3 +-- src/components/settings/recipes/RecipeItem.js | 3 +-- src/components/settings/recipes/RecipesDashboard.js | 3 +-- src/components/settings/services/EditServiceForm.js | 3 +-- src/components/settings/services/ServiceError.js | 3 +-- src/components/settings/services/ServiceItem.js | 3 +-- src/components/settings/services/ServicesDashboard.js | 3 +-- src/components/settings/settings/EditSettingsForm.js | 3 +-- src/components/settings/user/EditUserForm.js | 3 +-- src/components/subscription/SubscriptionForm.js | 3 +-- src/components/subscription/SubscriptionPopup.js | 3 +-- src/components/ui/Button.js | 3 +-- src/components/ui/ImageUpload.js | 4 +--- src/components/ui/InfoBar.js | 3 +-- src/components/ui/Infobox.js | 3 +-- src/components/ui/Input.js | 3 +-- src/components/ui/Link.js | 4 +--- src/components/ui/Radio.js | 3 +-- src/components/ui/SearchInput.js | 3 +-- src/components/ui/Select.js | 3 +-- src/components/ui/StatusBarTargetUrl.js | 3 +-- src/components/ui/Tabs/Tabs.js | 3 +-- src/components/ui/Toggle.js | 3 +-- src/containers/auth/AuthLayoutContainer.js | 3 +-- src/containers/auth/ImportScreen.js | 3 +-- src/containers/auth/InviteScreen.js | 3 +-- src/containers/auth/LoginScreen.js | 3 +-- src/containers/auth/PasswordScreen.js | 3 +-- src/containers/auth/PricingScreen.js | 3 +-- src/containers/auth/SignupScreen.js | 3 +-- src/containers/auth/WelcomeScreen.js | 3 +-- src/containers/layout/AppLayoutContainer.js | 3 +-- src/containers/settings/AccountScreen.js | 3 +-- src/containers/settings/EditServiceScreen.js | 3 +-- src/containers/settings/EditSettingsScreen.js | 3 +-- src/containers/settings/EditUserScreen.js | 3 +-- src/containers/settings/InviteScreen.js | 3 +-- src/containers/settings/RecipesScreen.js | 3 +-- src/containers/settings/ServicesScreen.js | 3 +-- src/containers/settings/SettingsWindow.js | 3 +-- src/containers/subscription/SubscriptionFormScreen.js | 3 +-- src/containers/subscription/SubscriptionPopupScreen.js | 3 +-- src/stores/ServicesStore.js | 2 +- src/webview/plugin.js | 2 +- 62 files changed, 64 insertions(+), 125 deletions(-) (limited to 'src') diff --git a/src/I18n.js b/src/I18n.js index 4ee34157c..e33141576 100644 --- a/src/I18n.js +++ b/src/I18n.js @@ -7,8 +7,7 @@ import { oneOrManyChildElements } from './prop-types'; import translations from './i18n/translations'; import UserStore from './stores/UserStore'; -@inject('stores') @observer -export default class I18N extends Component { +export default @inject('stores') @observer class I18N extends Component { componentDidUpdate() { window.franz.menu.rebuild(); } diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 2741b8a15..4c991797c 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -10,8 +10,7 @@ import InfoBar from '../ui/InfoBar'; import { oneOrManyChildElements, globalError as globalErrorPropType } from '../../prop-types'; import globalMessages from '../../i18n/globalMessages'; -@observer -export default class AuthLayout extends Component { +export default @observer class AuthLayout extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, pathname: PropTypes.string.isRequired, diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 9ba14e768..0d5feb274 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js @@ -28,8 +28,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Import extends Component { +export default @observer class Import extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, onSubmit: PropTypes.func.isRequired, diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index f1c16986b..96821a61a 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js @@ -43,8 +43,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Invite extends Component { +export default @observer class Invite extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, embed: PropTypes.bool, diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 4a3cd6776..f465b35a5 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -55,8 +55,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Login extends Component { +export default @observer class Login extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 5bcc80b6e..ad34e39af 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js @@ -41,8 +41,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Password extends Component { +export default @observer class Password extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, diff --git a/src/components/auth/Pricing.js b/src/components/auth/Pricing.js index 3cc8d5f6b..f08129568 100644 --- a/src/components/auth/Pricing.js +++ b/src/components/auth/Pricing.js @@ -28,8 +28,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Signup extends Component { +export default @observer class Signup extends Component { static propTypes = { donor: MobxPropTypes.objectOrObservableObject.isRequired, isLoading: PropTypes.bool.isRequired, diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 923aa456d..bbcad8b67 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -65,8 +65,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Signup extends Component { +export default @observer class Signup extends Component { static propTypes = { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 9e1c762a5..f6d77f70f 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -16,8 +16,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Login extends Component { +export default @observer class Login extends Component { static propTypes = { loginRoute: PropTypes.string.isRequired, signupRoute: PropTypes.string.isRequired, diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 746775a7f..c2e811f3e 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -40,8 +40,7 @@ const messages = defineMessages({ }, }); -@observer -export default class AppLayout extends Component { +export default @observer class AppLayout extends Component { static propTypes = { isFullScreen: PropTypes.bool.isRequired, sidebar: PropTypes.element.isRequired, diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index fa269f216..6ea95bf88 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -26,8 +26,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Sidebar extends Component { +export default @observer class Sidebar extends Component { static propTypes = { openSettings: PropTypes.func.isRequired, toggleMuteApp: PropTypes.func.isRequired, diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index b5af3743d..58fb38d8c 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js @@ -16,8 +16,7 @@ const messages = defineMessages({ }, }); -@observer -export default class ServiceDisabled extends Component { +export default @observer class ServiceDisabled extends Component { static propTypes = { name: PropTypes.string.isRequired, enable: PropTypes.func.isRequired, diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index c146abf4e..7163209ee 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js @@ -10,8 +10,7 @@ import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl'; import WebviewCrashHandler from './WebviewCrashHandler'; import ServiceDisabled from './ServiceDisabled'; -@observer -export default class ServiceWebview extends Component { +export default @observer class ServiceWebview extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, setWebviewReference: PropTypes.func.isRequired, diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index b1322afc2..4cbd51043 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -18,8 +18,7 @@ const messages = defineMessages({ }, }); -@observer -export default class Services extends Component { +export default @observer class Services extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, setWebviewReference: PropTypes.func.isRequired, diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index d3e6951f3..3be1fccf4 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js @@ -24,8 +24,7 @@ const messages = defineMessages({ }, }); -@observer -export default class WebviewCrashHandler extends Component { +export default @observer class WebviewCrashHandler extends Component { static propTypes = { name: PropTypes.string.isRequired, reload: PropTypes.func.isRequired, diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 638262f7f..8de7dc438 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js @@ -141,10 +141,10 @@ class TabItem extends Component { {service.unreadIndirectMessageCount > 0 && service.unreadDirectMessageCount === 0 && service.isIndirectMessageBadgeEnabled && ( - + • - - )} + + )} ); } diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index ceb88c51c..dd5c2140f 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js @@ -4,8 +4,7 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; import TabBarSortableList from './TabBarSortableList'; -@observer -export default class TabBar extends Component { +export default @observer class TabBar extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, setActive: PropTypes.func.isRequired, diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index d5392ddba..3cb08feb1 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js @@ -5,8 +5,7 @@ import { observer } from 'mobx-react'; import { oneOrManyChildElements } from '../../prop-types'; import Appear from '../ui/effects/Appear'; -@observer -export default class SettingsLayout extends Component { +export default @observer class SettingsLayout extends Component { static propTypes = { navigation: PropTypes.element.isRequired, children: oneOrManyChildElements.isRequired, diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 4992f0913..2fcfdfc9a 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -74,8 +74,7 @@ const messages = defineMessages({ }, }); -@observer -export default class AccountDashboard extends Component { +export default @observer class AccountDashboard extends Component { static propTypes = { user: MobxPropTypes.observableObject.isRequired, orders: MobxPropTypes.arrayOrObservableArray.isRequired, diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index 7b2f64d26..dae8891b3 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import RecipePreviewModel from '../../../models/RecipePreview'; -@observer -export default class RecipeItem extends Component { +export default @observer class RecipeItem extends Component { static propTypes = { recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, onClick: PropTypes.func.isRequired, diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 4610c69a5..cd783200f 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js @@ -46,8 +46,7 @@ const messages = defineMessages({ }, }); -@observer -export default class RecipesDashboard extends Component { +export default @observer class RecipesDashboard extends Component { static propTypes = { recipes: MobxPropTypes.arrayOrObservableArray.isRequired, isLoading: PropTypes.bool.isRequired, diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index f6f2df2f3..29e49ada2 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -94,8 +94,7 @@ const messages = defineMessages({ }, }); -@observer -export default class EditServiceForm extends Component { +export default @observer class EditServiceForm extends Component { static propTypes = { recipe: PropTypes.instanceOf(Recipe).isRequired, service(props, propName) { diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index 1f1512927..3cfc080d6 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js @@ -25,8 +25,7 @@ const messages = defineMessages({ }, }); -@observer -export default class ServiceError extends Component { +export default @observer class ServiceError extends Component { static contextTypes = { intl: intlShape, }; diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index 9743315b0..84080519b 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -22,8 +22,7 @@ const messages = defineMessages({ }, }); -@observer -export default class ServiceItem extends Component { +export default @observer class ServiceItem extends Component { static propTypes = { service: PropTypes.instanceOf(ServiceModel).isRequired, goToServiceForm: PropTypes.func.isRequired, diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index 20e451f01..e7dfaf106 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -49,8 +49,7 @@ const messages = defineMessages({ }, }); -@observer -export default class ServicesDashboard extends Component { +export default @observer class ServicesDashboard extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, isLoading: PropTypes.bool.isRequired, diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 97f535594..3d265ce31 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -82,8 +82,7 @@ const messages = defineMessages({ }, }); -@observer -export default class EditSettingsForm extends Component { +export default @observer class EditSettingsForm extends Component { static propTypes = { checkForUpdates: PropTypes.func.isRequired, installUpdate: PropTypes.func.isRequired, diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index f36887fc2..6c0305089 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js @@ -39,8 +39,7 @@ const messages = defineMessages({ }, }); -@observer -export default class EditServiceForm extends Component { +export default @observer class EditServiceForm extends Component { static propTypes = { status: MobxPropTypes.observableArray.isRequired, form: PropTypes.instanceOf(Form).isRequired, diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index dd350479d..5992e4204 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js @@ -71,8 +71,7 @@ const messages = defineMessages({ }, }); -@observer -export default class SubscriptionForm extends Component { +export default @observer class SubscriptionForm extends Component { static propTypes = { plan: MobxPropTypes.objectOrObservableObject.isRequired, isLoading: PropTypes.bool.isRequired, diff --git a/src/components/subscription/SubscriptionPopup.js b/src/components/subscription/SubscriptionPopup.js index 528d02907..f3c63e7ee 100644 --- a/src/components/subscription/SubscriptionPopup.js +++ b/src/components/subscription/SubscriptionPopup.js @@ -17,8 +17,7 @@ const messages = defineMessages({ }, }); -@observer -export default class SubscriptionPopup extends Component { +export default @observer class SubscriptionPopup extends Component { static propTypes = { url: PropTypes.string.isRequired, closeWindow: PropTypes.func.isRequired, diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index 554206cb7..309e05bb4 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import Loader from 'react-loader'; import classnames from 'classnames'; -@observer -export default class Button extends Component { +export default @observer class Button extends Component { static propTypes = { className: PropTypes.string, label: PropTypes.string.isRequired, diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 81c3b8da6..76f77d631 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js @@ -2,12 +2,10 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; -// import Loader from 'react-loader'; import classnames from 'classnames'; import Dropzone from 'react-dropzone'; -@observer -export default class ImageUpload extends Component { +export default @observer class ImageUpload extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, className: PropTypes.string, diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index 84a5f1446..94a1ddf76 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js @@ -7,8 +7,7 @@ import Loader from 'react-loader'; // import { oneOrManyChildElements } from '../../prop-types'; import Appear from '../ui/effects/Appear'; -@observer -export default class InfoBar extends Component { +export default @observer class InfoBar extends Component { static propTypes = { // eslint-disable-next-line children: PropTypes.any.isRequired, diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js index 2d063c7ef..77051f567 100644 --- a/src/components/ui/Infobox.js +++ b/src/components/ui/Infobox.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import classnames from 'classnames'; import Loader from 'react-loader'; -@observer -export default class Infobox extends Component { +export default @observer class Infobox extends Component { static propTypes = { children: PropTypes.any.isRequired, // eslint-disable-line icon: PropTypes.string, diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js index 0bb9f23bf..7fc5b69b0 100644 --- a/src/components/ui/Input.js +++ b/src/components/ui/Input.js @@ -6,8 +6,7 @@ import classnames from 'classnames'; import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers'; -@observer -export default class Input extends Component { +export default @observer class Input extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, className: PropTypes.string, diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index f5da921fa..0602290f1 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js @@ -9,9 +9,7 @@ import { oneOrManyChildElements } from '../../prop-types'; import { matchRoute } from '../../helpers/routing-helpers'; // TODO: create container component for this component - -@inject('stores') @observer -export default class Link extends Component { +export default @inject('stores') @observer class Link extends Component { onClick(e) { if (this.props.target === '_blank') { e.preventDefault(); diff --git a/src/components/ui/Radio.js b/src/components/ui/Radio.js index b54cfc820..63ca6f9b8 100644 --- a/src/components/ui/Radio.js +++ b/src/components/ui/Radio.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; import classnames from 'classnames'; -@observer -export default class Radio extends Component { +export default @observer class Radio extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, className: PropTypes.string, diff --git a/src/components/ui/SearchInput.js b/src/components/ui/SearchInput.js index a94cde201..5a9571d27 100644 --- a/src/components/ui/SearchInput.js +++ b/src/components/ui/SearchInput.js @@ -5,8 +5,7 @@ import classnames from 'classnames'; import uuidv1 from 'uuid/v1'; import { debounce } from 'lodash'; -@observer -export default class SearchInput extends Component { +export default @observer class SearchInput extends Component { static propTypes = { value: PropTypes.string, placeholder: PropTypes.string, diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index 2a877af3e..abcad417e 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import { Field } from 'mobx-react-form'; import classnames from 'classnames'; -@observer -export default class Select extends Component { +export default @observer class Select extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, className: PropTypes.string, diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js index b7b198f42..4285a343c 100644 --- a/src/components/ui/StatusBarTargetUrl.js +++ b/src/components/ui/StatusBarTargetUrl.js @@ -5,8 +5,7 @@ import classnames from 'classnames'; import Appear from '../ui/effects/Appear'; -@observer -export default class StatusBarTargetUrl extends Component { +export default @observer class StatusBarTargetUrl extends Component { static propTypes = { className: PropTypes.string, text: PropTypes.string, diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js index 50397f9bb..12f650ffd 100644 --- a/src/components/ui/Tabs/Tabs.js +++ b/src/components/ui/Tabs/Tabs.js @@ -5,8 +5,7 @@ import classnames from 'classnames'; import { oneOrManyChildElements } from '../../../prop-types'; -@observer -export default class Tab extends Component { +export default @observer class Tab extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, active: PropTypes.number, diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js index 62d46393e..f7c2ec955 100644 --- a/src/components/ui/Toggle.js +++ b/src/components/ui/Toggle.js @@ -4,8 +4,7 @@ import { observer } from 'mobx-react'; import classnames from 'classnames'; import { Field } from 'mobx-react-form'; -@observer -export default class Toggle extends Component { +export default @observer class Toggle extends Component { static propTypes = { field: PropTypes.instanceOf(Field).isRequired, className: PropTypes.string, diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index 004054fdd..62b589d2f 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js @@ -8,8 +8,7 @@ import GlobalErrorStore from '../../stores/GlobalErrorStore'; import { oneOrManyChildElements } from '../../prop-types'; -@inject('stores', 'actions') @observer -export default class AuthLayoutContainer extends Component { +export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, location: PropTypes.shape({ diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index ddd56ffb6..fc46f8b54 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js @@ -5,8 +5,7 @@ import Import from '../../components/auth/Import'; import UserStore from '../../stores/UserStore'; import { gaPage } from '../../lib/analytics'; -@inject('stores', 'actions') @observer -export default class ImportScreen extends Component { +export default @inject('stores', 'actions') @observer class ImportScreen extends Component { componentDidMount() { gaPage('Auth/Import'); } diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index 059888c99..26bf97038 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js @@ -4,8 +4,7 @@ import { inject, observer } from 'mobx-react'; import Invite from '../../components/auth/Invite'; import { gaPage } from '../../lib/analytics'; -@inject('stores', 'actions') @observer -export default class InviteScreen extends Component { +export default @inject('stores', 'actions') @observer class InviteScreen extends Component { componentDidMount() { gaPage('Auth/Invite'); } diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index 9e22c5141..865bd38f8 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js @@ -7,8 +7,7 @@ import { gaPage } from '../../lib/analytics'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') @observer -export default class LoginScreen extends Component { +export default @inject('stores', 'actions') @observer class LoginScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, }; diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index d88cb08e6..236fd2031 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js @@ -5,8 +5,7 @@ import Password from '../../components/auth/Password'; import UserStore from '../../stores/UserStore'; import { gaPage } from '../../lib/analytics'; -@inject('stores', 'actions') @observer -export default class PasswordScreen extends Component { +export default @inject('stores', 'actions') @observer class PasswordScreen extends Component { componentDidMount() { gaPage('Auth/Password Retrieve'); } diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js index 7e1586535..34b512e15 100644 --- a/src/containers/auth/PricingScreen.js +++ b/src/containers/auth/PricingScreen.js @@ -10,8 +10,7 @@ import { gaPage } from '../../lib/analytics'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') @observer -export default class PricingScreen extends Component { +export default @inject('stores', 'actions') @observer class PricingScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, }; diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 3b86ab138..caf75de90 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js @@ -8,8 +8,7 @@ import { gaPage } from '../../lib/analytics'; import { globalError as globalErrorPropType } from '../../prop-types'; -@inject('stores', 'actions') @observer -export default class SignupScreen extends Component { +export default @inject('stores', 'actions') @observer class SignupScreen extends Component { static propTypes = { error: globalErrorPropType.isRequired, }; diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index e413264a6..2c120f81c 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js @@ -7,8 +7,7 @@ import UserStore from '../../stores/UserStore'; import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; import { gaPage } from '../../lib/analytics'; -@inject('stores', 'actions') @observer -export default class LoginScreen extends Component { +export default @inject('stores', 'actions') @observer class LoginScreen extends Component { componentDidMount() { gaPage('Auth/Welcome'); } diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 9212f809f..f63fe3717 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js @@ -17,8 +17,7 @@ import Sidebar from '../../components/layout/Sidebar'; import Services from '../../components/services/content/Services'; import AppLoader from '../../components/ui/AppLoader'; -@inject('stores', 'actions') @observer -export default class AppLayoutContainer extends Component { +export default @inject('stores', 'actions') @observer class AppLayoutContainer extends Component { static defaultProps = { children: null, }; diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index c5c2982b0..5818af0b1 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js @@ -12,8 +12,7 @@ import AccountDashboard from '../../components/settings/account/AccountDashboard const { BrowserWindow } = remote; -@inject('stores', 'actions') @observer -export default class AccountScreen extends Component { +export default @inject('stores', 'actions') @observer class AccountScreen extends Component { componentDidMount() { gaPage('Settings/Account Dashboard'); } diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index 67c2731fc..1fc6bc85e 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js @@ -52,8 +52,7 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') @observer -export default class EditServiceScreen extends Component { +export default @inject('stores', 'actions') @observer class EditServiceScreen extends Component { static contextTypes = { intl: intlShape, }; diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 018ce663f..0b3ad0389 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js @@ -65,8 +65,7 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') @observer -export default class EditSettingsScreen extends Component { +export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component { static contextTypes = { intl: intlShape, }; diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index dda8ce513..4c5a9117e 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js @@ -50,8 +50,7 @@ const messages = defineMessages({ }, }); -@inject('stores', 'actions') @observer -export default class EditUserScreen extends Component { +export default @inject('stores', 'actions') @observer class EditUserScreen extends Component { static contextTypes = { intl: intlShape, }; diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index 5f341b1b3..38ca6ec74 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js @@ -5,8 +5,7 @@ import { inject, observer } from 'mobx-react'; import Invite from '../../components/auth/Invite'; import { gaPage } from '../../lib/analytics'; -@inject('stores', 'actions') @observer -export default class InviteScreen extends Component { +export default @inject('stores', 'actions') @observer class InviteScreen extends Component { componentDidMount() { gaPage('Settings/Invite'); } diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 65341e9e3..4efe81505 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js @@ -11,8 +11,7 @@ import { gaPage } from '../../lib/analytics'; import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard'; -@inject('stores', 'actions') @observer -export default class RecipesScreen extends Component { +export default @inject('stores', 'actions') @observer class RecipesScreen extends Component { static propTypes = { params: PropTypes.shape({ filter: PropTypes.string, diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index 12db1bcd3..c1a133ef7 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js @@ -10,8 +10,7 @@ import { gaPage } from '../../lib/analytics'; import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; -@inject('stores', 'actions') @observer -export default class ServicesScreen extends Component { +export default @inject('stores', 'actions') @observer class ServicesScreen extends Component { componentDidMount() { gaPage('Settings/Service Dashboard'); } diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 13ca96f72..55589d0be 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js @@ -7,8 +7,7 @@ import ServicesStore from '../../stores/ServicesStore'; import Layout from '../../components/settings/SettingsLayout'; import Navigation from '../../components/settings/navigation/SettingsNavigation'; -@inject('stores', 'actions') @observer -export default class SettingsContainer extends Component { +export default @inject('stores', 'actions') @observer class SettingsContainer extends Component { render() { const { children, stores } = this.props; const { closeSettings } = this.props.actions.ui; diff --git a/src/containers/subscription/SubscriptionFormScreen.js b/src/containers/subscription/SubscriptionFormScreen.js index fc6e3c4be..9f7571bda 100644 --- a/src/containers/subscription/SubscriptionFormScreen.js +++ b/src/containers/subscription/SubscriptionFormScreen.js @@ -9,8 +9,7 @@ import SubscriptionForm from '../../components/subscription/SubscriptionForm'; const { BrowserWindow } = remote; -@inject('stores', 'actions') @observer -export default class SubscriptionFormScreen extends Component { +export default @inject('stores', 'actions') @observer class SubscriptionFormScreen extends Component { static propTypes = { onCloseWindow: PropTypes.func, content: PropTypes.oneOrManyChildElements, diff --git a/src/containers/subscription/SubscriptionPopupScreen.js b/src/containers/subscription/SubscriptionPopupScreen.js index bb0603170..6641f236d 100644 --- a/src/containers/subscription/SubscriptionPopupScreen.js +++ b/src/containers/subscription/SubscriptionPopupScreen.js @@ -5,8 +5,7 @@ import { inject, observer } from 'mobx-react'; import SubscriptionPopup from '../../components/subscription/SubscriptionPopup'; -@inject('stores', 'actions') @observer -export default class SubscriptionPopupScreen extends Component { +export default @inject('stores', 'actions') @observer class SubscriptionPopupScreen extends Component { state = { complete: false, }; diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index ccb85421a..4c2992c70 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -93,7 +93,7 @@ export default class ServicesStore extends Store { return this.stores.settings.all.app.showDisabledServices ? this.all : this.enabled; } - // This is just used to avoid unnecessary rerendering of resource-heavy webviews + // This is just used to avoid unnecessary rerendering of resource-heavy webviews @computed get allDisplayedUnordered() { const services = this.allServicesRequest.execute().result || []; return this.stores.settings.all.app.showDisabledServices ? services : services.filter(service => service.isEnabled); diff --git a/src/webview/plugin.js b/src/webview/plugin.js index c6530fef6..a148d4633 100644 --- a/src/webview/plugin.js +++ b/src/webview/plugin.js @@ -47,7 +47,7 @@ document.addEventListener('DOMContentLoaded', () => { const originalWindowOpen = window.open; window.open = (url, frameName, features) => { - // We need to differentiate if the link should be opened in a popup or in the systems default browser + // We need to differentiate if the link should be opened in a popup or in the systems default browser if (!frameName && !features) { return ipcRenderer.sendToHost('new-window', url); } -- cgit v1.2.3-70-g09d2