From ede486c16adbb4a5a387f71edad509c85da88fa2 Mon Sep 17 00:00:00 2001 From: KenTandrian Date: Fri, 23 May 2025 08:36:13 +0700 Subject: [PATCH] resolve comments --- apps/client/src/app/app-routing.module.ts | 2 +- .../components/admin-settings/admin-settings.component.ts | 3 +-- apps/client/src/app/core/auth.guard.ts | 8 ++++---- apps/client/src/app/core/paths.ts | 2 +- .../app/pages/faq/overview/faq-overview-page.component.ts | 3 +-- apps/client/src/app/pages/faq/saas/saas-page.component.ts | 3 +-- .../pages/faq/self-hosting/self-hosting-page.component.ts | 3 +-- .../personal-finance-tools-page-routing.module.ts | 2 +- 8 files changed, 11 insertions(+), 15 deletions(-) diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 5e1f68c87..00a7548e0 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -100,7 +100,7 @@ const routes: Routes = [ import('./pages/open/open-page.module').then((m) => m.OpenPageModule) }, { - path: paths.p, + path: paths.public, loadChildren: () => import('./pages/public/public-page.module').then( (m) => m.PublicPageModule diff --git a/apps/client/src/app/components/admin-settings/admin-settings.component.ts b/apps/client/src/app/components/admin-settings/admin-settings.component.ts index fa0dac0b0..c465ed63e 100644 --- a/apps/client/src/app/components/admin-settings/admin-settings.component.ts +++ b/apps/client/src/app/components/admin-settings/admin-settings.component.ts @@ -76,8 +76,7 @@ export class AdminSettingsComponent implements OnDestroy, OnInit { const languageCode = this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE; - this.pricingUrl = - `https://ghostfol.io/${languageCode}/` + paths.pricing; + this.pricingUrl = `https://ghostfol.io/${languageCode}/${paths.pricing}`; this.changeDetectorRef.markForCheck(); } diff --git a/apps/client/src/app/core/auth.guard.ts b/apps/client/src/app/core/auth.guard.ts index 2e37445f5..8f88ead4c 100644 --- a/apps/client/src/app/core/auth.guard.ts +++ b/apps/client/src/app/core/auth.guard.ts @@ -23,7 +23,7 @@ export class AuthGuard { `/${paths.features}`, `/${paths.markets}`, `/${paths.open}`, - `/${paths.p}`, + `/${paths.public}`, `/${paths.pricing}`, `/${paths.register}`, `/${paths.resources}` @@ -89,13 +89,13 @@ export class AuthGuard { resolve(true); return; } else if ( - state.url.startsWith('/home') && + state.url.startsWith(`/${paths.home}`) && user.settings.viewMode === 'ZEN' ) { this.router.navigate(['/' + paths.zen]); resolve(false); return; - } else if (state.url.startsWith('/start')) { + } else if (state.url.startsWith(`/${paths.start}`)) { if (user.settings.viewMode === 'ZEN') { this.router.navigate(['/' + paths.zen]); } else { @@ -105,7 +105,7 @@ export class AuthGuard { resolve(false); return; } else if ( - state.url.startsWith('/zen') && + state.url.startsWith(`/${paths.zen}`) && user.settings.viewMode === 'DEFAULT' ) { this.router.navigate(['/' + paths.home]); diff --git a/apps/client/src/app/core/paths.ts b/apps/client/src/app/core/paths.ts index 759260bde..442405f2f 100644 --- a/apps/client/src/app/core/paths.ts +++ b/apps/client/src/app/core/paths.ts @@ -18,7 +18,7 @@ export const paths = { marketData: 'market-data', membership: 'membership', open: 'open', - p: 'p', + public: 'p', personalFinanceTools: 'personal-finance-tools', portfolio: 'portfolio', saas: 'saas', diff --git a/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts b/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts index c91c79e09..7e4196e97 100644 --- a/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts +++ b/apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts @@ -13,8 +13,7 @@ import { Subject, takeUntil } from 'rxjs'; standalone: false }) export class FaqOverviewPageComponent implements OnDestroy { - public pricingUrl = - `https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing; + public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`; public routerLinkFeatures = ['/' + paths.features]; public user: User; 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 2c85c9e7d..b9a40ce4c 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 @@ -13,8 +13,7 @@ import { Subject, takeUntil } from 'rxjs'; standalone: false }) export class SaasPageComponent implements OnDestroy { - public pricingUrl = - `https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing; + public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`; public routerLinkMarkets = ['/' + paths.markets]; public routerLinkRegister = ['/' + paths.register]; public user: User; diff --git a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts index d2f269db1..900a5dbd7 100644 --- a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts +++ b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts @@ -11,8 +11,7 @@ import { Subject } from 'rxjs'; standalone: false }) export class SelfHostingPageComponent implements OnDestroy { - public pricingUrl = - `https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing; + public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`; private unsubscribeSubject = new Subject(); diff --git a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page-routing.module.ts b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page-routing.module.ts index fb370871d..93225c63a 100644 --- a/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page-routing.module.ts +++ b/apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page-routing.module.ts @@ -24,7 +24,7 @@ const routes: Routes = [ return GfProductPageComponent; } ), - path: paths.openSourceAlternativeTo + `-${alias ?? key}`, + path: `${paths.openSourceAlternativeTo}-${alias ?? key}`, title: $localize`Open Source Alternative to ${name}` }; })