Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/improve markets overview (#1206)

Thomas Kaul7a9fd1840786
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc1e92859e..99830aa524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+### Added
+
+- Added a skeleton loader to the market mood component in the markets overview
+
### Changed
- Moved the build pipeline from _Travis_ to _GitHub Actions_
+- Increased the caching of the benchmarks
### Fixed
diff --git a/apps/api/src/app/benchmark/benchmark.controller.ts b/apps/api/src/app/benchmark/benchmark.controller.ts
index d3dcb0bb5e..4638e0c4fe 100644
--- a/apps/api/src/app/benchmark/benchmark.controller.ts
+++ b/apps/api/src/app/benchmark/benchmark.controller.ts
@@ -1,30 +1,20 @@
import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { PROPERTY_BENCHMARKS } from '@ghostfolio/common/config';
-import { BenchmarkResponse, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { BenchmarkResponse } from '@ghostfolio/common/interfaces';
import { Controller, Get, UseInterceptors } from '@nestjs/common';
import { BenchmarkService } from './benchmark.service';
@Controller('benchmark')
export class BenchmarkController {
- public constructor(
- private readonly benchmarkService: BenchmarkService,
- private readonly propertyService: PropertyService
- ) {}
+ public constructor(private readonly benchmarkService: BenchmarkService) {}
@Get()
@UseInterceptors(TransformDataSourceInRequestInterceptor)
@UseInterceptors(TransformDataSourceInResponseInterceptor)
public async getBenchmark(): Promise<BenchmarkResponse> {
- const benchmarkAssets: UniqueAsset[] =
- ((await this.propertyService.getByKey(
- PROPERTY_BENCHMARKS
- )) as UniqueAsset[]) ?? [];
-
return {
- benchmarks: await this.benchmarkService.getBenchmarks(benchmarkAssets)
+ benchmarks: await this.benchmarkService.getBenchmarks()
};
}
}
diff --git a/apps/api/src/app/benchmark/benchmark.service.ts b/apps/api/src/app/benchmark/benchmark.service.ts
index 2e8ee61d44..f723865447 100644
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@@ -1,10 +1,13 @@
import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import { PROPERTY_BENCHMARKS } from '@ghostfolio/common/config';
import { BenchmarkResponse, UniqueAsset } from '@ghostfolio/common/interfaces';
import { Injectable } from '@nestjs/common';
import Big from 'big.js';
+import ms from 'ms';
@Injectable()
export class BenchmarkService {
@@ -13,25 +16,32 @@ export class BenchmarkService {
public constructor(
private readonly dataProviderService: DataProviderService,
private readonly marketDataService: MarketDataService,
+ private readonly propertyService: PropertyService,
private readonly redisCacheService: RedisCacheService,
private readonly symbolProfileService: SymbolProfileService
) {}
- public async getBenchmarks(
- benchmarkAssets: UniqueAsset[]
- ): Promise<BenchmarkResponse['benchmarks']> {
+ public async getBenchmarks({ useCache = true } = {}): Promise<
+ BenchmarkResponse['benchmarks']
+ > {
let benchmarks: BenchmarkResponse['benchmarks'];
- try {
- benchmarks = JSON.parse(
- await this.redisCacheService.get(this.CACHE_KEY_BENCHMARKS)
- );
+ if (useCache) {
+ try {
+ benchmarks = JSON.parse(
+ await this.redisCacheService.get(this.CACHE_KEY_BENCHMARKS)
+ );
- if (benchmarks) {
- return benchmarks;
- }
- } catch {}
+ if (benchmarks) {
+ return benchmarks;
+ }
+ } catch {}
+ }
+ const benchmarkAssets: UniqueAsset[] =
+ ((await this.propertyService.getByKey(
+ PROPERTY_BENCHMARKS
+ )) as UniqueAsset[]) ?? [];
const promises: Promise<number>[] = [];
const [quotes, assetProfiles] = await Promise.all([
@@ -76,7 +86,8 @@ export class BenchmarkService {
await this.redisCacheService.set(
this.CACHE_KEY_BENCHMARKS,
- JSON.stringify(benchmarks)
+ JSON.stringify(benchmarks),
+ ms('4 hours') / 1000
);
return benchmarks;
diff --git a/apps/api/src/services/twitter-bot/twitter-bot.module.ts b/apps/api/src/services/twitter-bot/twitter-bot.module.ts
index 02213ef625..5e9b304ee5 100644
--- a/apps/api/src/services/twitter-bot/twitter-bot.module.ts
+++ b/apps/api/src/services/twitter-bot/twitter-bot.module.ts
@@ -7,7 +7,7 @@ import { Module } from '@nestjs/common';
@Module({
exports: [TwitterBotService],
- imports: [BenchmarkModule, ConfigurationModule, PropertyModule, SymbolModule],
+ imports: [BenchmarkModule, ConfigurationModule, SymbolModule],
providers: [TwitterBotService]
})
export class TwitterBotModule {}
diff --git a/apps/api/src/services/twitter-bot/twitter-bot.service.ts b/apps/api/src/services/twitter-bot/twitter-bot.service.ts
index 402159add4..9deb8fb1c6 100644
--- a/apps/api/src/services/twitter-bot/twitter-bot.service.ts
+++ b/apps/api/src/services/twitter-bot/twitter-bot.service.ts
@@ -1,9 +1,7 @@
import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
import {
- PROPERTY_BENCHMARKS,
ghostfolioFearAndGreedIndexDataSource,
ghostfolioFearAndGreedIndexSymbol
} from '@ghostfolio/common/config';
@@ -11,7 +9,6 @@ import {
resolveFearAndGreedIndex,
resolveMarketCondition
} from '@ghostfolio/common/helper';
-import { UniqueAsset } from '@ghostfolio/common/interfaces';
import { Injectable, Logger } from '@nestjs/common';
import { isWeekend } from 'date-fns';
import { TwitterApi, TwitterApiReadWrite } from 'twitter-api-v2';
@@ -23,7 +20,6 @@ export class TwitterBotService {
public constructor(
private readonly benchmarkService: BenchmarkService,
private readonly configurationService: ConfigurationService,
- private readonly propertyService: PropertyService,
private readonly symbolService: SymbolService
) {
this.twitterClient = new TwitterApi({
@@ -82,14 +78,9 @@ export class TwitterBotService {
}
private async getBenchmarkListing(aMax: number) {
- const benchmarkAssets: UniqueAsset[] =
- ((await this.propertyService.getByKey(
- PROPERTY_BENCHMARKS
- )) as UniqueAsset[]) ?? [];
-
- const benchmarks = await this.benchmarkService.getBenchmarks(
- benchmarkAssets
- );
+ const benchmarks = await this.benchmarkService.getBenchmarks({
+ useCache: false
+ });
const benchmarkListing: string[] = [];
diff --git a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.html b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.html
index 16b2ea6026..6bc52fa116 100644
--- a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.html
+++ b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.html
@@ -1,13 +1,23 @@
-<div class="align-items-center d-flex flex-row">
- <div class="h2 mb-0 mr-2">{{ fearAndGreedIndexEmoji }}</div>
- <div>
- <div class="h4 mb-0">
- <span class="mr-2">{{ fearAndGreedIndexText }}</span>
- <small class="text-muted"
- ><strong>{{ fearAndGreedIndex }}</strong
- >/100</small
- >
+<div class="position-relative">
+ <div class="align-items-center d-flex flex-row" [hidden]="!fearAndGreedIndex">
+ <div class="h2 mb-0 mr-2">{{ fearAndGreedIndexEmoji }}</div>
+ <div>
+ <div class="h4 mb-0">
+ <span class="mr-2">{{ fearAndGreedIndexText }}</span>
+ <small class="text-muted"
+ ><strong>{{ fearAndGreedIndex }}</strong
+ >/100</small
+ >
+ </div>
+ <small class="d-block" i18n>Current Market Mood</small>
</div>
- <small class="d-block" i18n>Current Market Mood</small>
</div>
+ <ngx-skeleton-loader
+ *ngIf="!fearAndGreedIndex"
+ animation="pulse"
+ class="position-absolute w-100"
+ [theme]="{
+ height: '100%'
+ }"
+ ></ngx-skeleton-loader>
</div>
diff --git a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.scss b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.scss
index 5d4e87f30f..dfe024a035 100644
--- a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.scss
+++ b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.component.scss
@@ -1,3 +1,8 @@
:host {
display: block;
+
+ ngx-skeleton-loader {
+ bottom: 0;
+ top: 0;
+ }
}
diff --git a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.module.ts b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.module.ts
index ad2143aaa9..426326344c 100644
--- a/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.module.ts
+++ b/apps/client/src/app/components/fear-and-greed-index/fear-and-greed-index.module.ts
@@ -1,11 +1,12 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { FearAndGreedIndexComponent } from './fear-and-greed-index.component';
@NgModule({
declarations: [FearAndGreedIndexComponent],
exports: [FearAndGreedIndexComponent],
- imports: [CommonModule]
+ imports: [CommonModule, NgxSkeletonLoaderModule]
})
export class GfFearAndGreedIndexModule {}
diff --git a/apps/client/src/app/components/home-market/home-market.html b/apps/client/src/app/components/home-market/home-market.html
index fe6cba147e..ba34c1fabe 100644
--- a/apps/client/src/app/components/home-market/home-market.html
+++ b/apps/client/src/app/components/home-market/home-market.html
@@ -20,7 +20,6 @@
<gf-fear-and-greed-index
class="d-flex justify-content-center"
[fearAndGreedIndex]="fearAndGreedIndex"
- [hidden]="isLoading"
></gf-fear-and-greed-index>
</div>
</div>