From ef0782e99caf2a8e340aedaeabfb85d13988f0fe Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 15 Jun 2025 09:48:00 +0200 Subject: [PATCH] Refactor public routes: markets --- apps/client/src/app/app-routing.module.ts | 2 +- apps/client/src/app/app.component.ts | 4 ++-- apps/client/src/app/components/header/header.component.ts | 4 ++-- apps/client/src/app/core/auth.guard.ts | 2 +- .../500-stars-on-github/500-stars-on-github-page.component.ts | 4 ++-- .../blog/2023/09/ghostfolio-2/ghostfolio-2-page.component.ts | 2 +- apps/client/src/app/pages/faq/saas/saas-page.component.ts | 2 +- .../src/app/pages/markets/markets-page-routing.module.ts | 3 ++- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 241d95493..0bfc12268 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -92,7 +92,7 @@ const routes: Routes = [ title: $localize`Internationalization` }, { - path: ghostfolioRoutes.markets, + path: publicRoutes.markets.path, loadChildren: () => import('./pages/markets/markets-page.module').then( (m) => m.MarketsPageModule diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts index d2805314d..84e220a28 100644 --- a/apps/client/src/app/app.component.ts +++ b/apps/client/src/app/app.component.ts @@ -81,7 +81,7 @@ export class AppComponent implements OnDestroy, OnInit { public routerLinkBlog = publicRoutes.blog.routerLink; public routerLinkFaq = ['/' + routes.faq]; public routerLinkFeatures = publicRoutes.features.routerLink; - public routerLinkMarkets = ['/' + routes.markets]; + public routerLinkMarkets = publicRoutes.markets.routerLink; public routerLinkOpenStartup = publicRoutes.openStartup.routerLink; public routerLinkPricing = publicRoutes.pricing.routerLink; public routerLinkRegister = publicRoutes.register.routerLink; @@ -213,7 +213,7 @@ export class AppComponent implements OnDestroy, OnInit { this.showFooter = (this.currentRoute === publicRoutes.blog.path || this.currentRoute === publicRoutes.features.path || - this.currentRoute === routes.markets || + this.currentRoute === publicRoutes.markets.path || this.currentRoute === publicRoutes.openStartup.path || this.currentRoute === routes.public || this.currentRoute === publicRoutes.pricing.path || diff --git a/apps/client/src/app/components/header/header.component.ts b/apps/client/src/app/components/header/header.component.ts index 71d902139..f6864fa8b 100644 --- a/apps/client/src/app/components/header/header.component.ts +++ b/apps/client/src/app/components/header/header.component.ts @@ -87,7 +87,7 @@ export class HeaderComponent implements OnChanges { public isMenuOpen: boolean; public routeAbout = routes.about; public routeFeatures = publicRoutes.features.path; - public routeMarkets = routes.markets; + public routeMarkets = publicRoutes.markets.path; public routePricing = publicRoutes.pricing.path; public routeResources = routes.resources; public routerLinkAbout = ['/' + routes.about]; @@ -95,7 +95,7 @@ export class HeaderComponent implements OnChanges { public routerLinkAccounts = internalRoutes.accounts.routerLink; public routerLinkAdminControl = ['/' + routes.adminControl]; public routerLinkFeatures = publicRoutes.features.routerLink; - public routerLinkMarkets = ['/' + routes.markets]; + public routerLinkMarkets = publicRoutes.markets.routerLink; public routerLinkPortfolio = internalRoutes.portfolio.routerLink; public routerLinkPricing = publicRoutes.pricing.routerLink; public routerLinkRegister = publicRoutes.register.routerLink; diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index f472dd63e..02f685a86 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -24,7 +24,7 @@ export class AuthGuard { `/${routes.demo}`, `/${routes.faq}`, `/${publicRoutes.features.path}`, - `/${routes.markets}`, + `/${publicRoutes.markets.path}`, `/${publicRoutes.openStartup.path}`, `/${publicRoutes.pricing.path}`, `/${routes.public}`, diff --git a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts index 3cf7d4b97..9004ac0e2 100644 --- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts +++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.component.ts @@ -1,4 +1,4 @@ -import { publicRoutes, routes } from '@ghostfolio/common/routes/routes'; +import { publicRoutes } from '@ghostfolio/common/routes/routes'; import { Component } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; @@ -12,6 +12,6 @@ import { RouterModule } from '@angular/router'; }) export class FiveHundredStarsOnGitHubPageComponent { public routerLinkBlog = publicRoutes.blog.routerLink; - public routerLinkMarkets = ['/' + routes.markets]; + public routerLinkMarkets = publicRoutes.markets.routerLink; public routerLinkPricing = publicRoutes.pricing.routerLink; } diff --git a/apps/client/src/app/pages/blog/2023/09/ghostfolio-2/ghostfolio-2-page.component.ts b/apps/client/src/app/pages/blog/2023/09/ghostfolio-2/ghostfolio-2-page.component.ts index fb3b1d818..14d6e19d8 100644 --- a/apps/client/src/app/pages/blog/2023/09/ghostfolio-2/ghostfolio-2-page.component.ts +++ b/apps/client/src/app/pages/blog/2023/09/ghostfolio-2/ghostfolio-2-page.component.ts @@ -15,5 +15,5 @@ export class Ghostfolio2PageComponent { public routerLinkAboutChangelog = ['/' + routes.about, routes.changelog]; public routerLinkBlog = publicRoutes.blog.routerLink; public routerLinkFeatures = publicRoutes.features.routerLink; - public routerLinkMarkets = ['/' + routes.markets]; + public routerLinkMarkets = publicRoutes.markets.routerLink; } diff --git a/apps/client/src/app/pages/faq/saas/saas-page.component.ts b/apps/client/src/app/pages/faq/saas/saas-page.component.ts index 20c16ffff..e3fba4d21 100644 --- a/apps/client/src/app/pages/faq/saas/saas-page.component.ts +++ b/apps/client/src/app/pages/faq/saas/saas-page.component.ts @@ -23,7 +23,7 @@ export class SaasPageComponent implements OnDestroy { '/' + internalRoutes.account.path, routes.membership ]; - public routerLinkMarkets = ['/' + routes.markets]; + public routerLinkMarkets = publicRoutes.markets.routerLink; public routerLinkRegister = publicRoutes.register.routerLink; public user: User; diff --git a/apps/client/src/app/pages/markets/markets-page-routing.module.ts b/apps/client/src/app/pages/markets/markets-page-routing.module.ts index 6501d58b9..05ab9b275 100644 --- a/apps/client/src/app/pages/markets/markets-page-routing.module.ts +++ b/apps/client/src/app/pages/markets/markets-page-routing.module.ts @@ -1,4 +1,5 @@ import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; +import { publicRoutes } from '@ghostfolio/common/routes/routes'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -10,7 +11,7 @@ const routes: Routes = [ canActivate: [AuthGuard], component: MarketsPageComponent, path: '', - title: $localize`Markets` + title: publicRoutes.markets.title } ];