Merge branch 'Romain' into dev

src/app/admin-component/update-del-restau/update-del-restau.component.ts

@@ -15,9 +15,7 @@ export class UpdateDelRestauComponent implements OnInit {
     this.restauList = [];
    }
 
-  ngOnInit(): void {
+  ngOnInit(): void {}
-
-  }
 
   
   saveRestauList(event : any){
@@ -28,10 +26,7 @@ export class UpdateDelRestauComponent implements OnInit {
   deleteRestau(idRestau : number | undefined){
     this.apiBackService.deleteRestau(idRestau).subscribe( 
       resp =>{
-
-      
       this.restauList = this.restauList.filter(restaus => restaus.id != idRestau)
-      
     });
   }
 

src/app/header/components/nav-bar/nav-bar.component.html

@@ -10,7 +10,7 @@
           <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse justify-content-end" id="navbarNavAltMarkup">
-          <div class="navbar-nav ">
+          <div class="navbar-nav navbar-light">
               <a routerLink="home" routerLinkActive="active-custom" class="nav-link p-4 pe-5 " style="font-size: 21px;">Accueil</a>
               <a routerLink="categories" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Categories</a>
               <a routerLink="restaurants" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Restaurants</a>
@@ -23,7 +23,6 @@
     <div id="image-header">
       <img src="assets/images-header/bandeau2.png" alt="fond_header">
     </div>
-    
 </nav>
 
 

src/app/header/components/nav-bar/nav-bar.component.ts

@@ -9,15 +9,21 @@ import { environment } from 'src/environments/environment';
   styleUrls: ['./nav-bar.component.scss']
 })
 export class NavBarComponent implements OnInit {
-  tokenKey = environment.tokenKey;
 
-  constructor( private tokenService : TokenService,  public route: Router) { }
+  private tokenKey: string;
+
+
+  constructor( private tokenService : TokenService,  public route: Router) {
+
+    this.tokenKey = environment.tokenKey;
+   }
 
   ngOnInit(): void {
   }
 
   onCloseSession() : void {
-this.tokenService.destroyToken();
+
+this.tokenService.destroyToken(this.tokenKey);
 this.route.navigate(['signin']);
   }
 

src/app/pages/models/user.ts

@@ -1,7 +1,7 @@
 export interface User {   
     id?:number;
     prenom: string;
-    lastName: string;
+    nom: string;
     email: string;
     password?: string;
     preference ?: object;

src/app/pages/signin/signin.component.html

@@ -1,7 +1,6 @@
 <div class="signin-form text-center">
   <main class="form-signin d-inline-flex">
       <form (ngSubmit)="onSubmit(signinForm)" #signinForm="ngForm">
-      <h5>Merci de vous connecter</h5>
       <img src="../../../assets/images-header/logo.png"><br>
       <br>Le bon plan pour manger<br>
           <div class="form-floating">

src/app/services/auth.guard.ts

@@ -31,7 +31,6 @@ export class AuthGuard implements CanActivate {
           const dateExp = new Date(decodedToken.exp * 1000);
           if(new Date() >= dateExp) {
             // le token a expiré, je n'autorise pas l'accès
-            this.tokenService.destroyToken();
             this.router.navigate(['signin']);
             return false;
           }

src/app/services/token.service.ts

@@ -33,7 +33,7 @@ export class TokenService {
   }
 
 
-  public destroyToken(): void { 
+  public destroyToken(token : any) { 
-    localStorage.removeItem(this.tokenKey);
+    localStorage.removeItem(token);
   }
 }