diff options
author | 2022-07-25 08:16:50 +0530 | |
---|---|---|
committer | 2022-07-25 08:17:10 +0530 | |
commit | cf282aa351cbc58691fb1b2fb4764830247cdbe8 (patch) | |
tree | 1a6ac4c9abd8b3de9d358016a5065da86cdd8510 /src/components/auth | |
parent | 6.0.1-nightly.3 [skip ci] (diff) | |
download | ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.tar.gz ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.tar.zst ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.zip |
eslint needs to be executed at the top-level to actually workv6.0.1-nightly.3
Diffstat (limited to 'src/components/auth')
-rw-r--r-- | src/components/auth/Invite.js | 8 | ||||
-rw-r--r-- | src/components/auth/Locked.js | 20 | ||||
-rw-r--r-- | src/components/auth/Password.js | 24 | ||||
-rw-r--r-- | src/components/auth/Welcome.jsx | 7 |
4 files changed, 32 insertions, 27 deletions
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index 9eca924cd..6b0e0e40b 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -70,9 +70,7 @@ class Invite extends Component { | |||
70 | fields: { | 70 | fields: { |
71 | name: { | 71 | name: { |
72 | label: intl.formatMessage(messages.nameLabel), | 72 | label: intl.formatMessage(messages.nameLabel), |
73 | placeholder: intl.formatMessage( | 73 | placeholder: intl.formatMessage(messages.nameLabel), |
74 | messages.nameLabel, | ||
75 | ), | ||
76 | onChange: () => { | 74 | onChange: () => { |
77 | this.setState({ showSuccessInfo: false }); | 75 | this.setState({ showSuccessInfo: false }); |
78 | }, | 76 | }, |
@@ -80,9 +78,7 @@ class Invite extends Component { | |||
80 | }, | 78 | }, |
81 | email: { | 79 | email: { |
82 | label: intl.formatMessage(messages.emailLabel), | 80 | label: intl.formatMessage(messages.emailLabel), |
83 | placeholder: intl.formatMessage( | 81 | placeholder: intl.formatMessage(messages.emailLabel), |
84 | messages.emailLabel, | ||
85 | ), | ||
86 | onChange: () => { | 82 | onChange: () => { |
87 | this.setState({ showSuccessInfo: false }); | 83 | this.setState({ showSuccessInfo: false }); |
88 | }, | 84 | }, |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 90ee46722..6e32dd980 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -54,17 +54,19 @@ class Locked extends Component { | |||
54 | 54 | ||
55 | form = (() => { | 55 | form = (() => { |
56 | const { intl } = this.props; | 56 | const { intl } = this.props; |
57 | return new Form({ | 57 | return new Form( |
58 | fields: { | 58 | { |
59 | password: { | 59 | fields: { |
60 | label: intl.formatMessage(messages.passwordLabel), | 60 | password: { |
61 | value: '', | 61 | label: intl.formatMessage(messages.passwordLabel), |
62 | type: 'password', | 62 | value: '', |
63 | type: 'password', | ||
64 | }, | ||
63 | }, | 65 | }, |
64 | }, | 66 | }, |
65 | }, | 67 | intl, |
66 | intl, | 68 | ); |
67 | )})(); | 69 | })(); |
68 | 70 | ||
69 | submit(e) { | 71 | submit(e) { |
70 | e.preventDefault(); | 72 | e.preventDefault(); |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index 0daa4c77a..5086b0bbd 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -50,17 +50,19 @@ class Password extends Component { | |||
50 | 50 | ||
51 | form = (() => { | 51 | form = (() => { |
52 | const { intl } = this.props; | 52 | const { intl } = this.props; |
53 | return new Form({ | 53 | return new Form( |
54 | fields: { | 54 | { |
55 | email: { | 55 | fields: { |
56 | label: intl.formatMessage(messages.emailLabel), | 56 | email: { |
57 | value: '', | 57 | label: intl.formatMessage(messages.emailLabel), |
58 | validators: [required, email], | 58 | value: '', |
59 | validators: [required, email], | ||
60 | }, | ||
59 | }, | 61 | }, |
60 | }, | 62 | }, |
61 | }, | 63 | intl, |
62 | intl, | 64 | ); |
63 | )})(); | 65 | })(); |
64 | 66 | ||
65 | submit(e) { | 67 | submit(e) { |
66 | e.preventDefault(); | 68 | e.preventDefault(); |
@@ -80,7 +82,9 @@ class Password extends Component { | |||
80 | return ( | 82 | return ( |
81 | <div className="auth__container"> | 83 | <div className="auth__container"> |
82 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 84 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
83 | <Link to='/auth/welcome'><img src="./assets/images/logo.svg" className="auth__logo" alt="" /></Link> | 85 | <Link to="/auth/welcome"> |
86 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | ||
87 | </Link> | ||
84 | <H1>{intl.formatMessage(messages.headline)}</H1> | 88 | <H1>{intl.formatMessage(messages.headline)}</H1> |
85 | {status.length > 0 && status.includes('sent') && ( | 89 | {status.length > 0 && status.includes('sent') && ( |
86 | <Infobox type="success" icon="checkbox-marked-circle-outline"> | 90 | <Infobox type="success" icon="checkbox-marked-circle-outline"> |
diff --git a/src/components/auth/Welcome.jsx b/src/components/auth/Welcome.jsx index c784b75c3..9e5d10126 100644 --- a/src/components/auth/Welcome.jsx +++ b/src/components/auth/Welcome.jsx | |||
@@ -21,7 +21,8 @@ const messages = defineMessages({ | |||
21 | }, | 21 | }, |
22 | changeServerMessage: { | 22 | changeServerMessage: { |
23 | id: 'login.changeServerMessage', | 23 | id: 'login.changeServerMessage', |
24 | defaultMessage: 'You are using {serverNameParse} Server, do you want to switch?' | 24 | defaultMessage: |
25 | 'You are using {serverNameParse} Server, do you want to switch?', | ||
25 | }, | 26 | }, |
26 | changeServer: { | 27 | changeServer: { |
27 | id: 'login.changeServer', | 28 | id: 'login.changeServer', |
@@ -78,7 +79,9 @@ class Welcome extends Component { | |||
78 | </Link> | 79 | </Link> |
79 | <div className="welcome__text__change-server"> | 80 | <div className="welcome__text__change-server"> |
80 | <span> | 81 | <span> |
81 | {intl.formatMessage(messages.changeServerMessage, { serverNameParse })} | 82 | {intl.formatMessage(messages.changeServerMessage, { |
83 | serverNameParse, | ||
84 | })} | ||
82 | </span> | 85 | </span> |
83 | <Link to={changeServerRoute} className="button__change-server"> | 86 | <Link to={changeServerRoute} className="button__change-server"> |
84 | <span>{intl.formatMessage(messages.changeServer)}</span> | 87 | <span>{intl.formatMessage(messages.changeServer)}</span> |