diff --git a/src/app/message/message.component.ts b/src/app/message/message.component.ts index 637f878..ed5986d 100644 --- a/src/app/message/message.component.ts +++ b/src/app/message/message.component.ts @@ -16,11 +16,11 @@ export class MessageComponent implements OnInit { isOwnMessage: boolean; ownEmail: string; - constructor() { - /* authService.authUser().subscribe(user => { - this.userName = user.userName; - this.isOwnMessage = true; - }); */ + constructor(private chatService : ChatService) { + chatService.getUser().subscribe(user => { + this.userName = user.username; + this.isOwnMessage = user.username === "Miguel"; + }); } ngOnInit(chatMessage = this.chatMessage) { diff --git a/src/app/models/chat-message.model.ts b/src/app/models/chat-message.model.ts index 24b115f..694f0e4 100644 --- a/src/app/models/chat-message.model.ts +++ b/src/app/models/chat-message.model.ts @@ -1,4 +1,10 @@ export class ChatMessage { + + constructor(userName, message) { + this.userName = userName; + this.message = message; + } + $key?: string; userName?: string; message?: string; diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 9cf31de..3699e3d 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -1,4 +1,9 @@ export class User { + + constructor(username) { + this.username = username; + } + uid?: string; username?: string; status?: string; diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index f5d9349..f5a27c8 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, of } from 'rxjs'; import { ChatMessage } from '../models/chat-message.model'; import { RdfService } from './rdf.service'; @@ -15,25 +15,28 @@ export class ChatService { } getUser() { - return this.getUsers().subscribe(users => { - return users[0]; - }); + return of(new User("Miguel")); } getUsers() : Observable { var users = new Array(); - return new Observable(); + users.push(new User("Fulanito")); + users.push(new User("Menganito")); + users.push(new User("Adolfito")); + return of(users); } sendMessage(msg: string) { const timestamp = this.getTimeStamp(); this.chatMessages = this.getMessages(); - this.chatMessages.toPromise(); } getMessages(): Observable { var messages = new Array(); - return new Observable(); + messages.push(new ChatMessage("Miguel", "Hola")); + messages.push(new ChatMessage("Adolfito", "Que tal?")); + messages.push(new ChatMessage("Miguel", "Bien")); + return of(messages); } getTimeStamp() { diff --git a/src/app/user-item/user-item.component.html b/src/app/user-item/user-item.component.html index 3f8b254..ab80ddc 100644 --- a/src/app/user-item/user-item.component.html +++ b/src/app/user-item/user-item.component.html @@ -2,6 +2,6 @@ - {{user.displayName}} + {{user.username}} \ No newline at end of file