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

Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev

Browse source
This commit is contained in:
Romain Verger 2022-02-18 17:24:03 +01:00
commit 4049a0d8b1
15 changed files with 471 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/app/card-resto/card-resto.component.html
View file

@ -39,14 +39,20 @@
<i class="fas fa-walking ps-2 pe-2" style="color:#a8a8a8"></i>
<span class="categorie pe-2" style="font-weight: bold;">{{distance}}m</span>
<!-- <div class="d-inline-flex" *ngIf="restaurant.prix != null; else noPrice"> -->
<i class="fas fa-euro-sign ps-2 pe-2" style="color:#a8a8a8"></i>
<span class="prix" style="font-weight: bold;">{{ priceRef[restaurant.prix] }}</span>
<!-- </div> -->
<i class="fas fa-euro-sign ps-2 pe-2" style="color:#a8a8a8"></i>
<span class="prix" style="font-weight: bold;">5-10€</span>
<!-- <ng-template #noPrice>
<div class="d-inline-flex">
<p class="description pt-3 ps-3 pe-1 " style="font-size:1.9vh ;color:#545454">{{ priceRef[0] }} </p>
</div>
</ng-template> -->
<div class="d-inline-flex" *ngIf="restaurant.website; else noWebsite">
<p class="description pt-3 ps-2 pe-1"><i class="bi bi-globe2 ps-2 pe-2" style="color:#a8a8a8"></i>
<a href="{{restaurant.website}}" class="description text-decoration-none pe-1" style="font-style: italic;font-weight: bold; color:#545454">Site Web</a>
</p>
</div>
<!-- le else de notre *ngIf plus haut-->
@ -60,30 +66,54 @@
<div class="trait-rouge pt-2 pb-0"></div>
<div class="critere ps-1 pt-3">
<span class="sur-place pe-3" style="color:#545454">Sur place :</span>
<app-icon
[iconName]="restaurant.surPlace ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1 '"
[iconColor]="restaurant.surPlace ? '#4ECB71' : '#ED2F2F'"
></app-icon>
<span class="a-emporter pe-2 ps-4 " style="color:#545454">A emporter :</span>
<app-icon
[iconName]="restaurant.aEmporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
[iconColor]="restaurant.aEmporter ? '#4ECB71' : '#ED2F2F'"
></app-icon>
</div>
<div class="critere ps-1 pt-3">
<div class="d-inline-flex " *ngIf="restaurant.surPlace else noInfosSurPlace">
<span class="sur-place pe-3" style="color:#545454">Sur place :</span>
<app-icon
[iconName]="restaurant.surPlace ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1 '"
[iconColor]="restaurant.surPlace ? '#4ECB71' : '#ED2F2F'"
></app-icon>
</div>
<ng-template #noInfosSurPlace>
<span class="d-flex" style="color:#545454">Sur place :</span>
<p style="font-size:1.9vh ;color:#545454">Infos non disponible.</p>
</ng-template>
<div class="d-inline-flex " *ngIf="restaurant.aEmporter != null else noInfosAEmporter">
<span class="a-emporter pe-2 ps-4 " style="color:#545454">A emporter :</span>
<app-icon
[iconName]="restaurant.aEmporter ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-2 pt-1'"
[iconColor]="restaurant.aEmporter ? '#4ECB71' : '#ED2F2F'"
></app-icon>
</div>
<ng-template #noInfosAEmporter>
<span class="d-flex a-emporter pt-2 " style="color:#545454">A emporter :</span>
<p style="font-size:1.9vh ;color:#545454">Infos non disponible.</p>
</ng-template>
</div>
<div class="trait-rouge pt-3"></div>
<div class="critere d-flex justify-content-center ps-1 pt-3 pb-3">
<span class="acces-pmr pe-1" style="color:#545454">Accès PMR :</span>
<app-icon
[iconName]="restaurant.accesPMR ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-1 pt-1'"
[iconColor]="restaurant.accesPMR ? '#4ECB71' : '#ED2F2F'"
></app-icon>
<div class="d-inline-flex " *ngIf="restaurant.accesPMR else noAccesPMR">
<app-icon
[iconName]="restaurant.accesPMR ? 'bi bi-check-square-fill' : 'bi bi-x-square-fill ps-1 pt-1'"
[iconColor]="restaurant.accesPMR ? '#4ECB71' : '#ED2F2F'"
></app-icon>
</div>
<!-- le else de notre *ngIf plus haut-->
<ng-template #noAccesPMR>
<p class=" ps-2"style="font-size:1.9vh ;color:#545454">Infos non disponible.</p>
</ng-template>
<!-- ------------------------------------ -->
</div>
<div class="reserver pt-2">
<button type="button" class="button">Réserver</button>
</div>
</div>
</div>
</div>

9
src/app/card-resto/card-resto.component.ts
View file

@ -13,15 +13,15 @@ export class CardRestoComponent implements OnInit {
@Input() likeResto: any;
@Output() clickLike = new EventEmitter<boolean>();
isLiked : boolean = false;
priceRef = ["Info indisponible","1-10€ ","11-20€","21-30€","31-40€"];
constructor(private apiBackService : ApiBackService) {
this.distance = 0 ;
}
ngOnInit(): void {
console.log(this.restaurant);
this.distance = Math.round(
this.apiBackService.setDistance(
48.86201110271593 , //latitude Simplon
@ -29,10 +29,7 @@ export class CardRestoComponent implements OnInit {
this.restaurant.latitude,
this.restaurant.longitude)
);
console.log(this.distance);
}
onClickLike() {
console.log('click');