Merge branch 'dev' into cecile

src/app/pages/page-dashboard/page-dashboard.component.html

@@ -1,13 +1,43 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-meteo></app-meteo>
 <app-humeur></app-humeur>
 
+<app-deconnexion></app-deconnexion>
 
+<div class="container">
+  <div>
+    <h3 class="titre">Bienvenue {{ conectedUser.prenom }}!!</h3>
+  </div>
+  <div class="row d-flex align-items-center flex-row">
 
-<div class="d-flex justify-content-center">
-  <button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team"
-    routerLinkActive="active-custom">Créer ma team</button>
+      <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="col-sm-3 col-xs-6 box border" id="boxFour">
+        <div>
+          <p>Humeur en attente component
+          </p>
+          <p>Humeur en attente component
+          </p>
+          <p>Humeur en attente component
+          </p>
+        </div>
+        </div>
+      </div>
+    
+    <div class="row avatar">
+      <div class="col" *ngFor="let membreData of listMembres">
+          <app-card-avatar [membre]="membreData">
+          </app-card-avatar>
+      </div>
+    </div>
+  </div>
 </div>
 
 <app-footer></app-footer>
+

src/app/pages/page-dashboard/page-dashboard.component.scss

@@ -1,5 +1,50 @@
+.titre{
+  display: inline-flex;
+  margin-left: 20px;
+  text-align: center;
+  font-weight: bold;
+}
+
 .meteo {
-  display: flex;
-  margin-left: 300px;
+  margin-left: 500px;
   margin-top: -60px;
 }
+
+.container {
+  display: flex;
+  padding: 10px;
+
+}
+
+button{
+  margin-bottom: 5px;
+}
+
+.calendrier{
+  align-content: flex-end;
+}
+
+#boxFour{
+  height: 150px;
+  margin-top: -70px;
+  width: fit-content;
+}
+
+#boxThree{
+  margin-top: -85px;
+  height: 150px;
+  width: fit-content;
+}
+
+#boxTwo{
+  margin-top: 50px;
+  margin-left: 150px;
+  height: 50%;
+  width: fit-content;
+}
+
+.avatar{
+  margin-top: -50px;
+  justify-content: space-between;
+  margin: 0;
+}

src/app/pages/page-dashboard/page-dashboard.component.ts

@@ -1,5 +1,8 @@
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+import { MembreService } from 'src/app/services/membre.service';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-page-dashboard',
@@ -8,26 +11,27 @@ import { FormsModule } from '@angular/forms';
 })
 export class PageDashboardComponent implements OnInit {
 
-  constructor() { }
+  conectedUser: any;
+  listMembres: any[];
+
+  constructor(private membreService: MembreService,
+    private http: HttpClient, 
+    private router: Router,  
+    private tokenService: TokenService) { 
+      this.listMembres = [];
+}
 
   ngOnInit(): void {
+    this.membreService.getMembreId(this.tokenService.getCurrentMembreId()).subscribe((result) => {
+      this.conectedUser = result ;
+      console.log(result);
+    })
+
+    this.membreService.getMembresByTeamId()?.subscribe((membres: any[]) => {
+      console.log(membres);
+      this.listMembres = membres;
+  });
   }
 
+}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}