From f16d87ec4a998e670dd0e60743e331ab172d3c10 Mon Sep 17 00:00:00 2001 From: csehatt741 Date: Mon, 30 Jun 2025 12:31:31 +0200 Subject: [PATCH] AboutPageComponent migrated to standalone --- apps/client/src/app/app-routing.module.ts | 2 +- .../app/pages/about/about-page.component.ts | 15 ++++++-- .../src/app/pages/about/about-page.module.ts | 14 -------- ...routing.module.ts => about-page.routes.ts} | 35 ++++++------------- .../changelog/changelog-page.component.ts | 5 +-- .../about/changelog/changelog-page.module.ts | 19 ---------- ...ing.module.ts => changelog-page.routes.ts} | 11 ++---- .../about/license/license-page.component.ts | 5 +-- .../about/license/license-page.module.ts | 13 ------- ...uting.module.ts => license-page.routes.ts} | 11 ++---- .../oss-friends/oss-friends-page.component.ts | 3 +- .../oss-friends/oss-friends-page.module.ts | 19 ---------- ...g.module.ts => oss-friends-page.routes.ts} | 11 ++---- .../overview/about-overview-page.component.ts | 15 ++++++-- .../overview/about-overview-page.module.ts | 19 ---------- ...odule.ts => about-overview-page.routes.ts} | 11 ++---- .../privacy-policy-page.component.ts | 3 +- .../privacy-policy-page.module.ts | 17 --------- ...odule.ts => privacy-policy-page.routes.ts} | 11 ++---- .../terms-of-service-page.component.ts | 3 +- .../terms-of-service-page.module.ts | 17 --------- ...ule.ts => terms-of-service-page.routes.ts} | 11 ++---- 22 files changed, 58 insertions(+), 212 deletions(-) delete mode 100644 apps/client/src/app/pages/about/about-page.module.ts rename apps/client/src/app/pages/about/{about-page-routing.module.ts => about-page.routes.ts} (50%) delete mode 100644 apps/client/src/app/pages/about/changelog/changelog-page.module.ts rename apps/client/src/app/pages/about/changelog/{changelog-page-routing.module.ts => changelog-page.routes.ts} (58%) delete mode 100644 apps/client/src/app/pages/about/license/license-page.module.ts rename apps/client/src/app/pages/about/license/{license-page-routing.module.ts => license-page.routes.ts} (57%) delete mode 100644 apps/client/src/app/pages/about/oss-friends/oss-friends-page.module.ts rename apps/client/src/app/pages/about/oss-friends/{oss-friends-page-routing.module.ts => oss-friends-page.routes.ts} (59%) delete mode 100644 apps/client/src/app/pages/about/overview/about-overview-page.module.ts rename apps/client/src/app/pages/about/overview/{about-overview-page-routing.module.ts => about-overview-page.routes.ts} (51%) delete mode 100644 apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.module.ts rename apps/client/src/app/pages/about/privacy-policy/{privacy-policy-page-routing.module.ts => privacy-policy-page.routes.ts} (58%) delete mode 100644 apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.module.ts rename apps/client/src/app/pages/about/terms-of-service/{terms-of-service-page-routing.module.ts => terms-of-service-page.routes.ts} (59%) diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 7eac28c87..40dbceb1a 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/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, diff --git a/apps/client/src/app/pages/about/about-page.component.ts b/apps/client/src/app/pages/about/about-page.component.ts index 249ce5a2d..7a71d42f7 100644 --- a/apps/client/src/app/pages/about/about-page.component.ts +++ b/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', - standalone: false + templateUrl: './about-page.html' }) export class AboutPageComponent implements OnDestroy, OnInit { public deviceType: string; diff --git a/apps/client/src/app/pages/about/about-page.module.ts b/apps/client/src/app/pages/about/about-page.module.ts deleted file mode 100644 index 161faaee7..000000000 --- a/apps/client/src/app/pages/about/about-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/about-page-routing.module.ts b/apps/client/src/app/pages/about/about-page.routes.ts similarity index 50% rename from apps/client/src/app/pages/about/about-page-routing.module.ts rename to apps/client/src/app/pages/about/about-page.routes.ts index 59621c794..4cb13280a 100644 --- a/apps/client/src/app/pages/about/about-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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( - (m) => m.AboutOverviewPageModule - ) + import('./overview/about-overview-page.routes').then((m) => m.routes) }, { path: publicRoutes.about.subRoutes.changelog.path, loadChildren: () => - import('./changelog/changelog-page.module').then( - (m) => m.ChangelogPageModule - ) + import('./changelog/changelog-page.routes').then((m) => m.routes) }, { path: publicRoutes.about.subRoutes.license.path, loadChildren: () => - import('./license/license-page.module').then( - (m) => m.LicensePageModule - ) + import('./license/license-page.routes').then((m) => m.routes) }, { path: publicRoutes.about.subRoutes.ossFriends.path, loadChildren: () => - import('./oss-friends/oss-friends-page.module').then( - (m) => m.OpenSourceSoftwareFriendsPageModule - ) + import('./oss-friends/oss-friends-page.routes').then((m) => m.routes) }, { path: publicRoutes.about.subRoutes.privacyPolicy.path, loadChildren: () => - import('./privacy-policy/privacy-policy-page.module').then( - (m) => m.PrivacyPolicyPageModule + import('./privacy-policy/privacy-policy-page.routes').then( + (m) => m.routes ) }, { path: publicRoutes.about.subRoutes.termsOfService.path, loadChildren: () => - import('./terms-of-service/terms-of-service-page.module').then( - (m) => m.TermsOfServicePageModule + import('./terms-of-service/terms-of-service-page.routes').then( + (m) => m.routes ) } ], @@ -58,9 +49,3 @@ const routes: Routes = [ title: publicRoutes.about.title } ]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class AboutPageRoutingModule {} diff --git a/apps/client/src/app/pages/about/changelog/changelog-page.component.ts b/apps/client/src/app/pages/about/changelog/changelog-page.component.ts index bdf6f52f1..7fc3992a7 100644 --- a/apps/client/src/app/pages/about/changelog/changelog-page.component.ts +++ b/apps/client/src/app/pages/about/changelog/changelog-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-changelog-page', styleUrls: ['./changelog-page.scss'], - templateUrl: './changelog-page.html', - standalone: false + templateUrl: './changelog-page.html' }) export class ChangelogPageComponent implements OnDestroy { public isLoading = true; diff --git a/apps/client/src/app/pages/about/changelog/changelog-page.module.ts b/apps/client/src/app/pages/about/changelog/changelog-page.module.ts deleted file mode 100644 index e81e6805f..000000000 --- a/apps/client/src/app/pages/about/changelog/changelog-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/changelog/changelog-page-routing.module.ts b/apps/client/src/app/pages/about/changelog/changelog-page.routes.ts similarity index 58% rename from apps/client/src/app/pages/about/changelog/changelog-page-routing.module.ts rename to apps/client/src/app/pages/about/changelog/changelog-page.routes.ts index d69da3f64..78ac2ad9e 100644 --- a/apps/client/src/app/pages/about/changelog/changelog-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {} diff --git a/apps/client/src/app/pages/about/license/license-page.component.ts b/apps/client/src/app/pages/about/license/license-page.component.ts index deec0de60..0d4b2a97c 100644 --- a/apps/client/src/app/pages/about/license/license-page.component.ts +++ b/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', - standalone: false + templateUrl: './license-page.html' }) export class LicensePageComponent implements OnDestroy { private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/pages/about/license/license-page.module.ts b/apps/client/src/app/pages/about/license/license-page.module.ts deleted file mode 100644 index d18b48309..000000000 --- a/apps/client/src/app/pages/about/license/license-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/license/license-page-routing.module.ts b/apps/client/src/app/pages/about/license/license-page.routes.ts similarity index 57% rename from apps/client/src/app/pages/about/license/license-page-routing.module.ts rename to apps/client/src/app/pages/about/license/license-page.routes.ts index af884e35c..d842485ed 100644 --- a/apps/client/src/app/pages/about/license/license-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {} diff --git a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.component.ts b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.component.ts index 86dcd4ed3..fefda7abd 100644 --- a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.component.ts +++ b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.component.ts @@ -6,8 +6,7 @@ const ossFriends = require('../../../../assets/oss-friends.json'); @Component({ selector: 'gf-oss-friends-page', styleUrls: ['./oss-friends-page.scss'], - templateUrl: './oss-friends-page.html', - standalone: false + templateUrl: './oss-friends-page.html' }) export class OpenSourceSoftwareFriendsPageComponent implements OnDestroy { public ossFriends = ossFriends.data; diff --git a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.module.ts b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.module.ts deleted file mode 100644 index 95cf9c3c3..000000000 --- a/apps/client/src/app/pages/about/oss-friends/oss-friends-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/oss-friends/oss-friends-page-routing.module.ts b/apps/client/src/app/pages/about/oss-friends/oss-friends-page.routes.ts similarity index 59% rename from apps/client/src/app/pages/about/oss-friends/oss-friends-page-routing.module.ts rename to apps/client/src/app/pages/about/oss-friends/oss-friends-page.routes.ts index 3b21e89e4..ac0bd2a9f 100644 --- a/apps/client/src/app/pages/about/oss-friends/oss-friends-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {} diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.component.ts b/apps/client/src/app/pages/about/overview/about-overview-page.component.ts index afb260d20..58408d995 100644 --- a/apps/client/src/app/pages/about/overview/about-overview-page.component.ts +++ b/apps/client/src/app/pages/about/overview/about-overview-page.component.ts @@ -4,15 +4,24 @@ 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 { RouterModule } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ + imports: [CommonModule, RouterModule], + schemas: [CUSTOM_ELEMENTS_SCHEMA], selector: 'gf-about-overview-page', styleUrls: ['./about-overview-page.scss'], - templateUrl: './about-overview-page.html', - standalone: false + templateUrl: './about-overview-page.html' }) export class AboutOverviewPageComponent implements OnDestroy, OnInit { public hasPermissionForStatistics: boolean; diff --git a/apps/client/src/app/pages/about/overview/about-overview-page.module.ts b/apps/client/src/app/pages/about/overview/about-overview-page.module.ts deleted file mode 100644 index 594f5b362..000000000 --- a/apps/client/src/app/pages/about/overview/about-overview-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/overview/about-overview-page-routing.module.ts b/apps/client/src/app/pages/about/overview/about-overview-page.routes.ts similarity index 51% rename from apps/client/src/app/pages/about/overview/about-overview-page-routing.module.ts rename to apps/client/src/app/pages/about/overview/about-overview-page.routes.ts index 989dddc9d..8774ceee5 100644 --- a/apps/client/src/app/pages/about/overview/about-overview-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {} diff --git a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.component.ts b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.component.ts index 0dc1aab13..166963f9d 100644 --- a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.component.ts +++ b/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' }) diff --git a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.module.ts b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.module.ts deleted file mode 100644 index b33aea784..000000000 --- a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page-routing.module.ts b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.routes.ts similarity index 58% rename from apps/client/src/app/pages/about/privacy-policy/privacy-policy-page-routing.module.ts rename to apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.routes.ts index 83177bbe8..950fee5b5 100644 --- a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {} diff --git a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.component.ts b/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.component.ts index bd4e126ac..4278bb69f 100644 --- a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.component.ts +++ b/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' }) diff --git a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.module.ts b/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.module.ts deleted file mode 100644 index 5861cbb16..000000000 --- a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.module.ts +++ /dev/null @@ -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 {} diff --git a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page-routing.module.ts b/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.routes.ts similarity index 59% rename from apps/client/src/app/pages/about/terms-of-service/terms-of-service-page-routing.module.ts rename to apps/client/src/app/pages/about/terms-of-service/terms-of-service-page.routes.ts index c2b52a9f5..1cc6907c5 100644 --- a/apps/client/src/app/pages/about/terms-of-service/terms-of-service-page-routing.module.ts +++ b/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 { RouterModule, Routes } from '@angular/router'; +import { 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 {}