From 1b308a7b6f87b2a28ce5ac655763121c06fc54cd Mon Sep 17 00:00:00 2001 From: KenTandrian Date: Mon, 12 May 2025 18:50:30 +0700 Subject: [PATCH] feat(client): set paths for user account pages --- apps/client/src/app/app-routing.module.ts | 2 +- apps/client/src/app/core/paths.ts | 3 +++ .../pages/user-account/user-account-page-routing.module.ts | 5 +++-- .../app/pages/user-account/user-account-page.component.ts | 7 ++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts index 5148d6c37..71df21b4b 100644 --- a/apps/client/src/app/app-routing.module.ts +++ b/apps/client/src/app/app-routing.module.ts @@ -14,7 +14,7 @@ const routes: Routes = [ import('./pages/about/about-page.module').then((m) => m.AboutPageModule) }, { - path: 'account', + path: paths.account, loadChildren: () => import('./pages/user-account/user-account-page.module').then( (m) => m.UserAccountPageModule diff --git a/apps/client/src/app/core/paths.ts b/apps/client/src/app/core/paths.ts index f0a19b468..42a9b5203 100644 --- a/apps/client/src/app/core/paths.ts +++ b/apps/client/src/app/core/paths.ts @@ -1,5 +1,7 @@ export const paths = { about: $localize`:snake-case:about`, + access: 'access', + account: 'account', activities: 'activities', admin: 'admin', allocations: 'allocations', @@ -16,6 +18,7 @@ export const paths = { market: 'market', marketData: 'market-data', markets: $localize`:snake-case:markets`, + membership: 'membership', ossFriends: $localize`:snake-case:oss-friends`, portfolio: 'portfolio', pricing: $localize`:snake-case:pricing`, diff --git a/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts b/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts index ae8002d7f..47dd16d56 100644 --- a/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts +++ b/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts @@ -2,6 +2,7 @@ import { UserAccountAccessComponent } from '@ghostfolio/client/components/user-a import { UserAccountMembershipComponent } from '@ghostfolio/client/components/user-account-membership/user-account-membership.component'; import { UserAccountSettingsComponent } from '@ghostfolio/client/components/user-account-settings/user-account-settings.component'; import { AuthGuard } from '@ghostfolio/client/core/auth.guard'; +import { paths } from '@ghostfolio/client/core/paths'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; @@ -18,12 +19,12 @@ const routes: Routes = [ title: $localize`Settings` }, { - path: 'membership', + path: paths.membership, component: UserAccountMembershipComponent, title: $localize`Membership` }, { - path: 'access', + path: paths.access, component: UserAccountAccessComponent, title: $localize`Access` } diff --git a/apps/client/src/app/pages/user-account/user-account-page.component.ts b/apps/client/src/app/pages/user-account/user-account-page.component.ts index d53465faa..94301c357 100644 --- a/apps/client/src/app/pages/user-account/user-account-page.component.ts +++ b/apps/client/src/app/pages/user-account/user-account-page.component.ts @@ -1,3 +1,4 @@ +import { paths } from '@ghostfolio/client/core/paths'; import { UserService } from '@ghostfolio/client/services/user/user.service'; import { TabConfiguration, User } from '@ghostfolio/common/interfaces'; @@ -34,18 +35,18 @@ export class UserAccountPageComponent implements OnDestroy, OnInit { { iconName: 'settings-outline', label: $localize`Settings`, - path: ['/account'] + path: ['/' + paths.account] }, { iconName: 'diamond-outline', label: $localize`Membership`, - path: ['/account/membership'], + path: ['/' + paths.account, paths.membership], showCondition: !!this.user?.subscription }, { iconName: 'key-outline', label: $localize`Access`, - path: ['/account', 'access'] + path: ['/' + paths.account, paths.access] } ];