Merge pull request #54 from avatao-content/message-buttons

Message button support in bot messages

package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.json",
-    "build": "ng build --prod --aot --build-optimizer"
+    "build": "ng build --prod --aot --build-optimizer",
+    "lint": "ng lint --fix"
   },
   "private": true,
   "dependencies": {

src/app/app.module.ts

@@ -17,7 +17,7 @@ import { TerminalComponent } from './terminal/terminal.component';
 import { AppRoutingModule } from './app-routing.module';
 import { TestmessengerComponent } from './testmessenger/testmessenger.component';
 import { DeploymentNotificationService } from './services/deployment-notification.service';
-import { SafePipe } from './pipes/safe.pipe';
+import { SafePipe, SafeHtmlPipe } from './pipes/safe.pipe';
 import { ConsoleComponent } from './console/console.component';
 import { MonacoEditorModule } from 'ngx-monaco-editor';
 import {
@@ -28,6 +28,7 @@ import {
 } from './services/config.service';
 import { FSMUpdateService } from './services/fsmupdate.service';
 import { LoaderComponent } from './loader/loader.component';
+import {CapitalizePipe} from './pipes/capitalize.pipe';
 
 
 @NgModule({
@@ -41,6 +42,8 @@ import { LoaderComponent } from './loader/loader.component';
     DashboardComponent,
     TestmessengerComponent,
     SafePipe,
+    SafeHtmlPipe,
+    CapitalizePipe,
     ConsoleComponent,
     LoaderComponent
   ],

src/app/dashboard/dashboard.component.html

@@ -1,13 +1,11 @@
 <div [attr.class]="layout | async">
   <div class="tfw-grid-main-components">
-    <div class="tfw-header"><app-header></app-header></div>
-    <div [ngClass]="{'hide-attribute': hideMessages | async}"
-         class="tfw-messages"
-         #tfwmessages>
-      <app-messages (newMessageEvent)="scrollMessagesToBottom()"></app-messages>
+    <div [ngClass]="{'hide-attribute': hideMessages | async}" class="tfw-messages">
+      <app-messages></app-messages>
     </div>
+    <div class="tfw-header"><app-header></app-header></div>
     <div class="tfw-web tao-grid-top-left"
-         [ngClass]="{'deploy-blur': deploying || (polling | async)}">
+         [ngClass]="{'deploy-blur': deploying || (iframeReloadPoller.isPolling | async)}">
         <div *ngIf="iframeUrl | async" class="iframe-container">
           <div *ngIf="showUrlBar | async" class="urlbar-container">
             <button class="refresh btn btn-sm rounded-circle" (click)="reloadIframe()">&#8635;</button>
@@ -20,6 +18,7 @@
           </div>
           <iframe class="iframe"
                   #webiframe
+                  name="webiframe"
                   scrolling="yes"
                   frameborder="0"
                   (load)="iframeLoad()"

src/app/dashboard/dashboard.component.scss

@@ -57,7 +57,7 @@
   .tfw-messages {
     // Check whether the layout contains a web component
     div[class*="web"] & {
-      border: 2px solid $tao-gray-100;
+      border: 2px solid $tao-base-color;
       border-top: 0;
       border-left: 0;
       border-bottom: 0;
@@ -65,17 +65,16 @@
   }
 
   .tfw-header {
-    padding: $small;
-    padding-top: $tiny;
-    background-color: $tao-gray-50;
+    padding: $tiny;
+    padding-top: $hair;
+    background-color: $tao-base-color;
   }
 
   @include set-scrollbar-style('dark', '.tfw-messages');
 
   .tfw-messages {
-    padding: $space;
-    padding-top: $hair;
-    background-color: $tao-gray-50;
+    padding: $tiny;
+    background-color: $tao-base-color;
     overflow-y: scroll;
     max-height: 95vmin;
 

src/app/dashboard/dashboard.component.ts

@@ -1,12 +1,13 @@
 import { Component, OnDestroy, OnInit, ChangeDetectorRef, ElementRef, ViewChild } from '@angular/core';
 import { DeploymentNotificationService } from '../services/deployment-notification.service';
-import { Subscription, BehaviorSubject } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { WebSocketService } from '../services/websocket.service';
 import { WebSocketMessage } from '../message-types/websocket-message';
-import { DashboardConfigService } from '../services/config.service';
+import { DashboardConfigService, ConfigReadyService } from '../services/config.service';
 import { HttpClient } from '@angular/common/http';
-import { delay, retryWhen, tap } from 'rxjs/operators';
 import { FSMUpdateService } from '../services/fsmupdate.service';
+import { MessagesComponent } from '../messages/messages.component';
+import { StatusCodePoller } from './statuscodepoller';
 
 @Component({
   selector: 'app-dashboard',
@@ -15,10 +16,9 @@ import { FSMUpdateService } from '../services/fsmupdate.service';
 })
 export class DashboardComponent implements OnInit, OnDestroy {
   deploying = false;
-  polling = new BehaviorSubject<boolean>(false);
   deploymentNotificationSubscription: Subscription;
   @ViewChild('webiframe', {static: false}) webiframe: ElementRef;
-  @ViewChild('tfwmessages', {static: false}) messages: ElementRef;
+  @ViewChild(MessagesComponent, {static: false}) messages: MessagesComponent;
   @ViewChild('urlbar', {static: false}) urlbar: ElementRef;
 
   layout = this.configService.layout;
@@ -27,7 +27,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
   iframeUrl = this.configService.iframeUrl;
   actualIframeUrl = this.iframeUrl.value;
   terminalMenuItem = this.configService.terminalMenuItem;
-  iframeReloadSubscription: Subscription;
+  iframeReloadPoller: StatusCodePoller;
 
   command_handlers = {
     'dashboard.reloadFrontend':   this.reloadFrontendHandlder.bind(this),
@@ -38,6 +38,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
               private webSocketService: WebSocketService,
               private changeDetectorRef: ChangeDetectorRef,
               private http: HttpClient,
+              private configReadyService: ConfigReadyService,
               private configService: DashboardConfigService,
               private fsmUpdateService: FSMUpdateService) {}
 
@@ -45,6 +46,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
     this.webSocketService.connect();
     this.configService.init();
     this.subscribeCheckSolution();
+    this.iframeReloadPoller = new StatusCodePoller(this.iframeUrl, this.http);
     this.hideIframeUntilResponseOk();
     this.subscribeResizeOnLayoutChange();
     this.initCommandHandling();
@@ -62,14 +64,16 @@ export class DashboardComponent implements OnInit, OnDestroy {
   }
 
   hideIframeUntilResponseOk() {
-    // TODO: hide iframe and show it after this whole deal...
-    this.reloadIframeWhenResponseOk();
+    this.iframeReloadPoller.ok.subscribe(() => this.reloadIframe());
+    this.configReadyService.configDone.subscribe(() =>
+      this.iframeReloadPoller.start()
+    );
   }
 
   subscribeResizeOnLayoutChange() {
     this.configService.layout.subscribe(() => {
       this.emitResizeEvent();
-      setTimeout(() => this.scrollMessagesToBottom(), 0);
+      setTimeout(() => this.messages.scrollToBottom(), 0);
     });
   }
 
@@ -85,7 +89,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
       (deploying) => {
         this.deploying = deploying;
         if (!deploying && this.configService.reloadIframeOnDeploy.value) {
-          this.reloadIframeWhenResponseOk();
+          this.iframeReloadPoller.start();
         }
       });
   }
@@ -99,7 +103,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
   }
 
   reloadIframeHandler(message: WebSocketMessage) {
-    setTimeout(() => this.reloadIframeNoSubmit(), 200);
+    this.iframeReloadPoller.ok.subscribe(() => this.reloadIframe());
+    this.iframeReloadPoller.start();
   }
 
   setLayout(layout: string) {
@@ -114,14 +119,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
 
   reloadIframe() {
     setTimeout(() => {
-      this.webiframe.nativeElement.contentWindow.location.reload(true);
-    });
-  }
-
-  reloadIframeNoSubmit() {
-    // Sometimes it is needed to reload the iframe without resending the previous form data
-    setTimeout(() => {
-      this.webiframe.nativeElement.contentWindow.location = this.webiframe.nativeElement.contentWindow.location.href;
+      this.webiframe.nativeElement.contentWindow.frames.location.href = this.iframeUrl.value;
     });
   }
 
@@ -132,17 +130,9 @@ export class DashboardComponent implements OnInit, OnDestroy {
     this.terminalMenuItem.next(item);
   }
 
-  scrollMessagesToBottom() {
-    const element = this.messages.nativeElement;
-    // This must be done in the Angular event loop to avoid messing up
-    // change detection (not in the template like ConsoleComponent does)
-    element.scrollTop = element.scrollHeight;
-  }
-
   iframeLoad() {
     if (this.webiframe && this.iframeUrl.value) {
       const href = this.webiframe.nativeElement.contentWindow.frames.location.href;
-      console.log(href, this.webiframe.nativeElement.contentWindow);
       const match = href.match(/.*?\/\/.*?(\/.*)/);
       if (match !== null) {
         // iframes on Firefox can have an about:blank
@@ -162,35 +152,13 @@ export class DashboardComponent implements OnInit, OnDestroy {
     ) {
       return;
     }
-    this.webiframe.nativeElement.contentWindow.frames.location.href = this.urlbar.nativeElement.value;
-  }
-
-  reloadIframeWhenResponseOk() {
-    if (this.polling.value) {
-      this.iframeReloadSubscription.unsubscribe();
-    }
-    this.polling.next(true);
-    this.iframeReloadSubscription = this.http.get(this.actualIframeUrl, {observe: 'response'}).pipe(
-      retryWhen(errors =>
-        errors.pipe(
-          tap(
-            response => {
-              if (response.status === 200) {
-                this.iframeReloadSubscription.unsubscribe();
-                this.polling.next(false);
-                this.reloadIframe();
-          }}),
-          delay(1000)
-    ))).subscribe();
+    this.iframeUrl.next(this.urlbar.nativeElement.value);
   }
 
   ngOnDestroy() {
     if (this.deploymentNotificationSubscription) {
       this.deploymentNotificationSubscription.unsubscribe();
     }
-
-    if (this.iframeReloadSubscription) {
-      this.iframeReloadSubscription.unsubscribe();
-    }
+    this.iframeReloadPoller.stop();
   }
 }

src/app/dashboard/statuscodepoller.ts

@@ -0,0 +1,63 @@
+import { HttpClient } from '@angular/common/http';
+import { Subject, Subscription, BehaviorSubject } from 'rxjs';
+import { retryWhen, delay, tap, skip } from 'rxjs/operators';
+
+export class StatusCodePoller {
+  http: HttpClient;
+  url: BehaviorSubject<string>;
+  pollFreq: number;
+  okCode: number;
+  stopOnOk: boolean;
+
+  pollSubscription: Subscription;
+  urlSubscription: Subscription;
+  poll = new Subject<any>();
+  ok = new Subject<any>();
+  isPolling = new BehaviorSubject<boolean>(false);
+
+  constructor(
+      url: BehaviorSubject<string>, http: HttpClient,
+      pollFreq = 1000, okCode = 200,
+      stopOnOk = true
+    ) {
+    this.url = url;
+    this.http = http;
+    this.pollFreq = pollFreq;
+    this.okCode = okCode;
+    this.stopOnOk = stopOnOk;
+  }
+
+  start() {
+    this.stop();
+    if (this.url.value === '') {
+      return;
+    }
+    this.urlSubscription = this.url.pipe(skip(1)).subscribe(() => this.stop());
+    this.isPolling.next(true);
+    this.pollSubscription = this.http.get(this.url.value, {observe: 'response'}).pipe(
+      retryWhen(errors =>
+        errors.pipe(
+          tap(
+            response => {
+              this.poll.next(response);
+              if (response.status === this.okCode) {
+                if (this.stopOnOk) {
+                  this.stop();
+                }
+                this.ok.next(response);
+              }
+          }),
+          delay(this.pollFreq)
+    ))).subscribe();
+  }
+
+  stop() {
+    this.isPolling.next(false);
+    if (this.pollSubscription) {
+      this.pollSubscription.unsubscribe();
+    }
+    if (this.urlSubscription) {
+      this.urlSubscription.unsubscribe();
+    }
+  }
+}

src/app/header/header.component.html

@@ -1,4 +1,3 @@
-<div class="tfw-grid-navbar tao-grid-center-center">
-  <img src="images/avatao_logo.svg" routerLink="/" class="tao-grid-center-left tfw-company-logo" alt="">
-  <span class="tfw-header-title">Tutorials</span>
+<div>
+  <img src="images/avatao-tutorial-framework-logo.svg" routerLink="/" class="tao-grid-center-left tfw-company-logo" alt="">
 </div>

src/app/header/header.component.scss

@@ -1,19 +1,8 @@
 @import "../../assets/scss/variables.scss";
 
-.tfw-header-title {
-  color: $tao-blue-500;
-  font-size: $font-size-h3;
-}
-
-.tfw-grid-navbar {
-  display: grid;
-  grid-template-columns: $company-logo-width 1fr;
-  grid-column-gap: 8px;
-  width: 100%;
-}
-
 .tfw-company-logo {
   display: block;
-  width: $company-logo-width;
+  padding: $tiny;
+  width: 80%;
 }
 

src/app/ide/ide.component.scss

@@ -75,7 +75,8 @@
 
     .loader {
       border-radius: 50%;
-      border: 2px solid;
+      border: 2px solid $tao-warm-yellow-600;
+      border-top: 2px solid $tao-warm-yellow-200;
       width: 15px;
       height: 15px;
       animation: spin 2s linear infinite;

src/app/ide/ide.component.ts

@@ -32,6 +32,7 @@ export class IdeComponent implements OnInit {
   files: string[];
   filename = '';
   lastFilename = '';
+  reloadFile = false;
   code = 'Loading your file...';
 
   codeState = CodeState.SAVED;
@@ -85,10 +86,18 @@ export class IdeComponent implements OnInit {
   }
 
   reloadHandler(message: WebSocketMessage) {
-    this.requestCode();
+    if (!this.reloadFile) {
+      this.reloadFile = true;
+      this.requestCode();
+    }
   }
 
   readHandler(message: IDEMessage) {
+    if (!this.reloadFile && message.reload) {
+      return;
+    }
+    this.reloadFile = false;
+
     if (this.codeState === CodeState.SAVED) {
       if (this.filename !== message.filename) {
         this.filename = message.filename;
@@ -189,7 +198,8 @@ export class IdeComponent implements OnInit {
   requestCode() {
     this.webSocketService.send({
       'key': 'ide.read',
-      'filename': this.filename
+      'filename': this.filename,
+      'reload': this.reloadFile
     });
   }
 }

src/app/ide/language-map.ts

@@ -30,5 +30,7 @@ export const LanguageMap: { [extension: string]: string; } = {
     css: 'css',
     less: 'less',
     scss: 'scss',
-    sh: 'shell'
+    sh: 'shell',
+    kt: 'kotlin',
+    kts: 'kotlin'
 };

src/app/message-types/bot-messages.ts

@@ -1,13 +1,14 @@
 import { WebSocketMessage } from './websocket-message';
 
-export interface MessageConfig extends WebSocketMessage {
-  originator?: string;
-}
+export type MessageButton = 'yes' | 'no' | 'fix' | 'hint' | 'solution' | 'next';
+export type MessageButtonMap = Record<MessageButton, {caption: string}>;
 
 export interface MessageData {
   originator?: string;
   timestamp?: Date;
   typing?: boolean;
+  buttons?: MessageButton[];
+  command?: any;
   message: string;
 }
 

src/app/message-types/ide-message.ts

@@ -4,4 +4,5 @@ export interface IDEMessage extends WebSocketMessage {
   filename: string;
   content?: string;
   files?: string[];
+  reload?: boolean;
 }

src/app/messages/messages.component.html

@@ -1,17 +1,30 @@
 <div class="tfw-messages-main">
   <div class="tfw-grid-message"
        *ngFor="let message of messages.slice(); let last = last"
-       [class.highlighted-message]="last">
+       [class.highlighted-message]="last"
+       (click)="sendMessageCommand(message)">
     <div class="tfw-grid-message-header">
-      <img class="tao-grid-center-left" src="images/avataobot.svg"/>
       <div class="tao-grid-center-left originator">{{message.originator}}</div>
       <div class="timestamp tao-grid-center-right">{{message.timestamp | date:'HH:mm:ss'}}</div>
     </div>
-    <div class="tfw-grid-message-body" [innerHtml]="message.message"></div>
-  </div>
-  <div *ngIf="showTypingIndicator" class="tfw-grid-message jumping-circle-container">
-      <div class="jumping-circle" id="jc1"></div>
-      <div class="jumping-circle" id="jc2"></div>
-      <div class="jumping-circle" id="jc3"></div>
+    <div class="tfw-grid-message-body" [innerHtml]="message.message | safeHtml"></div>
+    <div *ngIf="message.buttons !== undefined">
+
+      <div class="tfw-message-btn-divider"></div>
+      <div class="tfw-message-btn">
+        <button *ngFor="let messageButton of message.buttons"
+             class="{{messageButton}}"
+             (click)="sendButtonCommand(messageButton)">
+          {{buttonMap[messageButton].caption}}
+        </button>
+      </div>
     </div>
+  </div>
+  <div *ngIf="showTypingIndicator"
+        class="tfw-grid-message jumping-circle-container"
+        (click)="drainMessageQueue()">
+    <div class="jumping-circle" id="jc1"></div>
+    <div class="jumping-circle" id="jc2"></div>
+    <div class="jumping-circle" id="jc3"></div>
+  </div>
 </div>

src/app/messages/messages.component.scss

@@ -1,25 +1,67 @@
 @import "../../assets/scss/variables.scss";
 @import "../../assets/scss/mixins/layout";
-
-.tfw-next-button {
-  text-align: center;
-}
+@import "../../assets/scss/mixins/button";
 
 .tfw-grid-message {
+  font-family: "Roboto";
+  font-style: normal;
   display: grid;
   grid-template-rows: 1fr auto;
-  grid-row-gap: $hair;
+  grid-row-gap: $nano;
   width: 100%;
-
-  background-color: $tao-gray-100;
+  padding: $hair;
   border-radius: $tao-panel-border-radius-sm;
-  padding: $tiny;
   font-size: $font-size-base;
   margin-bottom: $hair;
 
   animation-name: inflate;
   animation-duration: 0.5s;
   animation-timing-function: cubic-bezier(0.01, 0.1, 0, 1);
+  color: white;
+  background-color: $tao-card-color;
+
+  .tfw-message-btn-divider {
+    opacity: 0.25;
+    border: 1px solid $tao-gray-color;
+  }
+  .tfw-message-btn {
+    color: $tao-btn-font-color;
+    padding-top: $tiny;
+    padding-bottom: $hair;
+    display: flex;
+    align-items: center;
+    text-align: center;
+
+    .no {
+      @include set-button-style($tao-red-color);
+      width: $xlarge;
+    }
+
+    .yes {
+      @include set-button-style($tao-green-color);
+      width: $xlarge;
+    }
+
+    .solution {
+      @include set-button-style($tao-blue-color);
+      width: $xlarge + $medium + $tiny;
+    }
+
+    .hint {
+      @include set-button-style($tao-yellow-color);
+      width: $xlarge + $medium + $tiny;
+    }
+
+    .fix {
+      @include set-button-style($tao-yellow-color);
+      width: $xlarge + $medium + $tiny;
+    }
+
+    .next {
+      @include set-button-style($tao-blue-color);
+      width: $xlarge;
+    }
+  }
 }
 
 .highlighted-message {
@@ -44,7 +86,7 @@
   background-color: gray;
   margin-top: 0.3em;
   margin-left: 0.3em;
-  
+
   animation-name: float;
   animation-duration: 1.7s;
   animation-timing-function: ease-in-out;
@@ -65,24 +107,33 @@
 
 .tfw-grid-message-header {
   display: grid;
-  grid-template-columns: 1fr 5fr 8fr;
+  grid-template-columns: 5fr 8fr;
   grid-column-gap: 4px;
   width: 100%;
 
-  img {
-    width: 12px;
-  }
-
   .originator {
-    font-weight: 500;
+    font-style: normal;
+    font-weight: bold;
+    font-size: $font-size-base;
+    line-height: 26px;
+
+    display: flex;
+    align-items: center;
+    color: $tao-message-originator-color;
   }
 
   .timestamp {
-    font-size: $font-size-tiny;
+    font-size: $font-size-base;
+    color: $tao-gray-color;
     opacity: 0.37;
   }
 }
 
 .tfw-grid-message-body {
-  @include word-break()
+  @include word-break();
+  line-height: 26px;
+
+  & p {
+    margin-bottom: $tiny !important;
+  }
 }

src/app/messages/messages.component.ts

@@ -1,5 +1,5 @@
-import { ChangeDetectorRef, Component, OnInit, EventEmitter, Output } from '@angular/core';
-import { MessageData, Message } from '../message-types/bot-messages';
+import { ChangeDetectorRef, Component, OnInit, EventEmitter, Output, ElementRef } from '@angular/core';
+import {MessageData, Message, MessageButton, MessageButtonMap} from '../message-types/bot-messages';
 import { MarkdownService } from '../services/markdown.service';
 import { WebSocketService } from '../services/websocket.service';
 import { Subject } from 'rxjs';
@@ -13,13 +13,21 @@ export class MessagesComponent implements OnInit {
   @Output() newMessageEvent: EventEmitter<any> = new EventEmitter();
   newMessage: Subject<MessageData> = new Subject<MessageData>();
   showTypingIndicator = false;
-
   messages: MessageData[] = [];
+  buttonMap: MessageButtonMap = {
+    fix: {caption: 'Ready to fix'},
+    solution: {caption: 'Show solution'},
+    hint: {caption: 'Hint'},
+    next: {caption: 'Next'},
+    yes: {caption: 'Yes'},
+    no: {caption: 'No'},
+  };
 
   constructor(
     private markdownService: MarkdownService,
     private websocketService: WebSocketService,
-    private changeDetectorRef: ChangeDetectorRef
+    private changeDetectorRef: ChangeDetectorRef,
+    private ref: ElementRef
   ) {}
 
   ngOnInit() {
@@ -27,6 +35,7 @@ export class MessagesComponent implements OnInit {
       message => {
         this.writeMessage(message);
         this.newMessageEvent.emit();
+        this.scrollToBottom();
     });
 
     this.websocketService.connect();
@@ -41,6 +50,11 @@ export class MessagesComponent implements OnInit {
     this.changeDetectorRef.detectChanges();
   }
 
+  scrollToBottom() {
+    const element = this.ref.nativeElement.parentElement;
+    element.scrollTop = element.scrollHeight;
+  }
+
   transformMessage(message: MessageData) {
     message.message = this.convertMarkdownToHTML(message.message);
     if (!message.timestamp) {
@@ -52,4 +66,23 @@ export class MessagesComponent implements OnInit {
   convertMarkdownToHTML(text: string) {
     return this.markdownService.convertToHtml(text);
   }
+
+  drainMessageQueue() {
+    this.websocketService.send({
+      'key': 'message.queue.drain'
+    });
+  }
+
+  sendMessageCommand(message: MessageData) {
+    if ('command' in message) {
+      this.websocketService.send(message.command);
+    }
+  }
+
+  sendButtonCommand(messageButton: MessageButton) {
+    this.websocketService.send({
+      'key': 'message.button.click',
+      'value': messageButton
+    });
+  }
 }

src/app/pipes/capitalize.pipe.ts

@@ -0,0 +1,13 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'capitalize',
+})
+export class CapitalizePipe implements PipeTransform {
+  transform(value: string): string {
+    if (!value) {
+      return '';
+    }
+    return value[0].toLocaleUpperCase() + value.toLocaleLowerCase().slice(1);
+  }
+}

src/app/pipes/safe.pipe.ts

@@ -11,3 +11,14 @@ export class SafePipe implements PipeTransform {
     return this.sanitizer.bypassSecurityTrustResourceUrl(value);
   }
 }
+
+@Pipe({
+  name: 'safeHtml'
+})
+export class SafeHtmlPipe implements PipeTransform  {
+  constructor(private sanitized: DomSanitizer) {}
+
+  transform(value) {
+    return this.sanitized.bypassSecurityTrustHtml(value);
+  }
+}

src/app/services/config.service.ts

@@ -9,7 +9,7 @@ export class DashboardConfigService extends ConfigServiceBase {
 
   layout = new BehaviorSubject<string>('terminal-ide-web');
   hideMessages = new BehaviorSubject<boolean>(false);
-  iframeUrl = new BehaviorSubject<string>('/webservice');
+  iframeUrl = new BehaviorSubject<string>('');
   showUrlBar = new BehaviorSubject<boolean>(false);
   terminalMenuItem = new BehaviorSubject<string>('terminal');
   reloadIframeOnDeploy = new BehaviorSubject<boolean>(false);

src/app/services/terminado.service.ts

@@ -8,11 +8,16 @@ export class TerminadoService {
   xterm: Terminal;
   ws: WebSocket;
   attached = false;
+  private dataListener: any;
+  private resizeListener: any;
 
   constructor() {
     Terminal.applyAddon(fit);
-    Terminal.applyAddon(terminado);
-    this.xterm = new Terminal({
+    this.xterm = this.createTerminal();
+  }
+
+  createTerminal() {
+    return new Terminal({
       theme: {
         foreground: '#ffffff',
         background: '#0C0C0C',                  // $tao-gray-800
@@ -37,26 +42,52 @@ export class TerminadoService {
       },
       fontSize: 14
     });
-
-    const wsproto = (location.protocol === 'https:') ? 'wss://' : 'ws://';
-    this.ws = new WebSocket(wsproto + window.location.host + '/terminal');
   }
 
   attach(element: HTMLElement) {
+    if (this.attached) {
+      return;
+    }
+
+    const wsproto = (location.protocol === 'https:') ? 'wss://' : 'ws://';
+    this.ws = new WebSocket(wsproto + window.location.host + '/terminal');
+
     this.ws.onopen = () => {
-      (<any>this.xterm).terminadoAttach(this.ws);
+      this.attached = true;
+      this.xterm = this.createTerminal();
       this.xterm.open(element);
       this.fit();
-      this.xterm.blur();
-      this.attached = true;
+      // In order to reset the terminal state after a broken socket, we need to register the listeners manually.
+      (<any>this.xterm)._core.register(this.dataListener = this.xterm.onData(data => {
+        this.ws.send(JSON.stringify(['stdin', data]));
+      }));
+      (<any>this.xterm)._core.register(this.resizeListener = this.xterm.onResize((size: { rows: number, cols: number }) => {
+        this.ws.send(JSON.stringify(['set_size', size.rows, size.cols]));
+      }));
+    };
+
+    this.ws.onclose = () => {
+      this.detach();
+      this.xterm.destroy();
+      this.attach(element);
+    };
+
+    this.ws.onmessage = msg => {
+      const data = JSON.parse(msg.data);
+      if (data[0] === 'stdout') {
+        this.xterm.write(data[1]);
+      }
     };
   }
 
   detach() {
-    (<any>this.xterm).terminadoDetach(this.ws);
-    this.xterm.destroy();
-    this.ws.close();
+    if (!this.attached) {
+      return;
+    }
+
     this.attached = false;
+    this.dataListener.dispose();
+    this.resizeListener.dispose();
   }
 
   fit() {

src/app/services/websocket.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, Subject, Subscription } from 'rxjs';
 import { webSocket, WebSocketSubject } from 'rxjs/webSocket';
 import { filter, map } from 'rxjs/operators';
 import { WebSocketMessage } from '../message-types/websocket-message';
@@ -17,14 +17,28 @@ export enum Intent {
 @Injectable()
 export class WebSocketService {
   private ws: WebSocketSubject<WebSocketMessage>;
+  private subject: Subject<WebSocketMessage> = new Subject<WebSocketMessage>();
+  private subscription: Subscription;
 
   constructor() {}
 
   public connect() {
     if (!this.ws) {
+      if (this.subscription) {
+        this.subscription.unsubscribe();
+      }
       const wsproto = (location.protocol === 'https:') ? 'wss://' : 'ws://';
       const connAddr = wsproto + window.location.host + '/ws';
-      this.ws = webSocket<WebSocketMessage>(connAddr);
+      this.ws = webSocket<WebSocketMessage>({
+        url: connAddr,
+        closeObserver: {
+            next: closeEvent => {
+                this.ws = null;
+                this.connect();
+            }
+          }
+      });
+      this.subscription = this.ws.subscribe(msg => this.subject.next(msg));
     }
   }
 
@@ -35,7 +49,7 @@ export class WebSocketService {
   }
 
   public observeAll<T extends WebSocketMessage>(key: string): Observable<T> {
-    return this.ws.pipe(
+    return this.subject.pipe(
       filter(message => message.key.startsWith(key)),
       map(message => <T> message)
     );

src/assets/images/avataobot.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11.98 16.98"><defs><style>.cls-1{fill:none;stroke:#277eec;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style></defs><title>avataobot</title><rect class="cls-1" x="2.46" y="7.47" width="7.05" height="7.05" transform="translate(9.53 -1.01) rotate(45)"/><polyline class="cls-1" points="10.98 1 5.99 5.99 1 1"/></svg>

src/assets/scss/_main.scss

@@ -3,6 +3,7 @@
   'grid';
 
 @import
+  'mixins/button',
   'mixins/scrollbar';
 
 @import

src/assets/scss/_variables.scss

@@ -2,7 +2,7 @@
 // Spaces
 //
 
-$space: 24px;
+$space: 32px;
 
 $sxlarge: 9 * $space;
 $xxxlarge: 6 * $space;
@@ -30,30 +30,6 @@ $tao-blue-700: #195684;
 $tao-blue-800: #103B5B;
 $tao-blue-900: #081A2B;
 
-// Tao sky palette
-$tao-sky-50:  #F1FAFD;
-$tao-sky-100: #C5E9F5;
-$tao-sky-200: #9AD8EE;
-$tao-sky-300: #6EC7E6;
-$tao-sky-400: #42B7DF;
-$tao-sky-500: #19A7D8;
-$tao-sky-600: #0E8BA8;
-$tao-sky-700: #04647A;
-$tao-sky-800: #004251;
-$tao-sky-900: #002028;
-
-// Tao phtalo palette
-$tao-phtalo-50:  #F2FBFC;
-$tao-phtalo-100: #C8EDF1;
-$tao-phtalo-200: #9FDFE6;
-$tao-phtalo-300: #75D1DB;
-$tao-phtalo-400: #4CC3D0;
-$tao-phtalo-500: #24B6C6;
-$tao-phtalo-600: #16989E;
-$tao-phtalo-700: #0C7575;
-$tao-phtalo-800: #034C4F;
-$tao-phtalo-900: #002426;
-
 // Tao turqoise palette
 $tao-turqoise-50:  #F1FBFB;
 $tao-turqoise-100: #C3EFEF;
@@ -90,29 +66,6 @@ $tao-warm-yellow-700: #CC8B36;
 $tao-warm-yellow-800: #B2762F;
 $tao-warm-yellow-900: #996526;
 
-// Tao plum palette
-$tao-plum-50:  #F6F8FD;
-$tao-plum-100: #DADFF8;
-$tao-plum-200: #BEC7F3;
-$tao-plum-300: #A2AFED;
-$tao-plum-400: #8797E8;
-$tao-plum-500: #6C80E3;
-$tao-plum-600: #5E77BF;
-$tao-plum-700: #4B5E99;
-$tao-plum-800: #384672;
-$tao-plum-900: #272F4C;
-
-// Tao pink palette
-$tao-pink-50:  #FFF0F7;
-$tao-pink-100: #FFBFDF;
-$tao-pink-200: #FF8FC6;
-$tao-pink-300: #FF5EAE;
-$tao-pink-400: #FF2E95;
-$tao-pink-500: #FF007E;
-$tao-pink-600: #D8007C;
-$tao-pink-700: #B20066;
-$tao-pink-800: #8C0050;
-$tao-pink-900: #66003A;
 
 // Tao red palette
 $tao-red-50:  #FFF5F5;
@@ -138,6 +91,19 @@ $tao-gray-700: #232323;
 $tao-gray-800: #0C0C0C;
 $tao-gray-900: #000000;
 
+// Tao messages
+$tao-base-color: #2A324C;
+$tao-btn-font-color: #1F2836;
+$tao-card-color: #363E56;
+$tao-message-originator-color: #6697FF;
+$tao-copy-color: #FFFFFF;
+$tao-timestamp-color: #94A6B9;
+$tao-gray-color: #94A6B9; // @25% opacity
+$tao-yellow-color: #FFD68F;
+$tao-blue-color: #6697FF;
+$tao-green-color: #48BEB0;
+$tao-red-color: #FF4583;
+
 
 // Panel border radius
 $tao-panel-border-radius:	     14px;

src/assets/scss/mixins/_button.scss

@@ -0,0 +1,25 @@
+@import "../variables.scss";
+
+@mixin set-button-style($color) {
+  box-sizing: border-box;
+  border-radius: 10px;
+  background: $color;
+  border: 1.5px solid $color;
+
+  font-style: normal;
+  font-weight: bold;
+  font-size: 14px;
+  line-height: 26px;
+  height: $space;
+  margin-right: $tiny;
+  color: $tao-btn-font-color;
+  outline: none;
+
+  &:active {
+    background: $tao-btn-font-color;
+    border: $tao-btn-font-color;
+    color: $color;
+    border-radius: 10px;
+  }
+}
+

src/assets/scss/mixins/_layout.scss

@@ -2,8 +2,8 @@ $grid-columns-count: 100;
 $grid-rows-count: 30;
 
 $terminal-ide-web-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 60),
+  'messages': (0, 20, 0, 52),
+  'header': (0, 20, 52, 60),
   'ide': (56, 96, 0, 100),
   'terminal': (0, 56, 60, 100),
   'web': (20, 56, 0, 60),
@@ -11,8 +11,8 @@ $terminal-ide-web-layout: (
 );
 
 $terminal-web-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (),
   'terminal': (56, 96, 0, 100),
   'web': (20, 56, 0, 100),
@@ -20,8 +20,8 @@ $terminal-web-layout: (
 );
 
 $terminal-ide-vertical-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (56, 96, 0, 100),
   'terminal': (20, 56, 0, 100),
   'web': (),
@@ -29,8 +29,8 @@ $terminal-ide-vertical-layout: (
 );
 
 $terminal-ide-horizontal-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (20, 96, 0, 60),
   'terminal': (20, 96, 60, 100),
   'web': (),
@@ -38,8 +38,8 @@ $terminal-ide-horizontal-layout: (
 );
 
 $ide-web-vertical-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (56, 96, 0, 100),
   'terminal': (),
   'web': (20, 56, 0, 100),
@@ -47,8 +47,8 @@ $ide-web-vertical-layout: (
 );
 
 $terminal-only-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (),
   'terminal': (20, 96, 0, 100),
   'web': (),
@@ -56,8 +56,8 @@ $terminal-only-layout: (
 );
 
 $ide-only-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (20, 96, 0, 100),
   'terminal': (),
   'web': (),
@@ -65,8 +65,8 @@ $ide-only-layout: (
 );
 
 $web-only-layout: (
-  'header': (0, 20, 0, 8),
-  'messages': (0, 20, 8, 100),
+  'messages': (0, 20, 0, 92),
+  'header': (0, 20, 92, 100),
   'ide': (),
   'terminal': (),
   'web': (20, 96, 0, 100),

src/assets/scss/mixins/_scrollbar.scss

@@ -1,10 +1,10 @@
-@mixin set-scrollbar-style($style, $selctor) {
+@mixin set-scrollbar-style($style, $selector) {
   ::-webkit-scrollbar {
     width: 3px !important;
     height: 3px !important;
   }
 
-  #{$selctor}::-webkit-scrollbar-track {
+  #{$selector}::-webkit-scrollbar-track {
     border-radius: 10px !important;
     width: 3px !important;
     @if ($style == 'light') {
@@ -15,7 +15,7 @@
     };
   }
 
-  #{$selctor}::-webkit-scrollbar-thumb {
+  #{$selector}::-webkit-scrollbar-thumb {
     @if ($style == 'dark') {
       background: #8a8a8a !important;
 
@@ -25,7 +25,7 @@
     border-radius: 10px !important;
   }
 
-  #{$selctor}::-webkit-scrollbar-thumb:hover {
+  #{$selector}::-webkit-scrollbar-thumb:hover {
     @if ($style == 'dark') {
       background: #424242 !important;
 
@@ -35,3 +35,4 @@
     cursor: pointer !important;
   }
 }
+

src/index.html

@@ -5,6 +5,7 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="images/favicon.ico">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&display=swap" rel="stylesheet" type="text/css">
 </head>
 <body>
   <app-root></app-root>

src/styles.scss

@@ -8,5 +8,6 @@ body, html {
   height: 100vh;
   width: 100vw;
   overflow: hidden;
+
   @include set-scrollbar-style('light', '');
 }