Merge branch 'issue-8' into 'develop'
fix filters products - issue #8 See merge request ldc-web/projets/boutique-cnc-sable!42
This commit is contained in:
commit
8a683703ac
3 changed files with 85 additions and 82 deletions
|
|
@ -21,89 +21,89 @@
|
|||
<input v-on:change="updatedFilter()" class="form-control w-100 rounded-4 border-dark" :disabled="loading" type="text" id="search" name="search" v-model="search" placeholder="Rechercher...">
|
||||
<!--</form>-->
|
||||
</div>
|
||||
<!-- Filter Promotions -->
|
||||
<!-- <div class="m-3">
|
||||
<button
|
||||
class="btn filters-btn d-flex justify-content-between align-items-center rounded-0 w-100 border-0 p-0 pb-lg-2"
|
||||
type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapsePromotions"
|
||||
aria-expanded="true" aria-controls="filterCollapsePromotions">
|
||||
<span class="title-small font-Barlow-bold">Promotions</span>
|
||||
<svg id="arrow-down" class="svg" viewBox='0 0 16 16'>
|
||||
<path d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z" />
|
||||
</svg>
|
||||
</button>
|
||||
<div class="collapse show" id="filterCollapsePromotions">
|
||||
<div class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="hasPromotion" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button" id="filterPromotions">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button" for="filterPromotions">
|
||||
Promotions
|
||||
</label>
|
||||
<div class="accordion px-3" id="accordionFilters">
|
||||
<!-- Filter Promotions -->
|
||||
<!-- <div class="accordion-item rounded-0 border-0 bg-transparent mt-2">
|
||||
<h2 class="accordion-header" id="headingPromotions">
|
||||
<button class="accordion-button text-dark bg-transparent rounded-0 border-0 border-bottom border-3 border-secondary-subtle px-0 py-2 collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapsePromotions" aria-expanded="true" aria-controls="collapsePromotions">
|
||||
<span class="title-small font-Barlow-bold">Promotions</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapsePromotions" class="accordion-collapse collapse" aria-labelledby="headingPromotions" data-bs-parent="#accordionFilters">
|
||||
<div class="accordion-body p-0">
|
||||
<div class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="hasPromotion" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button" id="filterPromotions">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button" for="filterPromotions">
|
||||
Promotions
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- Filter Ranges -->
|
||||
<div class="accordion-item rounded-0 border-0 bg-transparent mt-2">
|
||||
<h2 class="accordion-header" id="headingRanges">
|
||||
<button class="accordion-button text-dark bg-transparent rounded-0 border-0 border-bottom border-3 border-secondary-subtle px-0 py-2" type="button" data-bs-toggle="collapse" data-bs-target="#collapseRanges" aria-expanded="true" aria-controls="collapseRanges">
|
||||
<span class="title-small font-Barlow-bold">Rayons</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseRanges" class="accordion-collapse collapse show" aria-labelledby="headingRanges" data-bs-parent="#accordionFilters">
|
||||
<div class="accordion-body p-0">
|
||||
<!-- Ranges -->
|
||||
<div v-for="(range, rangeIndex) in ranges" :key="rangeIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="range.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterRanges${rangeIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterRanges${rangeIndex}`">
|
||||
{{ range.name }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<!-- Filter Ranges -->
|
||||
<div class="m-3">
|
||||
<button
|
||||
class="btn filters-btn d-flex justify-content-between align-items-center rounded-0 w-100 border-0 p-0 pb-lg-2"
|
||||
type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapseRanges"
|
||||
aria-expanded="true" aria-controls="filterCollapseRanges">
|
||||
<span class="title-small font-Barlow-bold">Rayons</span>
|
||||
<i class="fas fa-chevron-down"></i>
|
||||
</button>
|
||||
<div class="collapse show" id="filterCollapseRanges">
|
||||
<!-- Ranges -->
|
||||
<div v-for="(range, rangeIndex) in ranges" :key="rangeIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="range.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterRanges${rangeIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterRanges${rangeIndex}`">
|
||||
{{ range.name }}
|
||||
</label>
|
||||
<!-- Filter Brands -->
|
||||
<div class="accordion-item rounded-0 border-0 bg-transparent mt-2">
|
||||
<h2 class="accordion-header" id="headingBrands">
|
||||
<button class="accordion-button text-dark bg-transparent rounded-0 border-0 border-bottom border-3 border-secondary-subtle px-0 py-2 collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseBrands" aria-expanded="false" aria-controls="collapseBrands">
|
||||
<span class="title-small font-Barlow-bold">Marques</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseBrands" class="accordion-collapse collapse" aria-labelledby="headingBrands" data-bs-parent="#accordionFilters">
|
||||
<div class="accordion-body p-0">
|
||||
<!-- Brands -->
|
||||
<div v-for="(brand, brandIndex) in brands" :key="brandIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="brand.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterBrand${brandIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterBrand${brandIndex}`">
|
||||
{{ brand.label }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Filter Brands -->
|
||||
<div class="m-3">
|
||||
<button
|
||||
class="btn filters-btn d-flex justify-content-between align-items-center rounded-0 w-100 border-0 p-0 pb-lg-2"
|
||||
type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapseBrand"
|
||||
aria-expanded="true" aria-controls="filterCollapseBrand">
|
||||
<span class="title-small font-Barlow-bold">Marques</span>
|
||||
<i class="fas fa-chevron-down"></i>
|
||||
</button>
|
||||
<div class="collapse show" id="filterCollapseBrand">
|
||||
<!-- Brands -->
|
||||
<div v-for="(brand, brandIndex) in brands" :key="brandIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="brand.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterBrand${brandIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterBrand${brandIndex}`">
|
||||
{{ brand.label }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Filter Tags -->
|
||||
<div class="m-3">
|
||||
<button
|
||||
class="btn filters-btn d-flex justify-content-between align-items-center rounded-0 w-100 border-0 p-0 pb-lg-2"
|
||||
type="button" data-bs-toggle="collapse" data-bs-target="#filterCollapseTag"
|
||||
aria-expanded="true" aria-controls="filterCollapseTag">
|
||||
<span class="title-small font-Barlow-bold">Spécial</span>
|
||||
<i class="fas fa-chevron-down" aria-hidden="true"></i>
|
||||
</button>
|
||||
<div class="collapse show" id="filterCollapseTag">
|
||||
<!-- Tags -->
|
||||
<div v-for="(tag, tagIndex) in tags" :key="tagIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="tag.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterTag${tagIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterTag${tagIndex}`">
|
||||
{{ tag.label }}
|
||||
</label>
|
||||
<!-- Filter Tags -->
|
||||
<div class="accordion-item rounded-0 border-0 bg-transparent mt-2">
|
||||
<h2 class="accordion-header" id="headingTags">
|
||||
<button class="accordion-button text-dark bg-transparent rounded-0 border-0 border-bottom border-3 border-secondary-subtle px-0 py-2 collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseTags" aria-expanded="false" aria-controls="collapseTags">
|
||||
<span class="title-small font-Barlow-bold">Spécial</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseTags" class="accordion-collapse collapse" aria-labelledby="headingTags" data-bs-parent="#accordionFilters">
|
||||
<div class="accordion-body p-0">
|
||||
<!-- Tags -->
|
||||
<div v-for="(tag, tagIndex) in tags" :key="tagIndex"
|
||||
class="form-check d-flex flex-row flex-lg-row-reverse justify-content-between align-items-center rounded-2 px-3 py-2 p-lg-0 mt-2 mb-0">
|
||||
<input v-on:click="updatedFilter()" v-model="tag.selected" :disabled="loading" class="form-check-input m-0" type="checkbox" role="button"
|
||||
:id="`filterTag${tagIndex}`">
|
||||
<label class="form-check-label w-100 ps-3 pe-0 ps-lg-0 pe-lg-3" role="button"
|
||||
:for="`filterTag${tagIndex}`">
|
||||
{{ tag.label }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -169,9 +169,6 @@
|
|||
</div>
|
||||
</article>
|
||||
<div class="d-flex flex-column m-0">
|
||||
<button class="btn btn-more-products my-3" v-bind:class="[this.productsResults > this.products.length ? 'd-none' : (currentPage > 1) ? 'd-none' : '']" v-on:click="checkScroll()">
|
||||
<i class="fas fa-circle-plus" aria-hidden="true"></i>
|
||||
</button>
|
||||
<p class="fst-italic text-center text-muted" v-bind:class="[(this.productsResults * this.currentPage) <= this.products.length ? 'd-none' : '']" v-on:click="checkScroll()">Tous les produits correspondants à votre recherche sont affichés</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -227,6 +224,7 @@
|
|||
this.selectFilters();
|
||||
this.responsiveFilters();
|
||||
this.countResults();
|
||||
this.checkScroll();
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -212,6 +212,10 @@ img {
|
|||
}
|
||||
}
|
||||
|
||||
.accordion-button:not(.collapsed)::after {
|
||||
background-image: var(--bs-accordion-btn-icon) !important;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
background-color: #909090;
|
||||
padding: 1rem;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
@import '~bootstrap/scss/forms';
|
||||
@import '~bootstrap/scss/nav';
|
||||
@import '~bootstrap/scss/navbar';
|
||||
@import '~bootstrap/scss/accordion';
|
||||
|
||||
// 5. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss`
|
||||
@import "~bootstrap/scss/utilities/api";
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue