diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:19:45 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-23 08:19:45 -0400 |
commit | 772a4337c62c07e9f825ddc68283be2bee3b280e (patch) | |
tree | 8e05a6107666674707d78502f3c221001f5ddd4d /web/react/components | |
parent | f340d21cf417547b7c35f435c7f071091e2c222c (diff) | |
parent | b4be8eb554d4de1de5b4928a37cb72c34d565487 (diff) | |
download | chat-772a4337c62c07e9f825ddc68283be2bee3b280e.tar.gz chat-772a4337c62c07e9f825ddc68283be2bee3b280e.tar.bz2 chat-772a4337c62c07e9f825ddc68283be2bee3b280e.zip |
Merge pull request #739 from rgarmsen2295/plt-39
PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/email_verify.jsx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/web/react/components/email_verify.jsx b/web/react/components/email_verify.jsx index 92123956f..8d3f15525 100644 --- a/web/react/components/email_verify.jsx +++ b/web/react/components/email_verify.jsx @@ -10,12 +10,14 @@ export default class EmailVerify extends React.Component { this.state = {}; } handleResend() { - window.location.href = window.location.href + '&resend=true'; + const newAddress = window.location.href.replace('&resend_success=true', ''); + window.location.href = newAddress + '&resend=true'; } render() { var title = ''; var body = ''; var resend = ''; + var resendConfirm = ''; if (this.props.isVerified === 'true') { title = global.window.config.SiteName + ' Email Verified'; body = <p>Your email has been verified! Click <a href={this.props.teamURL + '?email=' + this.props.userEmail}>here</a> to log in.</p>; @@ -30,6 +32,9 @@ export default class EmailVerify extends React.Component { Resend Email </button> ); + if (this.props.resendSuccess) { + resendConfirm = <div><br /><p className='alert alert-success'><i className='fa fa-check'></i>{' Verification email sent.'}</p></div>; + } } return ( @@ -41,6 +46,7 @@ export default class EmailVerify extends React.Component { <div className='panel-body'> {body} {resend} + {resendConfirm} </div> </div> </div> @@ -51,10 +57,12 @@ export default class EmailVerify extends React.Component { EmailVerify.defaultProps = { isVerified: 'false', teamURL: '', - userEmail: '' + userEmail: '', + resendSuccess: 'false' }; EmailVerify.propTypes = { isVerified: React.PropTypes.string, teamURL: React.PropTypes.string, - userEmail: React.PropTypes.string + userEmail: React.PropTypes.string, + resendSuccess: React.PropTypes.string }; |