Browse Source

Refactoring

pull/4711/head
Thomas Kaul 3 months ago
parent
commit
3d729a7fae
  1. 14
      apps/client/src/app/app-routing.module.ts
  2. 3
      apps/client/src/app/components/access-table/access-table.component.ts
  3. 2
      apps/client/src/app/core/auth.guard.ts

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

@ -99,13 +99,6 @@ const routes: Routes = [
loadChildren: () => loadChildren: () =>
import('./pages/open/open-page.module').then((m) => m.OpenPageModule) import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
}, },
{
path: paths.public,
loadChildren: () =>
import('./pages/public/public-page.module').then(
(m) => m.PublicPageModule
)
},
{ {
path: paths.portfolio, path: paths.portfolio,
loadChildren: () => loadChildren: () =>
@ -120,6 +113,13 @@ const routes: Routes = [
(m) => m.PricingPageModule (m) => m.PricingPageModule
) )
}, },
{
path: paths.public,
loadChildren: () =>
import('./pages/public/public-page.module').then(
(m) => m.PublicPageModule
)
},
{ {
path: paths.register, path: paths.register,
loadChildren: () => loadChildren: () =>

3
apps/client/src/app/components/access-table/access-table.component.ts

@ -2,6 +2,7 @@ import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/con
import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; import { NotificationService } from '@ghostfolio/client/core/notification/notification.service';
import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config'; import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
import { Access, User } from '@ghostfolio/common/interfaces'; import { Access, User } from '@ghostfolio/common/interfaces';
import { paths } from '@ghostfolio/common/paths';
import { Clipboard } from '@angular/cdk/clipboard'; import { Clipboard } from '@angular/cdk/clipboard';
import { import {
@ -55,7 +56,7 @@ export class AccessTableComponent implements OnChanges {
public getPublicUrl(aId: string): string { public getPublicUrl(aId: string): string {
const languageCode = this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE; const languageCode = this.user?.settings?.language ?? DEFAULT_LANGUAGE_CODE;
return `${this.baseUrl}/${languageCode}/p/${aId}`; return `${this.baseUrl}/${languageCode}/${paths.public}/${aId}`;
} }
public onCopyUrlToClipboard(aId: string): void { public onCopyUrlToClipboard(aId: string): void {

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

@ -22,8 +22,8 @@ export class AuthGuard {
`/${paths.features}`, `/${paths.features}`,
`/${paths.markets}`, `/${paths.markets}`,
`/${paths.open}`, `/${paths.open}`,
`/${paths.public}`,
`/${paths.pricing}`, `/${paths.pricing}`,
`/${paths.public}`,
`/${paths.register}`, `/${paths.register}`,
`/${paths.resources}` `/${paths.resources}`
]; ];

Loading…
Cancel
Save