diff options
Diffstat (limited to 'src')
25 files changed, 57 insertions, 63 deletions
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'); | |||
39 | 39 | ||
40 | const SERVER_URL = API; | 40 | const SERVER_URL = API; |
41 | const API_VERSION = 'v1'; | 41 | const API_VERSION = 'v1'; |
42 | const API_URL = `${SERVER_URL}/${API_VERSION}`; | ||
43 | 42 | ||
44 | export default class ServerApi { | 43 | export default class ServerApi { |
45 | recipePreviews = []; | 44 | recipePreviews = []; |
@@ -56,15 +55,15 @@ export default class ServerApi { | |||
56 | let url; | 55 | let url; |
57 | if (!this.stores.settings) { | 56 | if (!this.stores.settings) { |
58 | // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded | 57 | // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded |
59 | url = 'https://localhost:9999' | 58 | url = 'https://localhost:9999'; |
60 | } else if (this.stores.settings.all.app.server) { | 59 | } else if (this.stores.settings.all.app.server) { |
61 | // Load URL from store | 60 | // Load URL from store |
62 | url = this.stores.settings.all.app.server; | 61 | url = this.stores.settings.all.app.server; |
63 | } else { | 62 | } else { |
64 | // Use default server url | 63 | // Use default server url |
65 | url = SERVER_URL; | 64 | url = SERVER_URL; |
66 | } | 65 | } |
67 | 66 | ||
68 | return `${url}/${API_VERSION}`; | 67 | return `${url}/${API_VERSION}`; |
69 | } | 68 | } |
70 | 69 | ||
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 { | |||
51 | <Link to={loginRoute} className="button"> | 51 | <Link to={loginRoute} className="button"> |
52 | {intl.formatMessage(messages.loginButton)} | 52 | {intl.formatMessage(messages.loginButton)} |
53 | </Link> | 53 | </Link> |
54 | <br /><br /> | 54 | <br /> |
55 | <br /> | ||
55 | 56 | ||
56 | <Link to="settings/app"> | 57 | <Link to="settings/app"> |
57 | <span style={{ | 58 | <span style={{ |
58 | textAlign: 'center', | 59 | textAlign: 'center', |
59 | width: '100%', | 60 | width: '100%', |
60 | cursor: 'pointer' | 61 | cursor: 'pointer', |
61 | }}> | 62 | }} |
63 | > | ||
62 | Change server | 64 | Change server |
63 | </span> | 65 | </span> |
64 | </Link> | 66 | </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'; | |||
7 | 7 | ||
8 | import Tabbar from '../services/tabs/Tabbar'; | 8 | import Tabbar from '../services/tabs/Tabbar'; |
9 | import { ctrlKey } from '../../environment'; | 9 | import { ctrlKey } from '../../environment'; |
10 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces'; | 10 | import { workspaceStore } from '../../features/workspaces'; |
11 | 11 | ||
12 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
13 | settings: { | 13 | settings: { |
@@ -107,8 +107,8 @@ export default @observer class Sidebar extends Component { | |||
107 | <i className="mdi mdi-view-grid" /> | 107 | <i className="mdi mdi-view-grid" /> |
108 | </button> | 108 | </button> |
109 | ) : null} | 109 | ) : null} |
110 | 110 | ||
111 | <button | 111 | <button |
112 | type="button" | 112 | type="button" |
113 | onClick={() => { | 113 | onClick={() => { |
114 | toggleMuteApp(); | 114 | toggleMuteApp(); |
@@ -129,15 +129,16 @@ export default @observer class Sidebar extends Component { | |||
129 | </button> | 129 | </button> |
130 | </> | 130 | </> |
131 | ) : ( | 131 | ) : ( |
132 | <Link | 132 | <Link |
133 | to="/auth/welcome" | 133 | to="/auth/welcome" |
134 | className="sidebar__button sidebar__button--new-service" | 134 | className="sidebar__button sidebar__button--new-service" |
135 | data-tip="Login"> | 135 | data-tip="Login" |
136 | <i className="mdi mdi-login-variant" /> | 136 | > |
137 | <i className="mdi mdi-login-variant" /> | ||
137 | </Link> | 138 | </Link> |
138 | ) | 139 | ) |
139 | } | 140 | } |
140 | 141 | ||
141 | <button | 142 | <button |
142 | type="button" | 143 | type="button" |
143 | onClick={() => openSettings({ path: 'app' })} | 144 | 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 { | |||
63 | <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} /> | 63 | <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} /> |
64 | <h1>{intl.formatMessage(messages.welcome)}</h1> | 64 | <h1>{intl.formatMessage(messages.welcome)}</h1> |
65 | { !isLoggedIn && ( | 65 | { !isLoggedIn && ( |
66 | <p>Please open settings, choose a Ferdi server and click "Login" in the bottom left corner.</p> | 66 | <p>Please open settings, choose a Ferdi server and click "Login" in the bottom left corner.</p> |
67 | ) } | 67 | ) } |
68 | <Appear | 68 | <Appear |
69 | timeout={300} | 69 | timeout={300} |
70 | transitionName="slideUp" | 70 | transitionName="slideUp" |
71 | > | 71 | > |
72 | <Link to={ isLoggedIn ? '/settings/services' : '/settings/app' } className="button"> | 72 | <Link to={isLoggedIn ? '/settings/services' : '/settings/app'} className="button"> |
73 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Open settings' } | 73 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Open settings' } |
74 | </Link> | 74 | </Link> |
75 | </Appear> | 75 | </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 | |||
131 | </Link> | 131 | </Link> |
132 | <span className="settings-navigation__expander" /> | 132 | <span className="settings-navigation__expander" /> |
133 | <Link | 133 | <Link |
134 | to={ isLoggedIn ? "/auth/logout" : '/auth/welcome'} | 134 | to={isLoggedIn ? '/auth/logout' : '/auth/welcome'} |
135 | className="settings-navigation__link" | 135 | className="settings-navigation__link" |
136 | > | 136 | > |
137 | { isLoggedIn ? intl.formatMessage(messages.logout) : 'Login'} | 137 | { 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 { | |||
153 | const values = form.values(); | 153 | const values = form.values(); |
154 | let isValid = true; | 154 | let isValid = true; |
155 | 155 | ||
156 | const files = form.$('customIcon').files; | 156 | const { files } = form.$('customIcon'); |
157 | if (files) { | 157 | if (files) { |
158 | values.iconFile = files[0]; | 158 | values.iconFile = files[0]; |
159 | } | 159 | } |
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 { | |||
68 | 68 | ||
69 | const { passwordScore } = this.state; | 69 | const { passwordScore } = this.state; |
70 | 70 | ||
71 | let type = field.type; | 71 | let { type } = field; |
72 | if (type === 'password' && this.state.showPassword) { | 72 | if (type === 'password' && this.state.showPassword) { |
73 | type = 'text'; | 73 | type = 'text'; |
74 | } | 74 | } |
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 { | |||
45 | actions, | 45 | actions, |
46 | condition, | 46 | condition, |
47 | stores, | 47 | stores, |
48 | gaEventInfo, | ||
49 | } = this.props; | 48 | } = this.props; |
50 | 49 | ||
51 | const { intl } = this.context; | 50 | 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 | |||
152 | }, | 152 | }, |
153 | server: { | 153 | server: { |
154 | label: 'Server', | 154 | label: 'Server', |
155 | value: settings.all.app.server || API, | 155 | value: settings.all.app.server || API, |
156 | default: API | 156 | default: API, |
157 | }, | 157 | }, |
158 | showDisabledServices: { | 158 | showDisabledServices: { |
159 | label: intl.formatMessage(messages.showDisabledServices), | 159 | 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 { | |||
227 | <Button | 227 | <Button |
228 | label={announcement.main.cta.label} | 228 | label={announcement.main.cta.label} |
229 | onClick={() => { | 229 | onClick={() => { |
230 | const { analytics } = announcement.main.cta; | ||
231 | window.location.href = `#${announcement.main.cta.href}`; | 230 | window.location.href = `#${announcement.main.cta.href}`; |
232 | }} | 231 | }} |
233 | /> | 232 | /> |
@@ -251,7 +250,6 @@ class AnnouncementScreen extends Component { | |||
251 | <Button | 250 | <Button |
252 | label={announcement.spotlight.cta.label} | 251 | label={announcement.spotlight.cta.label} |
253 | onClick={() => { | 252 | onClick={() => { |
254 | const { analytics } = announcement.spotlight.cta; | ||
255 | window.location.href = `#${announcement.spotlight.cta.href}`; | 253 | window.location.href = `#${announcement.spotlight.cta.href}`; |
256 | }} | 254 | }} |
257 | /> | 255 | /> |
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'; | |||
7 | import localStorage from 'mobx-localstorage'; | 7 | import localStorage from 'mobx-localstorage'; |
8 | 8 | ||
9 | import { FeatureStore } from '../utils/FeatureStore'; | 9 | import { FeatureStore } from '../utils/FeatureStore'; |
10 | import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.'; | 10 | import { ANNOUNCEMENTS_ROUTES } from '.'; |
11 | import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api'; | 11 | import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api'; |
12 | import { announcementActions } from './actions'; | 12 | import { announcementActions } from './actions'; |
13 | import { createActionBindings } from '../utils/ActionBinding'; | 13 | 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'; | |||
6 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
7 | import Form from '../../../lib/Form'; | 7 | import Form from '../../../lib/Form'; |
8 | import { required } from '../../../helpers/validation-helpers'; | 8 | import { required } from '../../../helpers/validation-helpers'; |
9 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index'; | 9 | import { workspaceStore } from '../index'; |
10 | 10 | ||
11 | const messages = defineMessages({ | 11 | const messages = defineMessages({ |
12 | submitButton: { | 12 | 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'; | |||
12 | import { required } from '../../../helpers/validation-helpers'; | 12 | import { required } from '../../../helpers/validation-helpers'; |
13 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; | 13 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; |
14 | import Request from '../../../stores/lib/Request'; | 14 | import Request from '../../../stores/lib/Request'; |
15 | import { GA_CATEGORY_WORKSPACES } from '../index'; | ||
16 | 15 | ||
17 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
18 | buttonDelete: { | 17 | 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'; | |||
9 | 9 | ||
10 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | 10 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; |
11 | import { workspaceActions } from '../actions'; | 11 | import { workspaceActions } from '../actions'; |
12 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index'; | 12 | import { workspaceStore } from '../index'; |
13 | 13 | ||
14 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
15 | headline: { | 15 | 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'; | |||
3 | 3 | ||
4 | // import ServiceModel from '../models/Service'; | 4 | // import ServiceModel from '../models/Service'; |
5 | 5 | ||
6 | const app = remote.app; | 6 | const { app } = remote; |
7 | 7 | ||
8 | export function getRecipeDirectory(id = '') { | 8 | export function getRecipeDirectory(id = '') { |
9 | return path.join(app.getPath('userData'), 'recipes', id); | 9 | 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'; | |||
2 | import { remote } from 'electron'; | 2 | import { remote } from 'electron'; |
3 | import fs from 'fs-extra'; | 3 | import fs from 'fs-extra'; |
4 | 4 | ||
5 | const app = remote.app; | 5 | const { app } = remote; |
6 | 6 | ||
7 | export function getServicePartitionsDirectory() { | 7 | export function getServicePartitionsDirectory() { |
8 | return path.join(app.getPath('userData'), 'Partitions'); | 8 | 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 @@ | |||
4 | "defaultMessage": "!!!Delete workspace", | 4 | "defaultMessage": "!!!Delete workspace", |
5 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 5 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 18, | 7 | "line": 17, |
8 | "column": 16 | 8 | "column": 16 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 21, | 11 | "line": 20, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
@@ -17,11 +17,11 @@ | |||
17 | "defaultMessage": "!!!Save workspace", | 17 | "defaultMessage": "!!!Save workspace", |
18 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 18 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 22, | 20 | "line": 21, |
21 | "column": 14 | 21 | "column": 14 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 25, | 24 | "line": 24, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
@@ -30,11 +30,11 @@ | |||
30 | "defaultMessage": "!!!Name", | 30 | "defaultMessage": "!!!Name", |
31 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 31 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 26, | 33 | "line": 25, |
34 | "column": 8 | 34 | "column": 8 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 29, | 37 | "line": 28, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
@@ -43,11 +43,11 @@ | |||
43 | "defaultMessage": "!!!Your workspaces", | 43 | "defaultMessage": "!!!Your workspaces", |
44 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 44 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 30, | 46 | "line": 29, |
47 | "column": 18 | 47 | "column": 18 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 33, | 50 | "line": 32, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
@@ -56,11 +56,11 @@ | |||
56 | "defaultMessage": "!!!Services in this Workspace", | 56 | "defaultMessage": "!!!Services in this Workspace", |
57 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 57 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 34, | 59 | "line": 33, |
60 | "column": 31 | 60 | "column": 31 |
61 | }, | 61 | }, |
62 | "end": { | 62 | "end": { |
63 | "line": 37, | 63 | "line": 36, |
64 | "column": 3 | 64 | "column": 3 |
65 | } | 65 | } |
66 | }, | 66 | }, |
@@ -69,11 +69,11 @@ | |||
69 | "defaultMessage": "!!!You haven't added any services yet.", | 69 | "defaultMessage": "!!!You haven't added any services yet.", |
70 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 70 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
71 | "start": { | 71 | "start": { |
72 | "line": 38, | 72 | "line": 37, |
73 | "column": 19 | 73 | "column": 19 |
74 | }, | 74 | }, |
75 | "end": { | 75 | "end": { |
76 | "line": 41, | 76 | "line": 40, |
77 | "column": 3 | 77 | "column": 3 |
78 | } | 78 | } |
79 | }, | 79 | }, |
@@ -82,11 +82,11 @@ | |||
82 | "defaultMessage": "!!!Discover services", | 82 | "defaultMessage": "!!!Discover services", |
83 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 83 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
84 | "start": { | 84 | "start": { |
85 | "line": 42, | 85 | "line": 41, |
86 | "column": 20 | 86 | "column": 20 |
87 | }, | 87 | }, |
88 | "end": { | 88 | "end": { |
89 | "line": 45, | 89 | "line": 44, |
90 | "column": 3 | 90 | "column": 3 |
91 | } | 91 | } |
92 | } | 92 | } |
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 = () => { | |||
187 | mainWindow.webContents.on('did-finish-load', () => { | 187 | mainWindow.webContents.on('did-finish-load', () => { |
188 | const fns = onDidLoadFns; | 188 | const fns = onDidLoadFns; |
189 | onDidLoadFns = null; | 189 | onDidLoadFns = null; |
190 | for (const fn of fns) { | 190 | for (const fn of fns) { // eslint-disable-line no-unused-vars |
191 | fn(mainWindow); | 191 | fn(mainWindow); |
192 | } | 192 | } |
193 | }); | 193 | }); |
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'; | |||
3 | import { defineMessages } from 'react-intl'; | 3 | import { defineMessages } from 'react-intl'; |
4 | 4 | ||
5 | import { isMac, ctrlKey, cmdKey } from '../environment'; | 5 | import { isMac, ctrlKey, cmdKey } from '../environment'; |
6 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../features/workspaces/index'; | 6 | import { workspaceStore } from '../features/workspaces/index'; |
7 | import { workspaceActions } from '../features/workspaces/actions'; | 7 | import { workspaceActions } from '../features/workspaces/actions'; |
8 | import { announcementActions } from '../features/announcements/actions'; | 8 | import { announcementActions } from '../features/announcements/actions'; |
9 | import { announcementsStore } from '../features/announcements'; | 9 | import { announcementsStore } from '../features/announcements'; |
@@ -909,7 +909,7 @@ export default class FranzMenu { | |||
909 | return service.name; | 909 | return service.name; |
910 | } | 910 | } |
911 | 911 | ||
912 | let name = service.recipe.name; | 912 | let { name } = service.recipe; |
913 | 913 | ||
914 | if (service.team) { | 914 | if (service.team) { |
915 | name = `${name} (${service.team})`; | 915 | 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 { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | _getAsset(type, asset) { | 86 | _getAsset(type, asset) { |
87 | let platform = process.platform; | 87 | let { platform } = process; |
88 | 88 | ||
89 | if (platform === 'darwin' && systemPreferences.isDarkMode()) { | 89 | if (platform === 'darwin' && systemPreferences.isDarkMode()) { |
90 | platform = `${platform}-dark`; | 90 | 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 { | |||
162 | } | 162 | } |
163 | 163 | ||
164 | @computed get userAgent() { | 164 | @computed get userAgent() { |
165 | let userAgent = window.navigator.userAgent; | 165 | let { userAgent } = window.navigator; |
166 | if (typeof this.recipe.overrideUserAgent === 'function') { | 166 | if (typeof this.recipe.overrideUserAgent === 'function') { |
167 | userAgent = this.recipe.overrideUserAgent(); | 167 | userAgent = this.recipe.overrideUserAgent(); |
168 | } | 168 | } |
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 @@ | |||
1 | import { remote, ipcRenderer, shell } from 'electron'; | 1 | import { remote, ipcRenderer, shell } from 'electron'; |
2 | import { | 2 | import { |
3 | action, computed, observable, reaction, | 3 | action, computed, observable, |
4 | } from 'mobx'; | 4 | } from 'mobx'; |
5 | import moment from 'moment'; | 5 | import moment from 'moment'; |
6 | import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; | 6 | import { getDoNotDisturb } from '@meetfranz/electron-notification-state'; |
@@ -358,7 +358,7 @@ export default class AppStore extends Store { | |||
358 | } | 358 | } |
359 | 359 | ||
360 | _muteAppHandler() { | 360 | _muteAppHandler() { |
361 | const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted; | 361 | const { showMessageBadgesEvenWhenMuted } = this.stores.ui; |
362 | 362 | ||
363 | if (!showMessageBadgesEvenWhenMuted) { | 363 | if (!showMessageBadgesEvenWhenMuted) { |
364 | this.actions.app.setBadge({ unreadDirectMessageCount: 0, unreadIndirectMessageCount: 0 }); | 364 | 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 @@ | |||
1 | import { action, computed, observable } from 'mobx'; | 1 | import { action, computed, observable } from 'mobx'; |
2 | import { debounce } from 'lodash'; | ||
3 | import ms from 'ms'; | ||
4 | 2 | ||
5 | import Store from './lib/Store'; | 3 | import Store from './lib/Store'; |
6 | import CachedRequest from './lib/CachedRequest'; | 4 | 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 { | |||
4 | computed, | 4 | computed, |
5 | observable, | 5 | observable, |
6 | } from 'mobx'; | 6 | } from 'mobx'; |
7 | import { debounce, remove } from 'lodash'; | 7 | import { remove } from 'lodash'; |
8 | import ms from 'ms'; | 8 | import ms from 'ms'; |
9 | 9 | ||
10 | import Store from './lib/Store'; | 10 | import Store from './lib/Store'; |
@@ -262,8 +262,6 @@ export default class ServicesStore extends Store { | |||
262 | remove(result, c => c.id === serviceId); | 262 | remove(result, c => c.id === serviceId); |
263 | }); | 263 | }); |
264 | 264 | ||
265 | const service = this.one(serviceId); | ||
266 | |||
267 | await request._promise; | 265 | await request._promise; |
268 | this.actionStatus = request.result.status; | 266 | this.actionStatus = request.result.status; |
269 | } | 267 | } |
@@ -385,7 +383,7 @@ export default class ServicesStore extends Store { | |||
385 | }, | 383 | }, |
386 | }); | 384 | }); |
387 | } else if (channel === 'notification') { | 385 | } else if (channel === 'notification') { |
388 | const options = args[0].options; | 386 | const { options } = args[0]; |
389 | if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) { | 387 | if (service.recipe.hasNotificationSound || service.isMuted || this.stores.settings.all.app.isAppMuted) { |
390 | Object.assign(options, { | 388 | Object.assign(options, { |
391 | silent: true, | 389 | silent: true, |
@@ -509,7 +507,7 @@ export default class ServicesStore extends Store { | |||
509 | } | 507 | } |
510 | 508 | ||
511 | @action _reorderService({ oldIndex, newIndex }) { | 509 | @action _reorderService({ oldIndex, newIndex }) { |
512 | const showDisabledServices = this.stores.settings.all.app.showDisabledServices; | 510 | const { showDisabledServices } = this.stores.settings.all.app; |
513 | const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]); | 511 | const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]); |
514 | const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]); | 512 | const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]); |
515 | 513 | ||
@@ -603,8 +601,8 @@ export default class ServicesStore extends Store { | |||
603 | } | 601 | } |
604 | 602 | ||
605 | _getUnreadMessageCountReaction() { | 603 | _getUnreadMessageCountReaction() { |
606 | const showMessageBadgeWhenMuted = this.stores.settings.all.app.showMessageBadgeWhenMuted; | 604 | const { showMessageBadgeWhenMuted } = this.stores.settings.all.app; |
607 | const showMessageBadgesEvenWhenMuted = this.stores.ui.showMessageBadgesEvenWhenMuted; | 605 | const { showMessageBadgesEvenWhenMuted } = this.stores.ui; |
608 | 606 | ||
609 | const unreadDirectMessageCount = this.allDisplayed | 607 | const unreadDirectMessageCount = this.allDisplayed |
610 | .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) | 608 | .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 { | |||
232 | const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id); | 232 | const recipes = services.filter((obj, pos, arr) => arr.map(mapObj => mapObj.recipe.id).indexOf(obj.recipe.id) === pos).map(s => s.recipe.id); |
233 | 233 | ||
234 | // Install recipes | 234 | // Install recipes |
235 | for (const recipe of recipes) { | 235 | for (const recipe of recipes) { // eslint-disable-line no-unused-vars |
236 | // eslint-disable-next-line | 236 | // eslint-disable-next-line |
237 | await this.stores.recipes._install({ recipeId: recipe }); | 237 | await this.stores.recipes._install({ recipeId: recipe }); |
238 | } | 238 | } |
239 | 239 | ||
240 | for (const service of services) { | 240 | for (const service of services) { // eslint-disable-line no-unused-vars |
241 | this.actions.service.createFromLegacyService({ | 241 | this.actions.service.createFromLegacyService({ |
242 | data: service, | 242 | data: service, |
243 | }); | 243 | }); |