diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 33078f7c5..7eeb9bb5c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { @@ -14,8 +14,10 @@ const routes: Routes = [ }, { path: 'settings', - loadChildren: () => - import('./settings/settings.module').then((m) => m.SettingsModule), + loadComponent: () => + import('./settings/settings.component').then( + (c) => c.SettingsComponent + ), }, { path: '**', diff --git a/src/app/services/settings.service.ts b/src/app/services/settings.service.ts index 66e12d112..deabf65d7 100644 --- a/src/app/services/settings.service.ts +++ b/src/app/services/settings.service.ts @@ -59,8 +59,8 @@ export class SettingsService { * Returns the version of the released app */ getAppVersion() { - return this.http.get(PACKAGE_JSON_URL).pipe( - map((response) => response['version']), + return this.http.get<{ version: string }>(PACKAGE_JSON_URL).pipe( + map((response) => response.version), catchError((err) => { console.error(err); throw new Error(err); diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts index e95e87909..93ca6d0cd 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/settings/settings.component.ts @@ -1,3 +1,4 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; import { UntypedFormArray, @@ -15,6 +16,7 @@ import { EPG_FORCE_FETCH } from '../../../shared/ipc-commands'; import { DataService } from '../services/data.service'; import { EpgService } from '../services/epg.service'; import { STORE_KEY } from '../shared/enums/store-keys.enum'; +import { SharedModule } from '../shared/shared.module'; import { selectIsEpgAvailable } from '../state/selectors'; import { SettingsService } from './../services/settings.service'; import { Language } from './language.enum'; @@ -22,9 +24,10 @@ import { Settings, VideoPlayer } from './settings.interface'; import { Theme } from './theme.enum'; @Component({ - selector: 'app-settings', templateUrl: './settings.component.html', styleUrls: ['./settings.component.scss'], + standalone: true, + imports: [CommonModule, SharedModule], }) export class SettingsComponent implements OnInit { /** List with available languages as enum */ @@ -149,9 +152,10 @@ export class SettingsComponent implements OnInit { * settings UI */ checkAppVersion(): void { - this.settingsService.getAppVersion().subscribe((version) => { - this.showVersionInformation(version); - }); + this.settingsService + .getAppVersion() + .pipe(take(1)) + .subscribe((version) => this.showVersionInformation(version)); } /** diff --git a/src/app/settings/settings.module.ts b/src/app/settings/settings.module.ts deleted file mode 100644 index 98afb58c8..000000000 --- a/src/app/settings/settings.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SettingsComponent } from './settings.component'; -import { SettingsRoutingModule } from './settings.routing'; -import { SharedModule } from '../shared/shared.module'; - -@NgModule({ - imports: [CommonModule, SettingsRoutingModule, SharedModule], - declarations: [SettingsComponent], -}) -export class SettingsModule {} diff --git a/src/app/settings/settings.routing.ts b/src/app/settings/settings.routing.ts deleted file mode 100644 index 7ae98bd51..000000000 --- a/src/app/settings/settings.routing.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { SettingsComponent } from './settings.component'; - -const routes: Routes = [ - { - path: '', - component: SettingsComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class SettingsRoutingModule {}