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

merge resolution

This commit is contained in:
Thomas Cardon 2022-03-03 14:49:55 +01:00
parent c70e3bab94 97e024afb3
commit a7a53659f2
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/header/components/nav-bar/nav-bar.component.html
View File

@ -13,6 +13,7 @@
<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="restaurants" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Restaurants</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" (click) = "onCloseSession()" class="nav-link p-4 pe-5" style="font-size: 21px;">Deconnexion</a>

2
src/app/pages/favoris-user/favoris-user.component.html
View File

@ -2,4 +2,4 @@
<div *ngFor="let pref of restaurantData">
<app-card-resto [restaurant]= "pref"></app-card-resto>
</div>
</app-template-page>
</app-template-page>

2
src/app/pages/resto-page/resto-page.component.html
View File

@ -1,4 +1,4 @@
<app-template-page [title]="'Résultats :'">
<app-template-page [title]="'Restaurants :'">
<div *ngFor="let restaurantData of listRestaurants">
<app-card-resto [restaurant]= "restaurantData" (clickLike)="onEventLike()"></app-card-resto>
</div>

5
src/app/services/api-back.service.ts
View File

@ -35,14 +35,12 @@ export class ApiBackService {
}
setListRestau(listRestau: any[], routeParam?: string): void {
this.restoFilter = listRestau;
this.routeParam = routeParam;
}
setDistance(lat1: number, lon1: number, lat2: number, lon2: number) {
let R = 6371; // Radius of the earth in km
let dLat = this.deg2rad(lat2 - lat1); // deg2rad below
let dLon = this.deg2rad(lon2 - lon1);
@ -66,7 +64,6 @@ export class ApiBackService {
}
deleteRestau(idRestau: number | undefined): Observable<any> {
return this.httpClient.delete<Restaurant>(`${environment.apiUrl}/delete-restaurant/${idRestau}`);
}
@ -74,4 +71,4 @@ export class ApiBackService {
getPersonneById(id: any) {
return this.httpClient.get<User>(`${environment.apiUrl}/user/${id}`);
}
}
}