diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-07-02 19:49:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-03 07:19:55 +0530 |
commit | 33123c354b79f7951423dd75097b11e7eb075f99 (patch) | |
tree | 29f6e857f02d0e0fc67d89a657a54a865ed5538a /src/components/settings/services | |
parent | Minor refactoring to move all runtime configs from 'config.js' into 'environm... (diff) | |
download | ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.gz ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.tar.zst ferdium-app-33123c354b79f7951423dd75097b11e7eb075f99.zip |
Upgrade various dependencies to latest part 2 (#1557)
* Upgrade various dependencies to latest, remove unnecessary electron-hunspell
- upgrade eslint and friends to latest
- remove deprecated 'node-sass' in favor of 'sass'
- disable new rules from 'eslint-config-airbnb' that are conflicting with current code style
- add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote
* Run yarn lint to autofix with new ruleset and worked down lint issues to zero
Diffstat (limited to 'src/components/settings/services')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 1bbc1f1d4..a8501670b 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -311,14 +311,14 @@ export default @observer class EditServiceForm extends Component { | |||
311 | {recipe.hasCustomUrl && ( | 311 | {recipe.hasCustomUrl && ( |
312 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> | 312 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> |
313 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( | 313 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( |
314 | <Fragment> | 314 | <> |
315 | <Input field={form.$('customUrl')} /> | 315 | <Input field={form.$('customUrl')} /> |
316 | {form.error === 'url-validation-error' && ( | 316 | {form.error === 'url-validation-error' && ( |
317 | <p className="franz-form__error"> | 317 | <p className="franz-form__error"> |
318 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} | 318 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} |
319 | </p> | 319 | </p> |
320 | )} | 320 | )} |
321 | </Fragment> | 321 | </> |
322 | ) : ( | 322 | ) : ( |
323 | <div className="center premium-info"> | 323 | <div className="center premium-info"> |
324 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> | 324 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> |
@@ -360,12 +360,12 @@ export default @observer class EditServiceForm extends Component { | |||
360 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> | 360 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> |
361 | <Toggle field={form.$('isBadgeEnabled')} /> | 361 | <Toggle field={form.$('isBadgeEnabled')} /> |
362 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( | 362 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( |
363 | <Fragment> | 363 | <> |
364 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> | 364 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> |
365 | <p className="settings__help"> | 365 | <p className="settings__help"> |
366 | {intl.formatMessage(messages.indirectMessageInfo)} | 366 | {intl.formatMessage(messages.indirectMessageInfo)} |
367 | </p> | 367 | </p> |
368 | </Fragment> | 368 | </> |
369 | )} | 369 | )} |
370 | </div> | 370 | </div> |
371 | 371 | ||
@@ -389,8 +389,7 @@ export default @observer class EditServiceForm extends Component { | |||
389 | <Slider field={form.$('darkReaderContrast')} /> | 389 | <Slider field={form.$('darkReaderContrast')} /> |
390 | <Slider field={form.$('darkReaderSepia')} /> | 390 | <Slider field={form.$('darkReaderSepia')} /> |
391 | </> | 391 | </> |
392 | ) | 392 | )} |
393 | } | ||
394 | </div> | 393 | </div> |
395 | </div> | 394 | </div> |
396 | <div className="service-icon"> | 395 | <div className="service-icon"> |
@@ -425,7 +424,7 @@ export default @observer class EditServiceForm extends Component { | |||
425 | </h3> | 424 | </h3> |
426 | <Toggle field={form.$('proxy.isEnabled')} /> | 425 | <Toggle field={form.$('proxy.isEnabled')} /> |
427 | {form.$('proxy.isEnabled').value && ( | 426 | {form.$('proxy.isEnabled').value && ( |
428 | <Fragment> | 427 | <> |
429 | <div className="grid"> | 428 | <div className="grid"> |
430 | <div className="grid__row"> | 429 | <div className="grid__row"> |
431 | <Input field={form.$('proxy.host')} className="proxyHost" /> | 430 | <Input field={form.$('proxy.host')} className="proxyHost" /> |
@@ -449,7 +448,7 @@ export default @observer class EditServiceForm extends Component { | |||
449 | <span className="mdi mdi-information" /> | 448 | <span className="mdi mdi-information" /> |
450 | {intl.formatMessage(messages.proxyInfo)} | 449 | {intl.formatMessage(messages.proxyInfo)} |
451 | </p> | 450 | </p> |
452 | </Fragment> | 451 | </> |
453 | )} | 452 | )} |
454 | </div> | 453 | </div> |
455 | </PremiumFeatureContainer> | 454 | </PremiumFeatureContainer> |