From 0a101c992054b87881d412a7d5ae641a7adc2dd0 Mon Sep 17 00:00:00 2001
From: AlineRinquin <aline.rinquin.ar@gmail.com>
Date: Fri, 11 Mar 2022 15:16:18 +0100
Subject: [PATCH 1/2] essai d flex

---
 src/app/pages/page-dashboard/page-dashboard.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/pages/page-dashboard/page-dashboard.component.html b/src/app/pages/page-dashboard/page-dashboard.component.html
index 969f997..3f3016a 100644
--- a/src/app/pages/page-dashboard/page-dashboard.component.html
+++ b/src/app/pages/page-dashboard/page-dashboard.component.html
@@ -24,7 +24,7 @@
 
     </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">
           <li class="list-inline-item" *ngFor="let membreData of listMembres">
             <app-card-avatar class="avatar" [membre]="membreData"> </app-card-avatar>

From d5defdbf3eff4492ae5e41e6a4df27dc02f37a8d Mon Sep 17 00:00:00 2001
From: AlineRinquin <aline.rinquin.ar@gmail.com>
Date: Sun, 13 Mar 2022 14:47:31 +0100
Subject: [PATCH 2/2]  ajout des smileys dans coponent avatar plus css plus
 commentaires

---
 src/app/components/card-avatar/card-avatar.component.html   | 3 ++-
 src/app/components/card-avatar/card-avatar.component.scss   | 6 ++++++
 src/app/components/fiche-contact/fiche-contact.component.ts | 1 +
 src/app/pages/page-dashboard/page-dashboard.component.scss  | 2 +-
 src/app/pages/page-repertoire/page-repertoire.component.ts  | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/components/card-avatar/card-avatar.component.html b/src/app/components/card-avatar/card-avatar.component.html
index d6969cb..3d0749a 100644
--- a/src/app/components/card-avatar/card-avatar.component.html
+++ b/src/app/components/card-avatar/card-avatar.component.html
@@ -1,7 +1,8 @@
 <div class="card m-1 p-1 avatar bg-light">
 
   <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>
 
diff --git a/src/app/components/card-avatar/card-avatar.component.scss b/src/app/components/card-avatar/card-avatar.component.scss
index 86d9570..8024a71 100644
--- a/src/app/components/card-avatar/card-avatar.component.scss
+++ b/src/app/components/card-avatar/card-avatar.component.scss
@@ -13,4 +13,10 @@
   width: 150px;
   height: 170px;
   border-radius: 20px;
+}
+
+.humeur{
+  width: 60px;
+  height: 60px;
+  margin: 0 auto;
 }
\ No newline at end of file
diff --git a/src/app/components/fiche-contact/fiche-contact.component.ts b/src/app/components/fiche-contact/fiche-contact.component.ts
index 2d99fde..c91f728 100644
--- a/src/app/components/fiche-contact/fiche-contact.component.ts
+++ b/src/app/components/fiche-contact/fiche-contact.component.ts
@@ -19,6 +19,7 @@ export class FicheContactComponent implements OnInit {
   ngOnInit(): void {
     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"){
       this.parent = true;
     }
diff --git a/src/app/pages/page-dashboard/page-dashboard.component.scss b/src/app/pages/page-dashboard/page-dashboard.component.scss
index 3234c3a..3831680 100644
--- a/src/app/pages/page-dashboard/page-dashboard.component.scss
+++ b/src/app/pages/page-dashboard/page-dashboard.component.scss
@@ -24,5 +24,5 @@ h3{
 }
 
 .avatar{
-  margin:O;
+  margin:10px;
 }
diff --git a/src/app/pages/page-repertoire/page-repertoire.component.ts b/src/app/pages/page-repertoire/page-repertoire.component.ts
index c387247..9efaeb9 100644
--- a/src/app/pages/page-repertoire/page-repertoire.component.ts
+++ b/src/app/pages/page-repertoire/page-repertoire.component.ts
@@ -33,6 +33,7 @@ export class PageRepertoireComponent implements OnInit {
   ngOnInit(): void {
     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"){
       this.parent = true;
     }