Skip to content

Commit 6b4b9ad

Browse files
committed
removed duplicate first and last name inputs
1 parent daf3a56 commit 6b4b9ad

1 file changed

Lines changed: 35 additions & 68 deletions

File tree

src/pages/register/register.html

Lines changed: 35 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -61,76 +61,43 @@ <h1 id="title">INTRANSITION</h1>
6161
<ion-item class="input" no-lines *ngIf="!validate.controls.email.valid && (validate.controls.email.dirty || submitAttempt)">
6262
<p class="invalid-text">Enter a valid email</p>
6363
</ion-item><br>
64-
65-
<ion-row justify-content-center>
66-
<ion-col col-10>
67-
<ion-item no-lines>
68-
<ion-input
69-
class="inputs"
70-
type="text"
71-
#first
72-
placeholder="First Name"
73-
formControlName='first'
74-
[class.invalid]="!validate.controls.first.valid && (validate.controls.first.dirty || submitAttempt)">
75-
</ion-input>
76-
</ion-item>
77-
<ion-item no-lines *ngIf="!validate.controls.first.valid && (validate.controls.first.dirty || submitAttempt)">
78-
<p class="invalid-text">Enter a valid name</p>
79-
</ion-item><br>
80-
</ion-col>
81-
</ion-row>
8264

83-
<ion-row justify-content-center>
84-
<ion-col col-10>
85-
<ion-item no-lines>
86-
<ion-input
87-
type="text"
88-
#last
89-
placeholder="Last Name"
90-
formControlName='last'
91-
[class.invalid]="!validate.controls.last.valid && (validate.controls.last.dirty || submitAttempt)">
92-
</ion-input>
93-
</ion-item>
94-
<ion-item no-lines *ngIf="!validate.controls.last.valid && (validate.controls.last.dirty || submitAttempt)">
95-
<p class="invalid-text">Enter a valid name</p>
96-
</ion-item><br>
97-
</ion-col>
98-
</ion-row>
65+
<div formGroupName="pass">
66+
<ion-row justify-content-center>
67+
<ion-col col-10>
68+
<ion-item no-lines>
69+
<ion-input
70+
type="password"
71+
#pass
72+
placeholder="Password"
73+
formControlName='password'
74+
[class.invalid]="!validate.controls.pass.controls.password.valid && (validate.controls.pass.controls.password.dirty || submitAttempt)">
75+
</ion-input>
76+
</ion-item>
77+
<ion-item no-lines *ngIf="!validate.controls.pass.controls.password.valid && (validate.controls.pass.controls.password.dirty || submitAttempt)">
78+
<p class="invalid-text">Enter a password between 6-30 characters using only letters and numbers</p>
79+
</ion-item><br>
80+
</ion-col>
81+
</ion-row>
82+
83+
<ion-row justify-content-center>
84+
<ion-col col-10>
85+
<ion-item no-lines>
86+
<ion-input
87+
type="password"
88+
#repass
89+
placeholder="Password Confirmation"
90+
formControlName='passwordCheck'
91+
[class.invalid]="!validate.controls.pass.controls.passwordCheck.valid && (validate.controls.pass.controls.passwordCheck.dirty || submitAttempt)">
92+
</ion-input>
93+
</ion-item>
94+
<ion-item no-lines *ngIf="!validate.controls.pass.valid && (validate.controls.pass.controls.passwordCheck.dirty || submitAttempt)">
95+
<p class="invalid-text">Passwords do not match</p>
96+
</ion-item>
97+
</ion-col>
98+
</ion-row>
99+
</div>
99100

100-
101-
<ion-row justify-content-center>
102-
<ion-col col-10>
103-
<ion-item no-lines>
104-
<ion-input
105-
type="password"
106-
#pass
107-
placeholder="Password"
108-
formControlName='password'
109-
[class.invalid]="!validate.controls.password.valid && (validate.controls.password.dirty || submitAttempt)">
110-
</ion-input>
111-
</ion-item>
112-
<ion-item no-lines *ngIf="!validate.controls.password.valid && (validate.controls.password.dirty || submitAttempt)">
113-
<p class="invalid-text">Enter a password between 6-30 characters using only letters and numbers</p>
114-
</ion-item><br>
115-
</ion-col>
116-
</ion-row>
117-
118-
<ion-row justify-content-center>
119-
<ion-col col-10>
120-
<ion-item no-lines>
121-
<ion-input
122-
type="password"
123-
#repass
124-
placeholder="Password Confirmation"
125-
formControlName='passwordCheck'
126-
[class.invalid]="!validate.controls.passwordCheck.valid && (validate.controls.passwordCheck.dirty || submitAttempt)">
127-
</ion-input>
128-
</ion-item>
129-
<ion-item no-lines *ngIf="!validate.controls.passwordCheck.valid && (validate.controls.passwordCheck.dirty || submitAttempt)">
130-
<p class="invalid-text">Passwords do not match</p>
131-
</ion-item>
132-
</ion-col>
133-
</ion-row>
134101
<button id="register-button"color="secondary" ion-button [disabled]="!validate.valid" type="submit">REGISTER</button>
135102
</form>
136103

0 commit comments

Comments
 (0)