mirror of
https://github.com/avatao-content/frontend-tutorial-framework
synced 2025-09-18 08:19:58 +00:00
Move all message types to a standardised location
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
// Copyright (C) 2018 Avatao.com Innovative Learning Kft.
|
||||
// All Rights Reserved. See LICENSE file for details.
|
||||
|
||||
export class Message {
|
||||
originator: string;
|
||||
timestamp: Date;
|
||||
message: string;
|
||||
}
|
@@ -1,7 +0,0 @@
|
||||
// Copyright (C) 2018 Avatao.com Innovative Learning Kft.
|
||||
// All Rights Reserved. See LICENSE file for details.
|
||||
|
||||
export class MessageControl {
|
||||
command: string;
|
||||
next_visibility?: boolean;
|
||||
}
|
@@ -5,8 +5,8 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
|
||||
import { MarkdownService } from '../services/markdown.service';
|
||||
import { WebSocketService } from '../services/websocket.service';
|
||||
|
||||
import { Message } from './message';
|
||||
import { MessageControl } from './messagecontrol';
|
||||
import { MessagesMessage } from '../message.types/messages.message';
|
||||
import { MessageControl } from '../message.types/messagecontrol';
|
||||
import { config } from '../config';
|
||||
|
||||
@Component({
|
||||
@@ -15,7 +15,7 @@ import { config } from '../config';
|
||||
styleUrls: ['./messages.component.scss']
|
||||
})
|
||||
export class MessagesComponent implements OnInit {
|
||||
messages: Message[] = [];
|
||||
messages: MessagesMessage[] = [];
|
||||
showNextButton: boolean = config.messages.showNextButton;
|
||||
command_handlers = {'showbutton': this.showButton.bind(this)};
|
||||
|
||||
@@ -35,7 +35,7 @@ export class MessagesComponent implements OnInit {
|
||||
|
||||
ngOnInit() {
|
||||
this.websocketService.connect();
|
||||
this.websocketService.observeKey<Message>('message').subscribe(
|
||||
this.websocketService.observeKey<MessagesMessage>('message').subscribe(
|
||||
(event) => {
|
||||
this.messages.push(event.data);
|
||||
event.data.message = this.convert(event.data.message);
|
||||
|
Reference in New Issue
Block a user