Skip to content

changed EmailVerificationView Component to functional component #2405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2023
Merged

changed EmailVerificationView Component to functional component #2405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4e150
changed EmailVerificationVeiw Component to functional component
Akhilbisht798 Sep 10, 2023
834a115
added defaultProps for EmailVerficationVeiw
Akhilbisht798 Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 42 additions & 44 deletions client/modules/User/pages/EmailVerificationView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import React, { useEffect } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { withTranslation } from 'react-i18next';
Expand All @@ -9,57 +9,51 @@ import { verifyEmailConfirmation } from '../actions';
import RootPage from '../../../components/RootPage';
import Nav from '../../IDE/components/Header/Nav';

class EmailVerificationView extends React.Component {
static defaultProps = {
emailVerificationTokenState: null
};

componentWillMount() {
const verificationToken = this.verificationToken();
if (verificationToken != null) {
this.props.verifyEmailConfirmation(verificationToken);
}
}
const EmailVerificationView = (props) => {
const { emailVerificationTokenState, location, t } = props;

verificationToken = () => {
const { location } = this.props;
const verificationTokenFromLocation = () => {
const searchParams = new URLSearchParams(location.search);
return searchParams.get('t');
};

render() {
let status = null;
const { emailVerificationTokenState } = this.props;

if (this.verificationToken() == null) {
status = <p>{this.props.t('EmailVerificationView.InvalidTokenNull')}</p>;
} else if (emailVerificationTokenState === 'checking') {
status = <p>{this.props.t('EmailVerificationView.Checking')}</p>;
} else if (emailVerificationTokenState === 'verified') {
status = <p>{this.props.t('EmailVerificationView.Verified')}</p>;
setTimeout(() => browserHistory.push('/'), 1000);
} else if (emailVerificationTokenState === 'invalid') {
status = <p>{this.props.t('EmailVerificationView.InvalidState')}</p>;
useEffect(() => {
const verificationToken = verificationTokenFromLocation();
if (verificationToken != null) {
props.verifyEmailConfirmation(verificationToken);
}
}, [location, props]);

return (
<RootPage>
<Nav layout="dashboard" />
<div className="form-container">
<Helmet>
<title>{this.props.t('EmailVerificationView.Title')}</title>
</Helmet>
<div className="form-container__content">
<h2 className="form-container__title">
{this.props.t('EmailVerificationView.Verify')}
</h2>
{status}
</div>
</div>
</RootPage>
);
let status = null;

if (verificationTokenFromLocation() == null) {
status = <p>{t('EmailVerificationView.InvalidTokenNull')}</p>;
} else if (emailVerificationTokenState === 'checking') {
status = <p>{t('EmailVerificationView.Checking')}</p>;
} else if (emailVerificationTokenState === 'verified') {
status = <p>{t('EmailVerificationView.Verified')}</p>;
setTimeout(() => browserHistory.push('/'), 1000);
} else if (emailVerificationTokenState === 'invalid') {
status = <p>{t('EmailVerificationView.InvalidState')}</p>;
}
}

return (
<RootPage>
<Nav layout="dashboard" />
<div className="form-container">
<Helmet>
<title>{t('EmailVerificationView.Title')}</title>
</Helmet>
<div className="form-container__content">
<h2 className="form-container__title">
{t('EmailVerificationView.Verify')}
</h2>
{status}
</div>
</div>
</RootPage>
);
};

function mapStateToProps(state) {
return {
Expand All @@ -76,6 +70,10 @@ function mapDispatchToProps(dispatch) {
);
}

EmailVerificationView.defaultProps = {
emailVerificationTokenState: null
};

EmailVerificationView.propTypes = {
emailVerificationTokenState: PropTypes.oneOf([
'checking',
Expand Down