Merge branch 'dev' into Julian
This commit is contained in:
commit
5b700ae7bd
5 changed files with 42 additions and 39 deletions
1
db.json
1
db.json
|
@ -6050,3 +6050,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
<div class="custom-side-bar flex-shrink-0 bg-white border-end">
|
<div class="custom-side-bar flex-shrink-0 bg-white border-end">
|
||||||
<div class="p-3">
|
<div class="p-3">
|
||||||
<span class="fs-5 fw-semibold">Filtres</span>
|
<span class="fs-5 fw-semibold">Filtres</span>
|
||||||
</div>
|
</div>
|
||||||
<ul class="list-unstyled ps-0 border-top">
|
<ul class="list-unstyled ps-0 border-top">
|
||||||
<div class="p-3">
|
<div class="p-3">
|
||||||
<p class="mb-1 fs-5 fw-semibold">Catégories</p>
|
<p class="mb-1 fs-5 fw-semibold">Catégories</p>
|
||||||
<div *ngFor="let category of listCategories; let indexCat = index" class="form-check">
|
<div *ngFor="let category of listCategories; let indexCat = index" class="form-check">
|
||||||
|
|
||||||
<input class="form-check-input" type="checkbox" value="testcategory" id="checkBoxCategory{{indexCat}}">
|
<input class="form-check-input" type="checkbox" value="testcategory" id="checkBoxCategory{{indexCat}}">
|
||||||
|
|
||||||
<label class="form-check-label" for="checkBoxCategory{{indexCat}}">
|
<label class="form-check-label" for="checkBoxCategory{{indexCat}}">
|
||||||
{{ category }}
|
{{ category }}
|
||||||
|
|
|
@ -31,5 +31,4 @@ export class FilterSideBarComponent implements OnInit {
|
||||||
console.log(typeof(rangeArray[0]));
|
console.log(typeof(rangeArray[0]));
|
||||||
this.rangeNumber.emit(rangeArray);
|
this.rangeNumber.emit(rangeArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +1,25 @@
|
||||||
<div class="d-flex align-items-stretch">
|
<div class="d-flex align-items-stretch">
|
||||||
<app-filter-side-bar [listCategories]="listCategoriesFilter" (stateNumber)="onRatingFilter($event)" (rangeNumber)="onPriceFilter($event)"></app-filter-side-bar>
|
<app-filter-side-bar [listCategories]="listCategoriesFilter" (stateNumber)="onRatingFilter($event)" (rangeNumber)="onPriceFilter($event)"></app-filter-side-bar>
|
||||||
|
<div class="custom-main container p-3">
|
||||||
|
<input class="form-control"
|
||||||
|
type="text"
|
||||||
|
placeholder="Recherche ta belle plante"
|
||||||
|
aria-label="Input Recherche ta belle plante">
|
||||||
|
|
||||||
<div class="custom-main container p-3">
|
<div class="py-3">
|
||||||
<input class="form-control"
|
Trier par :
|
||||||
type="text"
|
<button class="btn btn-outline-success btn-sm me-2" (click)="onPriceTri()">Prix</button>
|
||||||
placeholder="Recherche ta belle plante"
|
<button class="btn btn-outline-success btn-sm me-2"(click)="onAlphaTri()">Ordre Alpha</button>
|
||||||
aria-label="Input Recherche ta belle plante">
|
<button class="btn btn-outline-success btn-sm me-2" (click)="onRatingTri()">Avis</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="py-3">
|
<div class="row">
|
||||||
Trier par :
|
<div class="col" *ngFor="let product of listData">
|
||||||
<button class="btn btn-outline-success btn-sm me-2">Prix</button>
|
<app-card-plante [plant]="product"
|
||||||
<button class="btn btn-outline-success btn-sm me-2">Ordre Alpha</button>
|
(clickLike)="onEventLike()">
|
||||||
<button class="btn btn-outline-success btn-sm me-2">Avis</button>
|
</app-card-plante>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row">
|
</div>
|
||||||
<div class="col" *ngFor="let product of listData">
|
|
||||||
<app-card-plante [plant]="product"
|
|
||||||
(clickLike)="onEventLike()">
|
|
||||||
</app-card-plante>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core';
|
||||||
import { PlantouneService } from 'src/app/services/plantoune.service';
|
import { PlantouneService } from 'src/app/services/plantoune.service';
|
||||||
import * as _ from 'underscore';
|
import * as _ from 'underscore';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-page-accueil',
|
selector: 'app-page-accueil',
|
||||||
templateUrl: './page-accueil.component.html',
|
templateUrl: './page-accueil.component.html',
|
||||||
|
@ -57,10 +60,11 @@ export class PageAccueilComponent implements OnInit {
|
||||||
* Technique avec Underscore JS pour recupérer les catégories uniques de nos plantes
|
* Technique avec Underscore JS pour recupérer les catégories uniques de nos plantes
|
||||||
*/
|
*/
|
||||||
const listAllCategories = listPlant.map(product => product.product_breadcrumb_label);
|
const listAllCategories = listPlant.map(product => product.product_breadcrumb_label);
|
||||||
console.log(listAllCategories);
|
// console.log(listAllCategories);
|
||||||
|
|
||||||
const listUniqCategories = _.uniq(listAllCategories)
|
const listUniqCategories = _.uniq(listAllCategories)
|
||||||
console.log(listUniqCategories);
|
// console.log(listUniqCategories);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -73,6 +77,7 @@ export class PageAccueilComponent implements OnInit {
|
||||||
this.listCategoriesFilter = listUniqJsCategories;
|
this.listCategoriesFilter = listUniqJsCategories;
|
||||||
this.listData = listPlant;
|
this.listData = listPlant;
|
||||||
this.listData.length = 9;
|
this.listData.length = 9;
|
||||||
|
|
||||||
console.log(this.listData);
|
console.log(this.listData);
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
@ -133,5 +138,4 @@ export class PageAccueilComponent implements OnInit {
|
||||||
|
|
||||||
if(this.listData.length >= 9) this.listData.length = 9;
|
if(this.listData.length >= 9) this.listData.length = 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue