isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into aline

Browse source
This commit is contained in:
AlineRinquin 2022-02-25 17:16:58 +01:00 • committed by GitHub
commit 4b17f61207
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 147 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -9,28 +9,27 @@
<h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
</div>
<div class="row d-flex align-items-center flex-row">
<div class="col-sm-3 col-xs-6 box border" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxTwo">
<app-calendrier>A venir</app-calendrier>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxThree">
<app-meteo></app-meteo>
</div>
<div class="col-sm-3 col-xs-6 box border" id="boxTwo">
<app-calendrier>A venir</app-calendrier>
</div>
<div class="row">
<div class="row">
<div class="col-sm-3 col-xs-6 box border" id="boxFour">
<app-humeur></app-humeur>
<div>
<app-humeur></app-humeur>
</div>
</div>
</div>
<div class="row avatar">
<div class="col" *ngFor="let membreData of listMembres">
<app-card-avatar [membre]="membreData">
</app-card-avatar>
<app-card-avatar [membre]="membreData"> </app-card-avatar>
</div>
</div>
</div>
</div>
<app-footer></app-footer>