Extract demo page to 'dashboard' component

This commit is contained in:
Kristóf Tóth 2018-02-16 11:19:52 +01:00
parent 3178fcc7e6
commit 80de695fa1
8 changed files with 44 additions and 26 deletions

View File

@ -1,11 +1 @@
<app-header></app-header>
<div class="container-fluid">
<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-messages></app-messages></div>
</div>
<div class="row tfw-second-row">
<div class="col-sm"><app-terminal></app-terminal></div>
</div>
</div>
<router-outlet></router-outlet>

View File

@ -1,5 +0,0 @@
.tfw-first-row {
height: 40vh;
}
.tfw-second-row {}

View File

@ -1,6 +1,4 @@
import { Component, OnInit } from '@angular/core';
import { WebSocketService } from './websocket.service';
import { FSMUpdateService } from './fsmupdate.service';
@Component({
selector: 'app-root',
@ -8,11 +6,6 @@ import { FSMUpdateService } from './fsmupdate.service';
styleUrls: ['./app.component.scss']
})
export class AppComponent implements OnInit {
constructor(private webSocketService: WebSocketService, private fsmUpdateService: FSMUpdateService) {}
ngOnInit() {
this.webSocketService.connect();
this.webSocketService.send('reset', '');
this.fsmUpdateService.init();
}
constructor() {}
ngOnInit() {}
}

View File

@ -7,6 +7,7 @@ import { AceEditorModule } from 'ng2-ace-editor';
import { AppComponent } from './app.component';
import { DashboardComponent } from './dashboard/dashboard.component';
import { HeaderComponent } from './header/header.component';
import { LoginComponent } from './login/login.component';
import { MarkdownService } from './markdown.service';
@ -16,6 +17,7 @@ import { MessagesComponent } from './messages/messages.component';
import { WebSocketService } from './websocket.service';
import { TerminalComponent } from './terminal/terminal.component';
import { FSMUpdateService } from './fsmupdate.service';
import { AppRoutingModule } from './app-routing.module';
@NgModule({
@ -25,7 +27,8 @@ import { FSMUpdateService } from './fsmupdate.service';
LoginComponent,
WebideComponent,
MessagesComponent,
TerminalComponent
TerminalComponent,
DashboardComponent
],
imports: [
BrowserModule,
@ -33,6 +36,7 @@ import { FSMUpdateService } from './fsmupdate.service';
HttpClientModule,
NgbModule.forRoot(),
AceEditorModule,
AppRoutingModule,
],
providers: [
MarkdownService,

View File

@ -0,0 +1,11 @@
<app-header></app-header>
<div class="container-fluid">
<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-messages></app-messages></div>
</div>
<div class="row tfw-second-row">
<div class="col-sm"><app-terminal></app-terminal></div>
</div>
</div>

View File

@ -0,0 +1,5 @@
.tfw-first-row {
height: 40vh;
}
.tfw-second-row {}

View File

@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { WebSocketService } from '../websocket.service';
import { FSMUpdateService } from '../fsmupdate.service';
@Component({
selector: 'app-dashboard',
templateUrl: './dashboard.component.html',
styleUrls: ['./dashboard.component.scss']
})
export class DashboardComponent implements OnInit {
constructor(private webSocketService: WebSocketService, private fsmUpdateService: FSMUpdateService) {}
ngOnInit() {
this.webSocketService.connect();
this.webSocketService.send('reset', '');
this.fsmUpdateService.init();
}
}

View File

@ -41,6 +41,8 @@ export class WebideComponent implements OnInit {
private changeDetectorRef: ChangeDetectorRef) { }
ngOnInit() {
this.webSocketService.connect();
this.webSocketService.send('reset', '');
this.subscribeWS();
this.requestCode();
}