From b3d0981b805eae16279f66cd29a2ee1602cae635 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Wed, 11 May 2022 18:38:10 +0200 Subject: [PATCH 01/55] huh --- src/app/control-center/_control-center-style.scss | 1 + .../control-center-sidebar-menu.component.scss | 11 ++++++++--- src/app/control-center/control-center.component.scss | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/control-center/_control-center-style.scss b/src/app/control-center/_control-center-style.scss index 2c74e25b..5f82bcb3 100644 --- a/src/app/control-center/_control-center-style.scss +++ b/src/app/control-center/_control-center-style.scss @@ -1,4 +1,5 @@ @import "variables"; +@import "theme-colors"; $header-background: #384044; $sidebar-background: #1e2529; diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss index b5d9ea02..4b51fced 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss @@ -1,5 +1,4 @@ @import "../control-center-style"; -@import "variables"; .sub-menu { width: 100%; @@ -8,18 +7,23 @@ display: flex; align-items: center; + width: 250px; + height: 40px; + + margin: 0 50px 2px; + border-radius: 8px; + padding-left: 20px; font-size: 16pt; line-height: 3em; vertical-align: middle; - border-bottom: 1px solid $button-border-color; cursor: pointer; user-select: none; outline: none; &:hover { - background-color: $button-hover-color; + background-color: $primary-default; } .icon { @@ -62,3 +66,4 @@ } } } +// why? \ No newline at end of file diff --git a/src/app/control-center/control-center.component.scss b/src/app/control-center/control-center.component.scss index 8433f94b..d2ccc4ec 100644 --- a/src/app/control-center/control-center.component.scss +++ b/src/app/control-center/control-center.component.scss @@ -30,12 +30,12 @@ .sidebar { flex: 0 0 auto; - width: 20rem; + width: 350px; height: 100%; overflow-y: auto; - background-color: $sidebar-background; + background-color: $input-background; } .main-page-container { From 717106dbb16337437131cb029b79fe957d54340b Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Thu, 12 May 2022 17:38:20 +0200 Subject: [PATCH 02/55] some adjustments --- .../control-center-sidebar-menu.component.html | 2 +- .../control-center-sidebar-menu.component.scss | 5 +++-- .../control-center-sidebar.component.scss | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html index 4f50cef1..e81775d7 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html @@ -1,5 +1,5 @@
-
+
{{menu.title}}{{menu.displayCount ? ' (' + menu.getDisplayCount() + ')' : ''}} Date: Thu, 12 May 2022 19:36:01 +0200 Subject: [PATCH 03/55] icons --- package-lock.json | 21 +++++++++++++++++++++ package.json | 1 + src/app/icons/icons.module.ts | 24 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 src/app/icons/icons.module.ts diff --git a/package-lock.json b/package-lock.json index 8a5524cb..9a57a3c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "@angular/router": "~13.2.5", "@fontsource/jost": "^4.5.4", "@sentry/angular": "^6.18.2", + "angular-tabler-icons": "^1.68.0", "ng-particles": "^2.40.2", "rxjs": "~7.5.0", "tslib": "^2.3.0", @@ -4569,6 +4570,18 @@ "ajv": "^8.8.2" } }, + "node_modules/angular-tabler-icons": { + "version": "1.68.0", + "resolved": "https://registry.npmjs.org/angular-tabler-icons/-/angular-tabler-icons-1.68.0.tgz", + "integrity": "sha512-nRshLst7hJfE88iZkjXlDFXm6gawxQfsLhpTcW+S4qrWhoIsIChiRMvFBg6M0gjQPswLhD+CN00wh4EXGrDaNA==", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": "11 - 13", + "@angular/core": "11 - 13" + } + }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -16819,6 +16832,14 @@ "fast-deep-equal": "^3.1.3" } }, + "angular-tabler-icons": { + "version": "1.68.0", + "resolved": "https://registry.npmjs.org/angular-tabler-icons/-/angular-tabler-icons-1.68.0.tgz", + "integrity": "sha512-nRshLst7hJfE88iZkjXlDFXm6gawxQfsLhpTcW+S4qrWhoIsIChiRMvFBg6M0gjQPswLhD+CN00wh4EXGrDaNA==", + "requires": { + "tslib": "^2.0.0" + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", diff --git a/package.json b/package.json index cb773f4b..7dc19bfe 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@angular/router": "~13.2.5", "@fontsource/jost": "^4.5.4", "@sentry/angular": "^6.18.2", + "angular-tabler-icons": "^1.68.0", "ng-particles": "^2.40.2", "rxjs": "~7.5.0", "tslib": "^2.3.0", diff --git a/src/app/icons/icons.module.ts b/src/app/icons/icons.module.ts new file mode 100644 index 00000000..331ea7d8 --- /dev/null +++ b/src/app/icons/icons.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; + +import { TablerIconsModule } from 'angular-tabler-icons'; +import { IconCamera, IconHeart, IconBrandGithub } from 'angular-tabler-icons/icons'; + + +const icons = { + IconCamera, + IconHeart, + IconBrandGithub +}; + + + +@NgModule({ + declarations: [], + imports: [ + TablerIconsModule.pick(icons) + ], + exports: [ + TablerIconsModule + ] +}) +export class IconsModule { } From 36078645cabb7642ba2841a4aebba75b7a3550a8 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Fri, 13 May 2022 15:16:56 +0200 Subject: [PATCH 04/55] . --- .../control-center-sidebar-menu.component.html | 4 ++-- src/app/control-center/control-center.module.ts | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html index e81775d7..8e71f4e0 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html @@ -1,6 +1,6 @@
- + {{menu.title}}{{menu.displayCount ? ' (' + menu.getDisplayCount() + ')' : ''}} @@ -11,4 +11,4 @@
{{item.title}}
-
+
\ No newline at end of file diff --git a/src/app/control-center/control-center.module.ts b/src/app/control-center/control-center.module.ts index 0edba10d..37a54082 100644 --- a/src/app/control-center/control-center.module.ts +++ b/src/app/control-center/control-center.module.ts @@ -19,6 +19,7 @@ import { } from './control-center-inventory-page/control-center-inventory-page.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {ControlCenterRoutingModule} from "./control-center-routing.module"; +import {IconsModule} from 'src/app/icons/icons.module' @NgModule({ declarations: [ @@ -36,7 +37,8 @@ import {ControlCenterRoutingModule} from "./control-center-routing.module"; CommonModule, ControlCenterRoutingModule, ReactiveFormsModule, - FormsModule + FormsModule, + IconsModule ] }) export class ControlCenterModule { From 376aae4a190aa9cb40addd233372789fbbf0ddbb Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Fri, 13 May 2022 18:18:17 +0200 Subject: [PATCH 05/55] icon stuff and other things --- ...control-center-sidebar-menu.component.html | 4 ++-- ...control-center-sidebar-menu.component.scss | 8 ++++---- .../control-center.component.ts | 12 ++++++------ src/app/icons/icons.module.ts | 19 +++++++++++++------ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html index 8e71f4e0..5ba8baae 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.html @@ -1,7 +1,7 @@
- - {{menu.title}}{{menu.displayCount ? ' (' + menu.getDisplayCount() + ')' : ''}} + + {{menu.title}} diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss index c4b0e2eb..fd1b2909 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss @@ -15,8 +15,7 @@ border-radius: 8px; padding-left: 20px; - font-size: 16pt; - line-height: 3em; + font-size: 20px; vertical-align: middle; cursor: pointer; @@ -25,12 +24,13 @@ &:hover, &.active { background-color: $primary-default; + color: $input-background; } .icon { flex: 0 0 auto; - width: 2em; - height: 2em; + width: 24px; + height: 24px; } span { diff --git a/src/app/control-center/control-center.component.ts b/src/app/control-center/control-center.component.ts index 93f5babf..ec3bd4ba 100644 --- a/src/app/control-center/control-center.component.ts +++ b/src/app/control-center/control-center.component.ts @@ -11,14 +11,14 @@ export class ControlCenterComponent { menus: SidebarMenu[] = [ new SidebarMenu( - $localize`Computers`, - 'menu_computers.svg', + $localize`Computer`, + 'device-desktop', {items: this.controlCenterService.deviceSidebarMenuItems, displayCount: true, specialItems: 1} ), - new SidebarMenu($localize`Inventory`, 'menu_inventory.svg', {routerLink: '/inventory'}), - new SidebarMenu($localize`Settings`, 'menu_settings.svg', {routerLink: '/settings'}), - new SidebarMenu($localize`Sound`, 'menu_sound.svg', {routerLink: '/sound'}), - new SidebarMenu($localize`Changelog`, 'menu_changelog.svg', {routerLink: '/changelog'}) + new SidebarMenu($localize`Inventory`, 'briefcase', {routerLink: '/inventory'}), + new SidebarMenu($localize`Settings`, 'user', {routerLink: '/settings'}), + new SidebarMenu($localize`Sound`, 'volume', {routerLink: '/sound'}), + new SidebarMenu($localize`Changelog`, 'code', {routerLink: '/changelog'}) ]; constructor(private controlCenterService: ControlCenterService) { diff --git a/src/app/icons/icons.module.ts b/src/app/icons/icons.module.ts index 331ea7d8..8ec07b35 100644 --- a/src/app/icons/icons.module.ts +++ b/src/app/icons/icons.module.ts @@ -1,13 +1,20 @@ -import { NgModule } from '@angular/core'; +import {NgModule} from '@angular/core'; -import { TablerIconsModule } from 'angular-tabler-icons'; -import { IconCamera, IconHeart, IconBrandGithub } from 'angular-tabler-icons/icons'; +import {TablerIconsModule} from 'angular-tabler-icons'; +import {IconBriefcase, IconDeviceDesktop, IconAffiliate, IconUser, IconLifebuoy, IconBug, IconActivity, IconCode, IconLicense, IconVolume} from 'angular-tabler-icons/icons'; const icons = { - IconCamera, - IconHeart, - IconBrandGithub + IconBriefcase, + IconDeviceDesktop, + IconAffiliate, + IconUser, + IconLifebuoy, + IconBug, + IconActivity, + IconCode, + IconLicense, + IconVolume }; From 1e70158a2565557c5c72b406e804b61a96d8a343 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Fri, 13 May 2022 18:21:02 +0200 Subject: [PATCH 06/55] new background --- src/app/control-center/control-center.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/control-center/control-center.component.scss b/src/app/control-center/control-center.component.scss index d2ccc4ec..6e0aa243 100644 --- a/src/app/control-center/control-center.component.scss +++ b/src/app/control-center/control-center.component.scss @@ -45,7 +45,7 @@ overflow-y: auto; - background-color: $page-background; + background-color: $background; .main-page { padding: 1.5rem 3rem; From 0c3feb5875852cb46d1f9a5625cd404af5486451 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Fri, 13 May 2022 18:27:08 +0200 Subject: [PATCH 07/55] account --- src/app/control-center/control-center.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/control-center/control-center.component.ts b/src/app/control-center/control-center.component.ts index ec3bd4ba..118e9284 100644 --- a/src/app/control-center/control-center.component.ts +++ b/src/app/control-center/control-center.component.ts @@ -16,7 +16,7 @@ export class ControlCenterComponent { {items: this.controlCenterService.deviceSidebarMenuItems, displayCount: true, specialItems: 1} ), new SidebarMenu($localize`Inventory`, 'briefcase', {routerLink: '/inventory'}), - new SidebarMenu($localize`Settings`, 'user', {routerLink: '/settings'}), + new SidebarMenu($localize`Account`, 'user', {routerLink: '/settings'}), new SidebarMenu($localize`Sound`, 'volume', {routerLink: '/sound'}), new SidebarMenu($localize`Changelog`, 'code', {routerLink: '/changelog'}) ]; From 4e570da484a43a8060cf336d4fa3ed671bf13588 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Sat, 14 May 2022 14:15:44 +0200 Subject: [PATCH 08/55] control center lettering and other font things --- .../control-center-sidebar-menu.component.scss | 5 +++-- .../control-center-sidebar.component.html | 1 + .../control-center-sidebar.component.scss | 9 +++++++++ src/app/control-center/control-center.component.html | 3 --- src/app/control-center/control-center.component.ts | 2 +- src/styles.scss | 1 + 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss index fd1b2909..9aac2dd4 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss @@ -14,7 +14,6 @@ border-radius: 8px; - padding-left: 20px; font-size: 20px; vertical-align: middle; @@ -25,17 +24,19 @@ &:hover, &.active { background-color: $primary-default; color: $input-background; + font-weight: 500; } .icon { flex: 0 0 auto; width: 24px; height: 24px; + margin-left: 20px; } span { flex: 1 1 auto; - margin-left: 1em; + margin-left: 15px; } .arrow { diff --git a/src/app/control-center/control-center-sidebar/control-center-sidebar.component.html b/src/app/control-center/control-center-sidebar/control-center-sidebar.component.html index 5277fce3..aa93bf3f 100644 --- a/src/app/control-center/control-center-sidebar/control-center-sidebar.component.html +++ b/src/app/control-center/control-center-sidebar/control-center-sidebar.component.html @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss index bdb80f68..0f66f6b2 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.scss @@ -3,4 +3,3 @@ .sub-menu { @include sidebar-menu-item; } -// why? \ No newline at end of file diff --git a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.ts b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.ts index 2dc4332d..987ea3cc 100644 --- a/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.ts +++ b/src/app/control-center/control-center-sidebar-menu/control-center-sidebar-menu.component.ts @@ -109,6 +109,10 @@ export class ControlCenterSidebarMenuComponent implements OnInit, OnDestroy { } +export enum SubMenuType { + Computer = "Computer" +} + export class SidebarMenu { title: string; icon: string; @@ -119,11 +123,12 @@ export class SidebarMenu { specialItems: number; routerLink?: string; queryParams?: Params; + subMenuType?: SubMenuType; constructor(title: string, icon: string, options: { - items?: SidebarMenuItem[]; displayCount?: boolean; specialItems?: number; + items?: SidebarMenuItem[]; subMenuType?: SubMenuType; displayCount?: boolean; specialItems?: number; routerLink?: string; queryParams?: Params; header?: string; link?: string; } = {}) { this.title = title; @@ -135,6 +140,7 @@ export class SidebarMenu { this.specialItems = options.specialItems ?? 0; this.routerLink = options.routerLink; this.queryParams = options.queryParams; + this.subMenuType = options.subMenuType; } getDisplayCount(): number { diff --git a/src/app/control-center/control-center.component.ts b/src/app/control-center/control-center.component.ts index 2bf72123..34574292 100644 --- a/src/app/control-center/control-center.component.ts +++ b/src/app/control-center/control-center.component.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {SidebarMenu} from './control-center-sidebar-menu/control-center-sidebar-menu.component'; +import {SidebarMenu, SubMenuType} from './control-center-sidebar-menu/control-center-sidebar-menu.component'; import {ControlCenterService} from './control-center.service'; @Component({ @@ -13,7 +13,7 @@ export class ControlCenterComponent { new SidebarMenu( $localize`Computer`, 'device-desktop', - {items: this.controlCenterService.deviceSidebarMenuItems, displayCount: true, specialItems: 1, header: $localize`Game`} + {items: this.controlCenterService.deviceSidebarMenuItems, subMenuType: SubMenuType.Computer, displayCount: true, specialItems: 1, header: $localize`Game`} ), new SidebarMenu($localize`Inventory`, 'briefcase', { routerLink: '/inventory' }), new SidebarMenu($localize`Network`, 'affiliate', { routerLink: '/network' }), diff --git a/src/app/control-center/control-center.module.ts b/src/app/control-center/control-center.module.ts index 8f869c40..fb2a8c14 100644 --- a/src/app/control-center/control-center.module.ts +++ b/src/app/control-center/control-center.module.ts @@ -19,7 +19,7 @@ import { } from './control-center-inventory-page/control-center-inventory-page.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {ControlCenterRoutingModule} from "./control-center-routing.module"; -import {IconsModule} from 'src/app/icons/icons.module'; +import {IconsModule} from '../icons/icons.module'; import {ControlCenterComputerMenuComponent} from './control-center-computer-menu/control-center-computer-menu.component'; @NgModule({ diff --git a/src/app/icons/icons.module.ts b/src/app/icons/icons.module.ts index 44181411..c16c9e7f 100644 --- a/src/app/icons/icons.module.ts +++ b/src/app/icons/icons.module.ts @@ -22,7 +22,6 @@ const icons = { @NgModule({ - declarations: [], imports: [ TablerIconsModule.pick(icons) ], From 5a17d35fd81532792006ddbc2569aeee3aae5ed8 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Sat, 19 Nov 2022 11:08:28 +0100 Subject: [PATCH 52/55] Fix test failing --- .../control-center-computer-menu.component.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts index e452052e..1d6bbf7d 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, Output, EventEmitter, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; +import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { SidebarMenu, SidebarMenuItem } from '../control-center-sidebar-menu/control-center-sidebar-menu.component'; import {Router} from '@angular/router'; import {Device} from 'src/app/api/devices/device'; @@ -8,7 +8,7 @@ import {Device} from 'src/app/api/devices/device'; templateUrl: './control-center-computer-menu.component.html', styleUrls: ['./control-center-computer-menu.component.scss'] }) -export class ControlCenterComputerMenuComponent implements OnInit, OnDestroy { +export class ControlCenterComputerMenuComponent implements OnInit { @Input() menu: SidebarMenu; @Input() expanded!: boolean; @@ -26,9 +26,6 @@ export class ControlCenterComputerMenuComponent implements OnInit, OnDestroy { constructor(private router: Router) { } - ngOnDestroy(): void { - } - ngOnInit(): void { this.updatePcState(); } From 07581b1d77d2c42071fd7c49c39b783d71aa5fc5 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Sat, 19 Nov 2022 13:04:15 +0100 Subject: [PATCH 53/55] Fix scroll ComputerMenu --- .../control-center-computer-menu.component.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss index 30b6662f..3e9f7b63 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss @@ -3,7 +3,7 @@ .computer-menu { background-color: #2a2a31; - padding: 50px 50px 0 50px; + padding: 50px; overflow: auto; @@ -64,10 +64,8 @@ .item { cursor: pointer; - box-sizing: border-box; + box-sizing: content-box; padding: 13px 20px; - width: 400px; - height: 85px; background-color: $input-background; margin-top: 40px; border-radius: 16px; From 1bfa01d6a797b721daf2a41bbf2de2290597a9c6 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Tue, 22 Nov 2022 16:21:36 +0100 Subject: [PATCH 54/55] Add ComputerState enum --- ...ontrol-center-computer-menu.component.html | 11 +++--- ...ontrol-center-computer-menu.component.scss | 9 +++-- .../control-center-computer-menu.component.ts | 36 ++++++++++++++----- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.html b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.html index 9dcbddbd..dcea7baa 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.html +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.html @@ -28,11 +28,12 @@
{{item.title}}
-
- Offline - Online - +
+ Offline + Online + + Unknown State
diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss index 3e9f7b63..2d5e3324 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.scss @@ -79,7 +79,7 @@ color: $input-background; .state { - .online, .offline, .at_startup, .at_shutdown { + .online, .offline, .stopping, .starting, .unknown { color: $input-background; } } @@ -103,9 +103,14 @@ .offline { color: $danger-default; } - .at_startup, .at_shutdown { + + .at_startup, .at_shutdown, .unknown { color: $warning-default; } + + .unknown { + font-style: italic; + } } diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts index 1d6bbf7d..0e20bb61 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts @@ -16,12 +16,8 @@ export class ControlCenterComputerMenuComponent implements OnInit { @Input() devices: Device[]; - // 0: off = Offline - // 1: on = Online - // 2: amoff = Am Einschalten - // 3: amon = Am Ausschalten - // I know I just could have used an enum will probably change it => Todo states: any[] = []; + computerState = ComputerState; constructor(private router: Router) { } @@ -34,12 +30,26 @@ export class ControlCenterComputerMenuComponent implements OnInit { if (this.devices != undefined) { this.devices.forEach(device => { - if (!device.powered_on) this.states.push({uuid: device.uuid, state: 0}) - else this.states.push({uuid: device.uuid, state:1}) + + switch (device.powered_on) { + + case true: + this.states.push(ComputerState.Online); + break; + + case false: + this.states.push(ComputerState.Offline); + break; + + default: + this.states.push(ComputerState.Unknown); + break; + } + }); - } - + } + } itemClicked(item: SidebarMenuItem) { @@ -66,3 +76,11 @@ export class ControlCenterComputerMenuComponent implements OnInit { } } + +enum ComputerState { + Online, + Offline, + Stopping, + Starting, + Unknown +} \ No newline at end of file From 68f304427ce5568b76e5d9294973c24eb3c009e6 Mon Sep 17 00:00:00 2001 From: 1Spinne Date: Tue, 22 Nov 2022 17:37:15 +0100 Subject: [PATCH 55/55] Fix switch case and rename Enum --- .../control-center-computer-menu.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts index 0e20bb61..e969701a 100644 --- a/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts +++ b/src/app/control-center/control-center-computer-menu/control-center-computer-menu.component.ts @@ -17,7 +17,7 @@ export class ControlCenterComputerMenuComponent implements OnInit { @Input() devices: Device[]; states: any[] = []; - computerState = ComputerState; + computerState = ComputerStateEnum; constructor(private router: Router) { } @@ -32,17 +32,17 @@ export class ControlCenterComputerMenuComponent implements OnInit { this.devices.forEach(device => { switch (device.powered_on) { - + case true: - this.states.push(ComputerState.Online); + this.states.push({uuid: device.uuid, state: ComputerStateEnum.Online}); break; case false: - this.states.push(ComputerState.Offline); + this.states.push({uuid: device.uuid, state: ComputerStateEnum.Offline}); break; default: - this.states.push(ComputerState.Unknown); + this.states.push({uuid: device.uuid, state: ComputerStateEnum.Unknown}); break; } @@ -77,7 +77,7 @@ export class ControlCenterComputerMenuComponent implements OnInit { } -enum ComputerState { +enum ComputerStateEnum { Online, Offline, Stopping,