diff --git a/CHANGELOG.md b/CHANGELOG.md index fb47ae1bd..59c2229d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added + +- Added support for sub-labels in the value component + ### Changed +- Reused the value component in the _Ghostfolio in Numbers_ section of the about page - Upgraded `yahoo-finance2` from version `2.3.0` to `2.3.1` ## 1.139.0 - 18.04.2022 diff --git a/apps/client/src/app/pages/about/about-page.html b/apps/client/src/app/pages/about/about-page.html index 90c1632a6..eb9da1593 100644 --- a/apps/client/src/app/pages/about/about-page.html +++ b/apps/client/src/app/pages/about/about-page.html @@ -109,38 +109,39 @@
-

{{ statistics?.activeUsers1d || '-' }}

-
- Active Users (Last 24 hours) -
+
-

{{ statistics?.newUsers30d ?? '-' }}

-
- New Users (Last 30 days) -
+
-

{{ statistics?.activeUsers30d ?? '-' }}

-
- Active Users (Last 30 days) -
+
@@ -148,10 +149,11 @@ class="d-block" href="https://github.com/ghostfolio/ghostfolio/graphs/contributors" > -

- {{ statistics?.gitHubContributors ?? '-' }} -

-
Contributors on GitHub
+
@@ -159,8 +161,11 @@ class="d-block" href="https://github.com/ghostfolio/ghostfolio/stargazers" > -

{{ statistics?.gitHubStargazers ?? '-' }}

-
Stars on GitHub
+
diff --git a/apps/client/src/app/pages/about/about-page.module.ts b/apps/client/src/app/pages/about/about-page.module.ts index 2ca669fde..f0003e3fb 100644 --- a/apps/client/src/app/pages/about/about-page.module.ts +++ b/apps/client/src/app/pages/about/about-page.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCardModule } from '@angular/material/card'; +import { GfValueModule } from '@ghostfolio/ui/value'; import { AboutPageRoutingModule } from './about-page-routing.module'; import { AboutPageComponent } from './about-page.component'; @@ -12,6 +13,7 @@ import { AboutPageComponent } from './about-page.component'; imports: [ AboutPageRoutingModule, CommonModule, + GfValueModule, MatButtonModule, MatCardModule ], diff --git a/libs/ui/src/lib/value/value.component.html b/libs/ui/src/lib/value/value.component.html index 026eb2794..8ed9c9bdf 100644 --- a/libs/ui/src/lib/value/value.component.html +++ b/libs/ui/src/lib/value/value.component.html @@ -10,14 +10,14 @@
{{ formattedValue }}%
@@ -36,7 +36,7 @@
{{ formattedValue | titlecase }} @@ -45,7 +45,8 @@
- {{ label }} + {{ label }} + {{ subLabel }}
{{ label }} diff --git a/libs/ui/src/lib/value/value.component.scss b/libs/ui/src/lib/value/value.component.scss index 7452006e0..04c8fe3ff 100644 --- a/libs/ui/src/lib/value/value.component.scss +++ b/libs/ui/src/lib/value/value.component.scss @@ -2,4 +2,8 @@ display: flex; flex-direction: column; font-variant-numeric: tabular-nums; + + .h2 { + line-height: 1; + } } diff --git a/libs/ui/src/lib/value/value.component.ts b/libs/ui/src/lib/value/value.component.ts index 2004065db..8919b1455 100644 --- a/libs/ui/src/lib/value/value.component.ts +++ b/libs/ui/src/lib/value/value.component.ts @@ -25,6 +25,7 @@ export class ValueComponent implements OnChanges { @Input() position = ''; @Input() precision: number | undefined; @Input() size: 'large' | 'medium' | 'small' = 'small'; + @Input() subLabel = ''; @Input() value: number | string = ''; public absoluteValue = 0;