diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 9d5123d1b..dae10fbf1 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -141,7 +141,7 @@ const routes: Routes = [ { path: internalRoutes.zen.path, loadChildren: () => - import('./pages/zen/zen-page.module').then((m) => m.ZenPageModule) + import('./pages/zen/zen-page.routes').then((m) => m.routes) }, { // wildcard, if requested url doesn't match any paths for routes defined diff --git a/apps/client/src/app/pages/zen/zen-page-routing.module.ts b/apps/client/src/app/pages/zen/zen-page-routing.module.ts index 84099425c..aa652aa39 100644 --- a/apps/client/src/app/pages/zen/zen-page-routing.module.ts +++ b/apps/client/src/app/pages/zen/zen-page-routing.module.ts @@ -1,11 +1,10 @@ -import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; -import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; -import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; import { internalRoutes } from '@ghostfolio/common/routes/routes'; -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; +import { GfHomeHoldingsComponent } from '../../components/home-holdings/home-holdings.component'; +import { GfHomeOverviewComponent } from '../../components/home-overview/home-overview.component'; +import { AuthGuard } from '../../core/auth.guard'; import { ZenPageComponent } from './zen-page.component'; const routes: Routes = [ @@ -28,8 +27,4 @@ const routes: Routes = [ } ]; -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class ZenPageRoutingModule {} +export { routes }; diff --git a/apps/client/src/app/pages/zen/zen-page.component.ts b/apps/client/src/app/pages/zen/zen-page.component.ts index 397a2eb47..19409384c 100644 --- a/apps/client/src/app/pages/zen/zen-page.component.ts +++ b/apps/client/src/app/pages/zen/zen-page.component.ts @@ -2,7 +2,11 @@ import { UserService } from '@ghostfolio/client/services/user/user.service'; import { TabConfiguration, User } from '@ghostfolio/common/interfaces'; import { internalRoutes } from '@ghostfolio/common/routes/routes'; +import { CommonModule } from '@angular/common'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +import { MatTabsModule } from '@angular/material/tabs'; +import { RouterModule } from '@angular/router'; +import { IonIcon } from '@ionic/angular/standalone'; import { addIcons } from 'ionicons'; import { analyticsOutline, walletOutline } from 'ionicons/icons'; import { DeviceDetectorService } from 'ngx-device-detector'; @@ -14,7 +18,8 @@ import { takeUntil } from 'rxjs/operators'; selector: 'gf-zen-page', styleUrls: ['./zen-page.scss'], templateUrl: './zen-page.html', - standalone: false + standalone: true, + imports: [CommonModule, MatTabsModule, RouterModule, IonIcon] }) export class ZenPageComponent implements OnDestroy, OnInit { public deviceType: string; diff --git a/apps/client/src/app/pages/zen/zen-page.module.ts b/apps/client/src/app/pages/zen/zen-page.module.ts deleted file mode 100644 index 2346e3705..000000000 --- a/apps/client/src/app/pages/zen/zen-page.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; -import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; - -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 { IonIcon } from '@ionic/angular/standalone'; - -import { ZenPageRoutingModule } from './zen-page-routing.module'; -import { ZenPageComponent } from './zen-page.component'; - -@NgModule({ - declarations: [ZenPageComponent], - imports: [ - CommonModule, - GfHomeHoldingsComponent, - GfHomeOverviewComponent, - IonIcon, - MatTabsModule, - RouterModule, - ZenPageRoutingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] -}) -export class ZenPageModule {} diff --git a/apps/client/src/app/pages/zen/zen-page.routes.ts b/apps/client/src/app/pages/zen/zen-page.routes.ts new file mode 100644 index 000000000..358cf706b --- /dev/null +++ b/apps/client/src/app/pages/zen/zen-page.routes.ts @@ -0,0 +1,28 @@ +import { GfHomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; +import { GfHomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; +import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; +import { internalRoutes } from '@ghostfolio/common/routes/routes'; + +import { Routes } from '@angular/router'; + +import { ZenPageComponent } from './zen-page.component'; + +export const routes: Routes = [ + { + canActivate: [AuthGuard], + children: [ + { + path: '', + component: GfHomeOverviewComponent + }, + { + path: internalRoutes.zen.subRoutes.holdings.path, + component: GfHomeHoldingsComponent, + title: internalRoutes.home.subRoutes.holdings.title + } + ], + component: ZenPageComponent, + path: '', + title: internalRoutes.zen.title + } +];