diff options
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/AuthLayout.js | 6 | ||||
-rw-r--r-- | src/components/auth/ChangeServer.js | 10 | ||||
-rw-r--r-- | src/components/auth/Import.js | 4 | ||||
-rw-r--r-- | src/components/auth/Login.js | 6 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 2 | ||||
-rw-r--r-- | src/components/auth/Welcome.js | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 7e96067eb..3d7c99c11 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -18,7 +18,7 @@ import globalMessages from '../../i18n/globalMessages'; | |||
18 | 18 | ||
19 | import { isWindows } from '../../environment'; | 19 | import { isWindows } from '../../environment'; |
20 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 20 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
21 | import { GITHUB_FERDI_URL } from '../../config'; | 21 | import { GITHUB_FERDIUM_URL } from '../../config'; |
22 | import { Icon } from '../ui/icon'; | 22 | import { Icon } from '../ui/icon'; |
23 | 23 | ||
24 | class AuthLayout extends Component { | 24 | class AuthLayout extends Component { |
@@ -57,7 +57,7 @@ class AuthLayout extends Component { | |||
57 | <> | 57 | <> |
58 | {isWindows && !isFullScreen && ( | 58 | {isWindows && !isFullScreen && ( |
59 | <TitleBar | 59 | <TitleBar |
60 | menu={window['ferdi'].menu.template} | 60 | menu={window['ferdium'].menu.template} |
61 | icon="assets/images/logo.svg" | 61 | icon="assets/images/logo.svg" |
62 | /> | 62 | /> |
63 | )} | 63 | )} |
@@ -96,7 +96,7 @@ class AuthLayout extends Component { | |||
96 | </div> | 96 | </div> |
97 | {/* </div> */} | 97 | {/* </div> */} |
98 | <Link | 98 | <Link |
99 | to={`${GITHUB_FERDI_URL}/ferdi`} | 99 | to={`${GITHUB_FERDIUM_URL}/ferdium`} |
100 | className="auth__adlk" | 100 | className="auth__adlk" |
101 | target="_blank" | 101 | target="_blank" |
102 | > | 102 | > |
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 4c69b2821..682f6512c 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_FERDI_API, LIVE_FRANZ_API } from '../../config'; | 12 | import { LIVE_FERDIUM_API, LIVE_FRANZ_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({ |
@@ -23,7 +23,7 @@ const messages = defineMessages({ | |||
23 | }, | 23 | }, |
24 | warning: { | 24 | warning: { |
25 | id: 'changeserver.warning', | 25 | id: 'changeserver.warning', |
26 | defaultMessage: 'Extra settings offered by Ferdi will not be saved', | 26 | defaultMessage: 'Extra settings offered by Ferdium will not be saved', |
27 | }, | 27 | }, |
28 | customServerLabel: { | 28 | customServerLabel: { |
29 | id: 'changeserver.customServerLabel', | 29 | id: 'changeserver.customServerLabel', |
@@ -41,11 +41,11 @@ class ChangeServer extends Component { | |||
41 | server: PropTypes.string.isRequired, | 41 | server: PropTypes.string.isRequired, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | ferdiServer = LIVE_FERDI_API; | 44 | ferdiumServer = LIVE_FERDIUM_API; |
45 | 45 | ||
46 | franzServer = LIVE_FRANZ_API; | 46 | franzServer = LIVE_FRANZ_API; |
47 | 47 | ||
48 | defaultServers = [this.franzServer, this.ferdiServer]; | 48 | defaultServers = [this.franzServer, this.ferdiumServer]; |
49 | 49 | ||
50 | form = new Form( | 50 | form = new Form( |
51 | { | 51 | { |
@@ -54,7 +54,7 @@ class ChangeServer extends Component { | |||
54 | label: this.props.intl.formatMessage(messages.label), | 54 | label: this.props.intl.formatMessage(messages.label), |
55 | value: this.props.server, | 55 | value: this.props.server, |
56 | options: [ | 56 | options: [ |
57 | { value: this.ferdiServer, label: 'Ferdi' }, | 57 | { value: this.ferdiumServer, label: 'Ferdium' }, |
58 | { value: this.franzServer, label: 'Franz' }, | 58 | { value: this.franzServer, label: 'Franz' }, |
59 | { | 59 | { |
60 | value: this.defaultServers.includes(this.props.server) | 60 | value: this.defaultServers.includes(this.props.server) |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index 8f70318ed..281ceda97 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -12,11 +12,11 @@ import Button from '../ui/Button'; | |||
12 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
13 | headline: { | 13 | headline: { |
14 | id: 'import.headline', | 14 | id: 'import.headline', |
15 | defaultMessage: 'Import your Ferdi 4 services', | 15 | defaultMessage: 'Import your Ferdium 4 services', |
16 | }, | 16 | }, |
17 | notSupportedHeadline: { | 17 | notSupportedHeadline: { |
18 | id: 'import.notSupportedHeadline', | 18 | id: 'import.notSupportedHeadline', |
19 | defaultMessage: 'Services not yet supported in Ferdi 5', | 19 | defaultMessage: 'Services not yet supported in Ferdium 5', |
20 | }, | 20 | }, |
21 | submitButtonLabel: { | 21 | submitButtonLabel: { |
22 | id: 'import.submit.label', | 22 | id: 'import.submit.label', |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index bd01f25cd..3c9c07f0d 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -41,7 +41,7 @@ const messages = defineMessages({ | |||
41 | }, | 41 | }, |
42 | customServerSuggestion: { | 42 | customServerSuggestion: { |
43 | id: 'login.customServerSuggestion', | 43 | id: 'login.customServerSuggestion', |
44 | defaultMessage: 'Try importing your Franz account into Ferdi', | 44 | defaultMessage: 'Try importing your Franz account into Ferdium', |
45 | }, | 45 | }, |
46 | tokenExpired: { | 46 | tokenExpired: { |
47 | id: 'login.tokenExpired', | 47 | id: 'login.tokenExpired', |
@@ -135,13 +135,13 @@ class Login extends Component { | |||
135 | <p className="error-message center"> | 135 | <p className="error-message center"> |
136 | {intl.formatMessage(messages.invalidCredentials)} | 136 | {intl.formatMessage(messages.invalidCredentials)} |
137 | </p> | 137 | </p> |
138 | {window['ferdi'].stores.settings.all.app.server !== | 138 | {window['ferdium'].stores.settings.all.app.server !== |
139 | LIVE_FRANZ_API && ( | 139 | LIVE_FRANZ_API && ( |
140 | <p className="error-message center"> | 140 | <p className="error-message center"> |
141 | {intl.formatMessage(messages.customServerQuestion)}{' '} | 141 | {intl.formatMessage(messages.customServerQuestion)}{' '} |
142 | <Link | 142 | <Link |
143 | to={`${window[ | 143 | to={`${window[ |
144 | 'ferdi' | 144 | 'ferdium' |
145 | ].stores.settings.all.app.server.replace( | 145 | ].stores.settings.all.app.server.replace( |
146 | API_VERSION, | 146 | API_VERSION, |
147 | '', | 147 | '', |
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 00b387b25..3cccb2428 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -40,7 +40,7 @@ const messages = defineMessages({ | |||
40 | }, | 40 | }, |
41 | legalInfo: { | 41 | legalInfo: { |
42 | id: 'signup.legal.info', | 42 | id: 'signup.legal.info', |
43 | defaultMessage: 'By creating a Ferdi account you accept the', | 43 | defaultMessage: 'By creating a Ferdium account you accept the', |
44 | }, | 44 | }, |
45 | terms: { | 45 | terms: { |
46 | id: 'signup.legal.terms', | 46 | id: 'signup.legal.terms', |
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index cfd26e2e9..94ea4d603 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -23,7 +23,7 @@ const messages = defineMessages({ | |||
23 | }, | 23 | }, |
24 | serverless: { | 24 | serverless: { |
25 | id: 'services.serverless', | 25 | id: 'services.serverless', |
26 | defaultMessage: 'Use Ferdi without an Account', | 26 | defaultMessage: 'Use Ferdium without an Account', |
27 | }, | 27 | }, |
28 | }); | 28 | }); |
29 | 29 | ||
@@ -56,7 +56,7 @@ class Welcome extends Component { | |||
56 | /> | 56 | /> |
57 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} | 57 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} |
58 | <div className="welcome__text"> | 58 | <div className="welcome__text"> |
59 | <h1>Ferdi</h1> | 59 | <h1>Ferdium</h1> |
60 | </div> | 60 | </div> |
61 | </div> | 61 | </div> |
62 | <div className="welcome__buttons"> | 62 | <div className="welcome__buttons"> |