From 9fe71c85d9698d364c87d531b6338cd0f14309fe Mon Sep 17 00:00:00 2001 From: Thomas Cardon Date: Mon, 7 Mar 2022 16:17:44 +0100 Subject: [PATCH] modif restau manque checkbox --- .../add-restau/add-restau.component.html | 18 ++++---- .../add-restau/add-restau.component.ts | 42 ++++++++++++++++++- .../update-del-restau.component.html | 4 +- .../update-del-restau.component.ts | 5 +-- src/app/app-routing.module.ts | 2 +- .../components/nav-bar/nav-bar.component.ts | 2 +- .../admin-page/admin-page.component.html | 2 +- .../pages/admin-page/admin-page.component.ts | 6 ++- src/app/services/api-back.service.ts | 9 +++- src/app/services/auth.guard.ts | 6 ++- src/app/services/auth.service.ts | 1 + src/app/services/token.service.ts | 5 ++- 12 files changed, 77 insertions(+), 25 deletions(-) diff --git a/src/app/admin-component/add-restau/add-restau.component.html b/src/app/admin-component/add-restau/add-restau.component.html index f552562..701b664 100644 --- a/src/app/admin-component/add-restau/add-restau.component.html +++ b/src/app/admin-component/add-restau/add-restau.component.html @@ -78,17 +78,17 @@

Sur Place :

-
+ [value]="false" formControlName="surPlaceFc">
-
@@ -98,17 +98,17 @@

A Emporter :

+ [value]="true" formControlName="aEmporterFc">
+ [value]="false" formControlName="aEmporterFc">
+ [value]="null" formControlName="aEmporterFc">
@@ -116,17 +116,17 @@

Accès PMR :

-
+ [value]="false" formControlName="accesPMRFc">
-
diff --git a/src/app/admin-component/add-restau/add-restau.component.ts b/src/app/admin-component/add-restau/add-restau.component.ts index 586719a..a28523e 100644 --- a/src/app/admin-component/add-restau/add-restau.component.ts +++ b/src/app/admin-component/add-restau/add-restau.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { Observable, Subscription } from 'rxjs'; import { Restaurant } from 'src/app/pages/models/restaurant'; import { ApiBackService } from 'src/app/services/api-back.service'; @@ -18,6 +18,7 @@ export class AddRestauComponent implements OnInit { public errorMessage?: string; public listCategories$: Observable; public expanded = false; + public idRestau : Subscription | undefined; constructor(private router: Router, private apiBackService: ApiBackService) { this.signupForm = new FormGroup({}); @@ -38,6 +39,36 @@ export class AddRestauComponent implements OnInit { accesPMRFc: new FormControl(''), typerestausFc: new FormArray([]) }) + + this.idRestau = this.apiBackService.restauAModif.subscribe(restau => { + + + // const formArray: FormArray = this.signupForm.get('typerestausFc') as FormArray; + // if(restau.typerestaus != undefined){ + // for (let index = 0; index < restau.typerestaus.length; index++) { + // //listCategories.filter(categorie => categorie.id == restau.typerestaus[index]['id']) + // this.signupForm.patchValue({typerestausFc : {restau.typerestaus[index]['id'] : true}}); + // formArray.push(new FormControl(restau.typerestaus[index]['id'] : true)); + + // } + // } + // console.log(formArray); + + this.signupForm = new FormGroup({ + nomFc: new FormControl(restau.nom, [Validators.required]), + prixFc: new FormControl(restau.prix), + longitudeFc: new FormControl(restau.longitude, [Validators.required,]), // chercher une meilleure regex + latitudeFc: new FormControl(restau.latitude, [Validators.required]), + adresseFc: new FormControl(restau.adresse, [Validators.required]), + telephoneFc: new FormControl(restau.telephone), + websiteFc: new FormControl(restau.website, [Validators.pattern("/^(http[s]?:\/\/){0,1}(www\.){0,1}[a-zA-Z0-9\.\-]+\.[a-zA-Z]{2,5}[\.]{0,1}/")]), + surPlaceFc: new FormControl(restau.surPlace), + aEmporterFc: new FormControl(restau.aEmporter), + accesPMRFc: new FormControl(restau.accesPMR), + typerestausFc: new FormArray([]) + }) + } + ) } public getCategories(): Observable { @@ -117,5 +148,12 @@ export class AddRestauComponent implements OnInit { } + ngOnDestroy() { + if (this.idRestau) { + this.idRestau.unsubscribe(); + this.idRestau = undefined; + } + } + } diff --git a/src/app/admin-component/update-del-restau/update-del-restau.component.html b/src/app/admin-component/update-del-restau/update-del-restau.component.html index d18c0d9..8b5e5a5 100644 --- a/src/app/admin-component/update-del-restau/update-del-restau.component.html +++ b/src/app/admin-component/update-del-restau/update-del-restau.component.html @@ -6,10 +6,8 @@ {{restau.nom}}
+
-
- -
\ No newline at end of file diff --git a/src/app/admin-component/update-del-restau/update-del-restau.component.ts b/src/app/admin-component/update-del-restau/update-del-restau.component.ts index eb41ba8..721618f 100644 --- a/src/app/admin-component/update-del-restau/update-del-restau.component.ts +++ b/src/app/admin-component/update-del-restau/update-del-restau.component.ts @@ -10,7 +10,6 @@ import { ApiBackService } from 'src/app/services/api-back.service'; export class UpdateDelRestauComponent implements OnInit { restauList : Restaurant[]; - @Output() idRestauAModif = new EventEmitter(); constructor(private apiBackService : ApiBackService) { this.restauList = []; @@ -36,8 +35,8 @@ export class UpdateDelRestauComponent implements OnInit { }); } - modifRestau(idRestau : number | undefined){ - this.idRestauAModif.emit(idRestau); + modifRestau(restau : Restaurant){ + this.apiBackService.idRestauAModifier(restau); } } \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 644c2ab..fe37095 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -18,7 +18,7 @@ const routes: Routes = [ { path: 'favoris', component: FavorisUserComponent }, { path: 'filtres', component: FiltersPageComponent }, { path: 'Deconnexion', redirectTo: 'home'}, - {path: 'restaurants', canActivate: [AuthGuard], component: RestoPageComponent}, + {path: 'restaurants', canActivate: [AuthGuard], /*data : {ROLE : "ROLE_ADMIN"},*/ component: RestoPageComponent}, {path: 'page-not-found',component: PageNotFoundComponent}, {path: 'admin', component: AdminPageComponent}, {path: '**', redirectTo: 'page-not-found' } 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 fc81ce2..a3b0d3d 100644 --- a/src/app/header/components/nav-bar/nav-bar.component.ts +++ b/src/app/header/components/nav-bar/nav-bar.component.ts @@ -17,7 +17,7 @@ export class NavBarComponent implements OnInit { } onCloseSession() : void { -this.tokenService.destroyToken(); +this.tokenService.destroyToken(this.tokenKey); this.route.navigate(['signin']); } diff --git a/src/app/pages/admin-page/admin-page.component.html b/src/app/pages/admin-page/admin-page.component.html index fd8ef34..757318b 100644 --- a/src/app/pages/admin-page/admin-page.component.html +++ b/src/app/pages/admin-page/admin-page.component.html @@ -1,6 +1,6 @@
- +
diff --git a/src/app/pages/admin-page/admin-page.component.ts b/src/app/pages/admin-page/admin-page.component.ts index e431721..0595138 100644 --- a/src/app/pages/admin-page/admin-page.component.ts +++ b/src/app/pages/admin-page/admin-page.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, EventEmitter, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { ApiBackService } from 'src/app/services/api-back.service'; @@ -11,6 +11,7 @@ import { Restaurant } from '../models/restaurant'; }) export class AdminPageComponent implements OnInit { + sendId = new EventEmitter(); constructor( ) { @@ -18,6 +19,9 @@ export class AdminPageComponent implements OnInit { ngOnInit(): void { } + sendIdRestau(idRestau : number){ + this.sendId.emit(idRestau); + } } diff --git a/src/app/services/api-back.service.ts b/src/app/services/api-back.service.ts index 7e37e82..b44cf59 100644 --- a/src/app/services/api-back.service.ts +++ b/src/app/services/api-back.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Input } from '@angular/core'; +import { EventEmitter, Injectable, Input } from '@angular/core'; import { Observable, of, Subject } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { environment } from 'src/environments/environment'; @@ -15,6 +15,7 @@ export class ApiBackService { public restoFilter: any[]; public routeParam?: string; @Input() restaurant: any; + public restauAModif = new EventEmitter(); constructor(private httpClient: HttpClient) { this.restoFilter = []; @@ -70,4 +71,10 @@ export class ApiBackService { return this.httpClient.get(`${environment.apiUrl}/user/${id}`); } + + public idRestauAModifier(restau:Restaurant): void { + + this.restauAModif.emit(restau); + } } + diff --git a/src/app/services/auth.guard.ts b/src/app/services/auth.guard.ts index f16c965..6001ce1 100644 --- a/src/app/services/auth.guard.ts +++ b/src/app/services/auth.guard.ts @@ -11,6 +11,7 @@ import { TokenService } from './token.service'; }) export class AuthGuard implements CanActivate { private tokenKey: string; + constructor(private router: Router, private tokenService : TokenService){ this.tokenKey = environment.tokenKey; } @@ -23,6 +24,9 @@ export class AuthGuard implements CanActivate { if(token) { const decodedToken = jwt_decode(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); @@ -31,7 +35,7 @@ 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.tokenService.destroyToken(this.tokenKey); this.router.navigate(['signin']); return false; } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index b649e4f..c1ed182 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -50,6 +50,7 @@ export class AuthService { console.log('Service : ', x.token); // Modification à faire ici localStorage.setItem(this.tokenKey, x.token); + //localStorage.setItem('ROLE', "ROLE_READER"); return x; // permet de renvoyer la réponse à l'initiateur (page Signin) après le traitement du map }) ); diff --git a/src/app/services/token.service.ts b/src/app/services/token.service.ts index 0529b5d..4d376de 100644 --- a/src/app/services/token.service.ts +++ b/src/app/services/token.service.ts @@ -33,7 +33,8 @@ export class TokenService { } - public destroyToken(): void { - localStorage.removeItem(this.tokenKey); + public destroyToken(tokenKey : string): void { + localStorage.removeItem(tokenKey); + localStorage.removeItem('ROLE'); } }