Merge 0088ebfc71 into d9fb159c6a

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enhanced the sitemap to dynamically compose public routes
 - Renamed `Account` to `account` in the `Order` database schema
 - Improved the language localization for German (`de`)
+- Migrated the `AboutPageComponent` to standalone
 
 ## 2.175.0 - 2025-06-28
 

apps/client/src/app/app-routing.module.ts

@@ -11,7 +11,7 @@ const routes: Routes = [
   {
     path: publicRoutes.about.path,
     loadChildren: () =>
-      import('./pages/about/about-page.module').then((m) => m.AboutPageModule)
+      import('./pages/about/about-page.routes').then((m) => m.routes)
   },
   {
     path: internalRoutes.account.path,

apps/client/src/app/app.module.ts

@@ -19,8 +19,8 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ServiceWorkerModule } from '@angular/service-worker';
-import { MarkdownModule } from 'ngx-markdown';
+import { provideMarkdown } from 'ngx-markdown';
-import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { provideNgxSkeletonLoader } from 'ngx-skeleton-loader';
 import { NgxStripeModule, STRIPE_PUBLISHABLE_KEY } from 'ngx-stripe';
 
 import { environment } from '../environments/environment';
@@ -50,13 +50,11 @@ export function NgxStripeFactory(): string {
     GfLogoComponent,
     GfNotificationModule,
     GfSubscriptionInterstitialDialogModule,
-    MarkdownModule.forRoot(),
     MatAutocompleteModule,
     MatChipsModule,
     MatNativeDateModule,
     MatSnackBarModule,
     MatTooltipModule,
-    NgxSkeletonLoaderModule,
     NgxStripeModule.forRoot(environment.stripePublicKey),
     ServiceWorkerModule.register('ngsw-worker.js', {
       enabled: environment.production,
@@ -73,6 +71,8 @@ export function NgxStripeFactory(): string {
       useClass: CustomDateAdapter,
       deps: [LanguageService, MAT_DATE_LOCALE, Platform]
     },
+    provideMarkdown(),
+    provideNgxSkeletonLoader(),
     { provide: MAT_DATE_FORMATS, useValue: DateFormats },
     {
       provide: STRIPE_PUBLISHABLE_KEY,

apps/client/src/app/pages/about/about-page.component.ts

@@ -4,17 +4,26 @@ import { TabConfiguration, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
+import { MatTabsModule } from '@angular/material/tabs';
+import { RouterModule } from '@angular/router';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 @Component({
   host: { class: 'page has-tabs' },
+  imports: [MatTabsModule, RouterModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
   selector: 'gf-about-page',
   styleUrls: ['./about-page.scss'],
-  templateUrl: './about-page.html',
+  templateUrl: './about-page.html'
-  standalone: false
 })
 export class AboutPageComponent implements OnDestroy, OnInit {
   public deviceType: string;

apps/client/src/app/pages/about/about-page.module.ts

@@ -1,14 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatTabsModule } from '@angular/material/tabs';
-import { RouterModule } from '@angular/router';
-
-import { AboutPageRoutingModule } from './about-page-routing.module';
-import { AboutPageComponent } from './about-page.component';
-
-@NgModule({
-  declarations: [AboutPageComponent],
-  imports: [AboutPageRoutingModule, CommonModule, MatTabsModule, RouterModule],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class AboutPageModule {}

apps/client/src/app/pages/about/about-page-routing.module.ts → apps/client/src/app/pages/about/about-page.routes.ts

@@ -1,55 +1,46 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { AboutPageComponent } from './about-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     children: [
       {
         path: '',
         loadChildren: () =>
-          import('./overview/about-overview-page.module').then(
+          import('./overview/about-overview-page.routes').then((m) => m.routes)
-            (m) => m.AboutOverviewPageModule
-          )
       },
       {
         path: publicRoutes.about.subRoutes.changelog.path,
         loadChildren: () =>
-          import('./changelog/changelog-page.module').then(
+          import('./changelog/changelog-page.routes').then((m) => m.routes)
-            (m) => m.ChangelogPageModule
-          )
       },
       {
         path: publicRoutes.about.subRoutes.license.path,
         loadChildren: () =>
-          import('./license/license-page.module').then(
+          import('./license/license-page.routes').then((m) => m.routes)
-            (m) => m.LicensePageModule
-          )
       },
       {
         path: publicRoutes.about.subRoutes.ossFriends.path,
         loadChildren: () =>
-          import('./oss-friends/oss-friends-page.module').then(
+          import('./oss-friends/oss-friends-page.routes').then((m) => m.routes)
-            (m) => m.OpenSourceSoftwareFriendsPageModule
-          )
       },
       {
         path: publicRoutes.about.subRoutes.privacyPolicy.path,
         loadChildren: () =>
-          import('./privacy-policy/privacy-policy-page.module').then(
+          import('./privacy-policy/privacy-policy-page.routes').then(
-            (m) => m.PrivacyPolicyPageModule
+            (m) => m.routes
           )
       },
       {
         path: publicRoutes.about.subRoutes.termsOfService.path,
         loadChildren: () =>
-          import('./terms-of-service/terms-of-service-page.module').then(
+          import('./terms-of-service/terms-of-service-page.routes').then(
-            (m) => m.TermsOfServicePageModule
+            (m) => m.routes
           )
       }
     ],
@@ -58,9 +49,3 @@ const routes: Routes = [
     title: publicRoutes.about.title
   }
 ];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class AboutPageRoutingModule {}

apps/client/src/app/pages/about/changelog/changelog-page.component.ts

@@ -1,11 +1,13 @@
 import { Component, OnDestroy } from '@angular/core';
+import { MarkdownModule } from 'ngx-markdown';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { Subject } from 'rxjs';
 
 @Component({
+  imports: [MarkdownModule, NgxSkeletonLoaderModule],
   selector: 'gf-changelog-page',
   styleUrls: ['./changelog-page.scss'],
-  templateUrl: './changelog-page.html',
+  templateUrl: './changelog-page.html'
-  standalone: false
 })
 export class ChangelogPageComponent implements OnDestroy {
   public isLoading = true;

apps/client/src/app/pages/about/changelog/changelog-page.module.ts

@@ -1,19 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MarkdownModule } from 'ngx-markdown';
-import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
-
-import { ChangelogPageRoutingModule } from './changelog-page-routing.module';
-import { ChangelogPageComponent } from './changelog-page.component';
-
-@NgModule({
-  declarations: [ChangelogPageComponent],
-  imports: [
-    ChangelogPageRoutingModule,
-    CommonModule,
-    MarkdownModule.forChild(),
-    NgxSkeletonLoaderModule
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class ChangelogPageModule {}

apps/client/src/app/pages/about/changelog/changelog-page-routing.module.ts → apps/client/src/app/pages/about/changelog/changelog-page.routes.ts

@@ -1,12 +1,11 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { ChangelogPageComponent } from './changelog-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: ChangelogPageComponent,
@@ -14,9 +13,3 @@ const routes: Routes = [
     title: publicRoutes.about.subRoutes.changelog.title
   }
 ];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class ChangelogPageRoutingModule {}

apps/client/src/app/pages/about/license/license-page.component.ts

@@ -1,11 +1,12 @@
 import { Component, OnDestroy } from '@angular/core';
+import { MarkdownModule } from 'ngx-markdown';
 import { Subject } from 'rxjs';
 
 @Component({
+  imports: [MarkdownModule],
   selector: 'gf-license-page',
   styleUrls: ['./license-page.scss'],
-  templateUrl: './license-page.html',
+  templateUrl: './license-page.html'
-  standalone: false
 })
 export class LicensePageComponent implements OnDestroy {
   private unsubscribeSubject = new Subject<void>();

apps/client/src/app/pages/about/license/license-page.module.ts

@@ -1,13 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MarkdownModule } from 'ngx-markdown';
-
-import { LicensePageRoutingModule } from './license-page-routing.module';
-import { LicensePageComponent } from './license-page.component';
-
-@NgModule({
-  declarations: [LicensePageComponent],
-  imports: [LicensePageRoutingModule, CommonModule, MarkdownModule.forChild()],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class LicensePageModule {}

apps/client/src/app/pages/about/license/license-page-routing.module.ts → apps/client/src/app/pages/about/license/license-page.routes.ts

@@ -1,12 +1,11 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { LicensePageComponent } from './license-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: LicensePageComponent,
@@ -14,9 +13,3 @@ const routes: Routes = [
     title: publicRoutes.about.subRoutes.license.title
   }
 ];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class LicensePageRoutingModule {}

apps/client/src/app/pages/about/oss-friends/oss-friends-page.component.ts

@@ -1,13 +1,15 @@
 import { Component, OnDestroy } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
 import { Subject } from 'rxjs';
 
 const ossFriends = require('../../../../assets/oss-friends.json');
 
 @Component({
+  imports: [MatButtonModule, MatCardModule],
   selector: 'gf-oss-friends-page',
   styleUrls: ['./oss-friends-page.scss'],
-  templateUrl: './oss-friends-page.html',
+  templateUrl: './oss-friends-page.html'
-  standalone: false
 })
 export class OpenSourceSoftwareFriendsPageComponent implements OnDestroy {
   public ossFriends = ossFriends.data;

apps/client/src/app/pages/about/oss-friends/oss-friends-page.module.ts

@@ -1,19 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-
-import { OpenSourceSoftwareFriendsPageRoutingModule } from './oss-friends-page-routing.module';
-import { OpenSourceSoftwareFriendsPageComponent } from './oss-friends-page.component';
-
-@NgModule({
-  declarations: [OpenSourceSoftwareFriendsPageComponent],
-  imports: [
-    CommonModule,
-    MatButtonModule,
-    MatCardModule,
-    OpenSourceSoftwareFriendsPageRoutingModule
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class OpenSourceSoftwareFriendsPageModule {}

apps/client/src/app/pages/about/oss-friends/oss-friends-page-routing.module.ts → apps/client/src/app/pages/about/oss-friends/oss-friends-page.routes.ts

@@ -1,12 +1,11 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { OpenSourceSoftwareFriendsPageComponent } from './oss-friends-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: OpenSourceSoftwareFriendsPageComponent,
@@ -14,9 +13,3 @@ const routes: Routes = [
     title: publicRoutes.about.subRoutes.ossFriends.title
   }
 ];
-
-@NgModule({
-  exports: [RouterModule],
-  imports: [RouterModule.forChild(routes)]
-})
-export class OpenSourceSoftwareFriendsPageRoutingModule {}

apps/client/src/app/pages/about/overview/about-overview-page.component.ts

@@ -4,15 +4,25 @@ import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { RouterModule } from '@angular/router';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 @Component({
+  imports: [CommonModule, MatButtonModule, RouterModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA],
   selector: 'gf-about-overview-page',
   styleUrls: ['./about-overview-page.scss'],
-  templateUrl: './about-overview-page.html',
+  templateUrl: './about-overview-page.html'
-  standalone: false
 })
 export class AboutOverviewPageComponent implements OnDestroy, OnInit {
   public hasPermissionForStatistics: boolean;

apps/client/src/app/pages/about/overview/about-overview-page.module.ts

@@ -1,19 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { RouterModule } from '@angular/router';
-
-import { AboutOverviewPageRoutingModule } from './about-overview-page-routing.module';
-import { AboutOverviewPageComponent } from './about-overview-page.component';
-
-@NgModule({
-  declarations: [AboutOverviewPageComponent],
-  imports: [
-    AboutOverviewPageRoutingModule,
-    CommonModule,
-    MatButtonModule,
-    RouterModule
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class AboutOverviewPageModule {}

apps/client/src/app/pages/about/overview/about-overview-page-routing.module.ts → apps/client/src/app/pages/about/overview/about-overview-page.routes.ts

@@ -1,11 +1,10 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { AboutOverviewPageComponent } from './about-overview-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: AboutOverviewPageComponent,
@@ -13,9 +12,3 @@ const routes: Routes = [
     title: $localize`About`
   }
 ];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class AboutOverviewPageRoutingModule {}

apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.component.ts

@@ -1,9 +1,10 @@
 import { Component, OnDestroy } from '@angular/core';
+import { MarkdownModule } from 'ngx-markdown';
 import { Subject } from 'rxjs';
 
 @Component({
+  imports: [MarkdownModule],
   selector: 'gf-privacy-policy-page',
-  standalone: false,
   styleUrls: ['./privacy-policy-page.scss'],
   templateUrl: './privacy-policy-page.html'
 })

apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.module.ts

@@ -1,17 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MarkdownModule } from 'ngx-markdown';
-
-import { PrivacyPolicyPageRoutingModule } from './privacy-policy-page-routing.module';
-import { PrivacyPolicyPageComponent } from './privacy-policy-page.component';
-
-@NgModule({
-  declarations: [PrivacyPolicyPageComponent],
-  imports: [
-    CommonModule,
-    MarkdownModule.forChild(),
-    PrivacyPolicyPageRoutingModule
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class PrivacyPolicyPageModule {}

apps/client/src/app/pages/about/privacy-policy/privacy-policy-page-routing.module.ts → apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.routes.ts

@@ -1,12 +1,11 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { PrivacyPolicyPageComponent } from './privacy-policy-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: PrivacyPolicyPageComponent,
@@ -14,9 +13,3 @@ const routes: Routes = [
     title: publicRoutes.about.subRoutes.privacyPolicy.title
   }
 ];
-
-@NgModule({
-  exports: [RouterModule],
-  imports: [RouterModule.forChild(routes)]
-})
-export class PrivacyPolicyPageRoutingModule {}

apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.component.ts

@@ -1,9 +1,10 @@
 import { Component, OnDestroy } from '@angular/core';
+import { MarkdownModule } from 'ngx-markdown';
 import { Subject } from 'rxjs';
 
 @Component({
+  imports: [MarkdownModule],
   selector: 'gf-terms-of-service-page',
-  standalone: false,
   styleUrls: ['./terms-of-service-page.scss'],
   templateUrl: './terms-of-service-page.html'
 })

apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.module.ts

@@ -1,17 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MarkdownModule } from 'ngx-markdown';
-
-import { TermsOfServicePageRoutingModule } from './terms-of-service-page-routing.module';
-import { TermsOfServicePageComponent } from './terms-of-service-page.component';
-
-@NgModule({
-  declarations: [TermsOfServicePageComponent],
-  imports: [
-    CommonModule,
-    MarkdownModule.forChild(),
-    TermsOfServicePageRoutingModule
-  ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA]
-})
-export class TermsOfServicePageModule {}

apps/client/src/app/pages/about/terms-of-service/terms-of-service-page-routing.module.ts → apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.routes.ts

@@ -1,12 +1,11 @@
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 
-import { NgModule } from '@angular/core';
+import { Routes } from '@angular/router';
-import { RouterModule, Routes } from '@angular/router';
 
 import { TermsOfServicePageComponent } from './terms-of-service-page.component';
 
-const routes: Routes = [
+export const routes: Routes = [
   {
     canActivate: [AuthGuard],
     component: TermsOfServicePageComponent,
@@ -14,9 +13,3 @@ const routes: Routes = [
     title: publicRoutes.about.subRoutes.termsOfService.title
   }
 ];
-
-@NgModule({
-  exports: [RouterModule],
-  imports: [RouterModule.forChild(routes)]
-})
-export class TermsOfServicePageRoutingModule {}

package-lock.json

@@ -78,7 +78,7 @@
         "ng-extract-i18n-merge": "2.15.1",
         "ngx-device-detector": "9.0.0",
         "ngx-markdown": "19.0.0",
-        "ngx-skeleton-loader": "11.0.0",
+        "ngx-skeleton-loader": "11.2.1",
         "ngx-stripe": "19.7.0",
         "open-color": "1.9.1",
         "papaparse": "5.3.1",
@@ -26911,9 +26911,9 @@
       }
     },
     "node_modules/ngx-skeleton-loader": {
-      "version": "11.0.0",
+      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-11.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-11.2.1.tgz",
-      "integrity": "sha512-SVWgrePXqIX0ToLf/G0Ce+aE6qXCKl/c+9arV61eiFlrqXXaMlXCkVAYT/wpK+4xgVMHXvQha1mnG9YcKVHQ1A==",
+      "integrity": "sha512-0YWwQgK3X4trtiLvTv3/CMGxcvjPkUbtTTKJJ2EOHhFuvPf0b+XO1KwguK0Ub9BMHnsqK8xOol0cEoVXyNh64Q==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"

package.json

@@ -124,7 +124,7 @@
     "ng-extract-i18n-merge": "2.15.1",
     "ngx-device-detector": "9.0.0",
     "ngx-markdown": "19.0.0",
-    "ngx-skeleton-loader": "11.0.0",
+    "ngx-skeleton-loader": "11.2.1",
     "ngx-stripe": "19.7.0",
     "open-color": "1.9.1",
     "papaparse": "5.3.1",