Skip to content

Commit aa92574

Browse files
committed
edited register to submit with ngform and without doubled click event, added navigation
1 parent 8a8da70 commit aa92574

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

src/pages/register/register.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,13 @@
9393
<p class="invalid-text">Passwords do not match</p>
9494
</ion-item>
9595

96-
<button id="register-button"color="secondary" ion-button [disabled]="!validate.valid" (click)='submitReg()'>REGISTER</button>
96+
<!--<button id="register-button"color="secondary" ion-button [disabled]="!validate.valid" (click)='submitReg()'>REGISTER</button>-->
97+
<button id="register-button"color="secondary" ion-button [disabled]="!validate.valid" type="submit">REGISTER</button>
9798
</form>
9899

99100
<div class='login2'>
100101
<p id="sign-in">If you already have an account, sign in.</p>
101-
<button id="login-button"color="primary" ion-button>LOGIN</button>
102+
<button id="login-button"color="primary" ion-button (click)="goLogin()">LOGIN</button>
102103
</div>
103104

104105
</ion-content>

src/pages/register/register.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { NavController, NavParams } from 'ionic-angular';
33
import { Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms';
44
import { PasswordValidator } from '../../validators/password.validator';
55
import { UserProvider } from '../../providers/user/user';
6+
import { WizardPage } from '../wizard/wizard'
7+
import { LoginPage } from '../login/login';
68

79

810

@@ -45,16 +47,19 @@ export class RegisterPage {
4547
this._user.sendReg(this.registerUser)
4648
.subscribe( (data: any) => {
4749
console.log('data from submitReg()', data)
48-
}/*,
50+
},
4951
err => {
5052
console.error('err from register:', err)
51-
this.presentToast()
53+
//this.presentToast()
5254
},
5355
() => {
54-
this.navCtrl.setRoot(HomePage, {registered: this.user})
55-
}*/
56+
this.navCtrl.setRoot(WizardPage, {registered: this.registerUser})
57+
}
5658
)
57-
59+
}
60+
61+
goLogin() {
62+
this.navCtrl.setRoot(LoginPage)
5863
}
5964

6065
}

0 commit comments

Comments
 (0)