Merge from git
This commit is contained in:
@@ -28,33 +28,34 @@ const RenderTextfield = ({
|
||||
}) => {
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
className={
|
||||
touched && error
|
||||
? "govuk-form-group govuk-form-group--error"
|
||||
: "govuk-form-group "
|
||||
}
|
||||
>
|
||||
<div className="govuk-form-group ">
|
||||
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
|
||||
{label}
|
||||
</label>
|
||||
{touched && error && (
|
||||
<span id={id + "-error"} className="govuk-error-message">
|
||||
<span className="govuk-visually-hidden">Error:</span>{" "}
|
||||
{touched &&
|
||||
((error && (
|
||||
<span>{errorMsg ? errorMsg : error}</span>
|
||||
)) ||
|
||||
(warning && <span>{warning}</span>))}
|
||||
</span>
|
||||
)}
|
||||
<input
|
||||
{...input}
|
||||
className={className}
|
||||
name={name}
|
||||
id={id}
|
||||
type={type}
|
||||
/>
|
||||
<div>
|
||||
<input
|
||||
{...input}
|
||||
className={className}
|
||||
name={name}
|
||||
id={id}
|
||||
type={type}
|
||||
/>
|
||||
{touched && error && (
|
||||
<span
|
||||
id={id + "-error"}
|
||||
className="govuk-error-message govuk-form-group--error"
|
||||
>
|
||||
<span className="govuk-visually-hidden">
|
||||
Error:
|
||||
</span>{" "}
|
||||
{touched &&
|
||||
((error && (
|
||||
<span>{errorMsg ? errorMsg : error}</span>
|
||||
)) ||
|
||||
(warning && <span>{warning}</span>))}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
@@ -63,6 +64,8 @@ const RenderTextfield = ({
|
||||
const RegisterForm = (props) => {
|
||||
const {
|
||||
handleSubmit,
|
||||
pristine,
|
||||
valid,
|
||||
value,
|
||||
setRegisterFormComplete,
|
||||
setAccountCreatedComplete,
|
||||
@@ -87,21 +90,51 @@ const RegisterForm = (props) => {
|
||||
? "Invalid phone number"
|
||||
: undefined;
|
||||
|
||||
const passwordsMatch = (value, allValues) =>
|
||||
value !== allValues.pinswg_custom_password
|
||||
? "Passwords don't match"
|
||||
: undefined;
|
||||
|
||||
const minLength = (min) => (value) =>
|
||||
value && value.length < min
|
||||
? `Must be ${min} characters or more`
|
||||
: undefined;
|
||||
const minLength5 = minLength(5);
|
||||
|
||||
const [hasErrors, setHasErrors] = useState("");
|
||||
|
||||
const onHandleSubmit = (values) => {
|
||||
//console.log(values);
|
||||
setRegisterFormComplete(true);
|
||||
};
|
||||
|
||||
console.log(pristine);
|
||||
return (
|
||||
<>
|
||||
{!pristine && !valid && (
|
||||
<div>
|
||||
<span
|
||||
id={"summary-error"}
|
||||
className="govuk-error-message govuk-form-group--error-summary"
|
||||
>
|
||||
<span className="govuk-visually-hidden">Error:</span>{" "}
|
||||
<span className="govuk-error-exclamation">
|
||||
There are errors on this page. Please correct any
|
||||
required fields and submit again.
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{props.accountCreatedComplete != true ? (
|
||||
props.registerFormComplete == false ? (
|
||||
<form onSubmit={handleSubmit(onHandleSubmit)}>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
|
||||
<h2 className="govuk-fieldset__heading">
|
||||
About you
|
||||
{t(
|
||||
"account:register-new-account-sub-heading-1"
|
||||
)}
|
||||
</h2>
|
||||
</legend>
|
||||
<Field
|
||||
@@ -111,8 +144,12 @@ const RegisterForm = (props) => {
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required]}
|
||||
label="First name"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-first-name-label"
|
||||
)}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-first-name-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="lastname"
|
||||
@@ -121,93 +158,143 @@ const RegisterForm = (props) => {
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required]}
|
||||
label="Last name"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-last-name-label"
|
||||
)}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-last-name-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="email"
|
||||
id="email"
|
||||
name="emailaddress1"
|
||||
id="emailaddress1"
|
||||
component={RenderTextfield}
|
||||
type="email"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required, email]}
|
||||
label="Email address"
|
||||
label={t(
|
||||
"account:register-new-account-email-address-label"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="telephone"
|
||||
id="telephone"
|
||||
name="telephone1"
|
||||
id="telephone1"
|
||||
component={RenderTextfield}
|
||||
type="number"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
validate={[required, phoneNumber]}
|
||||
label="Telephone"
|
||||
label={t(
|
||||
"account:register-new-account-phone-label"
|
||||
)}
|
||||
/>
|
||||
|
||||
<Field
|
||||
name="companygroup"
|
||||
id="companygroup"
|
||||
name="pinswg_custom_password"
|
||||
id="pinswg_custom_password"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
type="password"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Company/Group"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-password-label"
|
||||
)}
|
||||
validate={[required, minLength5]}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-password-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="custom_password_check"
|
||||
id="custom_password_check"
|
||||
component={RenderTextfield}
|
||||
type="password"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label={t(
|
||||
"account:register-new-account-confirm-password-label"
|
||||
)}
|
||||
validate={[
|
||||
required,
|
||||
passwordsMatch,
|
||||
minLength5,
|
||||
]}
|
||||
errorMsg={t(
|
||||
"account:register-new-account-confirm-password-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
</fieldset>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
|
||||
<h2 className="govuk-fieldset__heading">
|
||||
What is your address?
|
||||
{t(
|
||||
"account:register-new-account-sub-heading-2"
|
||||
)}
|
||||
</h2>
|
||||
</legend>
|
||||
|
||||
<Field
|
||||
name="addressline1"
|
||||
id="addressline1"
|
||||
name="address1_line1"
|
||||
id="address1_line1"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Address line 1"
|
||||
label={t(
|
||||
"account:register-new-account-address-line-1-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-address-line-1-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="addressline2"
|
||||
id="addressline2"
|
||||
name="address1_line2"
|
||||
id="address1_line2"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-20"
|
||||
label="Address line 2"
|
||||
errorMsg="Is required"
|
||||
label={t(
|
||||
"account:register-new-account-address-line-2-label"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="towncity"
|
||||
id="towncity"
|
||||
name="address1_city"
|
||||
id="address1_city"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
label="Town/City"
|
||||
label={t(
|
||||
"account:register-new-account-town-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-town-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="county"
|
||||
id="county"
|
||||
name="address1_county"
|
||||
id="address1_county"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-10"
|
||||
label="County"
|
||||
label={t(
|
||||
"account:register-new-account-county-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-county-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
<Field
|
||||
name="postcode"
|
||||
id="postcode"
|
||||
name="address1_postalcode"
|
||||
id="address1_postalcode"
|
||||
component={RenderTextfield}
|
||||
type="text"
|
||||
className="govuk-input govuk-input--width-5"
|
||||
label="Postcode"
|
||||
label={t(
|
||||
"account:register-new-account-postcode-label"
|
||||
)}
|
||||
validate={[required]}
|
||||
errorMsg="Is required"
|
||||
errorMsg={t(
|
||||
"account:register-new-account-postcode-label-errormsg"
|
||||
)}
|
||||
/>
|
||||
</fieldset>
|
||||
|
||||
@@ -217,7 +304,7 @@ const RegisterForm = (props) => {
|
||||
className="govuk-button"
|
||||
data-module="govuk-button"
|
||||
>
|
||||
Continue
|
||||
{t("common:continue-button")}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
@@ -229,7 +316,11 @@ const RegisterForm = (props) => {
|
||||
/>
|
||||
)
|
||||
) : (
|
||||
<RegisterComplete />
|
||||
<RegisterComplete
|
||||
props={props}
|
||||
setRegisterFormComplete={setRegisterFormComplete}
|
||||
setAccountCreatedComplete={setAccountCreatedComplete}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user