dasboard pas fini

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

@@ -1,9 +1,32 @@
 <app-header></app-header>
 <app-side-bar></app-side-bar>
-<app-meteo></app-meteo>
+
+<div class="container">
+
+  <div>
+    <h3 class="titre">Bienvenue {{conectedUser.prenom}}!!</h3>
+  </div>
+
+  <div class="row d-flex align-items-center flex-row">
+
+    <div class="col-4">
+      <div class="flex-row border">
+        <app-meteo></app-meteo>
+      </div>
+      <div class="flex-row border">
+        <span>Humeur en attente component</span>
+      </div>
+    </div>
+
+    <div class="col-8 border">
+      <app-calendrier>A venir</app-calendrier>
+    </div>
+  
+  </div>
 
 
-<div class="d-flex justify-content-center">
+  <div class="row">
-  <button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team"
+    <app-card-member>A modifier</app-card-member>
-    routerLinkActive="active-custom">Créer ma team</button>
+  </div>
-</div>
+
+</div>

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

@@ -1,5 +1,22 @@
+.titre{
+  text-align: center;
+  font-weight: bold;
+}
+
 .meteo {
   display: flex;
-  margin-left: 300px;
+  margin-left: 500px;
   margin-top: -60px;
 }
+
+.container {
+  display: flex;
+  padding: 10px;
+  border: 1px solid 8c2e9b;
+}
+
+
+
+.calendrier{
+  align-content: flex-end;
+}

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

@@ -1,4 +1,8 @@
+import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
+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',
@@ -7,9 +11,26 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PageDashboardComponent implements OnInit {
 
-  constructor() { }
+  conectedUser: any;
 
-  ngOnInit(): void {
+  constructor(private membreService: MembreService,
+    private http: HttpClient, 
+    private router: Router,  
+    private tokenService: TokenService) { 
   }
 
+  ngOnInit(): void {
+    this.membreService.getMembreId(this.tokenService.getCurrentMembreId()).subscribe((result) => {
+      this.conectedUser = result ;
+      console.log(result);
+    })
+  }
+
+
+
+
+  // récuperer l id du membre s=qui est connecté
+  //recuperer l id dans le token grace au user id du getCurrentMembreId
+  // placer ce userId dans la methode getMembreId a la place de l id
+//********************************************************************
 }

src/app/services/membre.service.ts

@@ -21,12 +21,11 @@ export class MembreService {
   }
 
   getMembreId(id: any): Observable<any> {
-    return this.http.get(`${this.apiUrl}/membres/1` + id);
+    return this.http.get(`${this.apiUrl}/membres/` + id);
   }
 
   addMembre(membre: Membre): Observable<any> {
     console.log(membre);
-
     return this.http.post(`${this.apiUrl}/membres/sign-up`, membre);
   }
 

src/app/services/token.service.ts

@@ -24,7 +24,7 @@ tokenKey = environment.tokenKey;
     const token = this.getToken();
     if(token) {
       const decodedToken = jwt_decode<any>(token);
-      const userId = decodedToken.sub;
+      const userId = decodedToken.userId;
       return userId;
     } else {
       return null;

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiUrl: 'http://localhost:8080',
+  apiUrl: 'http://localhost:8088',
   tokenKey: 'TOKEN-ORGANIZEE',
 };