diff options
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/ChangeServer.js | 11 | ||||
-rw-r--r-- | src/components/auth/Login.js | 20 |
2 files changed, 26 insertions, 5 deletions
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 682f6512c..7e74fe779 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -9,7 +9,7 @@ import Button from '../ui/Button'; | |||
9 | import Link from '../ui/Link'; | 9 | import Link from '../ui/Link'; |
10 | import Infobox from '../ui/Infobox'; | 10 | import Infobox from '../ui/Infobox'; |
11 | import { url, required } from '../../helpers/validation-helpers'; | 11 | import { url, required } from '../../helpers/validation-helpers'; |
12 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API } from '../../config'; | 12 | import { LIVE_FERDIUM_API, LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config'; |
13 | import globalMessages from '../../i18n/globalMessages'; | 13 | import globalMessages from '../../i18n/globalMessages'; |
14 | 14 | ||
15 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
@@ -43,9 +43,11 @@ class ChangeServer extends Component { | |||
43 | 43 | ||
44 | ferdiumServer = LIVE_FERDIUM_API; | 44 | ferdiumServer = LIVE_FERDIUM_API; |
45 | 45 | ||
46 | ferdiServer = LIVE_FERDI_API; | ||
47 | |||
46 | franzServer = LIVE_FRANZ_API; | 48 | franzServer = LIVE_FRANZ_API; |
47 | 49 | ||
48 | defaultServers = [this.franzServer, this.ferdiumServer]; | 50 | defaultServers = [this.ferdiumServer, this.franzServer, this.ferdiServer]; |
49 | 51 | ||
50 | form = new Form( | 52 | form = new Form( |
51 | { | 53 | { |
@@ -54,8 +56,9 @@ class ChangeServer extends Component { | |||
54 | label: this.props.intl.formatMessage(messages.label), | 56 | label: this.props.intl.formatMessage(messages.label), |
55 | value: this.props.server, | 57 | value: this.props.server, |
56 | options: [ | 58 | options: [ |
57 | { value: this.ferdiumServer, label: 'Ferdium' }, | 59 | { value: this.ferdiumServer, label: 'Ferdium (Default)' }, |
58 | { value: this.franzServer, label: 'Franz' }, | 60 | { value: this.franzServer, label: 'Franz' }, |
61 | { value: this.ferdiServer, label: 'Ferdi' }, | ||
59 | { | 62 | { |
60 | value: this.defaultServers.includes(this.props.server) | 63 | value: this.defaultServers.includes(this.props.server) |
61 | ? '' | 64 | ? '' |
@@ -108,7 +111,7 @@ class ChangeServer extends Component { | |||
108 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 111 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
109 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 112 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> |
110 | <h1>{intl.formatMessage(messages.headline)}</h1> | 113 | <h1>{intl.formatMessage(messages.headline)}</h1> |
111 | {form.$('server').value === this.franzServer && ( | 114 | {(form.$('server').value === this.franzServer || form.$('server').value === this.ferdiServer) && ( |
112 | <Infobox type="warning"> | 115 | <Infobox type="warning"> |
113 | {intl.formatMessage(messages.warning)} | 116 | {intl.formatMessage(messages.warning)} |
114 | </Infobox> | 117 | </Infobox> |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 3c9c07f0d..ccffd0c6a 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; | |||
4 | import { observer, inject } from 'mobx-react'; | 4 | import { observer, inject } from 'mobx-react'; |
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | 6 | ||
7 | import { LIVE_FRANZ_API } from '../../config'; | 7 | import { LIVE_FRANZ_API, LIVE_FERDI_API } from '../../config'; |
8 | import { API_VERSION } from '../../environment-remote'; | 8 | import { API_VERSION } from '../../environment-remote'; |
9 | import Form from '../../lib/Form'; | 9 | import Form from '../../lib/Form'; |
10 | import { required, email } from '../../helpers/validation-helpers'; | 10 | import { required, email } from '../../helpers/validation-helpers'; |
@@ -153,6 +153,24 @@ class Login extends Component { | |||
153 | </Link> | 153 | </Link> |
154 | </p> | 154 | </p> |
155 | )} | 155 | )} |
156 | {window['ferdium'].stores.settings.all.app.server !== | ||
157 | LIVE_FERDI_API && ( | ||
158 | <p className="error-message center"> | ||
159 | {intl.formatMessage(messages.customServerQuestion)}{' '} | ||
160 | <Link | ||
161 | to={`${window[ | ||
162 | 'ferdium' | ||
163 | ].stores.settings.all.app.server.replace( | ||
164 | API_VERSION, | ||
165 | '', | ||
166 | )}/import`} | ||
167 | target="_blank" | ||
168 | style={{ cursor: 'pointer', textDecoration: 'underline' }} | ||
169 | > | ||
170 | {intl.formatMessage(messages.customServerSuggestion)} | ||
171 | </Link> | ||
172 | </p> | ||
173 | )} | ||
156 | </> | 174 | </> |
157 | )} | 175 | )} |
158 | {isSubmitting ? ( | 176 | {isSubmitting ? ( |