diff --git a/src/app/pages/messages/messages-infouser/messages-infouser.component.html b/src/app/pages/messages/messages-infouser/messages-infouser.component.html index 49255bc..4477fe4 100644 --- a/src/app/pages/messages/messages-infouser/messages-infouser.component.html +++ b/src/app/pages/messages/messages-infouser/messages-infouser.component.html @@ -2,5 +2,5 @@
user
- Nom User + {{ name || 'Utilisateur' }} \ No newline at end of file diff --git a/src/app/pages/messages/messages-infouser/messages-infouser.component.ts b/src/app/pages/messages/messages-infouser/messages-infouser.component.ts index 701f4e9..8bbbe6f 100644 --- a/src/app/pages/messages/messages-infouser/messages-infouser.component.ts +++ b/src/app/pages/messages/messages-infouser/messages-infouser.component.ts @@ -1,4 +1,5 @@ -import { Component } from '@angular/core'; +import {Component, inject, Input} from '@angular/core'; +import {AuthService} from "../../../core/auth/auth.service"; @Component({ selector: 'app-messages-infouser', @@ -7,5 +8,8 @@ import { Component } from '@angular/core'; styleUrl: './messages-infouser.component.css' }) export class MessagesInfoUser { + @Input() name: string = ''; + private authService = inject(AuthService); + user = this.authService.currentUser; } diff --git a/src/app/pages/messages/messages-main/messages-main.component.html b/src/app/pages/messages/messages-main/messages-main.component.html index d6dae06..f25738b 100644 --- a/src/app/pages/messages/messages-main/messages-main.component.html +++ b/src/app/pages/messages/messages-main/messages-main.component.html @@ -2,7 +2,7 @@
- +
diff --git a/src/app/pages/messages/messages-main/messages-main.component.ts b/src/app/pages/messages/messages-main/messages-main.component.ts index 63645b5..b5b7c3b 100644 --- a/src/app/pages/messages/messages-main/messages-main.component.ts +++ b/src/app/pages/messages/messages-main/messages-main.component.ts @@ -22,11 +22,19 @@ export class MessagesMain implements OnInit { currentDiscussionId!: string; currentUserId!: number; messages: Message[] = []; + discussionName: string = ''; ngOnInit() { this.currentDiscussionId = this.route.snapshot.paramMap.get('discussionId')!; this.currentUserId = this.authService.getCurrentUserId(); + this.discussionService.getDiscussions().subscribe({ + next: (discussions) => { + const discussion = discussions.find(d => d.id === +this.currentDiscussionId); + this.discussionName = discussion?.name ?? ''; + } + }); + this.discussionService.getMessages(this.currentDiscussionId).subscribe({ next: (messages) => this.messages = messages, error: (err) => console.error('Impossible de charger les messages', err)