Merge pull request #2 from avatao-content/messaging

Initial messaging implementation

src/app/app.component.html

@@ -3,7 +3,7 @@
   <div class="row tfw-first-row">
     <div class="col-sm"><app-login></app-login></div>
     <div class="col-sm-6"><app-webide></app-webide></div>
-    <div class="col-sm"><app-logs></app-logs></div>
+    <div class="col-sm"><app-messages></app-messages></div>
   </div>
   <!--div class="row">
     <div class="col-sm"><app-test-button [anchor_id]="'anchor_a'"></app-test-button></div>

src/app/app.module.ts

@@ -12,7 +12,7 @@ import { LoginComponent } from './login/login.component';
 import { MarkdownService } from './markdown.service';
 import { TerminadoService } from './terminado.service';
 import { WebideComponent } from './webide/webide.component';
-import { LogsComponent } from './logs/logs.component';
+import { MessagesComponent } from './messages/messages.component';
 import { TestButtonComponent } from './test-button/test-button.component';
 import { WebSocketService } from './websocket.service';
 import { TerminalComponent } from './terminal/terminal.component';
@@ -25,7 +25,7 @@ import { FSMUpdateService } from './fsmupdate.service';
     HeaderComponent,
     LoginComponent,
     WebideComponent,
-    LogsComponent,
+    MessagesComponent,
     TestButtonComponent,
     TerminalComponent
   ],

src/app/logs/logs.component.html

@@ -1,2 +0,0 @@
-<div [innerHtml]="this.markdown">
-</div>

src/app/logs/logs.component.ts

@@ -1,28 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { MarkdownService } from '../markdown.service';
-
-const mdText =
-`# Showdown test
-
-**bold**
-
-_italic_
-
-[link](https://avatao.com)
-`;
-
-@Component({
-  selector: 'app-logs',
-  templateUrl: './logs.component.html',
-  styleUrls: ['./logs.component.scss']
-})
-export class LogsComponent implements OnInit {
-  markdown: string;
-  constructor(private markdownService: MarkdownService) {
-    this.markdown = markdownService.convertToHtml(mdText);
-  }
-
-  ngOnInit() {
-  }
-
-}

src/app/messages/message.ts

@@ -0,0 +1,5 @@
+export class Message {
+  originator: string;
+  timestamp: Date;
+  message: string;
+}

src/app/messages/messages.component.html

@@ -0,0 +1,11 @@
+<div>
+<ul>
+  <li *ngFor="let message of messages">
+    <p>
+      <strong>{{message.originator}}</strong>
+      <span class="timestamp">{{message.timestamp | date:'yyyy-MM-dd HH:mm:ss'}}</span><br>
+      <span [innerHtml]="message.message"></span>
+    </p>
+  </li>
+</ul>
+</div>

src/app/messages/messages.component.scss

@@ -0,0 +1,14 @@
+div {
+  display: block;
+  overflow: auto;
+  max-height: 100%;
+}
+
+ul {
+  max-height: inherit;
+  list-style-type: none;
+}
+
+.timestamp {
+  opacity: 0.37;
+}

src/app/messages/messages.component.ts

@@ -0,0 +1,32 @@
+import { Component, OnInit } from '@angular/core';
+import { MarkdownService } from '../markdown.service';
+import { WebSocketService } from '../websocket.service';
+
+import { Message } from './message';
+
+@Component({
+  selector: 'app-messages',
+  templateUrl: './messages.component.html',
+  styleUrls: ['./messages.component.scss']
+})
+export class MessagesComponent implements OnInit {
+  messages: Message[] = [];
+  constructor(
+    private markdownService: MarkdownService,
+    private websocketService: WebSocketService
+  ) {}
+
+  convert(text: string) {
+    return this.markdownService.convertToHtml(text);
+  }
+
+  ngOnInit() {
+    this.websocketService.observeAnchor<Message>('message').subscribe(
+      (event) => {
+        this.messages.push(event.data);
+        event.data.message = this.convert(event.data.message);
+      }
+    );
+  }
+
+}