From 220ad7c99d30c9e3e3085640b9af378da269b973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?=
<60623551+arthurgdn@users.noreply.github.com>
Date: Tue, 22 Dec 2020 19:29:42 +0100
Subject: [PATCH] adds error message when email is already used and redirects
after signup (#64)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* improves phone number validation format
* adds message when email already used and redirects after signup
---
.../account/edit-data/edit-data.component.ts | 1 -
.../student-signup.component.html | 4 +---
.../student-signup/student-signup.component.ts | 18 +++++++++++++++++-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/app/members/account/edit-data/edit-data.component.ts b/src/app/members/account/edit-data/edit-data.component.ts
index c001642..72fb644 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -95,7 +95,6 @@ export class EditDataComponent implements OnInit {
street:this.personalData.street,
zipCode:this.personalData.zipCode,
city:this.personalData.city,
-
personalPhone:[this.personalData.personalPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
parentsPhone:[this.personalData.parentsPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 68c6854..31e460d 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,10 +33,7 @@
</mat-hint>
</mat-form-field>
-<<<<<<< HEAD
-=======
->>>>>>> donnees_personnelles
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>
@@ -61,6 +58,7 @@
<app-load-spinner *ngIf="loading" [block]="false"></app-load-spinner>
</button>
</div>
+ <p class="text-center">{{error}}</p>
<p class="text-center">
diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts
index a07350b..398a968 100644
--- a/src/app/signup/student-signup/student-signup.component.ts
+++ b/src/app/signup/student-signup/student-signup.component.ts
@@ -18,6 +18,7 @@ export class StudentSignupComponent implements OnInit {
registration: Registration;
personnalData: PersonnalData
formGroup: FormGroup;
+ error: String;
loading = false;
public showPersonnalDataForm = false;
public zipPattern = new RegExp(/^\d{5}(?:\d{2})?$/)
@@ -123,10 +124,25 @@ export class StudentSignupComponent implements OnInit {
'OK',
{ duration: 3000 },
)),
+ tap(()=> this.error = ""),
tap(() => this.loading = false),
+ tap(() => {
+ setTimeout(()=>{
+ this.router.navigate(['./membres'])
+
+ },3000)})
+
).subscribe(
() => {},
- (error) => this.loading = false,
+ (error) => {
+
+
+ this.loading=false
+
+ if(error.error.email){
+ this.error = "Erreur, cet email est déjà utilisé !"
+ }
+ }
);
// this.personnalDataService.create(personnalData).pipe(
// tap(() => this.loading = false),
--
GitLab