diff options
author | kytwb <kytwb@pm.me> | 2021-12-18 04:24:10 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2021-12-18 04:24:10 +0100 |
commit | 18494f66a7e0f4020cbc77374d4679421fcf469a (patch) | |
tree | cfd10fb71ca86f4d0580946cee2ccbc8c66dc634 /src/components | |
parent | Fix linter (diff) | |
download | ferdium-app-18494f66a7e0f4020cbc77374d4679421fcf469a.tar.gz ferdium-app-18494f66a7e0f4020cbc77374d4679421fcf469a.tar.zst ferdium-app-18494f66a7e0f4020cbc77374d4679421fcf469a.zip |
Refactor autoUpdater usage
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 14 | ||||
-rw-r--r-- | src/components/ui/ToggleRaw.js | 76 |
3 files changed, 0 insertions, 92 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 084d93ecd..b47a6040d 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -10,7 +10,6 @@ import { mdiFlash, mdiPowerPlug } from '@mdi/js'; | |||
10 | import InfoBar from '../ui/InfoBar'; | 10 | import InfoBar from '../ui/InfoBar'; |
11 | import { Component as BasicAuth } from '../../features/basicAuth'; | 11 | import { Component as BasicAuth } from '../../features/basicAuth'; |
12 | import { Component as QuickSwitch } from '../../features/quickSwitch'; | 12 | import { Component as QuickSwitch } from '../../features/quickSwitch'; |
13 | import { Component as NightlyBuilds } from '../../features/nightlyBuilds'; | ||
14 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; | 13 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; |
15 | import ErrorBoundary from '../util/ErrorBoundary'; | 14 | import ErrorBoundary from '../util/ErrorBoundary'; |
16 | 15 | ||
@@ -193,7 +192,6 @@ class AppLayout extends Component { | |||
193 | )} | 192 | )} |
194 | <BasicAuth /> | 193 | <BasicAuth /> |
195 | <QuickSwitch /> | 194 | <QuickSwitch /> |
196 | <NightlyBuilds /> | ||
197 | <PublishDebugInfo /> | 195 | <PublishDebugInfo /> |
198 | {services} | 196 | {services} |
199 | {children} | 197 | {children} |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index eab65f5e5..d17c804f0 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -9,7 +9,6 @@ import { mdiGithub, mdiOpenInNew } from '@mdi/js'; | |||
9 | import Form from '../../../lib/Form'; | 9 | import Form from '../../../lib/Form'; |
10 | import Button from '../../ui/Button'; | 10 | import Button from '../../ui/Button'; |
11 | import Toggle from '../../ui/Toggle'; | 11 | import Toggle from '../../ui/Toggle'; |
12 | import ToggleRaw from '../../ui/ToggleRaw'; | ||
13 | import Select from '../../ui/Select'; | 12 | import Select from '../../ui/Select'; |
14 | import Input from '../../ui/Input'; | 13 | import Input from '../../ui/Input'; |
15 | import Infobox from '../../ui/Infobox'; | 14 | import Infobox from '../../ui/Infobox'; |
@@ -203,7 +202,6 @@ class EditSettingsForm extends Component { | |||
203 | isDarkmodeEnabled: PropTypes.bool.isRequired, | 202 | isDarkmodeEnabled: PropTypes.bool.isRequired, |
204 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, | 203 | isAdaptableDarkModeEnabled: PropTypes.bool.isRequired, |
205 | isSplitModeEnabled: PropTypes.bool.isRequired, | 204 | isSplitModeEnabled: PropTypes.bool.isRequired, |
206 | isNightlyEnabled: PropTypes.bool.isRequired, | ||
207 | hasAddedTodosAsService: PropTypes.bool.isRequired, | 205 | hasAddedTodosAsService: PropTypes.bool.isRequired, |
208 | isOnline: PropTypes.bool.isRequired, | 206 | isOnline: PropTypes.bool.isRequired, |
209 | }; | 207 | }; |
@@ -252,7 +250,6 @@ class EditSettingsForm extends Component { | |||
252 | isDarkmodeEnabled, | 250 | isDarkmodeEnabled, |
253 | isSplitModeEnabled, | 251 | isSplitModeEnabled, |
254 | isTodosActivated, | 252 | isTodosActivated, |
255 | isNightlyEnabled, | ||
256 | hasAddedTodosAsService, | 253 | hasAddedTodosAsService, |
257 | isOnline, | 254 | isOnline, |
258 | } = this.props; | 255 | } = this.props; |
@@ -770,17 +767,6 @@ class EditSettingsForm extends Component { | |||
770 | {automaticUpdates && ( | 767 | {automaticUpdates && ( |
771 | <div> | 768 | <div> |
772 | <Toggle field={form.$('beta')} /> | 769 | <Toggle field={form.$('beta')} /> |
773 | <ToggleRaw | ||
774 | field={{ | ||
775 | value: isNightlyEnabled, | ||
776 | id: 'nightly', | ||
777 | label: 'Include nightly versions', | ||
778 | name: 'Nightly builds', | ||
779 | }} | ||
780 | onChange={ | ||
781 | window['ferdi'].features.nightlyBuilds.toggleFeature | ||
782 | } | ||
783 | /> | ||
784 | {updateIsReadyToInstall ? ( | 770 | {updateIsReadyToInstall ? ( |
785 | <Button | 771 | <Button |
786 | label={intl.formatMessage(messages.buttonInstallUpdate)} | 772 | label={intl.formatMessage(messages.buttonInstallUpdate)} |
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js deleted file mode 100644 index e482b97b4..000000000 --- a/src/components/ui/ToggleRaw.js +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | /** | ||
2 | * "Raw" Toggle - for usage without a MobX Form element | ||
3 | */ | ||
4 | import { Component } from 'react'; | ||
5 | import PropTypes from 'prop-types'; | ||
6 | import { observer } from 'mobx-react'; | ||
7 | import classnames from 'classnames'; | ||
8 | |||
9 | class ToggleRaw extends Component { | ||
10 | static propTypes = { | ||
11 | onChange: PropTypes.func.isRequired, | ||
12 | field: PropTypes.shape({ | ||
13 | value: PropTypes.bool.isRequired, | ||
14 | id: PropTypes.string, | ||
15 | name: PropTypes.string, | ||
16 | label: PropTypes.string, | ||
17 | error: PropTypes.string, | ||
18 | }).isRequired, | ||
19 | className: PropTypes.string, | ||
20 | showLabel: PropTypes.bool, | ||
21 | disabled: PropTypes.bool, | ||
22 | }; | ||
23 | |||
24 | static defaultProps = { | ||
25 | className: '', | ||
26 | showLabel: true, | ||
27 | disabled: false, | ||
28 | }; | ||
29 | |||
30 | onChange(e) { | ||
31 | const { onChange } = this.props; | ||
32 | |||
33 | onChange(e); | ||
34 | } | ||
35 | |||
36 | render() { | ||
37 | const { field, className, showLabel, disabled } = this.props; | ||
38 | |||
39 | return ( | ||
40 | <div | ||
41 | className={classnames([ | ||
42 | 'franz-form__field', | ||
43 | 'franz-form__toggle-wrapper', | ||
44 | 'franz-form__toggle-disabled', | ||
45 | className, | ||
46 | ])} | ||
47 | > | ||
48 | <label | ||
49 | htmlFor={field.id} | ||
50 | className={classnames({ | ||
51 | 'franz-form__toggle': true, | ||
52 | 'is-active': field.value, | ||
53 | })} | ||
54 | > | ||
55 | <div className="franz-form__toggle-button" /> | ||
56 | <input | ||
57 | type="checkbox" | ||
58 | id={field.id} | ||
59 | name={field.name} | ||
60 | value={field.name} | ||
61 | checked={field.value} | ||
62 | onChange={e => (!disabled ? this.onChange(e) : null)} | ||
63 | /> | ||
64 | </label> | ||
65 | {field.error && <div className={field.error}>{field.error}</div>} | ||
66 | {field.label && showLabel && ( | ||
67 | <label className="franz-form__label" htmlFor={field.id}> | ||
68 | {field.label} | ||
69 | </label> | ||
70 | )} | ||
71 | </div> | ||
72 | ); | ||
73 | } | ||
74 | } | ||
75 | |||
76 | export default observer(ToggleRaw); | ||