Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion src/app/components/Authentication/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,18 @@ export class Login extends React.Component<LoginInterfaces.Props, LoginInterface
</div>
</div>
<div className="form-row">
<div className={ errorMessage ? classnames("col text-center mt -0 mb-2 errorMessage" ,styles['register-error-active']):""} >{errorMessage}</div>
<div
className={
errorMessage
? classnames(
'col text-center mt -0 mb-2 errorMessage',
styles['register-error-active'],
)
: ''
}
>
{errorMessage}
</div>
</div>
<div className="form-row">
<div className="col text-center">
Expand Down
40 changes: 27 additions & 13 deletions src/app/components/Authentication/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,11 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
})
}
/>
<label htmlFor="switch" className="flaglabel" style={{ backgroundColor: '#4630eb' }}>
<label
htmlFor="switch"
className="flaglabel"
style={{ backgroundColor: '#4630eb' }}
>
Toggle
</label>
</span>
Expand Down Expand Up @@ -298,14 +302,13 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
</div>
)}
<div className="input-group">

<ReactFlagsSelect
searchable={true}
placeholder="Search for a country"
className={classnames(styles["customFlag" ])}
defaultCountry="IN"
onSelect={this.onSelectFlag}
/>
<ReactFlagsSelect
searchable={true}
placeholder="Search for a country"
className={classnames(styles.customFlag)}
defaultCountry="IN"
onSelect={this.onSelectFlag}
/>

<div className={classnames('invalid-feedback', styles['register-error'])}>
Please Select a country
Expand Down Expand Up @@ -347,7 +350,10 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
ref={this.recaptchaRef}
/>
<div
className={classnames(styles['register-error-active'],"invalid-feedback text-center")}
className={classnames(
styles['register-error-active'],
'invalid-feedback text-center',
)}
style={{
display: !isCaptchaValidated && isFormSubmitted ? 'block' : 'none',
}}
Expand All @@ -357,7 +363,7 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
</div>
<div
className={
errorMessage===""
errorMessage === ''
? classnames(
'col text-center mt -0 mb-2 errorMessage',
styles['register-error-inactive'],
Expand Down Expand Up @@ -386,7 +392,11 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
<Row>
<div
className={classnames(styles['left-arrow'])}
onClick={() => { if(currentStep!==RegisterInterfaces.Steps.USER_DETAILS) this.handleStepChange(currentStep, currentStep - 1) }}
onClick={() => {
if (currentStep !== RegisterInterfaces.Steps.USER_DETAILS) {
this.handleStepChange(currentStep, currentStep - 1);
}
}}
>
<FontAwesomeIcon icon={faChevronCircleLeft} />
</div>
Expand Down Expand Up @@ -429,7 +439,11 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
</ul>
<div
className={classnames(styles['right-arrow'])}
onClick={() => { if(currentStep!==RegisterInterfaces.Steps.OTHERS) this.handleStepChange(currentStep, currentStep + 1) } }
onClick={() => {
if (currentStep !== RegisterInterfaces.Steps.OTHERS) {
this.handleStepChange(currentStep, currentStep + 1);
}
}}
>
<FontAwesomeIcon icon={faChevronCircleRight} />
</div>
Expand Down
16 changes: 7 additions & 9 deletions src/app/styles/Authentication.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,8 @@
overflow-y: hidden !important;
}

.stage-form{
width:390px;

.stage-form {
width: 390px;
}

.avatar-img {
Expand Down Expand Up @@ -147,7 +146,6 @@
margin-top: 3% !important;
}


.login-error {
background-color: #fee5d4;
padding: 9px;
Expand Down Expand Up @@ -246,11 +244,13 @@
cursor: pointer;
}

.left-arrow:active ,.left-arrow:focus {
.left-arrow:active,
.left-arrow:focus {
transform: scale(0.9);
}

.right-arrow:active , .right-arrow:focus{
.right-arrow:active,
.right-arrow:focus {
transform: scale(0.9);
}

Expand Down Expand Up @@ -352,8 +352,6 @@
border-radius: 5px;
}



.multi-steps > li.is-active:before,
.multi-steps > li.is-active ~ li:before {
content: counter(stepNum);
Expand Down Expand Up @@ -409,7 +407,7 @@
.multi-steps li.is-active {
color: #4630eb;
}
.multi-steps li:active:before{
.multi-steps li:active:before {
transform: scale(0.9);
}

Expand Down