aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/auth
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/auth')
-rw-r--r--src/components/auth/Import.js2
-rw-r--r--src/components/auth/Invite.js2
-rw-r--r--src/components/auth/Login.js2
-rw-r--r--src/components/auth/Welcome.jsx (renamed from src/components/auth/Welcome.js)7
4 files changed, 5 insertions, 8 deletions
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js
index e43be07a8..41b887974 100644
--- a/src/components/auth/Import.js
+++ b/src/components/auth/Import.js
@@ -2,7 +2,7 @@ import { Component } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; 3import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
4import { defineMessages, injectIntl } from 'react-intl'; 4import { defineMessages, injectIntl } from 'react-intl';
5import { Link } from 'react-router'; 5import { Link } from 'react-router-dom';
6import classnames from 'classnames'; 6import classnames from 'classnames';
7 7
8import Form from '../../lib/Form'; 8import Form from '../../lib/Form';
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js
index 8e1ab514e..9eca924cd 100644
--- a/src/components/auth/Invite.js
+++ b/src/components/auth/Invite.js
@@ -2,7 +2,7 @@ import { Component, Fragment } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { observer } from 'mobx-react'; 3import { observer } from 'mobx-react';
4import { defineMessages, injectIntl } from 'react-intl'; 4import { defineMessages, injectIntl } from 'react-intl';
5import { Link } from 'react-router'; 5import { Link } from 'react-router-dom';
6import classnames from 'classnames'; 6import classnames from 'classnames';
7 7
8import Infobox from '../ui/Infobox'; 8import Infobox from '../ui/Infobox';
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 3de576ca6..eb184f1ee 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -178,7 +178,7 @@ class Login extends Component {
178 <Link to={signupRoute}> 178 <Link to={signupRoute}>
179 {intl.formatMessage(messages.signupLink)} 179 {intl.formatMessage(messages.signupLink)}
180 </Link> 180 </Link>
181 <Link 181 <Link
182 // to={passwordRoute} // TODO: Uncomment this line after fixing password recovery in-app 182 // to={passwordRoute} // TODO: Uncomment this line after fixing password recovery in-app
183 to={`${serverBase()}/user/forgot`} // TODO: Remove this line after fixing password recovery in-app 183 to={`${serverBase()}/user/forgot`} // TODO: Remove this line after fixing password recovery in-app
184 target='_blank' // TODO: Remove this line after fixing password recovery in-app 184 target='_blank' // TODO: Remove this line after fixing password recovery in-app
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.jsx
index c9d592a88..c784b75c3 100644
--- a/src/components/auth/Welcome.js
+++ b/src/components/auth/Welcome.jsx
@@ -25,7 +25,7 @@ const messages = defineMessages({
25 }, 25 },
26 changeServer: { 26 changeServer: {
27 id: 'login.changeServer', 27 id: 'login.changeServer',
28 defaultMessage: 'Change here!' 28 defaultMessage: 'Change here!',
29 }, 29 },
30 serverless: { 30 serverless: {
31 id: 'services.serverless', 31 id: 'services.serverless',
@@ -65,7 +65,6 @@ class Welcome extends Component {
65 className="welcome__logo" 65 className="welcome__logo"
66 alt="" 66 alt=""
67 /> 67 />
68 {/* <img src="./assets/images/welcome.png" className="welcome__services" alt="" /> */}
69 </div> 68 </div>
70 <div className="welcome__text"> 69 <div className="welcome__text">
71 <H1>Ferdium</H1> 70 <H1>Ferdium</H1>
@@ -82,9 +81,7 @@ class Welcome extends Component {
82 {intl.formatMessage(messages.changeServerMessage, { serverNameParse })} 81 {intl.formatMessage(messages.changeServerMessage, { serverNameParse })}
83 </span> 82 </span>
84 <Link to={changeServerRoute} className="button__change-server"> 83 <Link to={changeServerRoute} className="button__change-server">
85 <span> 84 <span>{intl.formatMessage(messages.changeServer)}</span>
86 {intl.formatMessage(messages.changeServer)}
87 </span>
88 </Link> 85 </Link>
89 </div> 86 </div>
90 <br /> 87 <br />