vincentRamiere/simpleat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into thomas

Browse Source
This commit is contained in:
Thomas Cardon 2022-03-09 13:56:06 +01:00
commit 8b70164a9f
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/app-routing.module.ts
View File

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

2
src/app/card-resto/card-resto.component.scss
View File

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

4
src/app/pages/filters-page/filters-page.component.html
View File

@ -46,7 +46,9 @@
<div class="accordion-body"> <div class="accordion-body">
<div class="minMax p-3"> <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> </div>
<input type="range" class="form-range" ng-model="valuePrix" min="{{minPrice}}" max="{{maxPrice}}" <input type="range" class="form-range" ng-model="valuePrix" min="{{minPrice}}" max="{{maxPrice}}"
(change)="OnChangeValuePrice($event)"> (change)="OnChangeValuePrice($event)">

1
src/app/pages/page-account/page-account.component.html
View File

@ -1,4 +1,5 @@
<div class="container mt-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"> <form class="row g-2" [formGroup]="userInfo">
<div class="col-md-6"> <div class="col-md-6">
<label for="inputFirstName" class="form-label">Prénom</label> <label for="inputFirstName" class="form-label">Prénom</label>

3
src/app/services/auth.guard.ts
View File

@ -26,7 +26,7 @@ export class AuthGuard implements CanActivate {
const decodedToken = jwt_decode<any>(token); 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 // 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); console.log('decodedToken : ', decodedToken);
@ -37,6 +37,7 @@ export class AuthGuard implements CanActivate {
// le token a expiré, je n'autorise pas l'accès // le token a expiré, je n'autorise pas l'accès
this.tokenService.destroyToken(this.tokenKey); this.tokenService.destroyToken(this.tokenKey);
this.router.navigate(['signin']); this.router.navigate(['signin']);
return false; return false;
} }
} }