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

Merge pull request #100 from AlineRinquin/aline

Browse Source 
Aline
This commit is contained in:
AlineRinquin 2022-03-13 17:21:46 +01:00 committed by GitHub
commit f31463a1b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/card-avatar/card-avatar.component.html
View File

@ -1,7 +1,8 @@
<div class="card m-1 p-1 avatar bg-light"> <div class="card m-1 p-1 avatar bg-light">
<div class="card-img-top"> <div class="card-img-top">
<div class="rounded-circle"id="couleur"[style.background-color]="membre.couleur"> <div class="rounded-circle" id="couleur" [style.background-color]="membre.couleur">
<img *ngIf="membre.smiley" class="rounded-circle humeur" src="{{membre.smiley}}">
</div> </div>
</div> </div>

6
src/app/components/card-avatar/card-avatar.component.scss
View File

@ -14,3 +14,9 @@
height: 170px; height: 170px;
border-radius: 20px; border-radius: 20px;
} }
.humeur{
width: 60px;
height: 60px;
margin: 0 auto;
}

1
src/app/components/fiche-contact/fiche-contact.component.ts
View File

@ -19,6 +19,7 @@ export class FicheContactComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
const roleUser = this.tokenService.getRole(); const roleUser = this.tokenService.getRole();
//gestion du role parent ou non pour mettre en "disable" les boutons pour les roles enfants
if(roleUser == "ROLE_PARENT"){ if(roleUser == "ROLE_PARENT"){
this.parent = true; this.parent = true;
} }

2
src/app/pages/page-dashboard/page-dashboard.component.html
View File

@ -24,7 +24,7 @@
</div> </div>
<div class="row d-flex flex-wrap my-2 p-1"> <div class="row d-flex flex-wrap my-2 p-1 d-flex">
<ul class="list-inline"> <ul class="list-inline">
<li class="list-inline-item" *ngFor="let membreData of listMembres"> <li class="list-inline-item" *ngFor="let membreData of listMembres">
<app-card-avatar class="avatar" [membre]="membreData"> </app-card-avatar> <app-card-avatar class="avatar" [membre]="membreData"> </app-card-avatar>

2
src/app/pages/page-dashboard/page-dashboard.component.scss
View File

@ -24,5 +24,5 @@ h3{
} }
.avatar{ .avatar{
margin:O; margin:10px;
} }

1
src/app/pages/page-repertoire/page-repertoire.component.ts
View File

@ -33,6 +33,7 @@ export class PageRepertoireComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
const roleUser = this.tokenService.getRole(); const roleUser = this.tokenService.getRole();
//gestion du role parent ou non pour mettre en "disable" les boutons pour les roles enfants
if(roleUser == "ROLE_PARENT"){ if(roleUser == "ROLE_PARENT"){
this.parent = true; this.parent = true;
} }