Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Refactor account page to user account page (#2235)

Thomas Kaul3e98f097ef67
diff --git a/apps/client/src/app/app-routing.module.ts b/apps/client/src/app/app-routing.module.ts
index e9eed48a23..7ff6ead61b 100644
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@@ -21,8 +21,8 @@ const routes: Routes = [
{
path: 'account',
loadChildren: () =>
- import('./pages/account/account-page.module').then(
- (m) => m.AccountPageModule
+ import('./pages/user-account/user-account-page.module').then(
+ (m) => m.UserAccountPageModule
)
},
{
diff --git a/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts b/apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
similarity index 100%
rename from apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
rename to apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
diff --git a/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.html b/apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html
similarity index 100%
rename from apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.html
rename to apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html
diff --git a/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.module.ts b/apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.module.ts
similarity index 100%
rename from apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.module.ts
rename to apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.module.ts
diff --git a/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.scss b/apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.scss
similarity index 100%
rename from apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.scss
rename to apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.scss
diff --git a/apps/client/src/app/pages/account/create-or-update-access-dialog/interfaces/interfaces.ts b/apps/client/src/app/pages/user-account/create-or-update-access-dialog/interfaces/interfaces.ts
similarity index 100%
rename from apps/client/src/app/pages/account/create-or-update-access-dialog/interfaces/interfaces.ts
rename to apps/client/src/app/pages/user-account/create-or-update-access-dialog/interfaces/interfaces.ts
diff --git a/apps/client/src/app/pages/account/account-page-routing.module.ts b/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts
similarity index 69%
rename from apps/client/src/app/pages/account/account-page-routing.module.ts
rename to apps/client/src/app/pages/user-account/user-account-page-routing.module.ts
index e9d07bd77d..f52591d215 100644
--- a/apps/client/src/app/pages/account/account-page-routing.module.ts
+++ b/apps/client/src/app/pages/user-account/user-account-page-routing.module.ts
@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
-import { AccountPageComponent } from './account-page.component';
+import { UserAccountPageComponent } from './user-account-page.component';
const routes: Routes = [
{
canActivate: [AuthGuard],
- component: AccountPageComponent,
+ component: UserAccountPageComponent,
path: '',
title: $localize`My Ghostfolio`
}
@@ -17,4 +17,4 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
-export class AccountPageRoutingModule {}
+export class UserAccountPageRoutingModule {}
diff --git a/apps/client/src/app/pages/account/account-page.component.ts b/apps/client/src/app/pages/user-account/user-account-page.component.ts
similarity index 98%
rename from apps/client/src/app/pages/account/account-page.component.ts
rename to apps/client/src/app/pages/user-account/user-account-page.component.ts
index 0e4527eeb3..f59d1ed40b 100644
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/user-account/user-account-page.component.ts
@@ -24,6 +24,7 @@ import { WebAuthnService } from '@ghostfolio/client/services/web-authn.service';
import { downloadAsFile, getDateFormatString } from '@ghostfolio/common/helper';
import { Access, User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { format, parseISO } from 'date-fns';
import { uniq } from 'lodash';
import { DeviceDetectorService } from 'ngx-device-detector';
import { StripeService } from 'ngx-stripe';
@@ -31,15 +32,14 @@ import { EMPTY, Subject } from 'rxjs';
import { catchError, switchMap, takeUntil } from 'rxjs/operators';
import { CreateOrUpdateAccessDialog } from './create-or-update-access-dialog/create-or-update-access-dialog.component';
-import { format, parseISO } from 'date-fns';
@Component({
host: { class: 'page' },
- selector: 'gf-account-page',
- styleUrls: ['./account-page.scss'],
- templateUrl: './account-page.html'
+ selector: 'gf-user-account-page',
+ styleUrls: ['./user-account-page.scss'],
+ templateUrl: './user-account-page.html'
})
-export class AccountPageComponent implements OnDestroy, OnInit {
+export class UserAccountPageComponent implements OnDestroy, OnInit {
@ViewChild('toggleSignInWithFingerprintEnabledElement')
signInWithFingerprintElement: MatCheckbox;
diff --git a/apps/client/src/app/pages/account/account-page.html b/apps/client/src/app/pages/user-account/user-account-page.html
similarity index 100%
rename from apps/client/src/app/pages/account/account-page.html
rename to apps/client/src/app/pages/user-account/user-account-page.html
diff --git a/apps/client/src/app/pages/account/account-page.module.ts b/apps/client/src/app/pages/user-account/user-account-page.module.ts
similarity index 81%
rename from apps/client/src/app/pages/account/account-page.module.ts
rename to apps/client/src/app/pages/user-account/user-account-page.module.ts
index 77e32f2f6b..240441ada2 100644
--- a/apps/client/src/app/pages/account/account-page.module.ts
+++ b/apps/client/src/app/pages/user-account/user-account-page.module.ts
@@ -12,14 +12,13 @@ import { GfPortfolioAccessTableModule } from '@ghostfolio/client/components/acce
import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
import { GfValueModule } from '@ghostfolio/ui/value';
-import { AccountPageRoutingModule } from './account-page-routing.module';
-import { AccountPageComponent } from './account-page.component';
import { GfCreateOrUpdateAccessDialogModule } from './create-or-update-access-dialog/create-or-update-access-dialog.module';
+import { UserAccountPageRoutingModule } from './user-account-page-routing.module';
+import { UserAccountPageComponent } from './user-account-page.component';
@NgModule({
- declarations: [AccountPageComponent],
+ declarations: [UserAccountPageComponent],
imports: [
- AccountPageRoutingModule,
CommonModule,
FormsModule,
GfCreateOrUpdateAccessDialogModule,
@@ -33,7 +32,8 @@ import { GfCreateOrUpdateAccessDialogModule } from './create-or-update-access-di
MatFormFieldModule,
MatSelectModule,
ReactiveFormsModule,
- RouterModule
+ RouterModule,
+ UserAccountPageRoutingModule
]
})
-export class AccountPageModule {}
+export class UserAccountPageModule {}
diff --git a/apps/client/src/app/pages/account/account-page.scss b/apps/client/src/app/pages/user-account/user-account-page.scss
similarity index 100%
rename from apps/client/src/app/pages/account/account-page.scss
rename to apps/client/src/app/pages/user-account/user-account-page.scss