mrtoth/frontend-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/frontend-tutorial-framework synced 2025-11-04 12:22:54 +00:00
Code Issues Releases Wiki Activity

Fix config variable not being JSON

Browse Source
This commit is contained in:
Kristóf Tóth
2018-04-20 14:10:57 +02:00
parent 46b750432e
commit 77e18f43e3
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/config.ts
View File

@@ -2,7 +2,7 @@ export const config = {
dashboard: { dashboard: {
route: 'dashboard', route: 'dashboard',
currentLayout: 'terminal-ide-web', currentLayout: 'terminal-ide-web',
enabledLayouts: new Set([ enabledLayouts: [
'terminal-ide-web', 'terminal-ide-web',
'terminal-ide-vertical', 'terminal-ide-vertical',
'terminal-ide-horizontal', 'terminal-ide-horizontal',
@@ -11,8 +11,8 @@ export const config = {
'ide-web-vertical', 'ide-web-vertical',
'ide-only', 'ide-only',
'web-only' 'web-only'
]), ],
allLayouts: new Set([ allLayouts: [
'terminal-ide-web', 'terminal-ide-web',
'terminal-ide-vertical', 'terminal-ide-vertical',
'terminal-ide-horizontal', 'terminal-ide-horizontal',
@@ -21,7 +21,7 @@ export const config = {
'ide-web-vertical', 'ide-web-vertical',
'ide-only', 'ide-only',
'web-only' 'web-only'
]), ],
hide_messages: false hide_messages: false
}, },
ide: { ide: {

3
src/app/dashboard/dashboard.component.ts
View File

@@ -14,7 +14,6 @@ import { SidebarComponent } from '../sidebar/sidebar.component';
export class DashboardComponent implements OnInit, OnDestroy { export class DashboardComponent implements OnInit, OnDestroy {
deploying = false; deploying = false;
deploymentNotificationSubscription: Subscription; deploymentNotificationSubscription: Subscription;
enabledLayouts: Set<string> = config.dashboard.enabledLayouts;
layout: string = config.dashboard.currentLayout; layout: string = config.dashboard.currentLayout;
hide_messages: boolean = config.dashboard.hide_messages; hide_messages: boolean = config.dashboard.hide_messages;
command_handlers = {'layout': this.layoutHandler.bind(this)}; command_handlers = {'layout': this.layoutHandler.bind(this)};
@@ -35,7 +34,7 @@ export class DashboardComponent implements OnInit, OnDestroy {
} }
layoutHandler(data: LayoutCommand) { layoutHandler(data: LayoutCommand) {
if (this.enabledLayouts.has(data.layout)) { if (config.dashboard.enabledLayouts.includes(data.layout)) {
this.setLayout(data.layout); this.setLayout(data.layout);
} }
else { else {