diff options
Diffstat (limited to 'src/components/auth/Welcome.js')
-rw-r--r-- | src/components/auth/Welcome.js | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index d595aef3d..18b506eba 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -5,6 +5,7 @@ import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; | |||
5 | import { defineMessages, injectIntl } from 'react-intl'; | 5 | import { defineMessages, injectIntl } from 'react-intl'; |
6 | import serverlessLogin from '../../helpers/serverless-helpers'; | 6 | import serverlessLogin from '../../helpers/serverless-helpers'; |
7 | import { shuffleArray } from '../../helpers/array-helpers'; | 7 | import { shuffleArray } from '../../helpers/array-helpers'; |
8 | import { serverName } from '../../api/apiBase'; | ||
8 | 9 | ||
9 | import Link from '../ui/Link'; | 10 | import Link from '../ui/Link'; |
10 | import { H1 } from '../ui/headline'; | 11 | import { H1 } from '../ui/headline'; |
@@ -18,9 +19,13 @@ const messages = defineMessages({ | |||
18 | id: 'welcome.loginButton', | 19 | id: 'welcome.loginButton', |
19 | defaultMessage: 'Login to your account', | 20 | defaultMessage: 'Login to your account', |
20 | }, | 21 | }, |
22 | changeServerMessage: { | ||
23 | id: 'login.changeServerMessage', | ||
24 | defaultMessage: 'You are using {serverNameParse}, do you want to switch?' | ||
25 | }, | ||
21 | changeServer: { | 26 | changeServer: { |
22 | id: 'login.changeServer', | 27 | id: 'login.changeServer', |
23 | defaultMessage: 'Change server' | 28 | defaultMessage: 'Change here!' |
24 | }, | 29 | }, |
25 | serverless: { | 30 | serverless: { |
26 | id: 'services.serverless', | 31 | id: 'services.serverless', |
@@ -47,6 +52,9 @@ class Welcome extends Component { | |||
47 | let { recipes } = this.props; | 52 | let { recipes } = this.props; |
48 | recipes = shuffleArray(recipes); | 53 | recipes = shuffleArray(recipes); |
49 | recipes.length = 8 * 2; | 54 | recipes.length = 8 * 2; |
55 | |||
56 | const serverNameParse = serverName(); | ||
57 | |||
50 | return ( | 58 | return ( |
51 | <div className="welcome"> | 59 | <div className="welcome"> |
52 | <div className="welcome__content"> | 60 | <div className="welcome__content"> |
@@ -56,15 +64,10 @@ class Welcome extends Component { | |||
56 | alt="" | 64 | alt="" |
57 | /> | 65 | /> |
58 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} | 66 | {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */} |
59 | <div className="welcome__text"> | ||
60 | <H1>Ferdium</H1> | ||
61 | </div> | ||
62 | </div> | 67 | </div> |
63 | <Link to={changeServerRoute} className="button__change-server"> | 68 | <div className="welcome__text"> |
64 | <span> | 69 | <H1>Ferdium</H1> |
65 | {intl.formatMessage(messages.changeServer)} | 70 | </div> |
66 | </span> | ||
67 | </Link> | ||
68 | <div className="welcome__buttons"> | 71 | <div className="welcome__buttons"> |
69 | <Link to={signupRoute} className="button button__inverted"> | 72 | <Link to={signupRoute} className="button button__inverted"> |
70 | {intl.formatMessage(messages.signupButton)} | 73 | {intl.formatMessage(messages.signupButton)} |
@@ -72,7 +75,16 @@ class Welcome extends Component { | |||
72 | <Link to={loginRoute} className="button"> | 75 | <Link to={loginRoute} className="button"> |
73 | {intl.formatMessage(messages.loginButton)} | 76 | {intl.formatMessage(messages.loginButton)} |
74 | </Link> | 77 | </Link> |
75 | <br /> | 78 | <div className="welcome__text__change-server"> |
79 | <span> | ||
80 | {intl.formatMessage(messages.changeServerMessage, { serverNameParse })} | ||
81 | </span> | ||
82 | <Link to={changeServerRoute} className="button__change-server"> | ||
83 | <span> | ||
84 | {intl.formatMessage(messages.changeServer)} | ||
85 | </span> | ||
86 | </Link> | ||
87 | </div> | ||
76 | <br /> | 88 | <br /> |
77 | <hr /> | 89 | <hr /> |
78 | <br /> | 90 | <br /> |