From 30f70296ba2f7b55ae9f7cc19f90f9c00833081d Mon Sep 17 00:00:00 2001
From: Romain Verger <romainverger35@gmail.com>
Date: Tue, 1 Mar 2022 15:31:13 +0100
Subject: [PATCH 1/4] modif app-routing-module

---
 src/app/app-routing.module.ts | 6 +++---
 src/app/app.component.ts      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index f4eae8e..388143a 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -11,7 +11,8 @@ import { AdminPageComponent } from './pages/admin-page/admin-page.component';
 import { AuthGuard } from './services/auth.guard';
 
 const routes: Routes = [
-    { path: '', redirectTo: 'home', pathMatch: 'full' },
+    { path: '', redirectTo: 'signin', pathMatch: 'full' },
+    {path: 'signin', component: SigninComponent},
     { path: 'home', component: HomePageComponent },
     { path: 'categories', component: ListCategoriesComponent },
     { path: 'favoris', component: FavorisUserComponent },
@@ -19,8 +20,7 @@ const routes: Routes = [
     { path: 'Deconnexion', redirectTo: 'home'},
     {path: 'restaurants', canActivate: [AuthGuard], component: RestoPageComponent},
     {path: 'page-not-found',component: PageNotFoundComponent},
-    {path: 'signin', component: SigninComponent},
-    {path: 'admin', component: AdminPageComponent},
+      {path: 'admin', component: AdminPageComponent},
     {path: '**', redirectTo: 'page-not-found' }
 ];
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7d60f78..33e703c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -16,7 +16,7 @@ export class AppComponent {
       //console.log(e);
       if(e instanceof NavigationEnd){
         console.log(e.url)
-        if (e.url == "/signin") {
+        if (e.url == "/") {
           this.dontShow = false;
         } else {
           this.dontShow = true;

From 547f6aee585f1e4d1f29b04ea724f00059dcd79f Mon Sep 17 00:00:00 2001
From: Romain Verger <romainverger35@gmail.com>
Date: Wed, 2 Mar 2022 10:25:30 +0100
Subject: [PATCH 2/4] module deconnexion

---
 src/app/app.component.html                           |  6 +++---
 src/app/footer/footer.component.html                 |  2 +-
 src/app/footer/footer.component.ts                   |  3 ++-
 .../header/components/nav-bar/nav-bar.component.html |  8 ++++----
 .../header/components/nav-bar/nav-bar.component.ts   | 12 +++++++++++-
 .../components/search-bar/search-bar.component.html  |  4 ++--
 .../components/search-bar/search-bar.component.ts    |  4 +++-
 src/app/services/token.service.ts                    |  5 +++++
 8 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index cc2f543..a555773 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<app-search-bar *ngIf="dontShow"></app-search-bar>
-<app-nav-bar *ngIf="dontShow"></app-nav-bar>
+<app-search-bar></app-search-bar>
+<app-nav-bar></app-nav-bar>
 <router-outlet></router-outlet>
-<app-footer *ngIf="dontShow"></app-footer>
+<app-footer ></app-footer>
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index c0ed86d..f17079e 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,4 +1,4 @@
-<footer class="d-flex">
+<footer *ngIf="route.url != '/signin'" class="d-flex">
 
   <div class = "logo d-inline-flex align-items-center">
       <img src="../../assets/Logo_footer.png">
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index c7a7ec5..8970ec8 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-footer',
@@ -7,7 +8,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class FooterComponent implements OnInit {
 
-  constructor() { }
+  constructor(public route : Router) { }
 
   ngOnInit(): void {
   }
diff --git a/src/app/header/components/nav-bar/nav-bar.component.html b/src/app/header/components/nav-bar/nav-bar.component.html
index e827353..48652a8 100644
--- a/src/app/header/components/nav-bar/nav-bar.component.html
+++ b/src/app/header/components/nav-bar/nav-bar.component.html
@@ -1,5 +1,5 @@
 <nav class="navbar-expand-lg navbar-light">
-  <div class="container-fluid">
+  <div *ngIf="route.url != '/signin'" class="container-fluid">
       <button class="navbar-toggler"
           type="button"
           data-bs-toggle="collapse"
@@ -10,16 +10,16 @@
           <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse justify-content-end" id="nav">
-          <div class="navbar-nav ">
+          <div *ngIf="route.url != '/signin'" class="navbar-nav ">
               <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="filtres" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Filtres</a>
               <a routerLink="favoris" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Mes favoris</a>
-              <a routerLink="deconnexion" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Deconnexion</a>
+              <a routerLink="deconnexion" routerLinkActive="active-custom" (click) = "onCloseSession()" class="nav-link p-4 pe-5" style="font-size: 21px;">Deconnexion</a>
           </div>
       </div>
     </div>
-    <div id="image-header">
+    <div *ngIf="route.url != '/signin'" id="image-header">
       <img src="assets/images-header/bandeau2.png" alt="fond_header">
     </div>
     
diff --git a/src/app/header/components/nav-bar/nav-bar.component.ts b/src/app/header/components/nav-bar/nav-bar.component.ts
index 6082d5b..fc81ce2 100644
--- a/src/app/header/components/nav-bar/nav-bar.component.ts
+++ b/src/app/header/components/nav-bar/nav-bar.component.ts
@@ -1,4 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { TokenService } from 'src/app/services/token.service';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-nav-bar',
@@ -6,10 +9,17 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./nav-bar.component.scss']
 })
 export class NavBarComponent implements OnInit {
+  tokenKey = environment.tokenKey;
 
-  constructor() { }
+  constructor( private tokenService : TokenService,  public route: Router) { }
 
   ngOnInit(): void {
   }
 
+  onCloseSession() : void {
+this.tokenService.destroyToken();
+this.route.navigate(['signin']);
+  }
+
+
 }
diff --git a/src/app/header/components/search-bar/search-bar.component.html b/src/app/header/components/search-bar/search-bar.component.html
index 48cb329..962d3f0 100644
--- a/src/app/header/components/search-bar/search-bar.component.html
+++ b/src/app/header/components/search-bar/search-bar.component.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-light p-0">
-  <div class="container-fluid d-flex align-items-center pt-3">
-    <div class="logo ps-4">
+  <div  *ngIf="route.url != '/signin'" class="container-fluid d-flex align-items-center pt-3">
+    <div *ngIf="route.url != '/signin'" class="logo ps-4">
       <img src="assets/images-header/LOGO2.png" alt="logo">
     </div>
       <form style="width: 30%;" class="d-flex align-items-center pe-2 pt-2">
diff --git a/src/app/header/components/search-bar/search-bar.component.ts b/src/app/header/components/search-bar/search-bar.component.ts
index 352cfde..6d786a2 100644
--- a/src/app/header/components/search-bar/search-bar.component.ts
+++ b/src/app/header/components/search-bar/search-bar.component.ts
@@ -13,7 +13,7 @@ export class SearchBarComponent implements OnInit {
   listRestau: any[];
   restauByName: any[];
 
-  constructor(private apiBackService: ApiBackService, private route: Router) {
+  constructor(private apiBackService: ApiBackService, public  route: Router) {
 
     this.listRestau = [];
     this.restauByName = [];
@@ -36,6 +36,8 @@ export class SearchBarComponent implements OnInit {
 
       this.apiBackService.setListRestau(this.restauByName, "filtres");
       this.route.navigate(['restaurants']);
+
+  
     }
   }
 
diff --git a/src/app/services/token.service.ts b/src/app/services/token.service.ts
index 8db8aa4..a6fa2a4 100644
--- a/src/app/services/token.service.ts
+++ b/src/app/services/token.service.ts
@@ -29,4 +29,9 @@ export class TokenService {
       return null;
     }
   }
+
+
+  public destroyToken(): void { 
+    localStorage.removeItem(this.tokenKey);
+  }
 }

From c082030aedd7057d960fe4cfc7f39dd856dfeaca Mon Sep 17 00:00:00 2001
From: Romain Verger <romainverger35@gmail.com>
Date: Wed, 2 Mar 2022 12:40:01 +0100
Subject: [PATCH 3/4] modif page connexion (cacher composants)

---
 src/app/pages/favoris-user/favoris-user.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/favoris-user/favoris-user.component.ts b/src/app/pages/favoris-user/favoris-user.component.ts
index 98e9f06..b9aa22f 100644
--- a/src/app/pages/favoris-user/favoris-user.component.ts
+++ b/src/app/pages/favoris-user/favoris-user.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import { ApiBackService } from 'src/app/services/api-back.service';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-favoris-user',
@@ -7,7 +9,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class FavorisUserComponent implements OnInit {
 
-  constructor() { }
+  constructor(private plantouneService: ApiBackService, private tokenService: TokenService) { }
 
   ngOnInit(): void {
   }

From 55d122eeeabd16fa68c0a8073f7edeac1c9efe9f Mon Sep 17 00:00:00 2001
From: Romain Verger <romainverger35@gmail.com>
Date: Wed, 2 Mar 2022 12:40:21 +0100
Subject: [PATCH 4/4] modif connexion

---
 src/app/app-routing.module.ts                               | 2 +-
 src/app/app.component.html                                  | 6 +++---
 src/app/app.component.ts                                    | 2 +-
 src/app/footer/footer.component.html                        | 2 +-
 src/app/header/components/nav-bar/nav-bar.component.html    | 6 +++---
 .../header/components/search-bar/search-bar.component.html  | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 388143a..644c2ab 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -20,7 +20,7 @@ const routes: Routes = [
     { path: 'Deconnexion', redirectTo: 'home'},
     {path: 'restaurants', canActivate: [AuthGuard], component: RestoPageComponent},
     {path: 'page-not-found',component: PageNotFoundComponent},
-      {path: 'admin', component: AdminPageComponent},
+    {path: 'admin', component: AdminPageComponent},
     {path: '**', redirectTo: 'page-not-found' }
 ];
 
diff --git a/src/app/app.component.html b/src/app/app.component.html
index a555773..4b9776d 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<app-search-bar></app-search-bar>
-<app-nav-bar></app-nav-bar>
+<app-search-bar *ngIf="router.url != '/signin'"></app-search-bar>
+<app-nav-bar *ngIf="router.url != '/signin'"></app-nav-bar>
 <router-outlet></router-outlet>
-<app-footer ></app-footer>
+<app-footer *ngIf="router.url != '/signin'"></app-footer>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 33e703c..be5ed0d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -11,7 +11,7 @@ export class AppComponent {
   title = 'simpleat';
   dontShow: boolean = false;
 
-  constructor(private router:Router, private apiBackService : ApiBackService){
+  constructor(public router:Router, private apiBackService : ApiBackService){
     this.router.events.subscribe(e=>{
       //console.log(e);
       if(e instanceof NavigationEnd){
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index f17079e..c0ed86d 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,4 +1,4 @@
-<footer *ngIf="route.url != '/signin'" class="d-flex">
+<footer class="d-flex">
 
   <div class = "logo d-inline-flex align-items-center">
       <img src="../../assets/Logo_footer.png">
diff --git a/src/app/header/components/nav-bar/nav-bar.component.html b/src/app/header/components/nav-bar/nav-bar.component.html
index 48652a8..a92274b 100644
--- a/src/app/header/components/nav-bar/nav-bar.component.html
+++ b/src/app/header/components/nav-bar/nav-bar.component.html
@@ -1,5 +1,5 @@
 <nav class="navbar-expand-lg navbar-light">
-  <div *ngIf="route.url != '/signin'" class="container-fluid">
+  <div class="container-fluid">
       <button class="navbar-toggler"
           type="button"
           data-bs-toggle="collapse"
@@ -10,7 +10,7 @@
           <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse justify-content-end" id="nav">
-          <div *ngIf="route.url != '/signin'" class="navbar-nav ">
+          <div class="navbar-nav ">
               <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="filtres" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Filtres</a>
@@ -19,7 +19,7 @@
           </div>
       </div>
     </div>
-    <div *ngIf="route.url != '/signin'" id="image-header">
+    <div id="image-header">
       <img src="assets/images-header/bandeau2.png" alt="fond_header">
     </div>
     
diff --git a/src/app/header/components/search-bar/search-bar.component.html b/src/app/header/components/search-bar/search-bar.component.html
index 962d3f0..48cb329 100644
--- a/src/app/header/components/search-bar/search-bar.component.html
+++ b/src/app/header/components/search-bar/search-bar.component.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-light p-0">
-  <div  *ngIf="route.url != '/signin'" class="container-fluid d-flex align-items-center pt-3">
-    <div *ngIf="route.url != '/signin'" class="logo ps-4">
+  <div class="container-fluid d-flex align-items-center pt-3">
+    <div class="logo ps-4">
       <img src="assets/images-header/LOGO2.png" alt="logo">
     </div>
       <form style="width: 30%;" class="d-flex align-items-center pe-2 pt-2">