Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/refactor various routes (part 2) (#4949)
Thomas Kaul18f94a1ba15f
diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.tsindex 63eef7250a..a7e587ea89 100644--- a/apps/client/src/app/app-routing.module.ts+++ b/apps/client/src/app/app-routing.module.ts@@ -119,7 +119,7 @@ const routes: Routes = [)},{- path: ghostfolioRoutes.public,+ path: publicRoutes.public.path,loadChildren: () =>import('./pages/public/public-page.module').then((m) => m.PublicPageModulediff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.tsindex 72e8b84d8b..fb39028fcd 100644--- a/apps/client/src/app/app.component.ts+++ b/apps/client/src/app/app.component.ts@@ -3,11 +3,7 @@ import { HoldingDetailDialogParams } from '@ghostfolio/client/components/holdingimport { getCssVariable } from '@ghostfolio/common/helper';import { InfoItem, User } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';-import {- internalRoutes,- publicRoutes,- routes-} from '@ghostfolio/common/routes/routes';+import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';import { ColorScheme } from '@ghostfolio/common/types';import { DOCUMENT } from '@angular/common';@@ -213,7 +209,7 @@ export class AppComponent implements OnDestroy, OnInit {this.currentRoute === publicRoutes.features.path ||this.currentRoute === publicRoutes.markets.path ||this.currentRoute === publicRoutes.openStartup.path ||- this.currentRoute === routes.public ||+ this.currentRoute === publicRoutes.public.path ||this.currentRoute === publicRoutes.pricing.path ||this.currentRoute === publicRoutes.register.path ||this.currentRoute === publicRoutes.start.path) &&diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.tsindex 50d823defa..641156f5bc 100644--- a/apps/client/src/app/components/access-table/access-table.component.ts+++ b/apps/client/src/app/components/access-table/access-table.component.ts@@ -1,7 +1,7 @@import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type';import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';import { Access, User } from '@ghostfolio/common/interfaces';-import { routes } from '@ghostfolio/common/routes/routes';+import { publicRoutes } from '@ghostfolio/common/routes/routes';import { Clipboard } from '@angular/cdk/clipboard';import {@@ -55,7 +55,7 @@ export class AccessTableComponent implements OnChanges {public getPublicUrl(aId: string): string {const languageCode = this.user.settings.language;- return `${this.baseUrl}/${languageCode}/${routes.public}/${aId}`;+ return `${this.baseUrl}/${languageCode}/${publicRoutes.public.path}/${aId}`;}public onCopyUrlToClipboard(aId: string): void {diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.tsindex ef6a8f4a75..69280af6a8 100644--- a/apps/client/src/app/core/auth.guard.ts+++ b/apps/client/src/app/core/auth.guard.ts@@ -1,11 +1,7 @@import { DataService } from '@ghostfolio/client/services/data.service';import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service';import { UserService } from '@ghostfolio/client/services/user/user.service';-import {- internalRoutes,- publicRoutes,- routes-} from '@ghostfolio/common/routes/routes';+import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';import { Injectable } from '@angular/core';import {@@ -27,7 +23,7 @@ export class AuthGuard {`/${publicRoutes.markets.path}`,`/${publicRoutes.openStartup.path}`,`/${publicRoutes.pricing.path}`,- `/${routes.public}`,+ `/${publicRoutes.public.path}`,`/${publicRoutes.register.path}`,`/${publicRoutes.resources.path}`];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.tsindex 68432c17d5..6fa7f1c272 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@@ -4,10 +4,7 @@ import { HomeOverviewComponent } from '@ghostfolio/client/components/home-overviimport { HomeSummaryComponent } from '@ghostfolio/client/components/home-summary/home-summary.component';import { HomeWatchlistComponent } from '@ghostfolio/client/components/home-watchlist/home-watchlist.component';import { AuthGuard } from '@ghostfolio/client/core/auth.guard';-import {- routes as ghostfolioRoutes,- internalRoutes-} from '@ghostfolio/common/routes/routes';+import { internalRoutes } from '@ghostfolio/common/routes/routes';import { NgModule } from '@angular/core';import { RouterModule, Routes } from '@angular/router';@@ -33,9 +30,9 @@ const routes: Routes = [title: internalRoutes.home.subRoutes.summary.title},{- path: ghostfolioRoutes.market,+ path: internalRoutes.home.subRoutes.markets.path,component: HomeMarketComponent,- title: $localize`Markets`+ title: internalRoutes.home.subRoutes.markets.title},{path: internalRoutes.home.subRoutes.watchlist.path,diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.tsindex 68d93520a4..ad9a65a4cd 100644--- a/apps/client/src/app/pages/home/home-page.component.ts+++ b/apps/client/src/app/pages/home/home-page.component.ts@@ -1,7 +1,7 @@import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';import { UserService } from '@ghostfolio/client/services/user/user.service';import { TabConfiguration, User } from '@ghostfolio/common/interfaces';-import { internalRoutes, routes } from '@ghostfolio/common/routes/routes';+import { internalRoutes } from '@ghostfolio/common/routes/routes';import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';import { DeviceDetectorService } from 'ngx-device-detector';@@ -56,8 +56,8 @@ export class HomePageComponent implements OnDestroy, OnInit {},{iconName: 'newspaper-outline',- label: $localize`Markets`,- routerLink: ['/' + internalRoutes.home.path, routes.market]+ label: internalRoutes.home.subRoutes.markets.title,+ routerLink: internalRoutes.home.subRoutes.markets.routerLink}];diff --git a/libs/common/src/lib/routes/routes.ts b/libs/common/src/lib/routes/routes.tsindex 6f60176230..adf2b57040 100644--- a/libs/common/src/lib/routes/routes.ts+++ b/libs/common/src/lib/routes/routes.ts@@ -5,9 +5,7 @@ import { IRoute } from './interfaces/interfaces';export const routes = {api: 'api',i18n: 'i18n',- market: 'market',personalFinanceTools: 'personal-finance-tools',- public: 'p',// Publicly accessible pagesopenSourceAlternativeTo: $localize`:kebab-case:open-source-alternative-to`@@ -79,6 +77,11 @@ export const internalRoutes: Record<string, IRoute> = {routerLink: ['/home', 'holdings'],title: $localize`Holdings`},+ markets: {+ path: 'markets',+ routerLink: ['/home', 'markets'],+ title: $localize`Markets`+ },summary: {path: 'summary',routerLink: ['/home', 'summary'],@@ -240,6 +243,10 @@ export const publicRoutes = {routerLink: ['/' + $localize`:kebab-case:pricing`],title: $localize`Pricing`},+ public: {+ path: 'p',+ routerLink: ['/p']+ },register: {path: $localize`:kebab-case:register`,routerLink: ['/' + $localize`:kebab-case:register`],