From f4b7e2542e863478bac5395393f96039f50ed410 Mon Sep 17 00:00:00 2001 From: Butterfly Dev Date: Tue, 7 Apr 2026 03:44:31 +0000 Subject: [PATCH] =?UTF-8?q?desktop:=20fix=20build=20errors=20=E2=80=94=20F?= =?UTF-8?q?ormsModule=20for=20settings,=20nativeWindow=20alias,=20move=20p?= =?UTF-8?q?rovideHttpClient=20to=20appConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desktop/src/app/app.config.ts | 4 +++- desktop/src/app/app.ts | 6 +----- .../src/app/components/apps/settings/settings.component.ts | 3 ++- desktop/src/app/components/window/window.component.html | 4 ++-- desktop/src/app/components/window/window.component.ts | 3 +++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/desktop/src/app/app.config.ts b/desktop/src/app/app.config.ts index cb1270e..37c2e1a 100644 --- a/desktop/src/app/app.config.ts +++ b/desktop/src/app/app.config.ts @@ -1,11 +1,13 @@ import { ApplicationConfig, provideBrowserGlobalErrorListeners } from '@angular/core'; import { provideRouter } from '@angular/router'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import { routes } from './app.routes'; export const appConfig: ApplicationConfig = { providers: [ provideBrowserGlobalErrorListeners(), - provideRouter(routes) + provideRouter(routes), + provideHttpClient(withInterceptorsFromDi()), ] }; diff --git a/desktop/src/app/app.ts b/desktop/src/app/app.ts index e25d40a..6884aee 100644 --- a/desktop/src/app/app.ts +++ b/desktop/src/app/app.ts @@ -1,14 +1,10 @@ import { Component } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { RouterOutlet } from '@angular/router'; import { DesktopComponent } from './components/desktop/desktop.component'; -import { provideHttpClient } from '@angular/common/http'; @Component({ selector: 'app-root', standalone: true, - imports: [FormsModule, RouterOutlet, DesktopComponent], - providers: [provideHttpClient()], + imports: [DesktopComponent], templateUrl: './app.html', styleUrl: './app.scss', }) diff --git a/desktop/src/app/components/apps/settings/settings.component.ts b/desktop/src/app/components/apps/settings/settings.component.ts index 7f885a4..e60c3c0 100644 --- a/desktop/src/app/components/apps/settings/settings.component.ts +++ b/desktop/src/app/components/apps/settings/settings.component.ts @@ -1,5 +1,6 @@ import { Component, signal } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; interface SettingSection { id: string; @@ -10,7 +11,7 @@ interface SettingSection { @Component({ selector: 'app-settings', standalone: true, - imports: [CommonModule], + imports: [CommonModule, FormsModule], templateUrl: './settings.component.html', styleUrl: './settings.component.scss', }) diff --git a/desktop/src/app/components/window/window.component.html b/desktop/src/app/components/window/window.component.html index 411c04d..de15b0c 100644 --- a/desktop/src/app/components/window/window.component.html +++ b/desktop/src/app/components/window/window.component.html @@ -6,8 +6,8 @@ [style.display]="windowState.isMinimized ? 'none' : 'flex'" [style.left.px]="windowState.isMaximized ? 0 : windowState.x" [style.top.px]="windowState.isMaximized ? 0 : windowState.y" - [style.width.px]="windowState.isMaximized ? window.innerWidth : windowState.width" - [style.height.px]="windowState.isMaximized ? (window.innerHeight - 48) : windowState.height" + [style.width.px]="windowState.isMaximized ? nativeWindow.innerWidth : windowState.width" + [style.height.px]="windowState.isMaximized ? (nativeWindow.innerHeight - 48) : windowState.height" [style.z-index]="windowState.zIndex" > diff --git a/desktop/src/app/components/window/window.component.ts b/desktop/src/app/components/window/window.component.ts index 5096c9e..6a9a660 100644 --- a/desktop/src/app/components/window/window.component.ts +++ b/desktop/src/app/components/window/window.component.ts @@ -55,6 +55,9 @@ export class WindowComponent implements AfterViewInit, OnDestroy { return this.elementRef.nativeElement; } + /** Expose native window for template bindings (avoids conflict with component name). */ + readonly nativeWindow = globalThis.window; + constructor(private elementRef: ElementRef) {} // ── Drag ───────────────────────────────────────────────────────────────