From 37396b155040e4ecf82d3aa416c1ff334f2b5d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87etin?= <69278826+cetincakiroglu@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:41:08 +0300 Subject: [PATCH] Refactor --- .../dashboard/revenuestreamwidget.ts | 2 +- src/components/floatingconfigurator.ts | 8 +-- src/views/uikit/chartdoc.ts | 2 +- src/views/uikit/mediadoc.ts | 6 +- src/views/uikit/overlaydoc.ts | 64 +++++++++++-------- 5 files changed, 49 insertions(+), 33 deletions(-) diff --git a/src/components/dashboard/revenuestreamwidget.ts b/src/components/dashboard/revenuestreamwidget.ts index e9fbff9..32262df 100644 --- a/src/components/dashboard/revenuestreamwidget.ts +++ b/src/components/dashboard/revenuestreamwidget.ts @@ -23,7 +23,7 @@ export class RevenueStreamWidget { constructor(public layoutService: LayoutService) { this.subscription = this.layoutService.configUpdate$ .pipe(debounceTime(25)) - .subscribe((config) => { + .subscribe(() => { this.initChart(); }); } diff --git a/src/components/floatingconfigurator.ts b/src/components/floatingconfigurator.ts index e625081..37553f1 100644 --- a/src/components/floatingconfigurator.ts +++ b/src/components/floatingconfigurator.ts @@ -2,7 +2,7 @@ import { Component, computed, inject } from '@angular/core'; import { ButtonModule } from 'primeng/button'; import { StyleClassModule } from 'primeng/styleclass'; import { AppConfigurator } from '@/src/layout/appconfigurator'; -import { AppConfigService } from '@/src/service/appconfigservice'; +import { LayoutService } from '@/src/service/applayoutservice'; @Component({ selector: 'floating-configurator', @@ -28,11 +28,11 @@ import { AppConfigService } from '@/src/service/appconfigservice'; `, }) export class FloatingConfigurator { - configService = inject(AppConfigService); + LayoutService = inject(LayoutService); - isDarkTheme = computed(() => this.configService.appState().darkTheme); + isDarkTheme = computed(() => this.LayoutService.layoutConfig().darkTheme); toggleDarkMode() { - this.configService.appState.update((state) => ({ ...state, darkTheme: !state.darkTheme })); + this.LayoutService.layoutConfig.update((state) => ({ ...state, darkTheme: !state.darkTheme })); } } diff --git a/src/views/uikit/chartdoc.ts b/src/views/uikit/chartdoc.ts index fcc781c..2346765 100644 --- a/src/views/uikit/chartdoc.ts +++ b/src/views/uikit/chartdoc.ts @@ -72,7 +72,7 @@ export class ChartDoc { constructor(private layoutService: LayoutService) { this.subscription = this.layoutService.configUpdate$ .pipe(debounceTime(25)) - .subscribe((config) => { + .subscribe(() => { this.initCharts(); }); } diff --git a/src/views/uikit/mediadoc.ts b/src/views/uikit/mediadoc.ts index 101c759..ff6493c 100644 --- a/src/views/uikit/mediadoc.ts +++ b/src/views/uikit/mediadoc.ts @@ -126,7 +126,9 @@ export class MediaDoc implements OnInit { return 'warn'; case 'OUTOFSTOCK': return 'danger'; + default: + return 'success'; } } - -} \ No newline at end of file + +} diff --git a/src/views/uikit/overlaydoc.ts b/src/views/uikit/overlaydoc.ts index ea16cfb..4ed4f79 100644 --- a/src/views/uikit/overlaydoc.ts +++ b/src/views/uikit/overlaydoc.ts @@ -6,12 +6,15 @@ import { ButtonModule } from 'primeng/button'; import { DialogModule } from 'primeng/dialog'; import { ToastModule } from 'primeng/toast'; import { DrawerModule } from 'primeng/drawer'; -import { PopoverModule } from 'primeng/popover'; +import { Popover, PopoverModule } from 'primeng/popover'; import { ConfirmPopupModule } from 'primeng/confirmpopup'; +import { OverlayPanel } from 'primeng/overlaypanel'; +import { InputText, InputTextModule } from 'primeng/inputtext'; +import { FormsModule } from '@angular/forms'; @Component({ standalone: true, - imports:[ToastModule,DialogModule,ButtonModule,DrawerModule, PopoverModule, ConfirmPopupModule], + imports:[ToastModule, DialogModule, ButtonModule, DrawerModule, PopoverModule, ConfirmPopupModule, InputTextModule, FormsModule], template:`
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-