Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/restructure fire page (#982)
Thomas Kaul6774c48dff2b
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 6de0c43fd7..39b91d8333 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed- Simplified the features page+- Restructured the _FIRE_ section- Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `4.1.0` to `5.2.1`## 1.155.0 - 29.05.2022diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.html b/apps/client/src/app/pages/portfolio/fire/fire-page.htmlindex d62eeab30c..89cc79a767 100644--- a/apps/client/src/app/pages/portfolio/fire/fire-page.html+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.html@@ -1,68 +1,68 @@<div class="container">- <div class="row">+ <div class="row mb-5"><div class="col-lg"><h3 class="d-flex justify-content-center mb-3" i18n>FIRE</h3>- <div class="mb-5">- <h4 i18n>4% Rule</h4>- <div *ngIf="isLoading">- <ngx-skeleton-loader- animation="pulse"- class="my-1"- [theme]="{- height: '1rem',- width: '100%'- }"- ></ngx-skeleton-loader>- <ngx-skeleton-loader- animation="pulse"- [theme]="{- height: '1rem',- width: '10rem'- }"- ></ngx-skeleton-loader>- </div>- <div *ngIf="!isLoading">- If you retire today, you would be able to withdraw- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [currency]="user?.settings?.baseCurrency"- [locale]="user?.settings?.locale"- [value]="withdrawalRatePerYear?.toNumber()"- ></gf-value>- per year</span- >- or- <span class="font-weight-bold"- ><gf-value- class="d-inline-block"- [currency]="user?.settings?.baseCurrency"- [locale]="user?.settings?.locale"- [value]="withdrawalRatePerMonth?.toNumber()"- ></gf-value>- per month</span- >, based on your total assets of- <gf-value- class="d-inline-block"- [currency]="user?.settings?.baseCurrency"- [locale]="user?.settings?.locale"- [value]="fireWealth?.toNumber()"- ></gf-value>- and a withdrawal rate of 4%.- </div>+ <div>+ <h4 class="mb-3" i18n>Calculator</h4>+ <gf-fire-calculator+ [currency]="user?.settings?.baseCurrency"+ [deviceType]="deviceType"+ [fireWealth]="fireWealth?.toNumber()"+ [hasPermissionToUpdateUserSettings]="hasPermissionToUpdateUserSettings"+ [locale]="user?.settings?.locale"+ [savingsRate]="user?.settings?.savingsRate"+ (savingsRateChanged)="onSavingsRateChange($event)"+ ></gf-fire-calculator></div></div></div><div>- <h4 class="mb-3" i18n>Calculator</h4>- <gf-fire-calculator- [currency]="user?.settings?.baseCurrency"- [deviceType]="deviceType"- [fireWealth]="fireWealth?.toNumber()"- [hasPermissionToUpdateUserSettings]="hasPermissionToUpdateUserSettings"- [locale]="user?.settings?.locale"- [savingsRate]="user?.settings?.savingsRate"- (savingsRateChanged)="onSavingsRateChange($event)"- ></gf-fire-calculator>+ <h4 i18n>4% Rule</h4>+ <div *ngIf="isLoading">+ <ngx-skeleton-loader+ animation="pulse"+ class="my-1"+ [theme]="{+ height: '1rem',+ width: '100%'+ }"+ ></ngx-skeleton-loader>+ <ngx-skeleton-loader+ animation="pulse"+ [theme]="{+ height: '1rem',+ width: '10rem'+ }"+ ></ngx-skeleton-loader>+ </div>+ <div *ngIf="!isLoading">+ If you retire today, you would be able to withdraw+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [currency]="user?.settings?.baseCurrency"+ [locale]="user?.settings?.locale"+ [value]="withdrawalRatePerYear?.toNumber()"+ ></gf-value>+ per year</span+ >+ or+ <span class="font-weight-bold"+ ><gf-value+ class="d-inline-block"+ [currency]="user?.settings?.baseCurrency"+ [locale]="user?.settings?.locale"+ [value]="withdrawalRatePerMonth?.toNumber()"+ ></gf-value>+ per month</span+ >, based on your total assets of+ <gf-value+ class="d-inline-block"+ [currency]="user?.settings?.baseCurrency"+ [locale]="user?.settings?.locale"+ [value]="fireWealth?.toNumber()"+ ></gf-value>+ and a withdrawal rate of 4%.+ </div></div></div>diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html b/libs/ui/src/lib/fire-calculator/fire-calculator.component.htmlindex 99273da112..bd45a14112 100644--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.html@@ -1,7 +1,7 @@<div class="container p-0"><div class="row"><div class="col-md-3">- <form class="" [formGroup]="calculatorForm">+ <form class="mb-4" [formGroup]="calculatorForm"><!--<mat-form-field appearance="outline"><input formControlName="principalInvestmentAmount" matInput /></mat-form-field>-->