Browse Source

resolve comments

pull/4711/head
KenTandrian 3 months ago
parent
commit
ede486c16a
  1. 2
      apps/client/src/app/app-routing.module.ts
  2. 3
      apps/client/src/app/components/admin-settings/admin-settings.component.ts
  3. 8
      apps/client/src/app/core/auth.guard.ts
  4. 2
      apps/client/src/app/core/paths.ts
  5. 3
      apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts
  6. 3
      apps/client/src/app/pages/faq/saas/saas-page.component.ts
  7. 3
      apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts
  8. 2
      apps/client/src/app/pages/resources/personal-finance-tools/personal-finance-tools-page-routing.module.ts

2
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) import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
}, },
{ {
path: paths.p, path: paths.public,
loadChildren: () => loadChildren: () =>
import('./pages/public/public-page.module').then( import('./pages/public/public-page.module').then(
(m) => m.PublicPageModule (m) => m.PublicPageModule

3
apps/client/src/app/components/admin-settings/admin-settings.component.ts

@ -76,8 +76,7 @@ export class AdminSettingsComponent implements OnDestroy, OnInit {
const languageCode = const languageCode =
this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE; this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE;
this.pricingUrl = this.pricingUrl = `https://ghostfol.io/${languageCode}/${paths.pricing}`;
`https://ghostfol.io/${languageCode}/` + paths.pricing;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
} }

8
apps/client/src/app/core/auth.guard.ts

@ -23,7 +23,7 @@ export class AuthGuard {
`/${paths.features}`, `/${paths.features}`,
`/${paths.markets}`, `/${paths.markets}`,
`/${paths.open}`, `/${paths.open}`,
`/${paths.p}`, `/${paths.public}`,
`/${paths.pricing}`, `/${paths.pricing}`,
`/${paths.register}`, `/${paths.register}`,
`/${paths.resources}` `/${paths.resources}`
@ -89,13 +89,13 @@ export class AuthGuard {
resolve(true); resolve(true);
return; return;
} else if ( } else if (
state.url.startsWith('/home') && state.url.startsWith(`/${paths.home}`) &&
user.settings.viewMode === 'ZEN' user.settings.viewMode === 'ZEN'
) { ) {
this.router.navigate(['/' + paths.zen]); this.router.navigate(['/' + paths.zen]);
resolve(false); resolve(false);
return; return;
} else if (state.url.startsWith('/start')) { } else if (state.url.startsWith(`/${paths.start}`)) {
if (user.settings.viewMode === 'ZEN') { if (user.settings.viewMode === 'ZEN') {
this.router.navigate(['/' + paths.zen]); this.router.navigate(['/' + paths.zen]);
} else { } else {
@ -105,7 +105,7 @@ export class AuthGuard {
resolve(false); resolve(false);
return; return;
} else if ( } else if (
state.url.startsWith('/zen') && state.url.startsWith(`/${paths.zen}`) &&
user.settings.viewMode === 'DEFAULT' user.settings.viewMode === 'DEFAULT'
) { ) {
this.router.navigate(['/' + paths.home]); this.router.navigate(['/' + paths.home]);

2
apps/client/src/app/core/paths.ts

@ -18,7 +18,7 @@ export const paths = {
marketData: 'market-data', marketData: 'market-data',
membership: 'membership', membership: 'membership',
open: 'open', open: 'open',
p: 'p', public: 'p',
personalFinanceTools: 'personal-finance-tools', personalFinanceTools: 'personal-finance-tools',
portfolio: 'portfolio', portfolio: 'portfolio',
saas: 'saas', saas: 'saas',

3
apps/client/src/app/pages/faq/overview/faq-overview-page.component.ts

@ -13,8 +13,7 @@ import { Subject, takeUntil } from 'rxjs';
standalone: false standalone: false
}) })
export class FaqOverviewPageComponent implements OnDestroy { export class FaqOverviewPageComponent implements OnDestroy {
public pricingUrl = public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`;
`https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing;
public routerLinkFeatures = ['/' + paths.features]; public routerLinkFeatures = ['/' + paths.features];
public user: User; public user: User;

3
apps/client/src/app/pages/faq/saas/saas-page.component.ts

@ -13,8 +13,7 @@ import { Subject, takeUntil } from 'rxjs';
standalone: false standalone: false
}) })
export class SaasPageComponent implements OnDestroy { export class SaasPageComponent implements OnDestroy {
public pricingUrl = public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`;
`https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing;
public routerLinkMarkets = ['/' + paths.markets]; public routerLinkMarkets = ['/' + paths.markets];
public routerLinkRegister = ['/' + paths.register]; public routerLinkRegister = ['/' + paths.register];
public user: User; public user: User;

3
apps/client/src/app/pages/faq/self-hosting/self-hosting-page.component.ts

@ -11,8 +11,7 @@ import { Subject } from 'rxjs';
standalone: false standalone: false
}) })
export class SelfHostingPageComponent implements OnDestroy { export class SelfHostingPageComponent implements OnDestroy {
public pricingUrl = public pricingUrl = `https://ghostfol.io/${document.documentElement.lang}/${paths.pricing}`;
`https://ghostfol.io/${document.documentElement.lang}/` + paths.pricing;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();

2
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; return GfProductPageComponent;
} }
), ),
path: paths.openSourceAlternativeTo + `-${alias ?? key}`, path: `${paths.openSourceAlternativeTo}-${alias ?? key}`,
title: $localize`Open Source Alternative to ${name}` title: $localize`Open Source Alternative to ${name}`
}; };
}) })

Loading…
Cancel
Save