Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript đ€
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/improve local number formatting in value component (#1992)
Thomas Kaul86296b35913c
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex dd61134371..87ee494842 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Changed++- Improved the local number formatting in the value component+### Fixed- Fixed the vertical alignment in the toggle componentdiff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.tsindex 4da3296676..8af8e6ee2d 100644--- a/apps/api/src/app/info/info.service.ts+++ b/apps/api/src/app/info/info.service.ts@@ -20,9 +20,11 @@ import {encodeDataSource,extractNumberFromString} from '@ghostfolio/common/helper';-import { InfoItem } from '@ghostfolio/common/interfaces';-import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';-import { Subscription } from '@ghostfolio/common/interfaces/subscription.interface';+import {+ InfoItem,+ Statistics,+ Subscription+} from '@ghostfolio/common/interfaces';import { permissions } from '@ghostfolio/common/permissions';import { SubscriptionOffer } from '@ghostfolio/common/types';import { Injectable, Logger } from '@nestjs/common';diff --git a/apps/api/src/app/subscription/subscription.service.ts b/apps/api/src/app/subscription/subscription.service.tsindex 591721f842..37b49ee34a 100644--- a/apps/api/src/app/subscription/subscription.service.ts+++ b/apps/api/src/app/subscription/subscription.service.ts@@ -4,7 +4,7 @@ import {DEFAULT_LANGUAGE_CODE,PROPERTY_STRIPE_CONFIG} from '@ghostfolio/common/config';-import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces/subscription.interface';+import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces';import { UserWithSettings } from '@ghostfolio/common/types';import { SubscriptionType } from '@ghostfolio/common/types/subscription-type.type';import { Injectable, Logger } from '@nestjs/common';diff --git a/apps/client/src/app/pages/about/about-page.component.ts b/apps/client/src/app/pages/about/about-page.component.tsindex 59f247315b..69f8eb0939 100644--- a/apps/client/src/app/pages/about/about-page.component.ts+++ b/apps/client/src/app/pages/about/about-page.component.ts@@ -3,8 +3,7 @@ import { environment } from '@ghostfolio/client/../environments/environment';import { DataService } from '@ghostfolio/client/services/data.service';import { UserService } from '@ghostfolio/client/services/user/user.service';import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';-import { User } from '@ghostfolio/common/interfaces';-import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';+import { Statistics, User } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { Subject } from 'rxjs';import { takeUntil } from 'rxjs/operators';diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.htmlindex ab8bd36cc1..7c5702adb1 100644--- a/apps/client/src/app/pages/about/about-page.html+++ b/apps/client/src/app/pages/about/about-page.html@@ -6,12 +6,26 @@<p>Ghostfolio is a lightweight wealth management application forindividuals to keep track of stocks, ETFs or cryptocurrencies and make- solid, data-driven investment decisions. We share aggregated- <a href="https://ghostfol.io/{{ defaultLanguageCode }}/open"+ solid, data-driven investment decisions. The source code is fully+ available as+ <a+ href="https://github.com/ghostfolio/ghostfolio"+ title="Find Ghostfolio on GitHub"+ >open source software</a+ >+ (OSS) under the+ <a+ href="https://www.gnu.org/licenses/agpl-3.0.html"+ title="GNU Affero General Public License"+ >AGPL-3.0 license</a+ >+ and we share aggregated+ <a+ href="https://ghostfol.io/{{ defaultLanguageCode }}/open"+ title="Open Startup">key metrics</a>- of our platformâs performance and the source code is fully available- as open source software (OSS). The project has been initiated by+ of the platformâs performance. The project has been initiated by<a href="https://dotsilver.ch" title="Website of Thomas Kaul">Thomas Kaul</a>@@ -130,6 +144,7 @@<gf-valuesize="large"subLabel="(Last 24 hours)"+ [locale]="user?.settings?.locale"[value]="statistics?.activeUsers1d ?? '-'">Active Users</gf-value>@@ -138,6 +153,7 @@<gf-valuesize="large"subLabel="(Last 30 days)"+ [locale]="user?.settings?.locale"[value]="statistics?.newUsers30d ?? '-'">New Users</gf-value>@@ -146,6 +162,7 @@<gf-valuesize="large"subLabel="(Last 30 days)"+ [locale]="user?.settings?.locale"[value]="statistics?.activeUsers30d ?? '-'">Active Users</gf-value>@@ -154,6 +171,7 @@<a class="d-block" href="https://ghostfolio.slack.com"><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.slackCommunityUsers ?? '-'">Users in Slack community</gf-value>@@ -166,6 +184,7 @@><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.gitHubContributors ?? '-'">Contributors on GitHub</gf-value>@@ -178,6 +197,7 @@><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.gitHubStargazers ?? '-'">Stars on GitHub</gf-value>diff --git a/apps/client/src/app/pages/landing/landing-page.component.ts b/apps/client/src/app/pages/landing/landing-page.component.tsindex 201105d46d..453534299d 100644--- a/apps/client/src/app/pages/landing/landing-page.component.ts+++ b/apps/client/src/app/pages/landing/landing-page.component.ts@@ -1,6 +1,6 @@import { Component, OnDestroy, OnInit } from '@angular/core';import { DataService } from '@ghostfolio/client/services/data.service';-import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';+import { Statistics } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import { format } from 'date-fns';import { DeviceDetectorService } from 'ngx-device-detector';diff --git a/apps/client/src/app/pages/open/open-page.component.ts b/apps/client/src/app/pages/open/open-page.component.tsindex 554ab3bef9..cf438a8167 100644--- a/apps/client/src/app/pages/open/open-page.component.ts+++ b/apps/client/src/app/pages/open/open-page.component.ts@@ -1,7 +1,8 @@-import { Component, OnDestroy, OnInit } from '@angular/core';+import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';import { DataService } from '@ghostfolio/client/services/data.service';-import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';-import { Subject } from 'rxjs';+import { UserService } from '@ghostfolio/client/services/user/user.service';+import { Statistics, User } from '@ghostfolio/common/interfaces';+import { Subject, takeUntil } from 'rxjs';@Component({host: { class: 'page' },@@ -11,16 +12,31 @@ import { Subject } from 'rxjs';})export class OpenPageComponent implements OnDestroy, OnInit {public statistics: Statistics;+ public user: User;private unsubscribeSubject = new Subject<void>();- public constructor(private dataService: DataService) {+ public constructor(+ private changeDetectorRef: ChangeDetectorRef,+ private dataService: DataService,+ private userService: UserService+ ) {const { statistics } = this.dataService.fetchInfo();this.statistics = statistics;}- public ngOnInit() {}+ public ngOnInit() {+ this.userService.stateChanged+ .pipe(takeUntil(this.unsubscribeSubject))+ .subscribe((state) => {+ if (state?.user) {+ this.user = state.user;++ this.changeDetectorRef.markForCheck();+ }+ });+ }public ngOnDestroy() {this.unsubscribeSubject.next();diff --git a/apps/client/src/app/pages/open/open-page.html b/apps/client/src/app/pages/open/open-page.htmlindex 2de588429e..81b4dcd4e6 100644--- a/apps/client/src/app/pages/open/open-page.html+++ b/apps/client/src/app/pages/open/open-page.html@@ -4,15 +4,21 @@<h3 class="d-none d-sm-block mb-3 text-center">Open Startup</h3><div class="intro-container"><p>- At Ghostfolio, transparency is at the core of our values. We openly- share aggregated key metrics of our platformâs performance and publish+ At Ghostfolio, transparency is at the core of our values. We publishthe source code as<ahref="https://github.com/ghostfolio/ghostfolio"- title="Contributors to Ghostfolio"+ title="Find Ghostfolio on GitHub">open source software</a>- (OSS).+ (OSS) under the+ <a+ href="https://www.gnu.org/licenses/agpl-3.0.html"+ title="GNU Affero General Public License"+ >AGPL-3.0 license</a+ >+ and we openly share aggregated key metrics of the platformâs+ performance.</p></div></div>@@ -27,6 +33,7 @@<gf-valuesize="large"subLabel="(Last 24 hours)"+ [locale]="user?.settings?.locale"[value]="statistics?.activeUsers1d ?? '-'">Active Users</gf-value>@@ -35,6 +42,7 @@<gf-valuesize="large"subLabel="(Last 30 days)"+ [locale]="user?.settings?.locale"[value]="statistics?.newUsers30d ?? '-'">New Users</gf-value>@@ -43,6 +51,7 @@<gf-valuesize="large"subLabel="(Last 30 days)"+ [locale]="user?.settings?.locale"[value]="statistics?.activeUsers30d ?? '-'">Active Users</gf-value>@@ -51,6 +60,7 @@<a class="d-block" href="https://ghostfolio.slack.com"><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.slackCommunityUsers ?? '-'">Users in Slack community</gf-value>@@ -63,6 +73,7 @@><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.gitHubContributors ?? '-'">Contributors on GitHub</gf-value>@@ -75,6 +86,7 @@><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.gitHubStargazers ?? '-'">Stars on GitHub</gf-value>@@ -87,6 +99,7 @@><gf-valuesize="large"+ [locale]="user?.settings?.locale"[value]="statistics?.dockerHubPulls ?? '-'">Pulls on Docker Hub</gf-value>@@ -97,6 +110,7 @@<gf-valuesize="large"[isPercent]="true"+ [locale]="user?.settings?.locale"[precision]="2"[value]="statistics?.uptime ?? '-'">Uptime</gf-valuediff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.tsindex b197add399..b6b1e79c70 100644--- a/libs/common/src/lib/interfaces/index.ts+++ b/libs/common/src/lib/interfaces/index.ts@@ -37,6 +37,8 @@ import { ImportResponse } from './responses/import-response.interface';import { OAuthResponse } from './responses/oauth-response.interface';import { PortfolioPerformanceResponse } from './responses/portfolio-performance-response.interface';import { ScraperConfiguration } from './scraper-configuration.interface';+import { Statistics } from './statistics.interface';+import { Subscription } from './subscription.interface';import { TimelinePosition } from './timeline-position.interface';import { UniqueAsset } from './unique-asset.interface';import { UserSettings } from './user-settings.interface';@@ -80,6 +82,8 @@ export {Position,ResponseError,ScraperConfiguration,+ Statistics,+ Subscription,TimelinePosition,UniqueAsset,User,diff --git a/libs/ui/src/lib/value/value.component.ts b/libs/ui/src/lib/value/value.component.tsindex e4b7779e98..959ae2002e 100644--- a/libs/ui/src/lib/value/value.component.ts+++ b/libs/ui/src/lib/value/value.component.ts@@ -21,7 +21,7 @@ export class ValueComponent implements OnChanges {@Input() isCurrency = false;@Input() isDate = false;@Input() isPercent = false;- @Input() locale = getLocale();+ @Input() locale: string | undefined;@Input() position = '';@Input() precision: number | undefined;@Input() size: 'large' | 'medium' | 'small' = 'small';@@ -92,7 +92,7 @@ export class ValueComponent implements OnChanges {});} catch {}} else {- this.formattedValue = this.value?.toString();+ this.formattedValue = this.value?.toLocaleString(this.locale);}if (this.isAbsolute) {@@ -128,6 +128,11 @@ export class ValueComponent implements OnChanges {this.formattedValue = '';this.isNumber = false;this.isString = false;++ if (!this.locale) {+ this.locale = getLocale();+ }+this.useAbsoluteValue = false;}}