From 30a891a83ce4bbbbaa6f6f3a13d2031b0a58188f Mon Sep 17 00:00:00 2001
From: vantezzen <properly@protonmail.com>
Date: Thu, 22 Aug 2019 21:40:07 +0200
Subject: Fix eslint errors

---
 src/api/server/ServerApi.js                        |  7 +++---
 src/components/auth/Welcome.js                     |  8 ++++---
 src/components/layout/Sidebar.js                   | 17 ++++++-------
 src/components/services/content/Services.js        |  4 ++--
 .../settings/navigation/SettingsNavigation.js      |  2 +-
 .../settings/services/EditServiceForm.js           |  2 +-
 src/components/ui/Input.js                         |  2 +-
 src/components/ui/PremiumFeatureContainer/index.js |  1 -
 src/containers/settings/EditSettingsScreen.js      |  4 ++--
 .../announcements/components/AnnouncementScreen.js |  2 --
 src/features/announcements/store.js                |  2 +-
 .../workspaces/components/CreateWorkspaceForm.js   |  2 +-
 .../workspaces/components/EditWorkspaceForm.js     |  1 -
 .../workspaces/components/WorkspaceDrawer.js       |  2 +-
 src/helpers/recipe-helpers.js                      |  2 +-
 src/helpers/service-helpers.js                     |  2 +-
 .../workspaces/components/EditWorkspaceForm.json   | 28 +++++++++++-----------
 src/index.js                                       |  2 +-
 src/lib/Menu.js                                    |  4 ++--
 src/lib/Tray.js                                    |  2 +-
 src/models/Service.js                              |  2 +-
 src/stores/AppStore.js                             |  4 ++--
 src/stores/RecipePreviewsStore.js                  |  2 --
 src/stores/ServicesStore.js                        | 12 ++++------
 src/stores/UserStore.js                            |  4 ++--
 25 files changed, 57 insertions(+), 63 deletions(-)

(limited to 'src')

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index 069994028..46a5b928d 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -39,7 +39,6 @@ const { default: fetch } = remote.require('electron-fetch');
 
 const SERVER_URL = API;
 const API_VERSION = 'v1';
-const API_URL = `${SERVER_URL}/${API_VERSION}`;
 
 export default class ServerApi {
   recipePreviews = [];
@@ -56,15 +55,15 @@ export default class ServerApi {
     let url;
     if (!this.stores.settings) {
       // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
-      url = 'https://localhost:9999'
+      url = 'https://localhost:9999';
     } else if (this.stores.settings.all.app.server) {
       // Load URL from store
       url = this.stores.settings.all.app.server;
     } else {
       // Use default server url
-      url = SERVER_URL;
+      url = SERVER_URL;
     }
-    
+
     return `${url}/${API_VERSION}`;
   }
 
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js
index 2b689db3b..ef917e336 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.js
@@ -51,14 +51,16 @@ export default @observer class Login extends Component {
           <Link to={loginRoute} className="button">
             {intl.formatMessage(messages.loginButton)}
           </Link>
-          <br /><br />
+          <br />
+          <br />
 
           <Link to="settings/app">
             <span style={{
               textAlign: 'center',
               width: '100%',
-              cursor: 'pointer'
-            }}>
+              cursor: 'pointer',
+            }}
+            >
               Change server
             </span>
           </Link>
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 3d8bcddb0..1bf2554b5 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -7,7 +7,7 @@ import { Link } from 'react-router';
 
 import Tabbar from '../services/tabs/Tabbar';
 import { ctrlKey } from '../../environment';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces';
+import { workspaceStore } from '../../features/workspaces';
 
 const messages = defineMessages({
   settings: {
@@ -107,8 +107,8 @@ export default @observer class Sidebar extends Component {
                   <i className="mdi mdi-view-grid" />
                 </button>
               ) : null}
-          
-                <button
+
+              <button
                 type="button"
                 onClick={() => {
                   toggleMuteApp();
@@ -129,15 +129,16 @@ export default @observer class Sidebar extends Component {
               </button>
             </>
           ) : (
-            <Link 
-              to="/auth/welcome" 
+            <Link
+              to="/auth/welcome"
               className="sidebar__button sidebar__button--new-service"
-              data-tip="Login">
-                <i className="mdi mdi-login-variant" />
+              data-tip="Login"
+            >
+              <i className="mdi mdi-login-variant" />
             </Link>
           )
         }
-        
+
         <button
           type="button"
           onClick={() => openSettings({ path: 'app' })}
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 5d21262af..4c5976f8d 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -63,13 +63,13 @@ export default @observer class Services extends Component {
               <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} />
               <h1>{intl.formatMessage(messages.welcome)}</h1>
               { !isLoggedIn && (
-                <p>Please open settings, choose a Ferdi server and click "Login" in the bottom left corner.</p>
+                <p>Please open settings, choose a Ferdi server and click &quot;Login&quot; in the bottom left corner.</p>
               ) }
               <Appear
                 timeout={300}
                 transitionName="slideUp"
               >
-                <Link to={ isLoggedIn ? '/settings/services' : '/settings/app' } className="button">
+                <Link to={isLoggedIn ? '/settings/services' : '/settings/app'} className="button">
                   { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Open settings' }
                 </Link>
               </Appear>
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index e1c5cabc3..6aa9bda03 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -131,7 +131,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp
         </Link>
         <span className="settings-navigation__expander" />
         <Link
-          to={ isLoggedIn ? "/auth/logout" : '/auth/welcome'}
+          to={isLoggedIn ? '/auth/logout' : '/auth/welcome'}
           className="settings-navigation__link"
         >
           { isLoggedIn ? intl.formatMessage(messages.logout) : 'Login'}
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 2ad62088b..711b571e2 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -153,7 +153,7 @@ export default @observer class EditServiceForm extends Component {
         const values = form.values();
         let isValid = true;
 
-        const files = form.$('customIcon').files;
+        const { files } = form.$('customIcon');
         if (files) {
           values.iconFile = files[0];
         }
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 9b070c4df..4e3eb4ab8 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -68,7 +68,7 @@ export default @observer class Input extends Component {
 
     const { passwordScore } = this.state;
 
-    let type = field.type;
+    let { type } = field;
     if (type === 'password' && this.state.showPassword) {
       type = 'text';
     }
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
index 08553b32a..b890b09ab 100644
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ b/src/components/ui/PremiumFeatureContainer/index.js
@@ -45,7 +45,6 @@ class PremiumFeatureContainer extends Component {
       actions,
       condition,
       stores,
-      gaEventInfo,
     } = this.props;
 
     const { intl } = this.context;
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 8059ee22d..246952125 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -152,8 +152,8 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         },
         server: {
           label: 'Server',
-          value: settings.all.app.server || API,
-          default: API
+          value: settings.all.app.server || API,
+          default: API,
         },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index eb157555f..38de2dbc8 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -227,7 +227,6 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.main.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.main.cta;
                         window.location.href = `#${announcement.main.cta.href}`;
                       }}
                     />
@@ -251,7 +250,6 @@ class AnnouncementScreen extends Component {
                     <Button
                       label={announcement.spotlight.cta.label}
                       onClick={() => {
-                        const { analytics } = announcement.spotlight.cta;
                         window.location.href = `#${announcement.spotlight.cta.href}`;
                       }}
                     />
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 515fd97a0..2884fb06f 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -7,7 +7,7 @@ import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index 528376474..15b97121d 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -6,7 +6,7 @@ import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   submitButton: {
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index 4fb67dfb4..82ea1b564 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -12,7 +12,6 @@ import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
 import WorkspaceServiceListItem from './WorkspaceServiceListItem';
 import Request from '../../../stores/lib/Request';
-import { GA_CATEGORY_WORKSPACES } from '../index';
 
 const messages = defineMessages({
   buttonDelete: {
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 7a36285c2..cbc7372ca 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -9,7 +9,7 @@ import ReactTooltip from 'react-tooltip';
 
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/helpers/recipe-helpers.js b/src/helpers/recipe-helpers.js
index 257e322fb..a31c29e72 100644
--- a/src/helpers/recipe-helpers.js
+++ b/src/helpers/recipe-helpers.js
@@ -3,7 +3,7 @@ import { remote } from 'electron';
 
 // import ServiceModel from '../models/Service';
 
-const app = remote.app;
+const { app } = remote;
 
 export function getRecipeDirectory(id = '') {
   return path.join(app.getPath('userData'), 'recipes', id);
diff --git a/src/helpers/service-helpers.js b/src/helpers/service-helpers.js
index 5f63f6b7c..83f89f108 100644
--- a/src/helpers/service-helpers.js
+++ b/src/helpers/service-helpers.js
@@ -2,7 +2,7 @@ import path from 'path';
 import { remote } from 'electron';
 import fs from 'fs-extra';
 
-const app = remote.app;
+const { app } = remote;
 
 export function getServicePartitionsDirectory() {
   return path.join(app.getPath('userData'), 'Partitions');
diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
index 7a7208dc9..61abf8ba0 100644
--- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
+++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json
@@ -4,11 +4,11 @@
     "defaultMessage": "!!!Delete workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 18,
+      "line": 17,
       "column": 16
     },
     "end": {
-      "line": 21,
+      "line": 20,
       "column": 3
     }
   },
@@ -17,11 +17,11 @@
     "defaultMessage": "!!!Save workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 22,
+      "line": 21,
       "column": 14
     },
     "end": {
-      "line": 25,
+      "line": 24,
       "column": 3
     }
   },
@@ -30,11 +30,11 @@
     "defaultMessage": "!!!Name",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 26,
+      "line": 25,
       "column": 8
     },
     "end": {
-      "line": 29,
+      "line": 28,
       "column": 3
     }
   },
@@ -43,11 +43,11 @@
     "defaultMessage": "!!!Your workspaces",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 30,
+      "line": 29,
       "column": 18
     },
     "end": {
-      "line": 33,
+      "line": 32,
       "column": 3
     }
   },
@@ -56,11 +56,11 @@
     "defaultMessage": "!!!Services in this Workspace",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 34,
+      "line": 33,
       "column": 31
     },
     "end": {
-      "line": 37,
+      "line": 36,
       "column": 3
     }
   },
@@ -69,11 +69,11 @@
     "defaultMessage": "!!!You haven't added any services yet.",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 38,
+      "line": 37,
       "column": 19
     },
     "end": {
-      "line": 41,
+      "line": 40,
       "column": 3
     }
   },
@@ -82,11 +82,11 @@
     "defaultMessage": "!!!Discover services",
     "file": "src/features/workspaces/components/EditWorkspaceForm.js",
     "start": {
-      "line": 42,
+      "line": 41,
       "column": 20
     },
     "end": {
-      "line": 45,
+      "line": 44,
       "column": 3
     }
   }
diff --git a/src/index.js b/src/index.js
index a5cf16db9..fbb8e1049 100644
--- a/src/index.js
+++ b/src/index.js
@@ -187,7 +187,7 @@ const createWindow = () => {
   mainWindow.webContents.on('did-finish-load', () => {
     const fns = onDidLoadFns;
     onDidLoadFns = null;
-    for (const fn of fns) {
+    for (const fn of fns) { // eslint-disable-line no-unused-vars
       fn(mainWindow);
     }
   });
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index a58e5b2de..7937aede9 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -3,7 +3,7 @@ import { observable, autorun } from 'mobx';
 import { defineMessages } from 'react-intl';
 
 import { isMac, ctrlKey, cmdKey } from '../environment';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index';
+import { workspaceStore } from '../features/workspaces/index';
 import { workspaceActions } from '../features/workspaces/actions';
 import { announcementActions } from '../features/announcements/actions';
 import { announcementsStore } from '../features/announcements';
@@ -909,7 +909,7 @@ export default class FranzMenu {
       return service.name;
     }
 
-    let name = service.recipe.name;
+    let { name } = service.recipe;
 
     if (service.team) {
       name = `${name} (${service.team})`;
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 28ec55eb7..90974de3f 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -84,7 +84,7 @@ export default class TrayIcon {
   }
 
   _getAsset(type, asset) {
-    let platform = process.platform;
+    let { platform } = process;
 
     if (platform === 'darwin' && systemPreferences.isDarkMode()) {
       platform = `${platform}-dark`;
diff --git a/src/models/Service.js b/src/models/Service.js
index 88bce3360..f098bdc7e 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -162,7 +162,7 @@ export default class Service {
   }
 
   @computed get userAgent() {
-    let userAgent = window.navigator.userAgent;
+    let { userAgent } = window.navigator;
     if (typeof this.recipe.overrideUserAgent === 'function') {
       userAgent = this.recipe.overrideUserAgent();
     }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 2eae9ed0a..0311a11a3 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -1,6 +1,6 @@
 import { remote, ipcRenderer, shell } from 'electron';
 import {
-  action, computed, observable, reaction,
+  action, computed, observable,
 } from 'mobx';
 import moment from 'moment';
 import { getDoNotDisturb } from '@meetfranz/electron-notification-state';
@@ -358,7 +358,7 @@ export default class AppStore extends Store {
   }
 
   _muteAppHandler() {
-    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+    const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     if (!showMessageBadgesEvenWhenMuted) {
       this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 });
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index a93aedfff..989e1124a 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -1,6 +1,4 @@
 import { action, computed, observable } from 'mobx';
-import { debounce } from 'lodash';
-import ms from 'ms';
 
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4d98df851..6c6b7589f 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -4,7 +4,7 @@ import {
   computed,
   observable,
 } from 'mobx';
-import { debounce, remove } from 'lodash';
+import { remove } from 'lodash';
 import ms from 'ms';
 
 import Store from './lib/Store';
@@ -262,8 +262,6 @@ export default class ServicesStore extends Store {
       remove(result, c => c.id === serviceId);
     });
 
-    const service = this.one(serviceId);
-
     await request._promise;
     this.actionStatus = request.result.status;
   }
@@ -385,7 +383,7 @@ export default class ServicesStore extends Store {
         },
       });
     } else if (channel === 'notification') {
-      const options = args[0].options;
+      const { options } = args[0];
       if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) {
         Object.assign(options, {
           silent: true,
@@ -509,7 +507,7 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorderService({ oldIndex, newIndex }) {
-    const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
+    const { showDisabledServices } = this.stores.settings.all.app;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
@@ -603,8 +601,8 @@ export default class ServicesStore extends Store {
   }
 
   _getUnreadMessageCountReaction() {
-    const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted;
-    const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted;
+    const { showMessageBadgeWhenMuted } = this.stores.settings.all.app;
+    const { showMessageBadgesEvenWhenMuted } = this.stores.ui;
 
     const unreadDirectMessageCount = this.allDisplayed
       .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled)
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index bd451661a..d813e97b1 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -232,12 +232,12 @@ export default class UserStore extends Store {
     const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id);
 
     // Install recipes
-    for (const recipe of recipes) {
+    for (const recipe of recipes) { // eslint-disable-line no-unused-vars
       // eslint-disable-next-line
       await this.stores.recipes._install({ recipeId: recipe });
     }
 
-    for (const service of services) {
+    for (const service of services) { // eslint-disable-line no-unused-vars
       this.actions.service.createFromLegacyService({
         data: service,
       });
-- 
cgit v1.2.3-54-g00ecf