|
|
|
@ -3,8 +3,8 @@
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
|
|
|
|
import React from 'react';
|
|
|
|
import React from 'react';
|
|
|
|
import Form, { FormComponentProps } from '@ant-design/compatible/lib/form/Form';
|
|
|
|
|
|
|
|
import { UserAddOutlined, MailOutlined, LockOutlined } from '@ant-design/icons';
|
|
|
|
import { UserAddOutlined, MailOutlined, LockOutlined } from '@ant-design/icons';
|
|
|
|
|
|
|
|
import Form, { RuleRender, RuleObject } from 'antd/lib/form';
|
|
|
|
import Button from 'antd/lib/button';
|
|
|
|
import Button from 'antd/lib/button';
|
|
|
|
import Input from 'antd/lib/input';
|
|
|
|
import Input from 'antd/lib/input';
|
|
|
|
import Checkbox from 'antd/lib/checkbox';
|
|
|
|
import Checkbox from 'antd/lib/checkbox';
|
|
|
|
@ -29,175 +29,153 @@ export interface RegisterData {
|
|
|
|
confirmations: UserConfirmation[];
|
|
|
|
confirmations: UserConfirmation[];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type RegisterFormProps = {
|
|
|
|
interface Props {
|
|
|
|
fetching: boolean;
|
|
|
|
fetching: boolean;
|
|
|
|
userAgreements: UserAgreement[];
|
|
|
|
userAgreements: UserAgreement[];
|
|
|
|
onSubmit(registerData: RegisterData): void;
|
|
|
|
onSubmit(registerData: RegisterData): void;
|
|
|
|
} & FormComponentProps;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function validateUsername(_: RuleObject, value: string): Promise<void> {
|
|
|
|
|
|
|
|
if (!patterns.validateUsernameLength.pattern.test(value)) {
|
|
|
|
|
|
|
|
return Promise.reject(new Error(patterns.validateUsernameLength.message));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
|
|
|
|
if (!patterns.validateUsernameCharacters.pattern.test(value)) {
|
|
|
|
private validateConfirmation = (rule: any, value: any, callback: any): void => {
|
|
|
|
return Promise.reject(new Error(patterns.validateUsernameCharacters.message));
|
|
|
|
const { form } = this.props;
|
|
|
|
|
|
|
|
if (value && value !== form.getFieldValue('password1')) {
|
|
|
|
|
|
|
|
callback('Two passwords that you enter is inconsistent!');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
callback();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private validatePassword = (_: any, value: any, callback: any): void => {
|
|
|
|
return Promise.resolve();
|
|
|
|
const { form } = this.props;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export const validatePassword: RuleRender = (): RuleObject => ({
|
|
|
|
|
|
|
|
validator(_: RuleObject, value: string): Promise<void> {
|
|
|
|
if (!patterns.validatePasswordLength.pattern.test(value)) {
|
|
|
|
if (!patterns.validatePasswordLength.pattern.test(value)) {
|
|
|
|
callback(patterns.validatePasswordLength.message);
|
|
|
|
return Promise.reject(new Error(patterns.validatePasswordLength.message));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!patterns.passwordContainsNumericCharacters.pattern.test(value)) {
|
|
|
|
if (!patterns.passwordContainsNumericCharacters.pattern.test(value)) {
|
|
|
|
callback(patterns.passwordContainsNumericCharacters.message);
|
|
|
|
return Promise.reject(new Error(patterns.passwordContainsNumericCharacters.message));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!patterns.passwordContainsUpperCaseCharacter.pattern.test(value)) {
|
|
|
|
if (!patterns.passwordContainsUpperCaseCharacter.pattern.test(value)) {
|
|
|
|
callback(patterns.passwordContainsUpperCaseCharacter.message);
|
|
|
|
return Promise.reject(new Error(patterns.passwordContainsUpperCaseCharacter.message));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!patterns.passwordContainsLowerCaseCharacter.pattern.test(value)) {
|
|
|
|
if (!patterns.passwordContainsLowerCaseCharacter.pattern.test(value)) {
|
|
|
|
callback(patterns.passwordContainsLowerCaseCharacter.message);
|
|
|
|
return Promise.reject(new Error(patterns.passwordContainsLowerCaseCharacter.message));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (value) {
|
|
|
|
|
|
|
|
form.validateFields(['password2'], { force: true });
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
callback();
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private validateUsername = (_: any, value: any, callback: any): void => {
|
|
|
|
|
|
|
|
if (!patterns.validateUsernameLength.pattern.test(value)) {
|
|
|
|
|
|
|
|
callback(patterns.validateUsernameLength.message);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!patterns.validateUsernameCharacters.pattern.test(value)) {
|
|
|
|
|
|
|
|
callback(patterns.validateUsernameCharacters.message);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
callback();
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private validateAgrement = (agreement: any, value: any, callback: any): void => {
|
|
|
|
|
|
|
|
const { userAgreements } = this.props;
|
|
|
|
|
|
|
|
let isValid = true;
|
|
|
|
|
|
|
|
for (const userAgreement of userAgreements) {
|
|
|
|
|
|
|
|
if (agreement.field === userAgreement.name && userAgreement.required && !value) {
|
|
|
|
|
|
|
|
isValid = false;
|
|
|
|
|
|
|
|
callback(`You must accept the ${userAgreement.displayText} to continue!`);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isValid) {
|
|
|
|
|
|
|
|
callback();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private handleSubmit = (e: React.FormEvent): void => {
|
|
|
|
|
|
|
|
e.preventDefault();
|
|
|
|
|
|
|
|
const { form, onSubmit, userAgreements } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
form.validateFields((error, values): void => {
|
|
|
|
return Promise.resolve();
|
|
|
|
if (!error) {
|
|
|
|
},
|
|
|
|
const validatedFields = {
|
|
|
|
});
|
|
|
|
...values,
|
|
|
|
|
|
|
|
confirmations: [],
|
|
|
|
export const validateConfirmation: ((firstFieldName: string) => RuleRender) = (
|
|
|
|
};
|
|
|
|
firstFieldName: string,
|
|
|
|
|
|
|
|
): RuleRender => ({ getFieldValue }): RuleObject => ({
|
|
|
|
for (const userAgreement of userAgreements) {
|
|
|
|
validator(_: RuleObject, value: string): Promise<void> {
|
|
|
|
validatedFields.confirmations.push({
|
|
|
|
if (value && value !== getFieldValue(firstFieldName)) {
|
|
|
|
name: userAgreement.name,
|
|
|
|
return Promise.reject(new Error('Two passwords that you enter is inconsistent!'));
|
|
|
|
value: validatedFields[userAgreement.name],
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
delete validatedFields[userAgreement.name];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
onSubmit(validatedFields);
|
|
|
|
return Promise.resolve();
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const validateAgreement: ((userAgreements: UserAgreement[]) => RuleRender) = (
|
|
|
|
|
|
|
|
userAgreements: UserAgreement[],
|
|
|
|
|
|
|
|
): RuleRender => () => ({
|
|
|
|
|
|
|
|
validator(rule: any, value: boolean): Promise<void> {
|
|
|
|
|
|
|
|
const [, name] = rule.field.split(':');
|
|
|
|
|
|
|
|
const [agreement] = userAgreements
|
|
|
|
|
|
|
|
.filter((userAgreement: UserAgreement): boolean => userAgreement.name === name);
|
|
|
|
|
|
|
|
if (agreement.required && !value) {
|
|
|
|
|
|
|
|
return Promise.reject(new Error(`You must accept ${agreement.displayText} to continue!`));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private renderFirstNameField(): JSX.Element {
|
|
|
|
return Promise.resolve();
|
|
|
|
const { form } = this.props;
|
|
|
|
},
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function RegisterFormComponent(props: Props): JSX.Element {
|
|
|
|
|
|
|
|
const { fetching, userAgreements, onSubmit } = props;
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
<Form
|
|
|
|
{form.getFieldDecorator('firstName', {
|
|
|
|
onFinish={(values: Record<string, string | boolean>) => {
|
|
|
|
rules: [
|
|
|
|
const agreements = Object.keys(values)
|
|
|
|
|
|
|
|
.filter((key: string):boolean => key.startsWith('agreement:'));
|
|
|
|
|
|
|
|
const confirmations = agreements
|
|
|
|
|
|
|
|
.map((key: string): UserConfirmation => ({ name: key.split(':')[1], value: (values[key] as boolean) }));
|
|
|
|
|
|
|
|
const rest = Object.entries(values)
|
|
|
|
|
|
|
|
.filter((entry: (string | boolean)[]) => !agreements.includes(entry[0] as string));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onSubmit({
|
|
|
|
|
|
|
|
...(Object.fromEntries(rest) as any as RegisterData),
|
|
|
|
|
|
|
|
confirmations,
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}}
|
|
|
|
|
|
|
|
className='register-form'
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<Row gutter={8}>
|
|
|
|
|
|
|
|
<Col span={12}>
|
|
|
|
|
|
|
|
<Form.Item
|
|
|
|
|
|
|
|
hasFeedback
|
|
|
|
|
|
|
|
name='firstName'
|
|
|
|
|
|
|
|
rules={[
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please specify a first name',
|
|
|
|
message: 'Please specify a first name',
|
|
|
|
pattern: patterns.validateName.pattern,
|
|
|
|
pattern: patterns.validateName.pattern,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
]}
|
|
|
|
})(
|
|
|
|
>
|
|
|
|
<Input
|
|
|
|
<Input
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='First name'
|
|
|
|
placeholder='First name'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
</Col>
|
|
|
|
}
|
|
|
|
<Col span={12}>
|
|
|
|
|
|
|
|
<Form.Item
|
|
|
|
private renderLastNameField(): JSX.Element {
|
|
|
|
hasFeedback
|
|
|
|
const { form } = this.props;
|
|
|
|
name='lastName'
|
|
|
|
|
|
|
|
rules={[
|
|
|
|
return (
|
|
|
|
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
|
|
|
|
{form.getFieldDecorator('lastName', {
|
|
|
|
|
|
|
|
rules: [
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please specify a last name',
|
|
|
|
message: 'Please specify a last name',
|
|
|
|
pattern: patterns.validateName.pattern,
|
|
|
|
pattern: patterns.validateName.pattern,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
]}
|
|
|
|
})(
|
|
|
|
>
|
|
|
|
<Input
|
|
|
|
<Input
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='Last name'
|
|
|
|
placeholder='Last name'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
</Col>
|
|
|
|
}
|
|
|
|
</Row>
|
|
|
|
|
|
|
|
<Form.Item
|
|
|
|
private renderUsernameField(): JSX.Element {
|
|
|
|
hasFeedback
|
|
|
|
const { form } = this.props;
|
|
|
|
name='username'
|
|
|
|
|
|
|
|
rules={[
|
|
|
|
return (
|
|
|
|
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
|
|
|
|
{form.getFieldDecorator('username', {
|
|
|
|
|
|
|
|
rules: [
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please specify a username',
|
|
|
|
message: 'Please specify a username',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{
|
|
|
|
validator: this.validateUsername,
|
|
|
|
validator: validateUsername,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
]}
|
|
|
|
})(
|
|
|
|
>
|
|
|
|
<Input
|
|
|
|
<Input
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<UserAddOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='Username'
|
|
|
|
placeholder='Username'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private renderEmailField(): JSX.Element {
|
|
|
|
|
|
|
|
const { form } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
<Form.Item
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
hasFeedback
|
|
|
|
{form.getFieldDecorator('email', {
|
|
|
|
name='email'
|
|
|
|
rules: [
|
|
|
|
rules={[
|
|
|
|
{
|
|
|
|
{
|
|
|
|
type: 'email',
|
|
|
|
type: 'email',
|
|
|
|
message: 'The input is not valid E-mail!',
|
|
|
|
message: 'The input is not valid E-mail!',
|
|
|
|
@ -206,120 +184,71 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please specify an email address',
|
|
|
|
message: 'Please specify an email address',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
]}
|
|
|
|
})(
|
|
|
|
>
|
|
|
|
<Input
|
|
|
|
<Input
|
|
|
|
autoComplete='email'
|
|
|
|
autoComplete='email'
|
|
|
|
prefix={<MailOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<MailOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='Email address'
|
|
|
|
placeholder='Email address'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private renderPasswordField(): JSX.Element {
|
|
|
|
|
|
|
|
const { form } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
<Form.Item
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
hasFeedback
|
|
|
|
{form.getFieldDecorator('password1', {
|
|
|
|
name='password1'
|
|
|
|
rules: [
|
|
|
|
rules={[
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please input your password!',
|
|
|
|
message: 'Please input your password!',
|
|
|
|
},
|
|
|
|
}, validatePassword,
|
|
|
|
{
|
|
|
|
]}
|
|
|
|
validator: this.validatePassword,
|
|
|
|
>
|
|
|
|
},
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
})(
|
|
|
|
|
|
|
|
<Input.Password
|
|
|
|
<Input.Password
|
|
|
|
autoComplete='new-password'
|
|
|
|
autoComplete='new-password'
|
|
|
|
prefix={<LockOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<LockOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='Password'
|
|
|
|
placeholder='Password'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private renderPasswordConfirmationField(): JSX.Element {
|
|
|
|
|
|
|
|
const { form } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
<Form.Item
|
|
|
|
<Form.Item hasFeedback>
|
|
|
|
hasFeedback
|
|
|
|
{form.getFieldDecorator('password2', {
|
|
|
|
name='password2'
|
|
|
|
rules: [
|
|
|
|
dependencies={['password1']}
|
|
|
|
|
|
|
|
rules={[
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'Please confirm your password!',
|
|
|
|
message: 'Please confirm your password!',
|
|
|
|
},
|
|
|
|
}, validateConfirmation('password1'),
|
|
|
|
{
|
|
|
|
]}
|
|
|
|
validator: this.validateConfirmation,
|
|
|
|
>
|
|
|
|
},
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
})(
|
|
|
|
|
|
|
|
<Input.Password
|
|
|
|
<Input.Password
|
|
|
|
autoComplete='new-password'
|
|
|
|
autoComplete='new-password'
|
|
|
|
prefix={<LockOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
prefix={<LockOutlined style={{ color: 'rgba(0, 0, 0, 0.25)' }} />}
|
|
|
|
placeholder='Confirm password'
|
|
|
|
placeholder='Confirm password'
|
|
|
|
/>,
|
|
|
|
/>
|
|
|
|
)}
|
|
|
|
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private renderUserAgreements(): JSX.Element[] {
|
|
|
|
{userAgreements.map((userAgreement: UserAgreement): JSX.Element => (
|
|
|
|
const { form, userAgreements } = this.props;
|
|
|
|
<Form.Item
|
|
|
|
const getUserAgreementsElements = (): JSX.Element[] => {
|
|
|
|
name={`agreement:${userAgreement.name}`}
|
|
|
|
const agreementsList: JSX.Element[] = [];
|
|
|
|
key={userAgreement.name}
|
|
|
|
for (const userAgreement of userAgreements) {
|
|
|
|
initialValue={false}
|
|
|
|
agreementsList.push(
|
|
|
|
valuePropName='checked'
|
|
|
|
<Form.Item key={userAgreement.name}>
|
|
|
|
rules={[
|
|
|
|
{form.getFieldDecorator(userAgreement.name, {
|
|
|
|
|
|
|
|
initialValue: false,
|
|
|
|
|
|
|
|
valuePropName: 'checked',
|
|
|
|
|
|
|
|
rules: [
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
required: true,
|
|
|
|
required: true,
|
|
|
|
message: 'You must accept to continue!',
|
|
|
|
message: 'You must accept to continue!',
|
|
|
|
},
|
|
|
|
}, validateAgreement(userAgreements),
|
|
|
|
{
|
|
|
|
]}
|
|
|
|
validator: this.validateAgrement,
|
|
|
|
>
|
|
|
|
},
|
|
|
|
|
|
|
|
],
|
|
|
|
|
|
|
|
})(
|
|
|
|
|
|
|
|
<Checkbox>
|
|
|
|
<Checkbox>
|
|
|
|
I read and accept the
|
|
|
|
I read and accept the
|
|
|
|
<a rel='noopener noreferrer' target='_blank' href={userAgreement.url}>
|
|
|
|
<a rel='noopener noreferrer' target='_blank' href={userAgreement.url}>
|
|
|
|
{` ${userAgreement.displayText}`}
|
|
|
|
{` ${userAgreement.displayText}`}
|
|
|
|
</a>
|
|
|
|
</a>
|
|
|
|
</Checkbox>,
|
|
|
|
</Checkbox>
|
|
|
|
)}
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>,
|
|
|
|
))}
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return agreementsList;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return getUserAgreementsElements();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public render(): JSX.Element {
|
|
|
|
|
|
|
|
const { fetching } = this.props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
|
|
|
<Form onSubmit={this.handleSubmit} className='login-form'>
|
|
|
|
|
|
|
|
<Row gutter={8}>
|
|
|
|
|
|
|
|
<Col span={12}>{this.renderFirstNameField()}</Col>
|
|
|
|
|
|
|
|
<Col span={12}>{this.renderLastNameField()}</Col>
|
|
|
|
|
|
|
|
</Row>
|
|
|
|
|
|
|
|
{this.renderUsernameField()}
|
|
|
|
|
|
|
|
{this.renderEmailField()}
|
|
|
|
|
|
|
|
{this.renderPasswordField()}
|
|
|
|
|
|
|
|
{this.renderPasswordConfirmationField()}
|
|
|
|
|
|
|
|
{this.renderUserAgreements()}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<Form.Item>
|
|
|
|
<Form.Item>
|
|
|
|
<Button
|
|
|
|
<Button
|
|
|
|
@ -334,7 +263,6 @@ class RegisterFormComponent extends React.PureComponent<RegisterFormProps> {
|
|
|
|
</Form.Item>
|
|
|
|
</Form.Item>
|
|
|
|
</Form>
|
|
|
|
</Form>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export default Form.create<RegisterFormProps>()(RegisterFormComponent);
|
|
|
|
export default React.memo(RegisterFormComponent);
|
|
|
|
|
Boris Sekachev
5 years ago