App hotfix

Author: khoadnguyen

src/app/app.module.ts

@@ -21,7 +21,6 @@ import { TimelineTimeComponent } from '../components/timeline/timeline';
 
 import { ChartsModule } from 'ng2-charts';
 import { UserProvider } from '../providers/user/user';
-import { HttpClientModule } from '@angular/common/http';
 
 @NgModule({
   declarations: [

src/pages/register/register.html

@@ -96,20 +96,7 @@ <h1 id="title">INTRANSITION</h1>
           </ion-item><br>
         </ion-col>
       </ion-row>
-      
-      <ion-item class="input" no-lines>
-        <ion-input 
-          [(ngModel)]="registerUser.password"
-          class="input" 
-          type="password" 
-          #pass 
-          placeholder="Password" 
-          formControlName='password'
-          [class.invalid]="!validate.controls.password.valid && (validate.controls.password.dirty || submitAttempt)"></ion-input> 
-      </ion-item>
-      <ion-item class="input" no-lines *ngIf="!validate.controls.password.valid  && (validate.controls.password.dirty || submitAttempt)">
-        <p class="invalid-text">Enter a password between 6-30 characters using only letters and numbers</p>
-      </ion-item><br>
+
 
       <ion-row justify-content-center>
         <ion-col col-10>
@@ -152,5 +139,4 @@ <h1 id="title">INTRANSITION</h1>
       <button id="login-button"color="primary" ion-button (click)="goLogin()">LOGIN</button>
     </div>
 
-    </ion-grid>
 </ion-content>

src/pages/register/register.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams } from 'ionic-angular';
-import { Validators, FormBuilder, FormGroup} from '@angular/forms';
+import { Validators, FormBuilder, FormGroup, FormControl} from '@angular/forms';
 import { PasswordValidator } from '../../validators/password.validator';
 import { UserProvider } from '../../providers/user/user';
 import { WizardPage } from '../wizard/wizard'
@@ -24,16 +24,16 @@ export class RegisterPage {
   private validate: FormGroup
   submitAttempt: boolean = false;
 
-  constructor(public navCtrl: NavController, public navParams: NavParams, private fb: FormBuilder, public _user: UserProvider) {
+  constructor(public navCtrl: NavController, public navParams: NavParams, private formBuilder: FormBuilder, public _user: UserProvider) {
 
-    this.validate = this.fb.group({
+    this.validate = this.formBuilder.group({
       first: ['', Validators.compose([Validators.maxLength(30), Validators.pattern('[a-zA-Z ]*'), Validators.required])],
       last: ['', Validators.compose([Validators.maxLength(30), Validators.pattern('[a-zA-Z ]*'), Validators.required])],
-      email: ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$')])],
-      pass: this.formbuilder.group({
-        password: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(30), Validators.pattern('[a-zA-Z0-9 ]*'), Validators.required])],
-        passwordCheck: ['', Validators.required]
-      }, {validator: PasswordValidator})
+      email: ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$')])]
+      // pass: this.formBuilder.group({
+      //   password: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(30), Validators.pattern('[a-zA-Z0-9 ]*'), Validators.required])],
+      //   passwordCheck: ['', Validators.required]
+      // }, {validator: PasswordValidator})
     })
 
   }