dev en cours

src/app/composants/login/login.component.html

@@ -7,14 +7,14 @@
 			<div class="form-group row">
 				<label class="col-sm-4 col-form-label col-form-label-sm label-nobr">Pseudonyme&nbsp;<sup><span class="text-danger">*</span></sup></label>
 				<div class="col-sm-8">
-					<input type="text" class="form-control form-control-sm field-separate" id="userid" name="userid" [(ngModel)]="identifiants.usr" #userRef="ngModel" required [class.is-invalid]="userRef.invalid && userRef.touched">
+					<input type="text" class="form-control form-control-sm field-separate" id="userid" name="userid" [(ngModel)]="identifiants.username" #userRef="ngModel" required [class.is-invalid]="userRef.invalid && userRef.touched">
 				</div>
 			</div>
 
 			<div class="form-group row">
 				<label class="col-sm-4 col-form-label col-form-label-sm label-nobr">Mot de passe&nbsp;<sup><span class="text-danger">*</span></sup></label>
 				<div class="col-sm-8">
-					<input type="password" class="form-control form-control-sm field-separate" id="userpwd" name="userpwd" [(ngModel)]="identifiants.pwd" #passRef="ngModel" required [class.is-invalid]="passRef.invalid && passRef.touched">
+					<input type="password" class="form-control form-control-sm field-separate" id="userpwd" name="userpwd" [(ngModel)]="identifiants.password" #passRef="ngModel" required [class.is-invalid]="passRef.invalid && passRef.touched">
 				</div>
 			</div>
 

src/app/composants/login/login.component.ts

@@ -26,8 +26,8 @@ export class LoginComponent implements OnInit, AfterViewInit
   {  
     if (this.loginForm.valid) 
     {
-      this.accountService.login(this.identifiants);  
-      this.router.navigate(['/']);  
+      console.log(this.accountService.login(this.identifiants));
+      // if then this.router.navigate(['/']);  
     }
   } 
   

src/app/composants/participant-list/participant-list.component.html

@@ -17,7 +17,7 @@
 					<th class="fs-6 label-nobr"><small>Status</small></th>
 					<th class="fs-6 label-nobr"><small>Arrivé</small></th>
 					<th class="fs-6 label-nobr"><small>Journées</small></th>
-					<th class="fs-6 label-nobr"><small>email</small></th>
+					<th class="fs-6 label-nobr"><small>Adresse email</small></th>
 				</tr>
 			</thead>
 			<tbody>

src/app/interfaces/user.ts

@@ -1,11 +1,11 @@
 
 export class User 
 {
-  usr: string = "";
-  pwd: string = "";
+  username: string = "";
+  password: string = "";
   token: string = "";
   id: number = 0;
   nom: string = "";
   prenom: string = "";
-  role: number = 0;
+  role: string = "";
 }

src/app/services/account.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { HttpClient } from '@angular/common/http';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+//import { map } from 'rxjs/operators';
 import { Environnement } from '../env';
 import { User } from '../interfaces/user';
 
@@ -11,7 +11,7 @@ import { User } from '../interfaces/user';
 export class AccountService 
 {
 
-  private baseURL = Environnement.apiUrl + "account";
+  private baseURL = Environnement.apiUrl + "auth";
 
   private userSubject: BehaviorSubject<User | null>;
   
@@ -24,11 +24,11 @@ export class AccountService
   }
 
   public isLogged() { if (this.userSubject.value) { return true; } return false; }
-  public getUsername() { if (this.userSubject.value) { return this.userSubject.value.usr; } return ""; }
+  public getUsername() { if (this.userSubject.value) { return this.userSubject.value.username; } return ""; }
   
   login(user: User) 
   {
-    return this.httpClient.post<User>(`${this.baseURL}/login`, user).pipe(map(u => { localStorage.setItem('user', JSON.stringify(u)); this.userSubject.next(u); return u; }));
+    return this.httpClient.post<User>(`${this.baseURL}/signin`, user); //.pipe(map(u => { localStorage.setItem('user', JSON.stringify(u)); this.userSubject.next(u); return u; }));
   }
 
   logout()