Browse Source

Clean up

pull/4037/head
Thomas Kaul 10 months ago
parent
commit
e7c8e89acd
  1. 2
      apps/client/src/app/pages/portfolio/fire/fire-page-routing.module.ts
  2. 11
      apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
  3. 2
      apps/client/src/app/pages/portfolio/fire/fire-page.module.ts
  4. 2
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page-routing.module.ts
  5. 15
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
  6. 4
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts

2
apps/client/src/app/pages/portfolio/fire/fire-page-routing.module.ts

@ -10,7 +10,7 @@ const routes: Routes = [
canActivate: [AuthGuard], canActivate: [AuthGuard],
component: FirePageComponent, component: FirePageComponent,
path: '', path: '',
title: $localize`FIRE` title: 'FIRE'
} }
]; ];

11
apps/client/src/app/pages/portfolio/fire/fire-page.component.ts

@ -1,7 +1,7 @@
import { DataService } from '@ghostfolio/client/services/data.service'; import { DataService } from '@ghostfolio/client/services/data.service';
import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service'; import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service'; import { UserService } from '@ghostfolio/client/services/user/user.service';
import { PortfolioReportRule, User } from '@ghostfolio/common/interfaces'; import { User } from '@ghostfolio/common/interfaces';
import { hasPermission, permissions } from '@ghostfolio/common/permissions'; import { hasPermission, permissions } from '@ghostfolio/common/permissions';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
@ -17,13 +17,10 @@ import { takeUntil } from 'rxjs/operators';
}) })
export class FirePageComponent implements OnDestroy, OnInit { export class FirePageComponent implements OnDestroy, OnInit {
public deviceType: string; public deviceType: string;
public economicMarketClusterRiskRules: PortfolioReportRule[];
public fireWealth: Big; public fireWealth: Big;
public hasImpersonationId: boolean; public hasImpersonationId: boolean;
public hasPermissionToUpdateUserSettings: boolean; public hasPermissionToUpdateUserSettings: boolean;
public inactiveRules: PortfolioReportRule[];
public isLoading = false; public isLoading = false;
public isLoadingPortfolioReport = false;
public user: User; public user: User;
public withdrawalRatePerMonth: Big; public withdrawalRatePerMonth: Big;
public withdrawalRatePerYear: Big; public withdrawalRatePerYear: Big;
@ -86,8 +83,6 @@ export class FirePageComponent implements OnDestroy, OnInit {
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
} }
}); });
this.initializePortfolioReport();
} }
public onAnnualInterestRateChange(annualInterestRate: number) { public onAnnualInterestRateChange(annualInterestRate: number) {
@ -163,8 +158,4 @@ export class FirePageComponent implements OnDestroy, OnInit {
this.unsubscribeSubject.next(); this.unsubscribeSubject.next();
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();
} }
private initializePortfolioReport() {
this.isLoadingPortfolioReport = true;
}
} }

2
apps/client/src/app/pages/portfolio/fire/fire-page.module.ts

@ -1,4 +1,3 @@
import { GfRulesModule } from '@ghostfolio/client/components/rules/rules.module';
import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator'; import { GfFireCalculatorComponent } from '@ghostfolio/ui/fire-calculator';
import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator'; import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
import { GfValueComponent } from '@ghostfolio/ui/value'; import { GfValueComponent } from '@ghostfolio/ui/value';
@ -17,7 +16,6 @@ import { FirePageComponent } from './fire-page.component';
FirePageRoutingModule, FirePageRoutingModule,
GfFireCalculatorComponent, GfFireCalculatorComponent,
GfPremiumIndicatorComponent, GfPremiumIndicatorComponent,
GfRulesModule,
GfValueComponent, GfValueComponent,
NgxSkeletonLoaderModule NgxSkeletonLoaderModule
], ],

2
apps/client/src/app/pages/portfolio/x-ray/x-ray-page-routing.module.ts

@ -10,7 +10,7 @@ const routes: Routes = [
canActivate: [AuthGuard], canActivate: [AuthGuard],
component: XRayPageComponent, component: XRayPageComponent,
path: '', path: '',
title: $localize`X-ray` title: 'X-ray'
} }
]; ];

15
apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html

@ -1,16 +1,11 @@
<div class="container mt-5"> <div class="container">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h2 class="d-none d-sm-block h3 mb-3 text-center">X-ray</h2> <h2 class="d-none d-sm-block h3 mb-3 text-center">X-ray</h2>
<p class="mb-4"> <p class="mb-4" i18n>
<span i18n Ghostfolio X-ray uses static analysis to uncover potential issues and
>Ghostfolio X-ray uses static analysis to identify potential issues risks in your portfolio. Adjust the rules below and set custom
and risks in your portfolio.</span thresholds to align with your personal investment strategy.
>
<span class="d-none" i18n
>Activate / deactivate rules and customize the thresholds to match
your personal investment style.</span
>
</p> </p>
<div class="mb-4"> <div class="mb-4">
<h4 class="align-items-center d-flex m-0"> <h4 class="align-items-center d-flex m-0">

4
apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts

@ -14,8 +14,8 @@ import { Subject, takeUntil } from 'rxjs';
@Component({ @Component({
selector: 'gf-x-ray-page', selector: 'gf-x-ray-page',
templateUrl: './x-ray-page.component.html', styleUrl: './x-ray-page.component.scss',
styleUrl: './x-ray-page.component.scss' templateUrl: './x-ray-page.component.html'
}) })
export class XRayPageComponent { export class XRayPageComponent {
public accountClusterRiskRules: PortfolioReportRule[]; public accountClusterRiskRules: PortfolioReportRule[];

Loading…
Cancel
Save