Browse Source

Move portfolio to internalRoutes

pull/4863/head
Thomas Kaul 3 months ago
parent
commit
4b0080e69d
  1. 2
      apps/client/src/app/app-routing.module.ts
  2. 20
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
  3. 2
      apps/client/src/app/components/header/header.component.ts
  4. 20
      apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
  5. 4
      apps/client/src/app/components/home-holdings/home-holdings.component.ts
  6. 4
      apps/client/src/app/components/home-overview/home-overview.component.ts
  7. 7
      apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts
  8. 12
      apps/client/src/app/pages/portfolio/portfolio-page.component.ts
  9. 8
      libs/common/src/lib/routes.ts
  10. 4
      libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts

2
apps/client/src/app/app-routing.module.ts

@ -104,7 +104,7 @@ const routes: Routes = [
import('./pages/open/open-page.module').then((m) => m.OpenPageModule) import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
}, },
{ {
path: ghostfolioRoutes.portfolio, path: internalRoutes.portfolio.path,
loadChildren: () => loadChildren: () =>
import('./pages/portfolio/portfolio-page.module').then( import('./pages/portfolio/portfolio-page.module').then(
(m) => m.PortfolioPageModule (m) => m.PortfolioPageModule

20
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@ -10,7 +10,7 @@ import {
User User
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { routes } from '@ghostfolio/common/routes'; import { internalRoutes, routes } from '@ghostfolio/common/routes';
import { OrderWithAccount } from '@ghostfolio/common/types'; import { OrderWithAccount } from '@ghostfolio/common/types';
import { import {
@ -93,9 +93,12 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
} }
public onCloneActivity(aActivity: Activity) { public onCloneActivity(aActivity: Activity) {
this.router.navigate(['/' + routes.portfolio, routes.activities], { this.router.navigate(
queryParams: { activityId: aActivity.id, createDialog: true } ['/' + internalRoutes.portfolio.path, routes.activities],
}); {
queryParams: { activityId: aActivity.id, createDialog: true }
}
);
this.dialogRef.close(); this.dialogRef.close();
} }
@ -152,9 +155,12 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
} }
public onUpdateActivity(aActivity: Activity) { public onUpdateActivity(aActivity: Activity) {
this.router.navigate(['/' + routes.portfolio, routes.activities], { this.router.navigate(
queryParams: { activityId: aActivity.id, editDialog: true } ['/' + internalRoutes.portfolio.path, routes.activities],
}); {
queryParams: { activityId: aActivity.id, editDialog: true }
}
);
this.dialogRef.close(); this.dialogRef.close();
} }

2
apps/client/src/app/components/header/header.component.ts

@ -96,7 +96,7 @@ export class HeaderComponent implements OnChanges {
public routerLinkAdminControl = ['/' + routes.adminControl]; public routerLinkAdminControl = ['/' + routes.adminControl];
public routerLinkFeatures = ['/' + routes.features]; public routerLinkFeatures = ['/' + routes.features];
public routerLinkMarkets = ['/' + routes.markets]; public routerLinkMarkets = ['/' + routes.markets];
public routerLinkPortfolio = ['/' + routes.portfolio]; public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path];
public routerLinkPricing = ['/' + routes.pricing]; public routerLinkPricing = ['/' + routes.pricing];
public routerLinkRegister = ['/' + publicRoutes.register.path]; public routerLinkRegister = ['/' + publicRoutes.register.path];
public routerLinkResources = ['/' + routes.resources]; public routerLinkResources = ['/' + routes.resources];

20
apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@ -14,7 +14,7 @@ import {
User User
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { routes } from '@ghostfolio/common/routes'; import { internalRoutes, routes } from '@ghostfolio/common/routes';
import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table'; import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
import { GfDataProviderCreditsComponent } from '@ghostfolio/ui/data-provider-credits'; import { GfDataProviderCreditsComponent } from '@ghostfolio/ui/data-provider-credits';
import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor'; import { GfHistoricalMarketDataEditorComponent } from '@ghostfolio/ui/historical-market-data-editor';
@ -470,9 +470,12 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
} }
public onCloneActivity(aActivity: Activity) { public onCloneActivity(aActivity: Activity) {
this.router.navigate(['/' + routes.portfolio, routes.activities], { this.router.navigate(
queryParams: { activityId: aActivity.id, createDialog: true } ['/' + internalRoutes.portfolio.path, routes.activities],
}); {
queryParams: { activityId: aActivity.id, createDialog: true }
}
);
this.dialogRef.close(); this.dialogRef.close();
} }
@ -512,9 +515,12 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
} }
public onUpdateActivity(aActivity: Activity) { public onUpdateActivity(aActivity: Activity) {
this.router.navigate(['/' + routes.portfolio, routes.activities], { this.router.navigate(
queryParams: { activityId: aActivity.id, editDialog: true } ['/' + internalRoutes.portfolio.path, routes.activities],
}); {
queryParams: { activityId: aActivity.id, editDialog: true }
}
);
this.dialogRef.close(); this.dialogRef.close();
} }

4
apps/client/src/app/components/home-holdings/home-holdings.component.ts

@ -8,7 +8,7 @@ import {
User User
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { routes } from '@ghostfolio/common/routes'; import { internalRoutes, routes } from '@ghostfolio/common/routes';
import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types'; import { HoldingType, HoldingsViewMode } from '@ghostfolio/common/types';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
@ -38,7 +38,7 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {
{ label: $localize`Closed`, value: 'CLOSED' } { label: $localize`Closed`, value: 'CLOSED' }
]; ];
public routerLinkPortfolioActivities = [ public routerLinkPortfolioActivities = [
'/' + routes.portfolio, '/' + internalRoutes.portfolio.path,
routes.activities routes.activities
]; ];
public user: User; public user: User;

4
apps/client/src/app/components/home-overview/home-overview.component.ts

@ -38,9 +38,9 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
public performance: PortfolioPerformance; public performance: PortfolioPerformance;
public precision = 2; public precision = 2;
public routerLinkAccounts = ['/' + internalRoutes.accounts.path]; public routerLinkAccounts = ['/' + internalRoutes.accounts.path];
public routerLinkPortfolio = ['/' + routes.portfolio]; public routerLinkPortfolio = ['/' + internalRoutes.portfolio.path];
public routerLinkPortfolioActivities = [ public routerLinkPortfolioActivities = [
'/' + routes.portfolio, '/' + internalRoutes.portfolio.path,
routes.activities routes.activities
]; ];
public showDetails = false; public showDetails = false;

7
apps/client/src/app/pages/portfolio/portfolio-page-routing.module.ts

@ -1,5 +1,8 @@
import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
import { routes as ghostfolioRoutes } from '@ghostfolio/common/routes'; import {
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';
@ -44,7 +47,7 @@ const routes: Routes = [
], ],
component: PortfolioPageComponent, component: PortfolioPageComponent,
path: '', path: '',
title: $localize`Portfolio` title: internalRoutes.portfolio.title
} }
]; ];

12
apps/client/src/app/pages/portfolio/portfolio-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 { routes } from '@ghostfolio/common/routes'; import { internalRoutes, routes } 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';
@ -34,27 +34,27 @@ export class PortfolioPageComponent implements OnDestroy, OnInit {
{ {
iconName: 'analytics-outline', iconName: 'analytics-outline',
label: $localize`Analysis`, label: $localize`Analysis`,
path: ['/' + routes.portfolio] path: ['/' + internalRoutes.portfolio.path]
}, },
{ {
iconName: 'swap-vertical-outline', iconName: 'swap-vertical-outline',
label: $localize`Activities`, label: $localize`Activities`,
path: ['/' + routes.portfolio, routes.activities] path: ['/' + internalRoutes.portfolio.path, routes.activities]
}, },
{ {
iconName: 'pie-chart-outline', iconName: 'pie-chart-outline',
label: $localize`Allocations`, label: $localize`Allocations`,
path: ['/' + routes.portfolio, routes.allocations] path: ['/' + internalRoutes.portfolio.path, routes.allocations]
}, },
{ {
iconName: 'calculator-outline', iconName: 'calculator-outline',
label: 'FIRE ', label: 'FIRE ',
path: ['/' + routes.portfolio, routes.fire] path: ['/' + internalRoutes.portfolio.path, routes.fire]
}, },
{ {
iconName: 'scan-outline', iconName: 'scan-outline',
label: 'X-ray', label: 'X-ray',
path: ['/' + routes.portfolio, routes.xRay] path: ['/' + internalRoutes.portfolio.path, routes.xRay]
} }
]; ];
this.user = state.user; this.user = state.user;

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

@ -17,7 +17,6 @@ export const routes = {
marketData: 'market-data', marketData: 'market-data',
membership: 'membership', membership: 'membership',
personalFinanceTools: 'personal-finance-tools', personalFinanceTools: 'personal-finance-tools',
portfolio: 'portfolio',
public: 'p', public: 'p',
saas: 'saas', saas: 'saas',
settings: 'settings', settings: 'settings',
@ -55,11 +54,18 @@ export const internalRoutes = {
title: $localize`Accounts` title: $localize`Accounts`
}, },
home: { home: {
excludeFromAssistant: true,
path: 'home', path: 'home',
subRoutes: {}, subRoutes: {},
title: $localize`Overview` title: $localize`Overview`
}, },
portfolio: {
path: 'portfolio',
subRoutes: {},
title: $localize`Portfolio`
},
zen: { zen: {
excludeFromAssistant: true,
path: 'zen', path: 'zen',
subRoutes: {}, subRoutes: {},
title: $localize`Overview` title: $localize`Overview`

4
libs/ui/src/lib/no-transactions-info/no-transactions-info.component.ts

@ -1,4 +1,4 @@
import { routes } from '@ghostfolio/common/routes'; import { internalRoutes, routes } from '@ghostfolio/common/routes';
import { import {
CUSTOM_ELEMENTS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA,
@ -24,7 +24,7 @@ export class GfNoTransactionsInfoComponent {
@HostBinding('class.has-border') @Input() hasBorder = true; @HostBinding('class.has-border') @Input() hasBorder = true;
public routerLinkPortfolioActivities = [ public routerLinkPortfolioActivities = [
'/' + routes.portfolio, '/' + internalRoutes.portfolio.path,
routes.activities routes.activities
]; ];
} }

Loading…
Cancel
Save