From 4b9f56bc6b390d2c66311380d8f8c2379ca8a8f8 Mon Sep 17 00:00:00 2001
From: ThomasBidot <77505438+ThomasBidot@users.noreply.github.com>
Date: Tue, 7 Dec 2021 16:20:20 +0100
Subject: [PATCH] Back to no email verification
---
.../student-signup.component.ts | 312 ++++--------------
1 file changed, 73 insertions(+), 239 deletions(-)
diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts
index 3b35859..1069166 100644
--- a/src/app/signup/student-signup/student-signup.component.ts
+++ b/src/app/signup/student-signup/student-signup.component.ts
@@ -2,10 +2,9 @@ import { Component, OnInit } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { MatSnackBar } from '@angular/material';
-// import { Observable } from 'rxjs';
+import { Observable } from 'rxjs';
import { tap, mergeMap } from 'rxjs/operators';
-import { Registration, RegistrationService, PersonnalData, PersonnalDataService } from '../core';
-import { CustomValidators, ConfirmValidParentMatcher, errorMessages } from '../core/customValidationModule';
+import { Registration, RegistrationService, PasswordErrorStateMatcher,PersonnalData,PersonnalDataService } from '../core';
import { AuthService } from 'app/core';
@@ -14,266 +13,108 @@ import { AuthService } from 'app/core';
templateUrl: './student-signup.component.html',
styleUrls: ['./student-signup.component.scss']
})
-// 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})?$/)
-// public possibleParentsStatus = [
-// { id: "maried", name: "Mariés" },
-// { id: "divorced", name: "Divorcés" },
-// { id: "cohabitation", name: "En concubinage" },
-// { id: "monoparental", name: "Famille monoparentale" }
-// ]
-
-// public possibleParentsActivities = [
-// { id: "farmer", name: "Agriculteur" },
-// { id: "artisan", name: "Artisan, commerçant, chef d'entreprise" },
-// { id: "executive", name: "Cadre, profession intellectuelle supérieure" },
-// { id: "teacher", name: "Enseignant et assimilé" },
-// { id: "intermediate", name: "Profession intermédiaire" },
-// { id: "employee", name: "Employé" },
-// { id: "worker", name: "Ouvrier" },
-// { id: "retreated", name: "Retraité" },
-// { id: "inactive", name: "Inactif" },
-// { id: "other", name: "Autre" }
-// ]
-
-// public possibleScholarships = [
-// { id: "echelon1", name: "Oui, échelon 1" },
-// { id: "echelon2", name: "Oui, échelon 2" },
-// { id: "echelon3", name: "Oui, échelon 3" },
-// { id: "echelon4", name: "Oui, échelon 4" },
-// { id: "echelon5", name: "Oui, échelon 5" },
-// { id: "echelon6", name: "Oui, échelon 6" },
-// { id: "no", name: "Non" },
-// ]
-
-// passwordMatcher = new PasswordErrorStateMatcher();
-// emailMatcher = new EmailErrorStateMatcher();
-
-// constructor(
-// private registrationService: RegistrationService,
-// private personnalDataService: PersonnalDataService,
-// private formBuilder: FormBuilder,
-// private router: Router,
-// private auth: AuthService,
-// private snackBar: MatSnackBar,
-
-// ) { }
-
-// ngOnInit() {
-// this.createForm();
-// }
-
-// createForm() {
-
-// this.formGroup = this.formBuilder.group({
-// firstName: '',
-// lastName: '',
-// email: ['', Validators.email],
-// emailConfirm: '',
-// phoneNumber: '',
-// gender: '',
-// adressNumber: '',
-// street: '',
-// zipCode: ['', Validators.pattern(this.zipPattern)],
-// city: '',
-// personnalPhone: '',
-// parentsPhone: '',
-// parentsEmail: ['', Validators.email],
-// school: '',
-// grade: '',
-// section: '',
-// specialTeaching: '',
-// scholarship: '',
-// fatherActivity: '',
-// motherActivity: '',
-// parentsStatus: '',
-// dependantsNumber: '',
-// password: '',
-// passwordConfirm: '',
-// agree: [false, Validators.required],
-// filledForm: false,
-// acceptedConditions: false,
-// }, { validator: (group) => this.checkPasswords(group) && this.checkEmails(group) })
-// console.log(this.formGroup.value.agree)
-// }
-
-// private checkPasswords(group: FormGroup): null | any {
-// const password = group.controls.password.value;
-// const passwordConfirm = group.controls.passwordConfirm.value;
-// return password === passwordConfirm ? null : { passwordsDifferent: true };
-// }
-// private checkEmails(group: FormGroup): null | any {
-// const email = group.controls.email.value;
-// const emailConfirm = group.controls.emailConfirm.value;
-// return email === emailConfirm ? null : { emailsDifferent: true };
-// }
-
-// toggleShowPersonnalDataForm() {
-// this.showPersonnalDataForm = !this.showPersonnalDataForm;
-// }
-// submit() {
-// this.loading = true;
-// const { email, firstName, lastName, phoneNumber } = this.formGroup.value
-// //const {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber} = this.formGroup.value;
-// const registration: Registration = { email, firstName, lastName, phoneNumber };
-// // const personnalData: PersonnalData = {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber};
-
-// const password: string = this.formGroup.controls.password.value;
-// this.registrationService.create(registration, password).pipe(
-// mergeMap(() => this.auth.login(registration.email, password)),
-// tap(() => this.snackBar.open(
-// `Ton compte a été créé ! Tu es maintenant connecté.`,
-// 'OK',
-// { duration: 3000 },
-// )),
-// tap(() => this.error = ""),
-// tap(() => this.loading = false),
-// tap(() => {
-// setTimeout(() => {
-// this.router.navigate(['./membres'])
-
-// }, 3000)
-// })
-
-// ).subscribe(
-// () => { },
-// (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),
-// // tap(() => this.router.navigate(['/'])),
-// // ).subscribe(
-// // () => {},
-// // (error) => this.loading = false,
-// // );
-// }
-// }
-
export class StudentSignupComponent implements OnInit {
registration: Registration;
- personnalData: PersonnalData;
+ personnalData: PersonnalData
formGroup: FormGroup;
error: String;
loading = false;
public showPersonnalDataForm = false;
public zipPattern = new RegExp(/^\d{5}(?:\d{2})?$/)
public possibleParentsStatus = [
- { id: "maried", name: "Mariés" },
- { id: "divorced", name: "Divorcés" },
- { id: "cohabitation", name: "En concubinage" },
- { id: "monoparental", name: "Famille monoparentale" }
+ {id:"maried",name:"Vos parents vivent ensemble"},
+ {id:"cohabitation",name:"Vos parents vivent séparément"},
+ {id:"monoparental",name:"Vous avez un seul parent"}
]
public possibleParentsActivities = [
- { id: "farmer", name: "Agriculteur" },
- { id: "artisan", name: "Artisan, commerçant, chef d'entreprise" },
- { id: "executive", name: "Cadre, profession intellectuelle supérieure" },
- { id: "teacher", name: "Enseignant et assimilé" },
- { id: "intermediate", name: "Profession intermédiaire" },
- { id: "employee", name: "Employé" },
- { id: "worker", name: "Ouvrier" },
- { id: "retreated", name: "Retraité" },
- { id: "inactive", name: "Inactif" },
- { id: "other", name: "Autre" }
+ {id:"farmer",name:"Agriculteur"},
+ {id:"artisan",name:"Artisan, commerçant, chef d'entreprise"},
+ {id:"executive",name:"Cadre, profession intellectuelle supérieure"},
+ {id:"teacher",name:"Enseignant et assimilé"},
+ {id:"intermediate",name:"Profession intermédiaire"},
+ {id:"employee",name:"Employé"},
+ {id:"worker",name:"Ouvrier"},
+ {id:"retreated",name:"Retraité"},
+ {id:"inactive",name:"Inactif"},
+ {id:"other",name:"Autre"}
]
public possibleScholarships = [
- { id: "echelon1", name: "Oui, échelon 1" },
- { id: "echelon2", name: "Oui, échelon 2" },
- { id: "echelon3", name: "Oui, échelon 3" },
- { id: "echelon4", name: "Oui, échelon 4" },
- { id: "echelon5", name: "Oui, échelon 5" },
- { id: "echelon6", name: "Oui, échelon 6" },
- { id: "no", name: "Non" },
+ {id:"echelon1",name:"Oui, échelon 1"},
+ {id:"echelon2",name:"Oui, échelon 2"},
+ {id:"echelon3",name:"Oui, échelon 3"},
+ {id:"echelon4",name:"Oui, échelon 4"},
+ {id:"echelon5",name:"Oui, échelon 5"},
+ {id:"echelon6",name:"Oui, échelon 6"},
+ {id:"no",name:"Non"},
]
- confirmValidParentMatcher = new ConfirmValidParentMatcher(); //ajouté
- errors = errorMessages; //ajouté
+ matcher = new PasswordErrorStateMatcher();
constructor(
private registrationService: RegistrationService,
- // private personnalDataService: PersonnalDataService,
+ private personnalDataService : PersonnalDataService,
private formBuilder: FormBuilder,
private router: Router,
private auth: AuthService,
private snackBar: MatSnackBar,
-
- ) {
- }
+
+ ) { }
ngOnInit() {
this.createForm();
}
createForm() {
+
this.formGroup = this.formBuilder.group({
firstName: '',
lastName: '',
- emailGroup: this.formBuilder.group({
- email: ['', [
- Validators.required,
- Validators.email
- ]],
- confirmEmail: ['', Validators.required]
- }, { validator: CustomValidators.childrenEqual }),
+ email: ['', Validators.email],
phoneNumber: '',
- gender: '',
- adressNumber: '',
- street: '',
- zipCode: ['', Validators.pattern(this.zipPattern)],
- city: '',
- personnalPhone: '',
- parentsPhone: '',
- parentsEmail: ['', Validators.email],
- school: '',
- grade: '',
- section: '',
- specialTeaching: '',
- scholarship: '',
- fatherActivity: '',
- motherActivity: '',
- parentsStatus: '',
- dependantsNumber: '',
- passwordGroup: this.formBuilder.group({
- password: ['', [
- Validators.required,
- // Validators.pattern(regExps.password) /si l'on veut ajouter une condition au mdp (en définissant regExps dans ../core/customValidationModule.ts)
- ]],
- confirmPassword: ['', Validators.required]
- }, { validator: CustomValidators.childrenEqual }),
+ gender:'',
+ adressNumber:'',
+ street:'',
+ zipCode:['',Validators.pattern(this.zipPattern)],
+ city:'',
+ personnalPhone:'',
+ parentsPhone:'',
+ parentsEmail:['',Validators.email],
+ school:'',
+ grade:'',
+ section:'',
+ specialTeaching:'',
+ scholarship:'',
+ fatherActivity:'',
+ motherActivity:'',
+ parentsStatus:'',
+ dependantsNumber:'',
+ password: '',
+ passwordConfirm: '',
agree: [false, Validators.required],
filledForm: false,
acceptedConditions: false,
- });
+ }, { validator: (group) => this.checkPasswords(group)},)
+ console.log(this.formGroup.value.agree)
}
- //dernières lignes ajoutées (jusqu'au register):
- toggleShowPersonnalDataForm() {
+ private checkPasswords(group: FormGroup): null | any {
+ const password = group.controls.password.value;
+ const passwordConfirm = group.controls.passwordConfirm.value;
+ return password === passwordConfirm ? null : { passwordsDifferent: true };
+ }
+ toggleShowPersonnalDataForm(){
this.showPersonnalDataForm = !this.showPersonnalDataForm;
}
submit() {
this.loading = true;
- const { email, firstName, lastName, phoneNumber } = this.formGroup.value
+ const {email,firstName,lastName,phoneNumber} = this.formGroup.value
//const {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber} = this.formGroup.value;
- const registration: Registration = { email, firstName, lastName, phoneNumber };
- // const personnalData: PersonnalData = {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber};
-
+ const registration: Registration = {email,firstName,lastName,phoneNumber};
+ // const personnalData: PersonnalData = {gender,adressNumber,street,zipCode,city,personnalPhone,parentsPhone,parentsEmail,school,grade,section,specialTeaching,scholarship,fatherActivity,motherActivity,parentsStatus,dependantsNumber};
+
const password: string = this.formGroup.controls.password.value;
this.registrationService.create(registration, password).pipe(
mergeMap(() => this.auth.login(registration.email, password)),
@@ -282,39 +123,32 @@ export class StudentSignupComponent implements OnInit {
'OK',
{ duration: 3000 },
)),
-
- tap(() => this.error = ""),
+ tap(()=> this.error = ""),
tap(() => this.loading = false),
tap(() => {
- setTimeout(() => {
+ setTimeout(()=>{
this.router.navigate(['./membres'])
-
- }, 3000)
- })
-
+
+ },3000)})
+
).subscribe(
- () => { },
- (error) => {
-
+ () => {},
+ (error) => {
+
- this.loading = false
-
- if (error.error.email) {
+ 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),
// tap(() => this.router.navigate(['/'])),
// ).subscribe(
- // () => { },
+ // () => {},
// (error) => this.loading = false,
// );
}
-
- register(): void {
- // API call to register your user
- } //ajouté (inutile?)
}
--
GitLab