From c78fe6a294b70b5ecad1bf4e1073563463a28dac Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 8 Jun 2025 12:54:54 +0200 Subject: [PATCH] Move holdings to internalRoutes (subRoute) --- .../app/pages/home/home-page-routing.module.ts | 4 ++-- .../src/app/pages/home/home-page.component.ts | 7 +++++-- .../src/app/pages/zen/zen-page-routing.module.ts | 16 ++++++++++------ .../src/app/pages/zen/zen-page.component.ts | 7 +++++-- libs/common/src/lib/routes.ts | 15 ++++++++++++--- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/apps/client/src/app/pages/home/home-page-routing.module.ts b/apps/client/src/app/pages/home/home-page-routing.module.ts index a1f0b97a7..7f00ceabe 100644 --- a/apps/client/src/app/pages/home/home-page-routing.module.ts +++ b/apps/client/src/app/pages/home/home-page-routing.module.ts @@ -23,9 +23,9 @@ const routes: Routes = [ component: HomeOverviewComponent }, { - path: ghostfolioRoutes.holdings, + path: internalRoutes.home.subRoutes.holdings.path, component: HomeHoldingsComponent, - title: $localize`Holdings` + title: internalRoutes.home.subRoutes.holdings.title }, { path: ghostfolioRoutes.summary, diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts index 8d56fc620..000dff24c 100644 --- a/apps/client/src/app/pages/home/home-page.component.ts +++ b/apps/client/src/app/pages/home/home-page.component.ts @@ -41,8 +41,11 @@ export class HomePageComponent implements OnDestroy, OnInit { }, { iconName: 'wallet-outline', - label: $localize`Holdings`, - path: ['/' + internalRoutes.home.path, routes.holdings] + label: internalRoutes.home.subRoutes.holdings.title, + path: [ + '/' + internalRoutes.home.path, + internalRoutes.home.subRoutes.holdings.path + ] }, { iconName: 'reader-outline', 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 45e0597e9..8ca947957 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,10 +1,7 @@ import { HomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component'; import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; -import { - routes as ghostfolioRoutes, - internalRoutes -} from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -15,8 +12,15 @@ const routes: Routes = [ { canActivate: [AuthGuard], children: [ - { path: '', component: HomeOverviewComponent }, - { path: ghostfolioRoutes.holdings, component: HomeHoldingsComponent } + { + path: '', + component: HomeOverviewComponent + }, + { + path: internalRoutes.zen.subRoutes.holdings.path, + component: HomeHoldingsComponent, + title: internalRoutes.home.subRoutes.holdings.title + } ], component: ZenPageComponent, path: '', 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 c5869bf91..c199c5e9e 100644 --- a/apps/client/src/app/pages/zen/zen-page.component.ts +++ b/apps/client/src/app/pages/zen/zen-page.component.ts @@ -1,6 +1,6 @@ import { UserService } from '@ghostfolio/client/services/user/user.service'; import { TabConfiguration, User } from '@ghostfolio/common/interfaces'; -import { internalRoutes, routes } from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { DeviceDetectorService } from 'ngx-device-detector'; @@ -39,7 +39,10 @@ export class ZenPageComponent implements OnDestroy, OnInit { { iconName: 'wallet-outline', label: internalRoutes.zen.title, - path: ['/' + internalRoutes.zen.path, routes.holdings] + path: [ + '/' + internalRoutes.zen.path, + internalRoutes.zen.subRoutes.holdings.path + ] } ]; this.user = state.user; diff --git a/libs/common/src/lib/routes.ts b/libs/common/src/lib/routes.ts index a7e255fc5..9e3b6de22 100644 --- a/libs/common/src/lib/routes.ts +++ b/libs/common/src/lib/routes.ts @@ -9,7 +9,6 @@ export const routes = { auth: 'auth', demo: 'demo', fire: 'fire', - holdings: 'holdings', i18n: 'i18n', jobs: 'jobs', market: 'market', @@ -54,7 +53,12 @@ export const internalRoutes = { home: { excludeFromAssistant: true, path: 'home', - subRoutes: {}, + subRoutes: { + holdings: { + path: 'holdings', + title: $localize`Holdings` + } + }, title: $localize`Overview` }, portfolio: { @@ -70,7 +74,12 @@ export const internalRoutes = { zen: { excludeFromAssistant: true, path: 'zen', - subRoutes: {}, + subRoutes: { + holdings: { + path: 'holdings', + title: $localize`Holdings` + } + }, title: $localize`Overview` } };