Merge branch 'new_signup' into 'master'

add

See merge request !81

src/app/login/login.component.ts

@@ -18,7 +18,7 @@ export class LoginComponent implements OnInit {
   defaultRedirectUrl: string = '/membres';
   charterUrl: string = 'inscription/student-charter';
   formGroup: FormGroup;
-  loginSuccess: boolean = false;
+  loginSuccess: boolean = true;
 
   constructor(
     private router: Router,
@@ -50,43 +50,31 @@ export class LoginComponent implements OnInit {
     this.loading = true;
     const { email, password } = this.formGroup.value;
     this.messageService.clear();
-    await this.auth.login(email, password).pipe(
        
-      map(() => this.loginSuccess = true),
+    await this.auth.checkSignatureCharter(email).pipe(
       catchError(() => {
-        this.messageService.error("L'identifiant ou le mot de passe est incorrect.");
-        this.loginSuccess = false;
+        this.hassignedCharter = false;
         return of(false);
       }),
-      tap(() => this.loading = false),
-
+      map(() =>  this.loginSuccess = true),
 
-      // Only continue if no error
-      filter(Boolean),
-      // Get redirect URL from the auth service, provided by the auth guard.
+    ).toPromise();
 
-    ).subscribe({
-      complete() {
-        console.log("login unsuccess");
-      },
-    });
+   await  this.auth.login(email, password).toPromise().catch(() => {
+    console.log("this.loginSuccess)");
 
+    this.messageService.error("L'identifiant ou le mot de passe est incorrect.");
+    tap(() => this.snackBar.open("L'identifiant ou le mot de passe est incorrect.", 'OK', { duration: 2000 })),
 
-      if(this.loginSuccess == true){
+    this.loginSuccess = false;
+    this.loading = false;
+    return of(false);
+  });
 
-          this.auth.checkSignatureCharter(email).pipe(
-            catchError(() => {
-              this.hassignedCharter = false;
+  if (this.loginSuccess ) {
     
-              this.messageService.error("Vous n'avez pas signé le(s) charte(s).");
-              map(() => this.auth.redirectUrl ? this.auth.redirectUrl : this.defaultRedirectUrl),
-                tap((redirectUrl: string) => this.router.navigate([redirectUrl]));
-              return of(false);
-            }),
-            map(() => this.auth.redirectUrl ? this.auth.redirectUrl : this.defaultRedirectUrl),
-            tap(() => this.snackBar.open('Connexion réussie !', 'OK', { duration: 2000 })),
-          ).subscribe().add(() =>   
-          { 
+      this.loading = false;
+      console.log(this.loginSuccess);
       if(this.hassignedCharter == false)
       {
         this.router.navigate([this.charterUrl]);
@@ -95,8 +83,6 @@ export class LoginComponent implements OnInit {
       {
         this.router.navigate([this.defaultRedirectUrl]);
       }
-          });
     }
             
-}
-}
+}}
\ No newline at end of file
\ No newline at end of file

src/app/signup/student-signup/student-signup.component.html

@@ -33,12 +33,12 @@
 
 
 
-    <!-- <mat-form-field class="full-width">
+    <mat-form-field class="full-width">
       <input matInput type="tel" minlength="10" maxlength="10" formControlName="phoneNumber" placeholder="Numéro de téléphone" required>
       <mat-hint>
         Il nous permettra de te contacter en cas de nécessité.
       </mat-hint>
-    </mat-form-field> -->
+    </mat-form-field>
 
 
     <p>