From f4b4416ea52d564bc2dbe543a82084ed98843ccc Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 30 Jul 2021 10:54:54 +0200 Subject: 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 --- src/components/auth/AuthLayout.js | 28 ++++++++++++++++++++-------- src/components/auth/ChangeServer.js | 4 ++-- src/components/auth/Locked.js | 2 +- src/components/auth/Login.js | 2 +- src/components/auth/Password.js | 2 +- src/components/auth/SetupAssistant.js | 10 +++++----- src/components/auth/Signup.js | 2 +- src/components/auth/Welcome.js | 2 +- 8 files changed, 32 insertions(+), 20 deletions(-) (limited to 'src/components/auth') diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 6fa3adf92..c0e6b982b 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -7,14 +7,19 @@ import { TitleBar } from 'electron-react-titlebar'; import Link from '../ui/Link'; import InfoBar from '../ui/InfoBar'; -import { oneOrManyChildElements, globalError as globalErrorPropType } from '../../prop-types'; +import { + oneOrManyChildElements, + globalError as globalErrorPropType, +} from '../../prop-types'; import globalMessages from '../../i18n/globalMessages'; import { isWindows } from '../../environment'; import AppUpdateInfoBar from '../AppUpdateInfoBar'; import { GITHUB_FERDI_URL } from '../../config'; -export default @observer class AuthLayout extends Component { +export default +@observer +class AuthLayout extends Component { static propTypes = { children: oneOrManyChildElements.isRequired, error: globalErrorPropType.isRequired, @@ -30,7 +35,7 @@ export default @observer class AuthLayout extends Component { state = { shouldShowAppUpdateInfoBar: true, - } + }; static defaultProps = { nextAppReleaseVersion: null, @@ -57,12 +62,15 @@ export default @observer class AuthLayout extends Component { return ( <> - {isWindows && !isFullScreen && } + {isWindows && !isFullScreen && ( + + )}
{!isOnline && ( - + {intl.formatMessage(globalMessages.notConnectedToTheInternet)} @@ -95,7 +103,11 @@ export default @observer class AuthLayout extends Component { })}
{/* */} - + diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 0dedd825a..7bab80280 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js @@ -100,7 +100,7 @@ export default @observer class ChangeServer extends Component { const { intl } = this.context; return (
-
this.submit(e)}> + this.submit(e)}>

{intl.formatMessage(messages.headline)}

{form.$('server').value === this.franzServer && ( @@ -113,7 +113,7 @@ export default @observer class ChangeServer extends Component { && ( this.submit(e)} + onChange={(e) => this.submit(e)} field={form.$('customServer')} /> )} diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 1fdbea595..2ad8a2409 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js @@ -102,7 +102,7 @@ export default @observer class Locked extends Component { return (
- this.submit(e)}> + this.submit(e)}> - this.submit(e)}> + this.submit(e)}> - this.submit(e)}> + this.submit(e)}> ({ +const styles = (theme) => ({ root: { width: '500px !important', textAlign: 'center', @@ -161,7 +161,7 @@ class SetupAssistant extends Component { const sanitizedWorkspace = slackWorkspace.trim().replace(/^https?:\/\//, ''); if (sanitizedWorkspace) { - const index = services.findIndex(s => s.id === SLACK_ID); + const index = services.findIndex((s) => s.id === SLACK_ID); if (index === -1) { const newServices = services; @@ -215,11 +215,11 @@ class SetupAssistant extends Component {