diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-07-30 10:54:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-30 14:24:54 +0530 |
commit | f4b4416ea52d564bc2dbe543a82084ed98843ccc (patch) | |
tree | 7ca6b23571c86458a6b799746c91a7191de02715 /src/components/settings | |
parent | 5.6.1-nightly.8 [skip ci] (diff) | |
download | ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.tar.gz ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.tar.zst ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.zip |
chore: migrate from tslint to @typescript-eslint (#1706)
- update .eslintrc to work for .js and .ts
- update devDependencies
- lint properly both root /src and nested /packages
- update webhint recommended setting for tsconfig.json to shrink output
- Manage all eslint rules from the repo root
- escape single quotes in scripts to please windows build
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/components/settings')
5 files changed, 25 insertions, 24 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 56e5f9c94..5e424fdd5 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -266,7 +266,7 @@ export default @observer class EditServiceForm extends Component { | |||
266 | </span> | 266 | </span> |
267 | </div> | 267 | </div> |
268 | <div className="settings__body"> | 268 | <div className="settings__body"> |
269 | <form onSubmit={e => this.submit(e)} id="form"> | 269 | <form onSubmit={(e) => this.submit(e)} id="form"> |
270 | <div className="service-name"> | 270 | <div className="service-name"> |
271 | <Input field={form.$('name')} focus /> | 271 | <Input field={form.$('name')} focus /> |
272 | </div> | 272 | </div> |
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index a05af5da0..11d3eaa79 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js | |||
@@ -96,7 +96,7 @@ export default @observer class ServicesDashboard extends Component { | |||
96 | {(services.length !== 0 || searchNeedle) && !isLoading && ( | 96 | {(services.length !== 0 || searchNeedle) && !isLoading && ( |
97 | <SearchInput | 97 | <SearchInput |
98 | placeholder={intl.formatMessage(messages.searchService)} | 98 | placeholder={intl.formatMessage(messages.searchService)} |
99 | onChange={needle => filterServices({ needle })} | 99 | onChange={(needle) => filterServices({ needle })} |
100 | onReset={() => resetFilter()} | 100 | onReset={() => resetFilter()} |
101 | autoFocus | 101 | autoFocus |
102 | /> | 102 | /> |
@@ -163,7 +163,7 @@ export default @observer class ServicesDashboard extends Component { | |||
163 | ) : ( | 163 | ) : ( |
164 | <table className="service-table"> | 164 | <table className="service-table"> |
165 | <tbody> | 165 | <tbody> |
166 | {services.map(service => ( | 166 | {services.map((service) => ( |
167 | <ServiceItem | 167 | <ServiceItem |
168 | key={service.id} | 168 | key={service.id} |
169 | service={service} | 169 | service={service} |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 7ac644446..339e2dff6 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -266,8 +266,8 @@ export default @observer class EditSettingsForm extends Component { | |||
266 | </div> | 266 | </div> |
267 | <div className="settings__body"> | 267 | <div className="settings__body"> |
268 | <form | 268 | <form |
269 | onSubmit={e => this.submit(e)} | 269 | onSubmit={(e) => this.submit(e)} |
270 | onChange={e => this.submit(e)} | 270 | onChange={(e) => this.submit(e)} |
271 | id="form" | 271 | id="form" |
272 | > | 272 | > |
273 | {/* Titles */} | 273 | {/* Titles */} |
@@ -367,7 +367,7 @@ export default @observer class EditSettingsForm extends Component { | |||
367 | <div> | 367 | <div> |
368 | <Input | 368 | <Input |
369 | placeholder="Todo Server" | 369 | placeholder="Todo Server" |
370 | onChange={e => this.submit(e)} | 370 | onChange={(e) => this.submit(e)} |
371 | field={form.$('customTodoServer')} | 371 | field={form.$('customTodoServer')} |
372 | /> | 372 | /> |
373 | <p | 373 | <p |
@@ -401,7 +401,7 @@ export default @observer class EditSettingsForm extends Component { | |||
401 | > | 401 | > |
402 | <Input | 402 | <Input |
403 | placeholder="17:00" | 403 | placeholder="17:00" |
404 | onChange={e => this.submit(e)} | 404 | onChange={(e) => this.submit(e)} |
405 | field={form.$('scheduledDNDStart')} | 405 | field={form.$('scheduledDNDStart')} |
406 | type="time" | 406 | type="time" |
407 | /> | 407 | /> |
@@ -413,7 +413,7 @@ export default @observer class EditSettingsForm extends Component { | |||
413 | > | 413 | > |
414 | <Input | 414 | <Input |
415 | placeholder="09:00" | 415 | placeholder="09:00" |
416 | onChange={e => this.submit(e)} | 416 | onChange={(e) => this.submit(e)} |
417 | field={form.$('scheduledDNDEnd')} | 417 | field={form.$('scheduledDNDEnd')} |
418 | type="time" | 418 | type="time" |
419 | /> | 419 | /> |
@@ -480,7 +480,7 @@ export default @observer class EditSettingsForm extends Component { | |||
480 | 480 | ||
481 | <Input | 481 | <Input |
482 | placeholder="Accent Color" | 482 | placeholder="Accent Color" |
483 | onChange={e => this.submit(e)} | 483 | onChange={(e) => this.submit(e)} |
484 | field={form.$('accentColor')} | 484 | field={form.$('accentColor')} |
485 | /> | 485 | /> |
486 | <p> | 486 | <p> |
@@ -515,7 +515,7 @@ export default @observer class EditSettingsForm extends Component { | |||
515 | 515 | ||
516 | <Input | 516 | <Input |
517 | placeholder={intl.formatMessage(messages.lockedPassword)} | 517 | placeholder={intl.formatMessage(messages.lockedPassword)} |
518 | onChange={e => this.submit(e)} | 518 | onChange={(e) => this.submit(e)} |
519 | field={form.$('lockedPassword')} | 519 | field={form.$('lockedPassword')} |
520 | type="password" | 520 | type="password" |
521 | scorePassword | 521 | scorePassword |
@@ -527,7 +527,7 @@ export default @observer class EditSettingsForm extends Component { | |||
527 | 527 | ||
528 | <Input | 528 | <Input |
529 | placeholder="Lock after inactivity" | 529 | placeholder="Lock after inactivity" |
530 | onChange={e => this.submit(e)} | 530 | onChange={(e) => this.submit(e)} |
531 | field={form.$('inactivityLock')} | 531 | field={form.$('inactivityLock')} |
532 | autoFocus | 532 | autoFocus |
533 | /> | 533 | /> |
@@ -570,6 +570,7 @@ export default @observer class EditSettingsForm extends Component { | |||
570 | href={FRANZ_TRANSLATION} | 570 | href={FRANZ_TRANSLATION} |
571 | target="_blank" | 571 | target="_blank" |
572 | className="link" | 572 | className="link" |
573 | rel="noreferrer" | ||
573 | > | 574 | > |
574 | {intl.formatMessage(messages.translationHelp)} | 575 | {intl.formatMessage(messages.translationHelp)} |
575 | {' '} | 576 | {' '} |
@@ -588,7 +589,7 @@ export default @observer class EditSettingsForm extends Component { | |||
588 | 589 | ||
589 | <Input | 590 | <Input |
590 | placeholder="User Agent" | 591 | placeholder="User Agent" |
591 | onChange={e => this.submit(e)} | 592 | onChange={(e) => this.submit(e)} |
592 | field={form.$('userAgentPref')} | 593 | field={form.$('userAgentPref')} |
593 | /> | 594 | /> |
594 | <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p> | 595 | <p className="settings__help">{intl.formatMessage(globalMessages.userAgentHelp)}</p> |
@@ -674,12 +675,12 @@ export default @observer class EditSettingsForm extends Component { | |||
674 | 675 | ||
675 | Ferdi is based on | 676 | Ferdi is based on |
676 | {' '} | 677 | {' '} |
677 | <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank">Franz</a> | 678 | <a href={`${GITHUB_FRANZ_URL}/franz`} target="_blank" rel="noreferrer">Franz</a> |
678 | 679 | ||
679 | , a project published | 680 | , a project published |
680 | under the | 681 | under the |
681 | {' '} | 682 | {' '} |
682 | <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank">Apache-2.0 License</a> | 683 | <a href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} target="_blank" rel="noreferrer">Apache-2.0 License</a> |
683 | </span> | 684 | </span> |
684 | <br /> | 685 | <br /> |
685 | <span className="mdi mdi-information" /> | 686 | <span className="mdi mdi-information" /> |
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js index 36c126565..b84e06739 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js | |||
@@ -94,10 +94,10 @@ class SupportFerdiDashboard extends Component { | |||
94 | <h1>{intl.formatMessage(messages.title)}</h1> | 94 | <h1>{intl.formatMessage(messages.title)}</h1> |
95 | <div> | 95 | <div> |
96 | <p className="settings__support-badges"> | 96 | <p className="settings__support-badges"> |
97 | <a href="https://github.com/getferdi/ferdi" target="_blank"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a> | 97 | <a href="https://github.com/getferdi/ferdi" target="_blank" rel="noreferrer"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a> |
98 | <a href="https://twitter.com/getferdi/" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a> | 98 | <a href="https://twitter.com/getferdi/" target="_blank" rel="noreferrer"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a> |
99 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a> | 99 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a> |
100 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a> | 100 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank" rel="noreferrer"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a> |
101 | </p> | 101 | </p> |
102 | <FormattedHTMLMessage {...messages.aboutIntro} /> | 102 | <FormattedHTMLMessage {...messages.aboutIntro} /> |
103 | <br /> | 103 | <br /> |
@@ -109,7 +109,7 @@ class SupportFerdiDashboard extends Component { | |||
109 | </p> | 109 | </p> |
110 | <p> | 110 | <p> |
111 | {intl.formatMessage(messages.textListContributors)} | 111 | {intl.formatMessage(messages.textListContributors)} |
112 | <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link"> | 112 | <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link" rel="noreferrer"> |
113 | {' '} | 113 | {' '} |
114 | {intl.formatMessage(messages.textListContributorsHere)} | 114 | {intl.formatMessage(messages.textListContributorsHere)} |
115 | <i className="mdi mdi-open-in-new" /> | 115 | <i className="mdi mdi-open-in-new" /> |
@@ -122,7 +122,7 @@ class SupportFerdiDashboard extends Component { | |||
122 | </p> | 122 | </p> |
123 | <p> | 123 | <p> |
124 | {intl.formatMessage(messages.textSupportWelcome)} | 124 | {intl.formatMessage(messages.textSupportWelcome)} |
125 | <a href="https://help.getferdi.com/general/support" target="_blank" className="link"> | 125 | <a href="https://help.getferdi.com/general/support" target="_blank" className="link" rel="noreferrer"> |
126 | {' '} | 126 | {' '} |
127 | {intl.formatMessage(messages.textSupportWelcomeHere)} | 127 | {intl.formatMessage(messages.textSupportWelcomeHere)} |
128 | <i className="mdi mdi-open-in-new" /> | 128 | <i className="mdi mdi-open-in-new" /> |
@@ -130,7 +130,7 @@ class SupportFerdiDashboard extends Component { | |||
130 | </p> | 130 | </p> |
131 | <p> | 131 | <p> |
132 | {intl.formatMessage(messages.textExpenses)} | 132 | {intl.formatMessage(messages.textExpenses)} |
133 | <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link"> | 133 | <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link" rel="noreferrer"> |
134 | {' '} | 134 | {' '} |
135 | {intl.formatMessage(messages.textOpenCollective)} | 135 | {intl.formatMessage(messages.textOpenCollective)} |
136 | <i className="mdi mdi-open-in-new" /> | 136 | <i className="mdi mdi-open-in-new" /> |
@@ -138,14 +138,14 @@ class SupportFerdiDashboard extends Component { | |||
138 | </p> | 138 | </p> |
139 | <p> | 139 | <p> |
140 | {intl.formatMessage(messages.textDonation)} | 140 | {intl.formatMessage(messages.textDonation)} |
141 | <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link"> | 141 | <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link" rel="noreferrer"> |
142 | {' '} | 142 | {' '} |
143 | {intl.formatMessage(messages.textOpenCollective)} | 143 | {intl.formatMessage(messages.textOpenCollective)} |
144 | <i className="mdi mdi-open-in-new" /> | 144 | <i className="mdi mdi-open-in-new" /> |
145 | </a> | 145 | </a> |
146 | {' '} | 146 | {' '} |
147 | {intl.formatMessage(messages.textDonationAnd)} | 147 | {intl.formatMessage(messages.textDonationAnd)} |
148 | <a href="https://github.com/sponsors/getferdi" target="_blank" className="link"> | 148 | <a href="https://github.com/sponsors/getferdi" target="_blank" className="link" rel="noreferrer"> |
149 | {' '} | 149 | {' '} |
150 | {intl.formatMessage(messages.textGitHubSponsors)} | 150 | {intl.formatMessage(messages.textGitHubSponsors)} |
151 | <i className="mdi mdi-open-in-new" /> | 151 | <i className="mdi mdi-open-in-new" /> |
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index a1a353e57..db78acb69 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -84,7 +84,7 @@ export default @observer class EditUserForm extends Component { | |||
84 | </span> | 84 | </span> |
85 | </div> | 85 | </div> |
86 | <div className="settings__body"> | 86 | <div className="settings__body"> |
87 | <form onSubmit={e => this.submit(e)} id="form"> | 87 | <form onSubmit={(e) => this.submit(e)} id="form"> |
88 | {status.length > 0 && status.includes('data-updated') && ( | 88 | {status.length > 0 && status.includes('data-updated') && ( |
89 | <Infobox | 89 | <Infobox |
90 | type="success" | 90 | type="success" |