karangupta-dev
diff --git a/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.html‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.html
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.html‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.html
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.scss‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.scss
+10Lines changed: 10 additions & 0 deletions b/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.scss‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.scss
+10Lines changed: 10 additions & 0 deletions
diff --git a/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.ts‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.ts
+24-7Lines changed: 24 additions & 7 deletions b/Collapse file
‎src/app/auth/components/sign-up/sign-up.component.ts‎
Copy file name to clipboardExpand all lines: src/app/auth/components/sign-up/sign-up.component.ts
+24-7Lines changed: 24 additions & 7 deletions
@@ -43,14 +43,14 @@ <h3 class="panel-title">Signup to {{title}}</h3>
               <div class="register-input-item">
                 <input type="password" class="register-user-input-password register-user-input" name="password_confirmation" formControlName="password_confirmation"
                   placeholder="Confirm Password" autocomplete="off">
-                <div *ngIf="signUpForm.get('password_confirmation').errors && signUpForm.get('password_confirmation').touched">
+                <div *ngIf="(signUpForm.get('password_confirmation').errors || signUpForm.hasError('mismatchedPasswords')) && signUpForm.get('password_confirmation').touched">
                   <span class="register-error-icon">!</span>
-                  <p class="register-error-message">{{signUpForm.get('password_confirmation').errors.msg || 'Password must match'}}</p>
+                  <p class="register-error-message">{{ 'Password must match'}}</p>
                 </div>
               </div>
 
               <div class="register-input-item">
-                <input type="number" min="1000000000" max="9999999999" class="register-user-input-mobile register-user-input" name="mobile"
+                <input type="number" class="register-user-input-mobile register-user-input" name="mobile"
                   formControlName="mobile" placeholder="Mobile Number (For order status updates)">
                 <div *ngIf="signUpForm.get('mobile').errors && signUpForm.get('mobile').touched">
                   <span class="register-error-icon">!</span>
 
@@ -218,6 +218,16 @@ a {
 [type=button], [type=reset], [type=submit], button {
   cursor: pointer;
 }
+/* For Firefox */
+input[type='number'] {
+    -moz-appearance:textfield;
+}
+/* Webkit browsers like Safari and Chrome */
+input[type=number]::-webkit-inner-spin-button,
+input[type=number]::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
 
 button, select {
   text-transform: none;
 
@@ -68,13 +68,14 @@ export class SignUpComponent implements OnInit, OnDestroy {
     const mobile = '';
     const gender = '';
 
-    this.signUpForm = this.fb.group({
-      'email': [email, Validators.required],
-      'password': [password, Validators.required],
-      'password_confirmation': [password_confirmation, Validators.required],
-      'mobile': [mobile, Validators.required],
-      'gender': [gender, Validators.required],
-    });
+    this.signUpForm = this.fb.group({  
+	  'email': [email, Validators.compose([Validators.required, Validators.email]) ],
+      'password': [password, Validators.compose([Validators.required, Validators.minLength(6)]) ],
+      'password_confirmation': [password_confirmation, Validators.compose([Validators.required, Validators.minLength(6)]) ],
+      'mobile': [mobile, Validators.compose([Validators.required, Validators.minLength(10), Validators.maxLength(10),Validators.pattern('[0-9]{10}')]) ],    
+      'gender': [gender, Validators.required]
+    },{validator: this.matchingPasswords('password', 'password_confirmation')}
+	);
   }
 
   redirectIfUserLoggedIn() {
@@ -88,4 +89,20 @@ export class SignUpComponent implements OnInit, OnDestroy {
   ngOnDestroy() {
     if (this.registerSubs) { this.registerSubs.unsubscribe(); }
   }
+  
+  matchingPasswords(passwordKey: string, confirmPasswordKey: string) {
+  return (group: FormGroup): {[key: string]: any} => {
+    let password = group.controls[passwordKey];
+    let confirmPassword = group.controls[confirmPasswordKey];
+    
+    if (password.value !== confirmPassword.value) {
+      return {
+        mismatchedPasswords: true		
+      };
+    }
+  }
+}
+
+  
+  
 }