From df2b660b7526316ff0e19aa07736ccadc766c285 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 19 Aug 2023 10:04:38 +0200 Subject: [PATCH 1/2] Fixed sidebar to support responsive mode #1.1.0.rc6 --- kdb-web/package.json | 2 +- kdb-web/src/app/app.component.html | 2 +- kdb-web/src/app/app.component.ts | 6 ++-- .../components/client/client.component.html | 2 +- .../server-dashboard.component.html | 1 - .../app/services/sidebar/sidebar.service.ts | 2 +- .../src/app/services/theme/theme.service.ts | 7 ---- kdb-web/src/assets/version.json | 2 +- kdb-web/src/styles.scss | 35 ++++++++++++++++--- kdb-web/src/styles/primeng-fixes.scss | 5 +-- 10 files changed, 40 insertions(+), 24 deletions(-) diff --git a/kdb-web/package.json b/kdb-web/package.json index 68d816d4..8fa498b9 100644 --- a/kdb-web/package.json +++ b/kdb-web/package.json @@ -1,6 +1,6 @@ { "name": "kdb-web", - "version": "1.1.0.rc5", + "version": "1.1.0.rc6", "scripts": { "ng": "ng", "update-version": "ts-node-esm update-version.ts", diff --git a/kdb-web/src/app/app.component.html b/kdb-web/src/app/app.component.html index 8c0cfa4f..3c199a6f 100644 --- a/kdb-web/src/app/app.component.html +++ b/kdb-web/src/app/app.component.html @@ -5,7 +5,7 @@
-
+
diff --git a/kdb-web/src/app/app.component.ts b/kdb-web/src/app/app.component.ts index d6b87c69..56419fb9 100644 --- a/kdb-web/src/app/app.component.ts +++ b/kdb-web/src/app/app.component.ts @@ -16,7 +16,7 @@ import { takeUntil } from "rxjs/operators"; export class AppComponent implements OnInit, OnDestroy { themeName: string = Themes.Default; - sidebarWidth: string = '175px'; + isSidebarOpen: boolean = true; isLoggedIn: boolean = false; @@ -29,10 +29,10 @@ export class AppComponent implements OnInit, OnDestroy { private translateService: TranslateService, private config: PrimeNGConfig, ) { - this.themeService.sidebarWidth$.pipe( + this.themeService.isSidebarOpen$.pipe( takeUntil(this.unsubscriber) ).subscribe(value => { - this.sidebarWidth = value; + this.isSidebarOpen = value; }); this.themeService.themeName$.pipe( takeUntil(this.unsubscriber) diff --git a/kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html b/kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html index 11fca14a..a89de4a4 100644 --- a/kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html +++ b/kdb-web/src/app/modules/view/server/server-dashboard/components/client/client.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html b/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html index 36005f1e..69fa157d 100644 --- a/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html +++ b/kdb-web/src/app/modules/view/server/server-dashboard/server-dashboard.component.html @@ -30,7 +30,6 @@
-
diff --git a/kdb-web/src/app/services/sidebar/sidebar.service.ts b/kdb-web/src/app/services/sidebar/sidebar.service.ts index c4d1a102..b79464bc 100644 --- a/kdb-web/src/app/services/sidebar/sidebar.service.ts +++ b/kdb-web/src/app/services/sidebar/sidebar.service.ts @@ -69,7 +69,7 @@ export class SidebarService { async buildMenu(user: UserDTO | null, hasPermission: boolean, isTechnician: boolean = false) { this.dashboard = { - label: this.isSidebarOpen ? this.translateService.instant("sidebar.dashboard") : "", + label: this.translateService.instant("sidebar.dashboard"), icon: "pi pi-th-large", routerLink: "dashboard" }; diff --git a/kdb-web/src/app/services/theme/theme.service.ts b/kdb-web/src/app/services/theme/theme.service.ts index dacfce99..96dfdfd8 100644 --- a/kdb-web/src/app/services/theme/theme.service.ts +++ b/kdb-web/src/app/services/theme/theme.service.ts @@ -9,13 +9,10 @@ import { AuthService } from "../auth/auth.service"; export class ThemeService { themeName: string = Themes.Default; - - sidebarWidth = "150px"; isSidebarOpen = false; themeName$ = new BehaviorSubject(Themes.Default); isSidebarOpen$ = new BehaviorSubject(true); - sidebarWidth$ = new BehaviorSubject("175px"); constructor( private authService: AuthService @@ -25,10 +22,6 @@ export class ThemeService { }); this.isSidebarOpen$.subscribe(isSidebarOpen => { this.isSidebarOpen = isSidebarOpen; - this.sidebarWidth$.next(isSidebarOpen ? "175px" : "75px"); - }); - this.sidebarWidth$.subscribe(sidebarWidth => { - this.sidebarWidth = sidebarWidth; }); this.loadTheme(); diff --git a/kdb-web/src/assets/version.json b/kdb-web/src/assets/version.json index 30a9e079..eb6850b8 100644 --- a/kdb-web/src/assets/version.json +++ b/kdb-web/src/assets/version.json @@ -2,6 +2,6 @@ "WebVersion": { "Major": "1", "Minor": "1", - "Micro": "0.rc5" + "Micro": "0.rc6" } } \ No newline at end of file diff --git a/kdb-web/src/styles.scss b/kdb-web/src/styles.scss index 7a8c242e..1ff67ce5 100644 --- a/kdb-web/src/styles.scss +++ b/kdb-web/src/styles.scss @@ -115,8 +115,14 @@ header { display: flex; flex: 1; - .sidebar { + .sidebar-open { height: 100%; + width: 175px; + } + + .sidebar-closed { + height: 100%; + width: 75px; } h1 { @@ -372,19 +378,23 @@ header { flex-wrap: wrap; gap: 10px; + .client-info-small { + flex: 0.25 !important; + } + .client-info { display: flex; flex-direction: column; - margin-left: 2%; + flex: 1; .client-info-header { margin-bottom: 5px; - white-space: nowrap; + white-space: break-spaces; font-weight: bold } .client-info-value { - white-space: nowrap; + word-break: break-word; } } } @@ -654,7 +664,23 @@ p-inputNumber { } } } + + + .p-panelmenu { + .p-menuitem-text { + display: none; + } + } + .app { + .sidebar-open { + width: 65px; + } + + .sidebar-closed { + display: none; + } + .component-wrapper { .component { .content-wrapper { @@ -749,6 +775,7 @@ p-inputNumber { .p-column-title { min-width: 50%; font-weight: 600; + word-break: break-word; } p-cellEditor { diff --git a/kdb-web/src/styles/primeng-fixes.scss b/kdb-web/src/styles/primeng-fixes.scss index 1a0df1cf..67f10cd6 100644 --- a/kdb-web/src/styles/primeng-fixes.scss +++ b/kdb-web/src/styles/primeng-fixes.scss @@ -40,6 +40,7 @@ header, white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + line-height: normal !important; } .p-panelmenu-header > a { @@ -53,10 +54,6 @@ header, border: none !important; background: none !important; } - - .p-menuitem-text { - line-height: normal !important; - } } ui-menu .ui-menu-parent .ui-menu-child { From 74437fdc20de5f1297b3504f0d81798da1f583cf Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 19 Aug 2023 13:06:07 +0200 Subject: [PATCH 2/2] Fixed client styling #1.1.0.rc6 --- kdb-web/src/styles.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kdb-web/src/styles.scss b/kdb-web/src/styles.scss index 1ff67ce5..16baf300 100644 --- a/kdb-web/src/styles.scss +++ b/kdb-web/src/styles.scss @@ -685,6 +685,10 @@ p-inputNumber { .component { .content-wrapper { .content { + .client { + flex-direction: column !important; + } + .server-list-wrapper { .server-list { .server {