From 22e44642a0221f68f56c302384a1d21f0c20ac22 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 8 Mar 2021 12:54:08 +0100 Subject: [PATCH] next-gen-gui: Add button to restore default theme (#7433) This adds a button in the top right that changes the config back to the default theme. Code wise, it takes the header that was previously a part of the dashboard component and moves it to the app component, and then adds the button there. Possibly the header should be a component of it's own, but that's more of refactor that can happen separately I think. The config change uses the new config API to just patch the relevant setting. I'm not doing an automatic reload because 1) I don't want to figure out how to do it correctly and 2) this doesn't work reliably anyway, as for example the current gen GUI does a reload and ends up with connection refused as the API service is still reloading... --- next-gen-gui/src/app/app.component.html | 10 +++++++++- next-gen-gui/src/app/app.component.scss | 6 +++++- next-gen-gui/src/app/app.component.ts | 15 ++++++++++++++- .../src/app/dashboard/dashboard.component.html | 7 +------ .../src/app/dashboard/dashboard.component.scss | 5 ----- .../src/app/services/system-config.service.ts | 5 +++++ 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/next-gen-gui/src/app/app.component.html b/next-gen-gui/src/app/app.component.html index 2e52e9df0..d176fda39 100644 --- a/next-gen-gui/src/app/app.component.html +++ b/next-gen-gui/src/app/app.component.html @@ -1 +1,9 @@ - \ No newline at end of file +
+
+ + Tech UI +
+ +
+ + diff --git a/next-gen-gui/src/app/app.component.scss b/next-gen-gui/src/app/app.component.scss index 6df0acfc4..f24418fbd 100644 --- a/next-gen-gui/src/app/app.component.scss +++ b/next-gen-gui/src/app/app.component.scss @@ -1,4 +1,8 @@ -/* Structure */ +.header { + margin: 15px 3vw 12px 3vw; + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; +} + table { width: 100%; } diff --git a/next-gen-gui/src/app/app.component.ts b/next-gen-gui/src/app/app.component.ts index d198fcdfa..db826164b 100644 --- a/next-gen-gui/src/app/app.component.ts +++ b/next-gen-gui/src/app/app.component.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { SystemConfigService } from './services/system-config.service'; +import { MessageService } from './services/message.service'; @Component({ selector: 'app-root', @@ -6,5 +8,16 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - constructor() { } + constructor( + private systemConfigService: SystemConfigService, + private messageService: MessageService, + ) { } + + restoreDefaultTheme(): void { + this.systemConfigService + .setGUITheme('default') + .subscribe(() => { + this.messageService.add('The default GUI theme has been selected. Please hit "Reload" in your browser.') + }) + } } diff --git a/next-gen-gui/src/app/dashboard/dashboard.component.html b/next-gen-gui/src/app/dashboard/dashboard.component.html index 31bd7fd6f..4e525403d 100644 --- a/next-gen-gui/src/app/dashboard/dashboard.component.html +++ b/next-gen-gui/src/app/dashboard/dashboard.component.html @@ -1,12 +1,7 @@ -
-
- - Tech UI -
-
+
diff --git a/next-gen-gui/src/app/dashboard/dashboard.component.scss b/next-gen-gui/src/app/dashboard/dashboard.component.scss index ddeec0bd2..3fd8c2b3f 100644 --- a/next-gen-gui/src/app/dashboard/dashboard.component.scss +++ b/next-gen-gui/src/app/dashboard/dashboard.component.scss @@ -1,8 +1,3 @@ -.header { - margin: 15px 3vw 12px 3vw; - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; -} - .progress { margin: 0 3vw 0 3vw; } diff --git a/next-gen-gui/src/app/services/system-config.service.ts b/next-gen-gui/src/app/services/system-config.service.ts index e359ca75a..f18ba79fd 100644 --- a/next-gen-gui/src/app/services/system-config.service.ts +++ b/next-gen-gui/src/app/services/system-config.service.ts @@ -20,6 +20,7 @@ export class SystemConfigService { private devicesSubject: ReplaySubject = new ReplaySubject(1); private systemConfigUrl = environment.production ? apiURL + 'rest/system/config' : 'api/config'; + private guiConfigUrl = environment.production ? apiURL + 'rest/config/gui' : 'api/config/gui'; constructor( private http: HttpClient, @@ -52,4 +53,8 @@ export class SystemConfigService { getDevices(): Observable { return this.devicesSubject.asObservable(); } + + setGUITheme(theme: String): Observable { + return this.http.patch(this.guiConfigUrl, { theme: theme }) + } } \ No newline at end of file