Skip to content

Commit

Permalink
19
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom committed Jun 19, 2020
1 parent f32ccb8 commit a84bca4
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 16 deletions.
5 changes: 0 additions & 5 deletions code_source/.firebaserc

This file was deleted.

82 changes: 71 additions & 11 deletions code_source/src/app/partie/partie.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ <h5>Manche {{this.GAME.manche}}/5 | {{this.GAME.nb_diamant_attente}} diamants en
</div>
</div>
<ion-row id="premier_ligne">

<!-- Affichage des cartes des 3 premiers joueurs -->
<ion-col *ngFor="let player of this.GAME.players | slice:0:3, let i = index;" >
<ion-col *ngFor="let player of this.GAME.players, let i = index;" >
<ion-card class="joueur">
<div class="entete">
<ion-avatar>
Expand All @@ -50,33 +48,95 @@ <h5>Manche {{this.GAME.manche}}/5 | {{this.GAME.nb_diamant_attente}} diamants en
</ion-card>
</ion-col>

<ion-col >
<ion-card class="joueur">
<div class="entete">
<ion-avatar>
<img src="">
</ion-avatar>
<ion-text class="pseudo">totoGaming</ion-text>
</div>
<div class="body">
<div class="coffre">
<img class="img" src="assets/img/coffre.png">
<ion-text class="nb_coffre">12</ion-text>
</div>
</div>
<div class="footer">
<div class="diamant">
<img src="assets/img/diamant.png" class="diamant_img">
<ion-text class="nb_diamant">23</ion-text>
</div>
<img src="assets/img/mine.png" class="statut">
</div>
</ion-card>
</ion-col>

</ion-row>
<ion-row id="deuxieme_ligne">
<!-- Affichage des cartes des 3 derniers joueurs -->
<ion-col *ngFor="let player of this.GAME.players | slice: 3: 6, let i = index;" >
<ion-col size="2">

</ion-col>


<ion-col size="4">
<ion-card class="joueur">
<div class="entete">
<ion-avatar>
<img src="{{playersDisplay[i].imageURL}}">
<img src="assets/img/avatar.png">
</ion-avatar>
<ion-text class="pseudo">{{playersDisplay[i].pseudo}}</ion-text>
<ion-text class="pseudo">TotoGamer</ion-text>
</div>
<div class="body">
<div class="coffre">
<img class="img" src="assets/img/coffre.png">
<ion-text class="nb_coffre" *ngIf="player.uid == currentuser.uid">{{player.nb_diamant_total}}</ion-text>
<ion-text class="nb_coffre">12</ion-text>
</div>
</div>
<div class="footer">
<div class="diamant">
<img src="assets/img/diamant.png" class="diamant_img">
<ion-text class="nb_diamant">{{player.nb_diamant_manche}}</ion-text>
<ion-text class="nb_diamant">15</ion-text>
</div>
<img src="assets/img/mine.png" class="statut">
</div>
</ion-card>
</ion-col>


<ion-col size="4">
<ion-card class="joueur">
<div class="entete">
<ion-avatar>
<img src="assets/img/avatar.png">
</ion-avatar>
<ion-text class="pseudo">TotoGamer</ion-text>
</div>
<div class="body">
<div class="coffre">
<img class="img" src="assets/img/coffre.png">
<ion-text class="nb_coffre">12</ion-text>
</div>
<img src="assets/img/mine.png" class="statut" *ngIf="player.etat == 'mine'">
<img src="assets/img/camp.png" class="statut" *ngIf="player.etat == 'camp'">
</div>
<div class="footer">
<div class="diamant">
<img src="assets/img/diamant.png" class="diamant_img">
<ion-text class="nb_diamant">15</ion-text>
</div>
<img src="assets/img/mine.png" class="statut">
</div>
</ion-card>

</ion-col>
<ion-col size="2">
</ion-col>
</ion-row>
<ion-row>
<ion-col class="test">
<ion-button block (click)="changeEtat('mine')" *ngIf="currentuser_game.status != 'attente'">EXPLORER</ion-button>
</ion-col>
<ion-col class="test">
<ion-button block (click)="changeEtat('rentre')" *ngIf="currentuser_game.status != 'attente'">RENTRER</ion-button>
</ion-col>
</ion-row>
</ion-content>

0 comments on commit a84bca4

Please sign in to comment.