Merge branch 'dev' into thomas

src/app/app-routing.module.ts

@@ -15,16 +15,15 @@ import { PageAccountComponent } from './pages/page-account/page-account.componen
 const routes: Routes = [
     { path: '', redirectTo: 'home', pathMatch: 'full' },
     {path: 'signin', component: SigninComponent},
-    {path: 'signup', component: SignupComponent},
-    { path: 'home', component: HomePageComponent },
-    { path: 'categories', component: ListCategoriesComponent },
-    { path: 'favoris', component: FavorisUserComponent },
-    { path: 'filtres', component: FiltersPageComponent },
-    { path: 'profil', component: PageAccountComponent },
+    { path: 'home',canActivate: [AuthGuard], component: HomePageComponent },
+    { path: 'categories',canActivate: [AuthGuard], component: ListCategoriesComponent },
+    { path: 'favoris',canActivate: [AuthGuard], component: FavorisUserComponent },
+    { path: 'filtres',canActivate: [AuthGuard], component: FiltersPageComponent },
+    { path: 'profil',canActivate: [AuthGuard], component: PageAccountComponent },
     { path: 'Deconnexion', redirectTo: 'home'},
     {path: 'restaurants', canActivate: [AuthGuard], /*data : {ROLE : "ROLE_ADMIN"},*/ component: RestoPageComponent},
     {path: 'page-not-found',component: PageNotFoundComponent},
-    {path: 'admin', component: AdminPageComponent},
+    {path: 'admin',canActivate: [AuthGuard], component: AdminPageComponent},
     {path: '**', redirectTo: 'page-not-found' }
 ];
 

src/app/card-resto/card-resto.component.scss

@@ -34,8 +34,6 @@
 }
 .accordion-button.collapsed {
     background: #CE0000;
-  
-    
   }
 
 .accordion-button.collapsed::after {

src/app/pages/filters-page/filters-page.component.html

@@ -46,7 +46,9 @@
       <div class="accordion-body">
 
         <div class="minMax p-3">
-          <span>Veuillez sélectionner le prix souhaité</span>
+          <span>Veuillez sélectionner la gamme de prix souhaitée</span>
+          <br>
+          <span>1(1 à 10)  2(11 à 20)  3(21 à 30)  4(31 à 20)</span>
         </div>
         <input type="range" class="form-range" ng-model="valuePrix" min="{{minPrice}}" max="{{maxPrice}}"
           (change)="OnChangeValuePrice($event)">

src/app/pages/page-account/page-account.component.html

@@ -1,4 +1,5 @@
 <div class="container mt-5">
+    <h1 style = "text-align: center; font-family: 'Dancing Script', cursive; font-size: 7vh;">Vos informations personnelles</h1>
     <form class="row g-2" [formGroup]="userInfo">
         <div class="col-md-6">
             <label for="inputFirstName" class="form-label">Prénom</label>

src/app/services/auth.guard.ts

@@ -26,7 +26,7 @@ export class AuthGuard implements CanActivate {
         const decodedToken = jwt_decode<any>(token);
 
         // TODO boucle sur le ['auth'] pour controler le role et en fonction de ca renvoyer true ou false ac redirection page403
-        
+      
         
         console.log('decodedToken : ', decodedToken);
         
@@ -37,6 +37,7 @@ export class AuthGuard implements CanActivate {
             // le token a expiré, je n'autorise pas l'accès
             this.tokenService.destroyToken(this.tokenKey);
             this.router.navigate(['signin']);
+            
             return false;
           }
         }