Merge remote-tracking branch 'origin/develop' into develop

src/app/pages/menu/menu-users/menu-users.component.html

@@ -13,9 +13,7 @@
 
         <div class="discussion-info">
             <span class="username">{{ disc.name }}</span>
-            <span class="members" *ngIf="disc.isGroup">
+            <span class="members" *ngIf="disc.isGroup"> {{ disc.membersCount }} membres </span>
-        {{ disc.membersCount }} membres
-      </span>
         </div>
 
     </button>

src/app/pages/menu/menu-users/menu-users.component.ts

@@ -1,6 +1,7 @@
-import { Component, inject } from '@angular/core';
+import {Component, inject, OnInit} from '@angular/core';
 import { Router } from "@angular/router";
 import { CommonModule } from "@angular/common";
+import {discussionsService} from "../../../core/chat/discussion.service";
 
 export interface Discussion {
   id: number;
@@ -15,18 +16,19 @@ export interface Discussion {
   templateUrl: './menu-users.component.html',
   styleUrl: './menu-users.component.css'
 })
-export class MenuUsersComponent {
+export class MenuUsersComponent implements OnInit {
 
   private router = inject(Router);
+  private discussionService = inject(discussionsService);
 
-  discussions: Discussion[] = [
+  discussions: Discussion[] = [];
-    { id: 1, name: 'Um-Bro', isGroup: false },
+
-    { id: 2, name: 'Doggeybag',      isGroup: false },
+  ngOnInit() {
-    { id: 3, name: '',               isGroup: false },
+    this.discussionService.getDiscussions().subscribe({
-    { id: 4, name: 'Abel Paradigm',  isGroup: false },
+      next: (discussions) => this.discussions = discussions,
-    { id: 5, name: 'Um-Brothers',    isGroup: true, membersCount: 7 },
+      error: (err) => console.error('Impossible de charger les discussions', err)
-    { id: 6, name: 'Hoodie G',       isGroup: false },
+    });
-  ];
+  }
 
   openDiscussion(discussionId: number) {
     this.router.navigate(['/main/messages', discussionId]);