Browse Source

Move holdings to internalRoutes (subRoute)

pull/4863/head
Thomas Kaul 3 months ago
parent
commit
c78fe6a294
  1. 4
      apps/client/src/app/pages/home/home-page-routing.module.ts
  2. 7
      apps/client/src/app/pages/home/home-page.component.ts
  3. 16
      apps/client/src/app/pages/zen/zen-page-routing.module.ts
  4. 7
      apps/client/src/app/pages/zen/zen-page.component.ts
  5. 15
      libs/common/src/lib/routes.ts

4
apps/client/src/app/pages/home/home-page-routing.module.ts

@ -23,9 +23,9 @@ const routes: Routes = [
component: HomeOverviewComponent component: HomeOverviewComponent
}, },
{ {
path: ghostfolioRoutes.holdings, path: internalRoutes.home.subRoutes.holdings.path,
component: HomeHoldingsComponent, component: HomeHoldingsComponent,
title: $localize`Holdings` title: internalRoutes.home.subRoutes.holdings.title
}, },
{ {
path: ghostfolioRoutes.summary, path: ghostfolioRoutes.summary,

7
apps/client/src/app/pages/home/home-page.component.ts

@ -41,8 +41,11 @@ export class HomePageComponent implements OnDestroy, OnInit {
}, },
{ {
iconName: 'wallet-outline', iconName: 'wallet-outline',
label: $localize`Holdings`, label: internalRoutes.home.subRoutes.holdings.title,
path: ['/' + internalRoutes.home.path, routes.holdings] path: [
'/' + internalRoutes.home.path,
internalRoutes.home.subRoutes.holdings.path
]
}, },
{ {
iconName: 'reader-outline', iconName: 'reader-outline',

16
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 { HomeHoldingsComponent } from '@ghostfolio/client/components/home-holdings/home-holdings.component';
import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component'; import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overview/home-overview.component';
import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
import { import { internalRoutes } from '@ghostfolio/common/routes';
routes as ghostfolioRoutes,
internalRoutes
} from '@ghostfolio/common/routes';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
@ -15,8 +12,15 @@ const routes: Routes = [
{ {
canActivate: [AuthGuard], canActivate: [AuthGuard],
children: [ 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, component: ZenPageComponent,
path: '', path: '',

7
apps/client/src/app/pages/zen/zen-page.component.ts

@ -1,6 +1,6 @@
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { TabConfiguration, User } from '@ghostfolio/common/interfaces'; 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 { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
import { DeviceDetectorService } from 'ngx-device-detector'; import { DeviceDetectorService } from 'ngx-device-detector';
@ -39,7 +39,10 @@ export class ZenPageComponent implements OnDestroy, OnInit {
{ {
iconName: 'wallet-outline', iconName: 'wallet-outline',
label: internalRoutes.zen.title, label: internalRoutes.zen.title,
path: ['/' + internalRoutes.zen.path, routes.holdings] path: [
'/' + internalRoutes.zen.path,
internalRoutes.zen.subRoutes.holdings.path
]
} }
]; ];
this.user = state.user; this.user = state.user;

15
libs/common/src/lib/routes.ts

@ -9,7 +9,6 @@ export const routes = {
auth: 'auth', auth: 'auth',
demo: 'demo', demo: 'demo',
fire: 'fire', fire: 'fire',
holdings: 'holdings',
i18n: 'i18n', i18n: 'i18n',
jobs: 'jobs', jobs: 'jobs',
market: 'market', market: 'market',
@ -54,7 +53,12 @@ export const internalRoutes = {
home: { home: {
excludeFromAssistant: true, excludeFromAssistant: true,
path: 'home', path: 'home',
subRoutes: {}, subRoutes: {
holdings: {
path: 'holdings',
title: $localize`Holdings`
}
},
title: $localize`Overview` title: $localize`Overview`
}, },
portfolio: { portfolio: {
@ -70,7 +74,12 @@ export const internalRoutes = {
zen: { zen: {
excludeFromAssistant: true, excludeFromAssistant: true,
path: 'zen', path: 'zen',
subRoutes: {}, subRoutes: {
holdings: {
path: 'holdings',
title: $localize`Holdings`
}
},
title: $localize`Overview` title: $localize`Overview`
} }
}; };

Loading…
Cancel
Save