Commit eff23e1d authored by Gauri Amol Pande's avatar Gauri Amol Pande
Browse files

Merge branch '57-registration-not-working-from-app' into 'master'

Resolve "Registration not working from App"

Closes #57

See merge request 92khra1mst/hft_awado_app!50
parents 7fa88a7b c011a53a
...@@ -18,31 +18,33 @@ ...@@ -18,31 +18,33 @@
</div> </div>
<ion-item ><ion-input type="text" formControlName="firstName" placeholder="Enter First Name"></ion-input></ion-item> <ion-item >
<ion-input type="text" formControlName="firstname" placeholder="Enter First Name"></ion-input>
</ion-item>
<div <div
*ngIf="angForm.controls['firstName'].invalid && (angForm.controls['firstName'].dirty || angForm.controls['firstName'].touched)" *ngIf="angForm.controls['firstname'].invalid && (angForm.controls['firstname'].dirty || angForm.controls['firstname'].touched)"
class="alert-danger"> class="alert-danger"><ion-icon name="alert"></ion-icon>
<div *ngIf="angForm.controls['firstName'].errors.required"> <div *ngIf="angForm.controls['firstName'].errors.required">
First Name is required. First Name is required.
</div> </div>
</div> </div>
<ion-item > <ion-item >
<ion-input type="text" formControlName="lastName" placeholder="Enter Last Name"></ion-input> <ion-input type="text" formControlName="lastname" placeholder="Enter Last Name"></ion-input>
</ion-item> </ion-item>
<div <div
*ngIf="angForm.controls['lastName'].invalid && (angForm.controls['lastName'].dirty || angForm.controls['lastName'].touched)" *ngIf="angForm.controls['lastname'].invalid && (angForm.controls['lastname'].dirty || angForm.controls['lastname'].touched)"
class="alert-danger"> class="alert-danger"><ion-icon name="alert"></ion-icon>
<div *ngIf="angForm.controls['lastName'].errors.required"> <div *ngIf="angForm.controls['lastName'].errors.required">
Last Name is required. Last Name is required.
</div> </div>
</div> </div>
<ion-item ><ion-input type="text" formControlName="email" placeholder="Enter Email"></ion-input></ion-item> <ion-item ><ion-input type="text" formControlName="email" placeholder="Enter Email"></ion-input></ion-item>
<div <div
*ngIf="angForm.controls['email'].invalid && (angForm.controls['email'].dirty || angForm.controls['email'].touched)" *ngIf="angForm.controls['email'].invalid && (angForm.controls['email'].dirty || angForm.controls['email'].touched)"
class="alert-danger"> class="alert-danger" ><ion-icon name="alert"></ion-icon>
<div *ngIf="angForm.controls['email'].errors.required"> <div *ngIf="angForm.controls['email'].errors.required ">
Email is required. Email is required.
</div> </div>
</div> </div>
...@@ -53,6 +55,7 @@ ...@@ -53,6 +55,7 @@
*ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)" *ngIf="angForm.controls['password'].invalid && (angForm.controls['password'].dirty || angForm.controls['password'].touched)"
class="alert-danger"> class="alert-danger">
<div *ngIf="angForm.controls['password'].errors.required"> <div *ngIf="angForm.controls['password'].errors.required">
Password is required. Password is required.
</div> </div>
</div> </div>
...@@ -65,6 +68,9 @@ ...@@ -65,6 +68,9 @@
<div padding> <div padding>
<ion-button [disabled]="angForm.pristine || angForm.invalid" size="large" expand="block" (click)="submitRegister()">Register</ion-button> <ion-button [disabled]="angForm.pristine || angForm.invalid" size="large" expand="block" (click)="submitRegister()">Register</ion-button>
</div> </div>
<div padding>
<ion-button size="large" expand="block" (click)="login()">Login</ion-button>
</div>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http'; import { HttpClient, HttpHeaders } from '@angular/common/http';
import { RestService } from 'src/app/rest.service'; import { RestService } from 'src/app/rest.service';
import { ToastService } from '../../services/toast.service'; import { ToastService } from '../../services/toast.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
...@@ -16,11 +16,8 @@ export class RegisterPage implements OnInit { ...@@ -16,11 +16,8 @@ export class RegisterPage implements OnInit {
registerApi: Observable<any>; registerApi: Observable<any>;
correctCredentials: boolean; correctCredentials: boolean;
email: "";
password: "";
lastName: "";
firstName: "";
constructor(private router: Router, constructor(private router: Router,
public httpClient: HttpClient, public httpClient: HttpClient,
public restService: RestService, public restService: RestService,
...@@ -34,10 +31,11 @@ export class RegisterPage implements OnInit { ...@@ -34,10 +31,11 @@ export class RegisterPage implements OnInit {
} }
createForm() { createForm() {
this.angForm = this.fb.group({ this.angForm = this.fb.group({
firstName: ['',[ Validators.required ]],
lastName: ['', [Validators.required ]], email: ['',[ Validators.required, Validators.email,Validators.pattern(/^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/)]],
email: ['',[ Validators.required, Validators.email]], password: ['', [Validators.required ]],
password: ['', [Validators.required,Validators.minLength(4) ]], firstname: ['',[ Validators.required ]],
lastname: ['', [Validators.required ]],
...@@ -48,13 +46,9 @@ export class RegisterPage implements OnInit { ...@@ -48,13 +46,9 @@ export class RegisterPage implements OnInit {
if (this.angForm.invalid) { if (this.angForm.invalid) {
return; return;
} }
let Form = JSON.stringify(this.angForm.value);
this.registerApi = this.httpClient.post('http://193.196.52.237:8081/register', { const headers = new HttpHeaders().set("Content-Type", 'application/json');
"email": this.email, this.registerApi = this.httpClient.post('http://193.196.52.237:8081/register', Form,{headers});
"password": this.password,
"firstname": this.firstName,
"lastname": this.lastName
});
this.registerApi this.registerApi
.subscribe((data) => { .subscribe((data) => {
console.log('my data: ', data); console.log('my data: ', data);
...@@ -68,4 +62,7 @@ export class RegisterPage implements OnInit { ...@@ -68,4 +62,7 @@ export class RegisterPage implements OnInit {
}); });
} }
login(){
this.router.navigateByUrl('/login');
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment