Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript π€
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/add global heat map to landing page (#1584)
Thomas Kaul90a7a84ac5a9
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 4a35e673ce..63dded11ba 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+### Added++- Extended the landing page by a global heat map of subscribers+### Changed- Improved the form of the import dividends dialog (disable while loading)diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.tsindex 8106113756..911243057f 100644--- a/apps/api/src/app/info/info.service.ts+++ b/apps/api/src/app/info/info.service.ts@@ -7,6 +7,7 @@ import { PropertyService } from '@ghostfolio/api/services/property/property.servimport { TagService } from '@ghostfolio/api/services/tag/tag.service';import {DEMO_USER_ID,+ PROPERTY_COUNTRIES_OF_SUBSCRIBERS,PROPERTY_IS_READ_ONLY_MODE,PROPERTY_SLACK_COMMUNITY_USERS,PROPERTY_STRIPE_CONFIG,@@ -92,6 +93,10 @@ export class InfoService {if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {globalPermissions.push(permissions.enableSubscription);+ info.countriesOfSubscribers =+ ((await this.propertyService.getByKey(+ PROPERTY_COUNTRIES_OF_SUBSCRIBERS+ )) as string[]) ?? [];info.stripePublicKey = this.configurationService.get('STRIPE_PUBLIC_KEY');}diff --git a/apps/client/src/app/components/world-map-chart/world-map-chart.component.ts b/apps/client/src/app/components/world-map-chart/world-map-chart.component.tsindex 22e4adc66e..ef49eebde4 100644--- a/apps/client/src/app/components/world-map-chart/world-map-chart.component.ts+++ b/apps/client/src/app/components/world-map-chart/world-map-chart.component.ts@@ -16,8 +16,8 @@ import svgMap from 'svgmap';styleUrls: ['./world-map-chart.component.scss']})export class WorldMapChartComponent implements OnChanges, OnDestroy, OnInit {- @Input() baseCurrency: string;- @Input() countries: { [code: string]: { name: string; value: number } };+ @Input() countries: { [code: string]: { name?: string; value: number } };+ @Input() format: string;@Input() isInPercent = false;public isLoading = true;@@ -71,7 +71,7 @@ export class WorldMapChartComponent implements OnChanges, OnDestroy, OnInit {applyData: 'value',data: {value: {- format: this.isInPercent ? `{0}%` : `{0} ${this.baseCurrency}`+ format: this.format}},values: this.countriesdiff --git a/apps/client/src/app/pages/landing/landing-page.component.ts b/apps/client/src/app/pages/landing/landing-page.component.tsindex f8c2c6a234..f4a80c6523 100644--- a/apps/client/src/app/pages/landing/landing-page.component.ts+++ b/apps/client/src/app/pages/landing/landing-page.component.ts@@ -13,10 +13,14 @@ import { Subject } from 'rxjs';templateUrl: './landing-page.html'})export class LandingPageComponent implements OnDestroy, OnInit {+ public countriesOfSubscribersMap: {+ [code: string]: { value: number };+ } = {};public currentYear = format(new Date(), 'yyyy');public demoAuthToken: string;public deviceType: string;public hasPermissionForStatistics: boolean;+ public hasPermissionForSubscription: boolean;public hasPermissionToCreateUser: boolean;public statistics: Statistics;public testimonials = [@@ -48,13 +52,25 @@ export class LandingPageComponent implements OnDestroy, OnInit {private dataService: DataService,private deviceService: DeviceDetectorService) {- const { globalPermissions, statistics } = this.dataService.fetchInfo();+ const { countriesOfSubscribers, globalPermissions, statistics } =+ this.dataService.fetchInfo();++ for (const country of countriesOfSubscribers) {+ this.countriesOfSubscribersMap[country] = {+ value: 1+ };+ }this.hasPermissionForStatistics = hasPermission(globalPermissions,permissions.enableStatistics);+ this.hasPermissionForSubscription = hasPermission(+ globalPermissions,+ permissions.enableSubscription+ );+this.hasPermissionToCreateUser = hasPermission(globalPermissions,permissions.createUserAccountdiff --git a/apps/client/src/app/pages/landing/landing-page.html b/apps/client/src/app/pages/landing/landing-page.htmlindex 0c8f20bcee..64f943f3cd 100644--- a/apps/client/src/app/pages/landing/landing-page.html+++ b/apps/client/src/app/pages/landing/landing-page.html@@ -269,6 +269,21 @@</div></div>+ <div *ngIf="hasPermissionForSubscription" class="row my-5">+ <div class="col-12">+ <h2 class="h4 text-center">+ Members from around the globe are using+ <a href="pricing"><strong>Ghostfolio Premium</strong></a>+ </h2>+ </div>+ <div class="col-md-8 customer-map-container offset-md-2">+ <gf-world-map-chart+ format="π»"+ [countries]="countriesOfSubscribersMap"+ ></gf-world-map-chart>+ </div>+ </div>+<div class="row my-3"><div class="col-12"><h2 class="h4 mb-1 text-center">diff --git a/apps/client/src/app/pages/landing/landing-page.module.ts b/apps/client/src/app/pages/landing/landing-page.module.tsindex 37c67f270c..4a3ce00cb9 100644--- a/apps/client/src/app/pages/landing/landing-page.module.ts+++ b/apps/client/src/app/pages/landing/landing-page.module.ts@@ -3,7 +3,9 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { MatButtonModule } from '@angular/material/button';import { MatCardModule } from '@angular/material/card';import { RouterModule } from '@angular/router';+import { GfWorldMapChartModule } from '@ghostfolio/client/components/world-map-chart/world-map-chart.module';import { GfLogoModule } from '@ghostfolio/ui/logo';+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';import { GfValueModule } from '@ghostfolio/ui/value';import { LandingPageRoutingModule } from './landing-page-routing.module';@@ -14,7 +16,9 @@ import { LandingPageComponent } from './landing-page.component';imports: [CommonModule,GfLogoModule,+ GfPremiumIndicatorModule,GfValueModule,+ GfWorldMapChartModule,LandingPageRoutingModule,MatButtonModule,MatCardModule,diff --git a/apps/client/src/app/pages/landing/landing-page.scss b/apps/client/src/app/pages/landing/landing-page.scssindex 74c416b088..bbc3c587a7 100644--- a/apps/client/src/app/pages/landing/landing-page.scss+++ b/apps/client/src/app/pages/landing/landing-page.scss@@ -9,6 +9,10 @@}}+ .customer-map-container {+ aspect-ratio: 16 / 9;+ }+.downloads {img {height: 2.5rem;diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.tsindex ea0f65ac0c..16cad4a907 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts@@ -84,6 +84,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {};public user: User;+ public worldMapChartFormat: string;private unsubscribeSubject = new Subject<void>();@@ -193,6 +194,11 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {...tagFilters];+ this.worldMapChartFormat =+ this.hasImpersonationId || this.user.settings.isRestrictedView+ ? `{0}%`+ : `{0} ${this.user?.settings?.baseCurrency}`;+this.changeDetectorRef.markForCheck();}});diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.htmlindex 43d8388083..907b62d514 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html@@ -257,8 +257,8 @@</mat-card-header><mat-card-content><gf-world-map-chart- [baseCurrency]="user?.settings?.baseCurrency"[countries]="countries"+ [format]="worldMapChartFormat"[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"></gf-world-map-chart><div class="row">diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.tsindex 5c85292312..91e83e2e08 100644--- a/libs/common/src/lib/config.ts+++ b/libs/common/src/lib/config.ts@@ -72,6 +72,7 @@ export const GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS: JobOptions = {export const MAX_CHART_ITEMS = 365;export const PROPERTY_BENCHMARKS = 'BENCHMARKS';+export const PROPERTY_COUNTRIES_OF_SUBSCRIBERS = 'COUNTRIES_OF_SUBSCRIBERS';export const PROPERTY_COUPONS = 'COUPONS';export const PROPERTY_CURRENCIES = 'CURRENCIES';export const PROPERTY_IS_READ_ONLY_MODE = 'IS_READ_ONLY_MODE';diff --git a/libs/common/src/lib/interfaces/info-item.interface.ts b/libs/common/src/lib/interfaces/info-item.interface.tsindex 3751c64052..bcb28402cc 100644--- a/libs/common/src/lib/interfaces/info-item.interface.ts+++ b/libs/common/src/lib/interfaces/info-item.interface.ts@@ -6,12 +6,12 @@ import { Subscription } from './subscription.interface';export interface InfoItem {baseCurrency: string;benchmarks: Partial<SymbolProfile>[];+ countriesOfSubscribers?: string[];currencies: string[];demoAuthToken: string;fearAndGreedDataSource?: string;globalPermissions: string[];isReadOnlyMode?: boolean;- lastDataGathering?: Date;platforms: { id: string; name: string }[];statistics: Statistics;stripePublicKey?: string;