diff options
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/basicAuth/mainIpcHandler.ts | 4 | ||||
-rw-r--r-- | src/features/publishDebugInfo/Component.js | 20 | ||||
-rw-r--r-- | src/features/publishDebugInfo/index.ts | 4 | ||||
-rw-r--r-- | src/features/quickSwitch/index.ts | 4 | ||||
-rw-r--r-- | src/features/serviceProxy/index.ts | 4 | ||||
-rw-r--r-- | src/features/todos/preload.ts | 4 | ||||
-rw-r--r-- | src/features/workspaces/actions.ts | 2 | ||||
-rw-r--r-- | src/features/workspaces/api.ts | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/EditWorkspaceForm.js | 5 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 4 |
10 files changed, 32 insertions, 23 deletions
diff --git a/src/features/basicAuth/mainIpcHandler.ts b/src/features/basicAuth/mainIpcHandler.ts index 5d320df5c..d9cedc974 100644 --- a/src/features/basicAuth/mainIpcHandler.ts +++ b/src/features/basicAuth/mainIpcHandler.ts | |||
@@ -1,6 +1,8 @@ | |||
1 | import { BrowserWindow } from 'electron'; | 1 | import { BrowserWindow } from 'electron'; |
2 | 2 | ||
3 | const debug = require('../../preload-safe-debug')('Ferdium:feature:basicAuth:main'); | 3 | const debug = require('../../preload-safe-debug')( |
4 | 'Ferdium:feature:basicAuth:main', | ||
5 | ); | ||
4 | 6 | ||
5 | export default function mainIpcHandler(mainWindow: BrowserWindow, authInfo) { | 7 | export default function mainIpcHandler(mainWindow: BrowserWindow, authInfo) { |
6 | debug('Sending basic auth call', authInfo); | 8 | debug('Sending basic auth call', authInfo); |
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index 1668ea79a..27661d917 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js | |||
@@ -14,7 +14,9 @@ import { DEBUG_API } from '../../config'; | |||
14 | import AppStore from '../../stores/AppStore'; | 14 | import AppStore from '../../stores/AppStore'; |
15 | import ServicesStore from '../../stores/ServicesStore'; | 15 | import ServicesStore from '../../stores/ServicesStore'; |
16 | 16 | ||
17 | const debug = require('../../preload-safe-debug')('Ferdium:feature:publishDebugInfo'); | 17 | const debug = require('../../preload-safe-debug')( |
18 | 'Ferdium:feature:publishDebugInfo', | ||
19 | ); | ||
18 | 20 | ||
19 | const messages = defineMessages({ | 21 | const messages = defineMessages({ |
20 | title: { | 22 | title: { |
@@ -89,7 +91,7 @@ class PublishDebugLogModal extends Component { | |||
89 | this.setState({ | 91 | this.setState({ |
90 | log: null, | 92 | log: null, |
91 | error: false, | 93 | error: false, |
92 | isSendingLog: false | 94 | isSendingLog: false, |
93 | }); | 95 | }); |
94 | } | 96 | } |
95 | 97 | ||
@@ -149,17 +151,15 @@ class PublishDebugLogModal extends Component { | |||
149 | className={`${classes.modal} publish-debug`} | 151 | className={`${classes.modal} publish-debug`} |
150 | close={() => this.close()} | 152 | close={() => this.close()} |
151 | > | 153 | > |
152 | <H1 className={classes.headline}>{intl.formatMessage(messages.title)}</H1> | 154 | <H1 className={classes.headline}> |
155 | {intl.formatMessage(messages.title)} | ||
156 | </H1> | ||
153 | {log && ( | 157 | {log && ( |
154 | <> | 158 | <> |
155 | <p className={classes.info}> | 159 | <p className={classes.info}> |
156 | {intl.formatMessage(messages.published)} | 160 | {intl.formatMessage(messages.published)} |
157 | </p> | 161 | </p> |
158 | <Input | 162 | <Input showLabel={false} value={`${DEBUG_API}/${log}`} readonly /> |
159 | showLabel={false} | ||
160 | value={`${DEBUG_API}/${log}`} | ||
161 | readonly | ||
162 | /> | ||
163 | </> | 163 | </> |
164 | )} | 164 | )} |
165 | 165 | ||
@@ -169,9 +169,7 @@ class PublishDebugLogModal extends Component { | |||
169 | 169 | ||
170 | {!log && !error && ( | 170 | {!log && !error && ( |
171 | <> | 171 | <> |
172 | <p className={classes.info}> | 172 | <p className={classes.info}>{intl.formatMessage(messages.info)}</p> |
173 | {intl.formatMessage(messages.info)} | ||
174 | </p> | ||
175 | 173 | ||
176 | <a | 174 | <a |
177 | href={`${DEBUG_API}/privacy.html`} | 175 | href={`${DEBUG_API}/privacy.html`} |
diff --git a/src/features/publishDebugInfo/index.ts b/src/features/publishDebugInfo/index.ts index 597bcdc12..80714a104 100644 --- a/src/features/publishDebugInfo/index.ts +++ b/src/features/publishDebugInfo/index.ts | |||
@@ -3,7 +3,9 @@ import { state as ModalState } from './store'; | |||
3 | export { default as Component } from './Component'; | 3 | export { default as Component } from './Component'; |
4 | 4 | ||
5 | const state = ModalState; | 5 | const state = ModalState; |
6 | const debug = require('../../preload-safe-debug')('Ferdium:feature:publishDebugInfo'); | 6 | const debug = require('../../preload-safe-debug')( |
7 | 'Ferdium:feature:publishDebugInfo', | ||
8 | ); | ||
7 | 9 | ||
8 | export default function initialize() { | 10 | export default function initialize() { |
9 | debug('Initialize publishDebugInfo feature'); | 11 | debug('Initialize publishDebugInfo feature'); |
diff --git a/src/features/quickSwitch/index.ts b/src/features/quickSwitch/index.ts index 9d53d0b2f..e6ee66e16 100644 --- a/src/features/quickSwitch/index.ts +++ b/src/features/quickSwitch/index.ts | |||
@@ -3,7 +3,9 @@ import { state as ModalState } from './store'; | |||
3 | export { default as Component } from './Component'; | 3 | export { default as Component } from './Component'; |
4 | const state = ModalState; | 4 | const state = ModalState; |
5 | 5 | ||
6 | const debug = require('../../preload-safe-debug')('Ferdium:feature:quickSwitch'); | 6 | const debug = require('../../preload-safe-debug')( |
7 | 'Ferdium:feature:quickSwitch', | ||
8 | ); | ||
7 | 9 | ||
8 | export default function initialize() { | 10 | export default function initialize() { |
9 | debug('Initialize quickSwitch feature'); | 11 | debug('Initialize quickSwitch feature'); |
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts index e0d667a72..51e67feca 100644 --- a/src/features/serviceProxy/index.ts +++ b/src/features/serviceProxy/index.ts | |||
@@ -1,7 +1,9 @@ | |||
1 | import { autorun, observable } from 'mobx'; | 1 | import { autorun, observable } from 'mobx'; |
2 | import { session } from '@electron/remote'; | 2 | import { session } from '@electron/remote'; |
3 | 3 | ||
4 | const debug = require('../../preload-safe-debug')('Ferdium:feature:serviceProxy'); | 4 | const debug = require('../../preload-safe-debug')( |
5 | 'Ferdium:feature:serviceProxy', | ||
6 | ); | ||
5 | 7 | ||
6 | export const config = observable({ | 8 | export const config = observable({ |
7 | isEnabled: true, | 9 | isEnabled: true, |
diff --git a/src/features/todos/preload.ts b/src/features/todos/preload.ts index 6c8bc1aea..0d76efd7a 100644 --- a/src/features/todos/preload.ts +++ b/src/features/todos/preload.ts | |||
@@ -1,7 +1,9 @@ | |||
1 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { IPC } from './constants'; | 2 | import { IPC } from './constants'; |
3 | 3 | ||
4 | const debug = require('../../preload-safe-debug')('Ferdium:feature:todos:preload'); | 4 | const debug = require('../../preload-safe-debug')( |
5 | 'Ferdium:feature:todos:preload', | ||
6 | ); | ||
5 | 7 | ||
6 | debug('Preloading Todos Webview'); | 8 | debug('Preloading Todos Webview'); |
7 | 9 | ||
diff --git a/src/features/workspaces/actions.ts b/src/features/workspaces/actions.ts index b7f8b6b90..b4e1d0758 100644 --- a/src/features/workspaces/actions.ts +++ b/src/features/workspaces/actions.ts | |||
@@ -24,5 +24,5 @@ export default createActionsFromDefinitions( | |||
24 | openWorkspaceSettings: {}, | 24 | openWorkspaceSettings: {}, |
25 | toggleKeepAllWorkspacesLoadedSetting: {}, | 25 | toggleKeepAllWorkspacesLoadedSetting: {}, |
26 | }, | 26 | }, |
27 | PropTypes.checkPropTypes | 27 | PropTypes.checkPropTypes, |
28 | ); | 28 | ); |
diff --git a/src/features/workspaces/api.ts b/src/features/workspaces/api.ts index fb752c565..b8bb703cd 100644 --- a/src/features/workspaces/api.ts +++ b/src/features/workspaces/api.ts | |||
@@ -4,7 +4,9 @@ import Request from '../../stores/lib/Request'; | |||
4 | import Workspace from './models/Workspace'; | 4 | import Workspace from './models/Workspace'; |
5 | import apiBase from '../../api/apiBase'; | 5 | import apiBase from '../../api/apiBase'; |
6 | 6 | ||
7 | const debug = require('../../preload-safe-debug')('Ferdium:feature:workspaces:api'); | 7 | const debug = require('../../preload-safe-debug')( |
8 | 'Ferdium:feature:workspaces:api', | ||
9 | ); | ||
8 | 10 | ||
9 | export const workspaceApi = { | 11 | export const workspaceApi = { |
10 | getUserWorkspaces: async () => { | 12 | getUserWorkspaces: async () => { |
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index 7e8541c44..6bc9ae6f0 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -170,10 +170,7 @@ class EditWorkspaceForm extends Component { | |||
170 | </div> | 170 | </div> |
171 | <div className="settings__body"> | 171 | <div className="settings__body"> |
172 | {updateWorkspaceRequest.error && ( | 172 | {updateWorkspaceRequest.error && ( |
173 | <Infobox | 173 | <Infobox icon="alert" type="danger"> |
174 | icon="alert" | ||
175 | type="danger" | ||
176 | > | ||
177 | Error while saving workspace | 174 | Error while saving workspace |
178 | </Infobox> | 175 | </Infobox> |
179 | )} | 176 | )} |
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index e8c5d0590..a8fb493df 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -15,7 +15,9 @@ import { createActionBindings } from '../utils/ActionBinding'; | |||
15 | 15 | ||
16 | import { KEEP_WS_LOADED_USID } from '../../config'; | 16 | import { KEEP_WS_LOADED_USID } from '../../config'; |
17 | 17 | ||
18 | const debug = require('../../preload-safe-debug')('Ferdium:feature:workspaces:store'); | 18 | const debug = require('../../preload-safe-debug')( |
19 | 'Ferdium:feature:workspaces:store', | ||
20 | ); | ||
19 | 21 | ||
20 | export default class WorkspacesStore extends FeatureStore { | 22 | export default class WorkspacesStore extends FeatureStore { |
21 | @observable isFeatureActive = false; | 23 | @observable isFeatureActive = false; |