diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts index bb764f05e..a753270e8 100644 --- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts +++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts @@ -10,7 +10,7 @@ import { User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; -import { internalRoutes, routes } from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { OrderWithAccount } from '@ghostfolio/common/types'; import { @@ -94,7 +94,10 @@ export class AccountDetailDialog implements OnDestroy, OnInit { public onCloneActivity(aActivity: Activity) { this.router.navigate( - ['/' + internalRoutes.portfolio.path, routes.activities], + [ + '/' + internalRoutes.portfolio.path, + internalRoutes.portfolio.subRoutes.activities.path + ], { queryParams: { activityId: aActivity.id, createDialog: true } } @@ -156,7 +159,10 @@ export class AccountDetailDialog implements OnDestroy, OnInit { public onUpdateActivity(aActivity: Activity) { this.router.navigate( - ['/' + internalRoutes.portfolio.path, routes.activities], + [ + '/' + internalRoutes.portfolio.path, + internalRoutes.portfolio.subRoutes.activities.path + ], { queryParams: { activityId: aActivity.id, editDialog: true } } diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts index 8ceef2f8a..2630569bb 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts @@ -14,7 +14,7 @@ import { User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; -import { internalRoutes, routes } from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table'; import { GfDataProviderCreditsComponent } from '@ghostfolio/ui/data-provider-credits'; import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor'; @@ -471,7 +471,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public onCloneActivity(aActivity: Activity) { this.router.navigate( - ['/' + internalRoutes.portfolio.path, routes.activities], + [ + '/' + internalRoutes.portfolio.path, + internalRoutes.portfolio.subRoutes.activities.path + ], { queryParams: { activityId: aActivity.id, createDialog: true } } @@ -516,7 +519,10 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public onUpdateActivity(aActivity: Activity) { this.router.navigate( - ['/' + internalRoutes.portfolio.path, routes.activities], + [ + '/' + internalRoutes.portfolio.path, + internalRoutes.portfolio.subRoutes.activities.path + ], { queryParams: { activityId: aActivity.id, editDialog: true } } diff --git a/apps/client/src/app/components/home-holdings/home-holdings.component.ts b/apps/client/src/app/components/home-holdings/home-holdings.component.ts index c1b5974ac..c84d2b7d7 100644 --- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts +++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts @@ -8,7 +8,7 @@ import { User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; -import { internalRoutes, routes } from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; @@ -39,7 +39,7 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit { ]; public routerLinkPortfolioActivities = [ '/' + internalRoutes.portfolio.path, - routes.activities + internalRoutes.portfolio.subRoutes.activities.path ]; public user: User; public viewModeFormControl = new FormControl( diff --git a/apps/client/src/app/components/home-overview/home-overview.component.ts b/apps/client/src/app/components/home-overview/home-overview.component.ts index 35082c724..cbb955f7a 100644 --- a/apps/client/src/app/components/home-overview/home-overview.component.ts +++ b/apps/client/src/app/components/home-overview/home-overview.component.ts @@ -11,7 +11,7 @@ import { User } from '@ghostfolio/common/interfaces'; import { hasPermission, permissions } from '@ghostfolio/common/permissions'; -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'; @@ -41,7 +41,7 @@ export class HomeOverviewComponent implements OnDestroy, OnInit { public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path]; public routerLinkPortfolioActivities = [ '/' + internalRoutes.portfolio.path, - routes.activities + internalRoutes.portfolio.subRoutes.activities.path ]; public showDetails = false; public unit: string; diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts b/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts index 00962d563..38a594c99 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page-routing.module.ts @@ -1,4 +1,5 @@ import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -10,7 +11,7 @@ const routes: Routes = [ canActivate: [AuthGuard], component: ActivitiesPageComponent, path: '', - title: $localize`Activities` + title: internalRoutes.portfolio.subRoutes.activities.title } ]; diff --git a/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts index 889fac555..87c1a2785 100644 --- a/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts +++ b/apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts @@ -21,7 +21,7 @@ const routes: Routes = [ ) }, { - path: ghostfolioRoutes.activities, + path: internalRoutes.portfolio.subRoutes.activities.path, loadChildren: () => import('./activities/activities-page.module').then( (m) => m.ActivitiesPageModule diff --git a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts index 29723ea92..91746a1ec 100644 --- a/apps/client/src/app/pages/portfolio/portfolio-page.component.ts +++ b/apps/client/src/app/pages/portfolio/portfolio-page.component.ts @@ -38,8 +38,11 @@ export class PortfolioPageComponent implements OnDestroy, OnInit { }, { iconName: 'swap-vertical-outline', - label: $localize`Activities`, - path: ['/' + internalRoutes.portfolio.path, routes.activities] + label: internalRoutes.portfolio.subRoutes.activities.title, + path: [ + '/' + internalRoutes.portfolio.path, + internalRoutes.portfolio.subRoutes.activities.path + ] }, { iconName: 'pie-chart-outline', 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 06080013b..c5869bf91 100644 --- a/apps/client/src/app/pages/zen/zen-page.component.ts +++ b/apps/client/src/app/pages/zen/zen-page.component.ts @@ -38,7 +38,7 @@ export class ZenPageComponent implements OnDestroy, OnInit { }, { iconName: 'wallet-outline', - label: $localize`Holdings`, + label: internalRoutes.zen.title, path: ['/' + internalRoutes.zen.path, routes.holdings] } ]; diff --git a/libs/common/src/lib/routes.ts b/libs/common/src/lib/routes.ts index 0a9a32c18..a7e255fc5 100644 --- a/libs/common/src/lib/routes.ts +++ b/libs/common/src/lib/routes.ts @@ -3,7 +3,6 @@ import '@angular/localize/init'; export const routes = { access: 'access', account: 'account', - activities: 'activities', adminControl: 'admin', allocations: 'allocations', api: 'api', @@ -60,7 +59,12 @@ export const internalRoutes = { }, portfolio: { path: 'portfolio', - subRoutes: {}, + subRoutes: { + activities: { + path: 'activities', + title: $localize`Activities` + } + }, title: $localize`Portfolio` }, zen: { diff --git a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts index bdcf0f058..e7537a9d3 100644 --- a/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts +++ b/libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts @@ -1,4 +1,4 @@ -import { internalRoutes, routes } from '@ghostfolio/common/routes'; +import { internalRoutes } from '@ghostfolio/common/routes'; import { CUSTOM_ELEMENTS_SCHEMA, @@ -25,6 +25,6 @@ export class GfNoTransactionsInfoComponent { public routerLinkPortfolioActivities = [ '/' + internalRoutes.portfolio.path, - routes.activities + internalRoutes.portfolio.subRoutes.activities.path ]; }