Refactor WebComponent and iframing to be mutually exclusive, strip old app

This commit is contained in:
Kristóf Tóth
2018-04-25 11:48:15 +02:00
parent a0f9ec6bd6
commit 52cfd4bf55
10 changed files with 37 additions and 87 deletions

View File

@ -4,11 +4,14 @@
<div [ngClass]="{ 'hide-attribute': hide_messages }" class="tfw-messages"><app-messages></app-messages></div>
<div class="tfw-web tao-grid-top-left"
[ngClass]="{ 'deploy-blur': deploying }">
<div class="iframe-container">
<iframe class="iframe"
scrolling="yes" frameborder="0"
src="about:blank"></iframe>
</div>
<app-web *ngIf="!iframeUrl"></app-web>
<div *ngIf="iframeUrl" class="iframe-container">
<iframe class="iframe"
scrolling="yes"
frameborder="0"
[src]="iframeUrl | safe">
</iframe>
</div>
</div>
<div class="tfw-ide">
<app-ide></app-ide>

View File

@ -16,6 +16,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
deploymentNotificationSubscription: Subscription;
layout: string = config.dashboard.currentLayout;
hide_messages: boolean = config.dashboard.hide_messages;
iframeUrl: string = config.dashboard.iframeUrl;
command_handlers = {'layout': this.layoutHandler.bind(this),
'reload_frontend': this.reloadFrontendHandlder.bind(this)};