Commit 0740749b by Nabil Sadki

Merge branch 'v1.1.0.0' into v1.1.5.0

# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/pages/compte/profil/profil.page.html
#	src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.html
#	src/app/pages/lots/lots-a-gagner/lots-a-gagner.page.ts
#	src/app/pages/menu/menu.module.ts
#	src/app/pages/offres/dashboard/dashboard.page.scss
parents 266cbf7b 12c49ee4
......@@ -57,7 +57,7 @@
<ion-card>
<ion-item color="primary">
Ma carte testeur :
<ion-button slot="end" color="light" fill="outline">Quêtes</ion-button>
<ion-button slot="end" color="light" fill="outline">Quêtes</ion-button>
</ion-item>
<ion-item>
<ion-icon name="card" slot="start"></ion-icon> 2019 0108 0000 0001
......
......@@ -10,6 +10,9 @@
width: 18vw;
height: 8vw;
font-size: large;
display: flex;
align-items: center;
justify-content: center;
}
ion-img {
min-height: 10rem;
......
......@@ -53,10 +53,10 @@ export class TripService {
this.products = this._ALLO.shuffleArray(products);
this.products.forEach((element) => { element.hidden = true; });
// setTimeout(() => {
this.filtredProducts = this.products;
this.offersCardList = this.filtredProducts.slice(0, 2);
// }, 3000);
setTimeout(() => {
this.filtredProducts = this.products;
this.offersCardList = this.filtredProducts.slice(0, 2);
}, 2000);
}
if (null !== data && 'object' === typeof data && data.hasOwnProperty('cats')) {
var cats = this._ALLO.jsonToArray(data.cats);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment