diff options
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/AuthLayout.tsx | 26 | ||||
-rw-r--r-- | src/components/auth/ChangeServer.tsx | 22 | ||||
-rw-r--r-- | src/components/auth/Invite.tsx | 20 | ||||
-rw-r--r-- | src/components/auth/Locked.tsx | 14 | ||||
-rw-r--r-- | src/components/auth/Login.tsx | 22 | ||||
-rw-r--r-- | src/components/auth/Password.tsx | 18 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.tsx | 24 | ||||
-rw-r--r-- | src/components/auth/Signup.tsx | 24 | ||||
-rw-r--r-- | src/components/auth/Welcome.tsx | 18 |
9 files changed, 110 insertions, 78 deletions
diff --git a/src/components/auth/AuthLayout.tsx b/src/components/auth/AuthLayout.tsx index eeb93b83b..67e898318 100644 --- a/src/components/auth/AuthLayout.tsx +++ b/src/components/auth/AuthLayout.tsx | |||
@@ -1,24 +1,24 @@ | |||
1 | import { mdiFlash } from '@mdi/js'; | ||
2 | import type { Response } from 'electron'; | ||
3 | import { TitleBar } from 'electron-react-titlebar/renderer'; | ||
4 | import { observer } from 'mobx-react'; | ||
1 | import { | 5 | import { |
2 | cloneElement, | ||
3 | Component, | 6 | Component, |
4 | MouseEventHandler, | 7 | type MouseEventHandler, |
5 | ReactElement, | 8 | type ReactElement, |
9 | cloneElement, | ||
6 | } from 'react'; | 10 | } from 'react'; |
7 | import { observer } from 'mobx-react'; | 11 | import { type WrappedComponentProps, injectIntl } from 'react-intl'; |
8 | import { TitleBar } from 'electron-react-titlebar/renderer'; | 12 | import { serverName } from '../../api/apiBase'; |
9 | import { injectIntl, WrappedComponentProps } from 'react-intl'; | 13 | import { GITHUB_FERDIUM_URL } from '../../config'; |
10 | import { mdiFlash } from '@mdi/js'; | 14 | import { isWindows } from '../../environment'; |
11 | import { Response } from 'electron'; | ||
12 | import Link from '../ui/Link'; | ||
13 | import InfoBar from '../ui/InfoBar'; | ||
14 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; | 15 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; |
15 | import { updateVersionParse } from '../../helpers/update-helpers'; | 16 | import { updateVersionParse } from '../../helpers/update-helpers'; |
16 | import globalMessages from '../../i18n/globalMessages'; | 17 | import globalMessages from '../../i18n/globalMessages'; |
17 | import { isWindows } from '../../environment'; | ||
18 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 18 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
19 | import { GITHUB_FERDIUM_URL } from '../../config'; | 19 | import InfoBar from '../ui/InfoBar'; |
20 | import Link from '../ui/Link'; | ||
20 | import Icon from '../ui/icon'; | 21 | import Icon from '../ui/icon'; |
21 | import { serverName } from '../../api/apiBase'; | ||
22 | 22 | ||
23 | export interface IProps extends WrappedComponentProps { | 23 | export interface IProps extends WrappedComponentProps { |
24 | children: ReactElement; | 24 | children: ReactElement; |
diff --git a/src/components/auth/ChangeServer.tsx b/src/components/auth/ChangeServer.tsx index c49e52673..665e8f6f9 100644 --- a/src/components/auth/ChangeServer.tsx +++ b/src/components/auth/ChangeServer.tsx | |||
@@ -1,19 +1,23 @@ | |||
1 | import { Component, FormEvent, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { mdiArrowLeftCircle } from '@mdi/js'; | 1 | import { mdiArrowLeftCircle } from '@mdi/js'; |
5 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
3 | import { observer } from 'mobx-react'; | ||
4 | import { Component, type FormEvent, type ReactElement } from 'react'; | ||
5 | import { | ||
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config'; | ||
11 | import { url, required } from '../../helpers/validation-helpers'; | ||
12 | import globalMessages from '../../i18n/globalMessages'; | ||
6 | import Form from '../../lib/Form'; | 13 | import Form from '../../lib/Form'; |
7 | import Input from '../ui/input/index'; | 14 | import Infobox from '../ui/Infobox'; |
15 | import Link from '../ui/Link'; | ||
8 | import Select from '../ui/Select'; | 16 | import Select from '../ui/Select'; |
9 | import Button from '../ui/button'; | 17 | import Button from '../ui/button'; |
10 | import Link from '../ui/Link'; | ||
11 | import Infobox from '../ui/Infobox'; | ||
12 | import { url, required } from '../../helpers/validation-helpers'; | ||
13 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config'; | ||
14 | import globalMessages from '../../i18n/globalMessages'; | ||
15 | import { H1 } from '../ui/headline'; | 18 | import { H1 } from '../ui/headline'; |
16 | import Icon from '../ui/icon'; | 19 | import Icon from '../ui/icon'; |
20 | import Input from '../ui/input/index'; | ||
17 | 21 | ||
18 | const messages = defineMessages({ | 22 | const messages = defineMessages({ |
19 | headline: { | 23 | headline: { |
diff --git a/src/components/auth/Invite.tsx b/src/components/auth/Invite.tsx index 0d39d861a..93441abe3 100644 --- a/src/components/auth/Invite.tsx +++ b/src/components/auth/Invite.tsx | |||
@@ -1,16 +1,20 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { Link } from 'react-router-dom'; | ||
5 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
6 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
7 | import Infobox from '../ui/Infobox'; | 3 | import { observer } from 'mobx-react'; |
8 | import Appear from '../ui/effects/Appear'; | 4 | import { Component } from 'react'; |
9 | import Form from '../../lib/Form'; | 5 | import { |
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import { Link } from 'react-router-dom'; | ||
10 | import { email, required } from '../../helpers/validation-helpers'; | 11 | import { email, required } from '../../helpers/validation-helpers'; |
11 | import Input from '../ui/input/index'; | 12 | import Form from '../../lib/Form'; |
13 | import Infobox from '../ui/Infobox'; | ||
12 | import Button from '../ui/button'; | 14 | import Button from '../ui/button'; |
15 | import Appear from '../ui/effects/Appear'; | ||
13 | import { H1 } from '../ui/headline'; | 16 | import { H1 } from '../ui/headline'; |
17 | import Input from '../ui/input/index'; | ||
14 | 18 | ||
15 | const messages = defineMessages({ | 19 | const messages = defineMessages({ |
16 | settingsHeadline: { | 20 | settingsHeadline: { |
diff --git a/src/components/auth/Locked.tsx b/src/components/auth/Locked.tsx index 34d010782..46ce24a2e 100644 --- a/src/components/auth/Locked.tsx +++ b/src/components/auth/Locked.tsx | |||
@@ -1,13 +1,17 @@ | |||
1 | import { systemPreferences } from '@electron/remote'; | 1 | import { systemPreferences } from '@electron/remote'; |
2 | import { Component } from 'react'; | ||
3 | import { observer } from 'mobx-react'; | ||
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
5 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
3 | import { observer } from 'mobx-react'; | ||
4 | import { Component } from 'react'; | ||
5 | import { | ||
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import { isMac } from '../../environment'; | ||
6 | import Form from '../../lib/Form'; | 11 | import Form from '../../lib/Form'; |
7 | import Input from '../ui/input/index'; | ||
8 | import Button from '../ui/button'; | 12 | import Button from '../ui/button'; |
9 | import { H1 } from '../ui/headline'; | 13 | import { H1 } from '../ui/headline'; |
10 | import { isMac } from '../../environment'; | 14 | import Input from '../ui/input/index'; |
11 | 15 | ||
12 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
13 | headline: { | 17 | headline: { |
diff --git a/src/components/auth/Login.tsx b/src/components/auth/Login.tsx index 9bad731c8..37ce595eb 100644 --- a/src/components/auth/Login.tsx +++ b/src/components/auth/Login.tsx | |||
@@ -1,19 +1,23 @@ | |||
1 | import { Component, FormEvent, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { mdiArrowLeftCircle } from '@mdi/js'; | 1 | import { mdiArrowLeftCircle } from '@mdi/js'; |
5 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
6 | import Icon from '../ui/icon'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Component, type FormEvent, type ReactElement } from 'react'; | ||
5 | import { | ||
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import type { GlobalError } from '../../@types/ferdium-components.types'; | ||
11 | import { serverBase } from '../../api/apiBase'; // TODO: Remove this line after fixing password recovery in-app | ||
7 | import { LIVE_FRANZ_API } from '../../config'; | 12 | import { LIVE_FRANZ_API } from '../../config'; |
8 | import { API_VERSION } from '../../environment-remote'; | 13 | import { API_VERSION } from '../../environment-remote'; |
9 | import { serverBase } from '../../api/apiBase'; // TODO: Remove this line after fixing password recovery in-app | 14 | import { email, required } from '../../helpers/validation-helpers'; |
10 | import Form from '../../lib/Form'; | 15 | import Form from '../../lib/Form'; |
11 | import { required, email } from '../../helpers/validation-helpers'; | ||
12 | import Input from '../ui/input/index'; | ||
13 | import Button from '../ui/button'; | ||
14 | import Link from '../ui/Link'; | 16 | import Link from '../ui/Link'; |
17 | import Button from '../ui/button'; | ||
15 | import { H1 } from '../ui/headline'; | 18 | import { H1 } from '../ui/headline'; |
16 | import { GlobalError } from '../../@types/ferdium-components.types'; | 19 | import Icon from '../ui/icon'; |
20 | import Input from '../ui/input/index'; | ||
17 | 21 | ||
18 | const messages = defineMessages({ | 22 | const messages = defineMessages({ |
19 | headline: { | 23 | headline: { |
diff --git a/src/components/auth/Password.tsx b/src/components/auth/Password.tsx index 03adc3859..6f398c3fb 100644 --- a/src/components/auth/Password.tsx +++ b/src/components/auth/Password.tsx | |||
@@ -1,16 +1,20 @@ | |||
1 | import { Component, FormEvent } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | 1 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { Component, type FormEvent } from 'react'; |
3 | import { | ||
4 | type WrappedComponentProps, | ||
5 | defineMessages, | ||
6 | injectIntl, | ||
7 | } from 'react-intl'; | ||
4 | 8 | ||
5 | import { noop } from 'lodash'; | 9 | import { noop } from 'lodash'; |
10 | import { email, required } from '../../helpers/validation-helpers'; | ||
11 | import globalMessages from '../../i18n/globalMessages'; | ||
6 | import Form from '../../lib/Form'; | 12 | import Form from '../../lib/Form'; |
7 | import { required, email } from '../../helpers/validation-helpers'; | ||
8 | import Input from '../ui/input/index'; | ||
9 | import Button from '../ui/button'; | ||
10 | import Link from '../ui/Link'; | ||
11 | import Infobox from '../ui/Infobox'; | 13 | import Infobox from '../ui/Infobox'; |
12 | import globalMessages from '../../i18n/globalMessages'; | 14 | import Link from '../ui/Link'; |
15 | import Button from '../ui/button'; | ||
13 | import { H1 } from '../ui/headline'; | 16 | import { H1 } from '../ui/headline'; |
17 | import Input from '../ui/input/index'; | ||
14 | 18 | ||
15 | const messages = defineMessages({ | 19 | const messages = defineMessages({ |
16 | headline: { | 20 | headline: { |
diff --git a/src/components/auth/SetupAssistant.tsx b/src/components/auth/SetupAssistant.tsx index c25495471..c1965dbb4 100644 --- a/src/components/auth/SetupAssistant.tsx +++ b/src/components/auth/SetupAssistant.tsx | |||
@@ -1,17 +1,21 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
5 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
6 | import Input from '../ui/input/index'; | 2 | import { observer } from 'mobx-react'; |
7 | import Button from '../ui/button'; | 3 | import { Component } from 'react'; |
8 | import Badge from '../ui/badge'; | 4 | import { |
9 | import Modal from '../ui/Modal'; | 5 | type WrappedComponentProps, |
6 | defineMessages, | ||
7 | injectIntl, | ||
8 | } from 'react-intl'; | ||
9 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
10 | import { CDN_URL } from '../../config'; | ||
11 | import globalMessages from '../../i18n/globalMessages'; | ||
10 | import Infobox from '../ui/Infobox'; | 12 | import Infobox from '../ui/Infobox'; |
13 | import Modal from '../ui/Modal'; | ||
14 | import Badge from '../ui/badge'; | ||
15 | import Button from '../ui/button'; | ||
11 | import Appear from '../ui/effects/Appear'; | 16 | import Appear from '../ui/effects/Appear'; |
12 | import globalMessages from '../../i18n/globalMessages'; | ||
13 | import { CDN_URL } from '../../config'; | ||
14 | import { H1, H2 } from '../ui/headline'; | 17 | import { H1, H2 } from '../ui/headline'; |
18 | import Input from '../ui/input/index'; | ||
15 | 19 | ||
16 | const SLACK_ID = 'slack'; | 20 | const SLACK_ID = 'slack'; |
17 | 21 | ||
diff --git a/src/components/auth/Signup.tsx b/src/components/auth/Signup.tsx index 06a9774aa..84974fd07 100644 --- a/src/components/auth/Signup.tsx +++ b/src/components/auth/Signup.tsx | |||
@@ -1,18 +1,22 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { observer, inject } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { mdiArrowLeftCircle } from '@mdi/js'; | 1 | import { mdiArrowLeftCircle } from '@mdi/js'; |
5 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
3 | import { inject, observer } from 'mobx-react'; | ||
4 | import { Component } from 'react'; | ||
5 | import { | ||
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import type { GlobalError } from '../../@types/ferdium-components.types'; | ||
11 | import type { Actions } from '../../actions/lib/actions'; | ||
12 | import { serverBase } from '../../api/apiBase'; | ||
13 | import { email, minLength, required } from '../../helpers/validation-helpers'; | ||
6 | import Form from '../../lib/Form'; | 14 | import Form from '../../lib/Form'; |
7 | import { required, email, minLength } from '../../helpers/validation-helpers'; | ||
8 | import Input from '../ui/input/index'; | ||
9 | import Button from '../ui/button'; | ||
10 | import Link from '../ui/Link'; | 15 | import Link from '../ui/Link'; |
11 | import Icon from '../ui/icon'; | 16 | import Button from '../ui/button'; |
12 | import { serverBase } from '../../api/apiBase'; | ||
13 | import { H1 } from '../ui/headline'; | 17 | import { H1 } from '../ui/headline'; |
14 | import { GlobalError } from '../../@types/ferdium-components.types'; | 18 | import Icon from '../ui/icon'; |
15 | import { Actions } from '../../actions/lib/actions'; | 19 | import Input from '../ui/input/index'; |
16 | 20 | ||
17 | const messages = defineMessages({ | 21 | const messages = defineMessages({ |
18 | headline: { | 22 | headline: { |
diff --git a/src/components/auth/Welcome.tsx b/src/components/auth/Welcome.tsx index c1a2db386..ec1c167c0 100644 --- a/src/components/auth/Welcome.tsx +++ b/src/components/auth/Welcome.tsx | |||
@@ -1,14 +1,18 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer, inject } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { noop } from 'lodash'; | 1 | import { noop } from 'lodash'; |
5 | import serverlessLogin from '../../helpers/serverless-helpers'; | 2 | import { inject, observer } from 'mobx-react'; |
6 | import shuffleArray from '../../helpers/array-helpers'; | 3 | import { Component, type ReactElement } from 'react'; |
4 | import { | ||
5 | type WrappedComponentProps, | ||
6 | defineMessages, | ||
7 | injectIntl, | ||
8 | } from 'react-intl'; | ||
9 | import type { StoresProps } from '../../@types/ferdium-components.types'; | ||
7 | import { serverName } from '../../api/apiBase'; | 10 | import { serverName } from '../../api/apiBase'; |
11 | import shuffleArray from '../../helpers/array-helpers'; | ||
12 | import serverlessLogin from '../../helpers/serverless-helpers'; | ||
13 | import type RecipePreview from '../../models/RecipePreview'; | ||
8 | import Link from '../ui/Link'; | 14 | import Link from '../ui/Link'; |
9 | import { H1 } from '../ui/headline'; | 15 | import { H1 } from '../ui/headline'; |
10 | import { StoresProps } from '../../@types/ferdium-components.types'; | ||
11 | import RecipePreview from '../../models/RecipePreview'; | ||
12 | 16 | ||
13 | const messages = defineMessages({ | 17 | const messages = defineMessages({ |
14 | signupButton: { | 18 | signupButton: { |