From a0d5dfdddcb66d9ad4091d583a4c0c4b57c0dfe7 Mon Sep 17 00:00:00 2001 From: Gabor PEK Date: Fri, 20 Apr 2018 09:22:23 +0200 Subject: [PATCH] All the enabled layouts are now enlisted on the sidebar in accordance with config.ts --- src/app/config.ts | 18 +++++++++++++----- src/app/dashboard/dashboard.component.scss | 13 +++++++------ src/app/dashboard/dashboard.component.ts | 5 +++-- src/app/sidebar/sidebar.component.html | 6 +++--- src/app/sidebar/sidebar.component.scss | 4 +--- src/app/sidebar/sidebar.component.ts | 9 +++++---- src/assets/images/ide-only.svg | 1 + src/assets/images/ide-only_active.svg | 1 + src/assets/images/ide-web-vertical.svg | 1 + src/assets/images/ide-web-vertical_active.svg | 1 + src/assets/images/terminal-ide-horizontal.svg | 1 + .../images/terminal-ide-horizontal_active.svg | 1 + .../images/terminal-ide-vertical_active.svg | 1 + src/assets/images/terminal-ide-web.svg | 1 + src/assets/images/terminal-ide-web_active.svg | 1 + src/assets/images/terminal-ide_vertical.svg | 1 + src/assets/images/terminal-only.svg | 1 + src/assets/images/terminal-only_active.svg | 1 + src/assets/images/terminal-web.svg | 1 + src/assets/images/terminal-web_active.svg | 1 + src/assets/images/web-only.svg | 1 + src/assets/images/web-only_active.svg | 1 + 22 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 src/assets/images/ide-only.svg create mode 100644 src/assets/images/ide-only_active.svg create mode 100644 src/assets/images/ide-web-vertical.svg create mode 100644 src/assets/images/ide-web-vertical_active.svg create mode 100644 src/assets/images/terminal-ide-horizontal.svg create mode 100644 src/assets/images/terminal-ide-horizontal_active.svg create mode 100644 src/assets/images/terminal-ide-vertical_active.svg create mode 100644 src/assets/images/terminal-ide-web.svg create mode 100644 src/assets/images/terminal-ide-web_active.svg create mode 100644 src/assets/images/terminal-ide_vertical.svg create mode 100644 src/assets/images/terminal-only.svg create mode 100644 src/assets/images/terminal-only_active.svg create mode 100644 src/assets/images/terminal-web.svg create mode 100644 src/assets/images/terminal-web_active.svg create mode 100644 src/assets/images/web-only.svg create mode 100644 src/assets/images/web-only_active.svg diff --git a/src/app/config.ts b/src/app/config.ts index 319178c..054b657 100644 --- a/src/app/config.ts +++ b/src/app/config.ts @@ -1,14 +1,22 @@ export const config = { dashboard: { route: 'dashboard', - defaultLayout: 'terminal-ide-vertical', - enabledLayouts: [ + currentLayout: 'terminal-ide-web', + enabledLayouts: new Set([ + 'terminal-ide-web', + 'terminal-web', + 'web-only' + ]), + allLayouts: new Set([ + 'terminal-ide-web', 'terminal-ide-vertical', 'terminal-ide-horizontal', 'terminal-only', - 'ide-only' - ] - + 'terminal-web', + 'ide-web-vertical', + 'ide-only', + 'web-only' + ]), }, ide: { route: 'ide', diff --git a/src/app/dashboard/dashboard.component.scss b/src/app/dashboard/dashboard.component.scss index 0ad7a3f..b9fab2f 100755 --- a/src/app/dashboard/dashboard.component.scss +++ b/src/app/dashboard/dashboard.component.scss @@ -51,10 +51,10 @@ padding-top: $hair; background-color: $tao-gray-50; overflow-y: scroll; - max-height: 55vmin; + max-height: 95vmin; - div[class*="web"] & { - max-height: 95vmin; + div[class="terminal-ide-web"] & { + max-height: 55vmin; } } @@ -63,13 +63,14 @@ } .tfw-sidebar { - background-color: $tao-turqoise-300; + background-color: $tao-gray-100; display: flex; flex-direction: column; justify-content: space-between; + column-gap: 15px; align-items: center; - padding-top: 75px; - border-left: 1px solid $tao-plum-500; + box-shadow: -15px -5px 19px -11px rgba(0,0,0,0.75); + z-index: 999; } diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 26b2dfc..bd56bca 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -13,7 +13,8 @@ import { config } from '../config'; export class DashboardComponent implements OnInit, OnDestroy { deploying = false; deploymentNotificationSubscription: Subscription; - layout: string = config.dashboard.defaultLayout ; + enabledLayouts: Set = config.dashboard.enabledLayouts; + layout: string = config.dashboard.currentLayout ; command_handlers = {'layout': this.layoutHandler.bind(this)}; constructor(private deploymentNotificationService: DeploymentNotificationService, @@ -32,7 +33,7 @@ export class DashboardComponent implements OnInit, OnDestroy { } layoutHandler(data: LayoutCommand) { - if (data.layout.match('terminal-ide-vertical|terminal-only|hraw|default-open|default-closed')) { + if (data.layout in (this.enabledLayouts)) { this.layout = data.layout; } else { diff --git a/src/app/sidebar/sidebar.component.html b/src/app/sidebar/sidebar.component.html index d1277ca..78bb2c1 100755 --- a/src/app/sidebar/sidebar.component.html +++ b/src/app/sidebar/sidebar.component.html @@ -1,4 +1,4 @@ -
- - +
+
+
diff --git a/src/app/sidebar/sidebar.component.scss b/src/app/sidebar/sidebar.component.scss index 14a4f05..8f27e70 100755 --- a/src/app/sidebar/sidebar.component.scss +++ b/src/app/sidebar/sidebar.component.scss @@ -4,13 +4,11 @@ img { width: 50px; height: auto; + padding-top: 75px; } .tfw-ide-pin { cursor: pointer; - & .active { - display: none; - } } diff --git a/src/app/sidebar/sidebar.component.ts b/src/app/sidebar/sidebar.component.ts index 60de369..86fe3fd 100644 --- a/src/app/sidebar/sidebar.component.ts +++ b/src/app/sidebar/sidebar.component.ts @@ -1,15 +1,16 @@ import { Component, OnInit } from '@angular/core'; +import { config } from '../config'; @Component({ selector: 'app-sidebar', templateUrl: './sidebar.component.html', styleUrls: ['./sidebar.component.scss'] }) + export class SidebarComponent implements OnInit { - - constructor() { } - + layout: string = config.dashboard.currentLayout; + enabledLayouts: Set = config.dashboard.enabledLayouts; + constructor() {} ngOnInit() { } - } diff --git a/src/assets/images/ide-only.svg b/src/assets/images/ide-only.svg new file mode 100644 index 0000000..6c3615f --- /dev/null +++ b/src/assets/images/ide-only.svg @@ -0,0 +1 @@ +webideonly \ No newline at end of file diff --git a/src/assets/images/ide-only_active.svg b/src/assets/images/ide-only_active.svg new file mode 100644 index 0000000..f6be46d --- /dev/null +++ b/src/assets/images/ide-only_active.svg @@ -0,0 +1 @@ +webideonly_active \ No newline at end of file diff --git a/src/assets/images/ide-web-vertical.svg b/src/assets/images/ide-web-vertical.svg new file mode 100644 index 0000000..afe4782 --- /dev/null +++ b/src/assets/images/ide-web-vertical.svg @@ -0,0 +1 @@ +web_webide \ No newline at end of file diff --git a/src/assets/images/ide-web-vertical_active.svg b/src/assets/images/ide-web-vertical_active.svg new file mode 100644 index 0000000..2872419 --- /dev/null +++ b/src/assets/images/ide-web-vertical_active.svg @@ -0,0 +1 @@ +web_webide_active \ No newline at end of file diff --git a/src/assets/images/terminal-ide-horizontal.svg b/src/assets/images/terminal-ide-horizontal.svg new file mode 100644 index 0000000..2d5fecd --- /dev/null +++ b/src/assets/images/terminal-ide-horizontal.svg @@ -0,0 +1 @@ +webide_terminal_horizontal \ No newline at end of file diff --git a/src/assets/images/terminal-ide-horizontal_active.svg b/src/assets/images/terminal-ide-horizontal_active.svg new file mode 100644 index 0000000..924ce3d --- /dev/null +++ b/src/assets/images/terminal-ide-horizontal_active.svg @@ -0,0 +1 @@ +webide_terminal_horizontal_active \ No newline at end of file diff --git a/src/assets/images/terminal-ide-vertical_active.svg b/src/assets/images/terminal-ide-vertical_active.svg new file mode 100644 index 0000000..ae63a60 --- /dev/null +++ b/src/assets/images/terminal-ide-vertical_active.svg @@ -0,0 +1 @@ +terminal_webide_vertical_active \ No newline at end of file diff --git a/src/assets/images/terminal-ide-web.svg b/src/assets/images/terminal-ide-web.svg new file mode 100644 index 0000000..5738b3c --- /dev/null +++ b/src/assets/images/terminal-ide-web.svg @@ -0,0 +1 @@ +web_webide_terminal \ No newline at end of file diff --git a/src/assets/images/terminal-ide-web_active.svg b/src/assets/images/terminal-ide-web_active.svg new file mode 100644 index 0000000..818f251 --- /dev/null +++ b/src/assets/images/terminal-ide-web_active.svg @@ -0,0 +1 @@ +web_webide_terminal_active \ No newline at end of file diff --git a/src/assets/images/terminal-ide_vertical.svg b/src/assets/images/terminal-ide_vertical.svg new file mode 100644 index 0000000..bc903ea --- /dev/null +++ b/src/assets/images/terminal-ide_vertical.svg @@ -0,0 +1 @@ +terminal_webide_vertical \ No newline at end of file diff --git a/src/assets/images/terminal-only.svg b/src/assets/images/terminal-only.svg new file mode 100644 index 0000000..a0d2267 --- /dev/null +++ b/src/assets/images/terminal-only.svg @@ -0,0 +1 @@ +terminalonly \ No newline at end of file diff --git a/src/assets/images/terminal-only_active.svg b/src/assets/images/terminal-only_active.svg new file mode 100644 index 0000000..1e8a8f0 --- /dev/null +++ b/src/assets/images/terminal-only_active.svg @@ -0,0 +1 @@ +terminalonly_active \ No newline at end of file diff --git a/src/assets/images/terminal-web.svg b/src/assets/images/terminal-web.svg new file mode 100644 index 0000000..b2e519a --- /dev/null +++ b/src/assets/images/terminal-web.svg @@ -0,0 +1 @@ +web_terminal \ No newline at end of file diff --git a/src/assets/images/terminal-web_active.svg b/src/assets/images/terminal-web_active.svg new file mode 100644 index 0000000..51d5bb9 --- /dev/null +++ b/src/assets/images/terminal-web_active.svg @@ -0,0 +1 @@ +web_terminal_active \ No newline at end of file diff --git a/src/assets/images/web-only.svg b/src/assets/images/web-only.svg new file mode 100644 index 0000000..8bf90b7 --- /dev/null +++ b/src/assets/images/web-only.svg @@ -0,0 +1 @@ +webonly \ No newline at end of file diff --git a/src/assets/images/web-only_active.svg b/src/assets/images/web-only_active.svg new file mode 100644 index 0000000..cfcb65d --- /dev/null +++ b/src/assets/images/web-only_active.svg @@ -0,0 +1 @@ +webonly_active \ No newline at end of file