Feature/add markets to public pages (#1062)

* Add Markets to public pages

* Update changelog

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Added _Markets_ to the public pages
+
 ### Changed
 
 - Upgraded `ngx-markdown` from version `13.0.0` to `14.0.1`

apps/api/src/app/benchmark/benchmark.controller.ts

@@ -3,8 +3,7 @@ import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interc
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { PROPERTY_BENCHMARKS } from '@ghostfolio/common/config';
 import { BenchmarkResponse, UniqueAsset } from '@ghostfolio/common/interfaces';
-import { Controller, Get, UseGuards, UseInterceptors } from '@nestjs/common';
+import { Controller, Get, UseInterceptors } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
 
 import { BenchmarkService } from './benchmark.service';
 
@@ -16,7 +15,6 @@ export class BenchmarkController {
   ) {}
 
   @Get()
-  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async getBenchmark(): Promise<BenchmarkResponse> {

apps/api/src/app/info/info.service.ts

@@ -63,6 +63,8 @@ export class InfoService {
       } else {
         info.fearAndGreedDataSource = ghostfolioFearAndGreedIndexDataSource;
       }
+
+      globalPermissions.push(permissions.enableFearAndGreedIndex);
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_IMPORT')) {

apps/api/src/app/symbol/symbol.controller.ts

@@ -46,7 +46,6 @@ export class SymbolController {
    * Must be after /lookup
    */
   @Get(':dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async getSymbolData(

apps/api/src/app/user/user.service.ts

@@ -158,10 +158,6 @@ export class UserService {
 
     let currentPermissions = getPermissions(user.role);
 
-    if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
-      currentPermissions.push(permissions.accessFearAndGreedIndex);
-    }
-
     if (user.subscription?.type === 'Premium') {
       currentPermissions.push(permissions.reportDataGlitch);
     }

apps/client/src/app/app-routing.module.ts

@@ -90,6 +90,13 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/home/home-page.module').then((m) => m.HomePageModule)
   },
+  {
+    path: 'markets',
+    loadChildren: () =>
+      import('./pages/markets/markets-page.module').then(
+        (m) => m.MarketsPageModule
+      )
+  },
   {
     path: 'p',
     loadChildren: () =>

apps/client/src/app/components/header/header.component.html

@@ -269,6 +269,18 @@
       [routerLink]="['/pricing']"
       >Pricing</a
     >
+    <a
+      *ngIf="hasPermissionToAccessFearAndGreedIndex"
+      class="d-none d-sm-block mx-1"
+      i18n
+      mat-flat-button
+      [ngClass]="{
+        'font-weight-bold': currentRoute === 'markets',
+        'text-decoration-underline': currentRoute === 'markets'
+      }"
+      [routerLink]="['/markets']"
+      >Markets</a
+    >
     <a
       class="d-none d-sm-block mx-1 no-min-width px-1"
       href="https://github.com/ghostfolio/ghostfolio"

apps/client/src/app/components/header/header.component.ts

@@ -37,6 +37,7 @@ export class HeaderComponent implements OnChanges {
   public hasPermissionForSocialLogin: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionToAccessAdminControl: boolean;
+  public hasPermissionToAccessFearAndGreedIndex: boolean;
   public impersonationId: string;
   public isMenuOpen: boolean;
 
@@ -73,6 +74,11 @@ export class HeaderComponent implements OnChanges {
       this.user?.permissions,
       permissions.accessAdminControl
     );
+
+    this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableFearAndGreedIndex
+    );
   }
 
   public impersonateAccount(aId: string) {

apps/client/src/app/components/home-market/home-market.component.ts

@@ -44,9 +44,15 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
         if (state?.user) {
           this.user = state.user;
 
+          this.changeDetectorRef.markForCheck();
+        }
+      });
+  }
+
+  public ngOnInit() {
     this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
-            this.user.permissions,
+      this.info?.globalPermissions,
-            permissions.accessFearAndGreedIndex
+      permissions.enableFearAndGreedIndex
     );
 
     if (this.hasPermissionToAccessFearAndGreedIndex) {
@@ -66,7 +72,6 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
               value: marketPrice
             }
           ];
-                this.isLoading = false;
 
           this.changeDetectorRef.markForCheck();
         });
@@ -77,17 +82,12 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ benchmarks }) => {
         this.benchmarks = benchmarks;
+        this.isLoading = false;
 
         this.changeDetectorRef.markForCheck();
       });
-
-          this.changeDetectorRef.markForCheck();
-        }
-      });
   }
 
-  public ngOnInit() {}
-
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();

apps/client/src/app/components/home-market/home-market.html

@@ -28,16 +28,17 @@
   <div class="mb-3 row">
     <div class="col-xs-12 col-md-8 offset-md-2">
       <gf-benchmark
-        *ngFor="let benchmark of benchmarks"
+        [benchmarks]="benchmarks"
-        class="py-2"
-        [benchmark]="benchmark"
         [locale]="user?.settings?.locale"
       ></gf-benchmark>
-      <gf-benchmark
+      <ngx-skeleton-loader
-        *ngIf="!benchmarks"
+        *ngIf="isLoading"
-        class="py-2"
+        animation="pulse"
-        [benchmark]="undefined"
+        [theme]="{
-      ></gf-benchmark>
+          height: '1.5rem',
+          width: '100%'
+        }"
+      ></ngx-skeleton-loader>
     </div>
   </div>
 </div>

apps/client/src/app/components/home-market/home-market.module.ts

@@ -3,19 +3,20 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { GfFearAndGreedIndexModule } from '@ghostfolio/client/components/fear-and-greed-index/fear-and-greed-index.module';
 import { GfBenchmarkModule } from '@ghostfolio/ui/benchmark/benchmark.module';
 import { GfLineChartModule } from '@ghostfolio/ui/line-chart/line-chart.module';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { HomeMarketComponent } from './home-market.component';
 
 @NgModule({
   declarations: [HomeMarketComponent],
-  exports: [],
+  exports: [HomeMarketComponent],
   imports: [
     CommonModule,
     GfBenchmarkModule,
     GfFearAndGreedIndexModule,
-    GfLineChartModule
+    GfLineChartModule,
+    NgxSkeletonLoaderModule
   ],
-  providers: [],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class GfHomeMarketModule {}

apps/client/src/app/core/auth.guard.ts

@@ -22,6 +22,7 @@ export class AuthGuard implements CanActivate {
     '/demo',
     '/en/blog',
     '/features',
+    '/markets',
     '/p',
     '/pricing',
     '/register',

apps/client/src/app/pages/home/home-page.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@angular/core';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { User } from '@ghostfolio/common/interfaces';
+import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -24,6 +24,7 @@ export class HomePageComponent implements OnDestroy, OnInit {
 
   public hasMessage: boolean;
   public hasPermissionToAccessFearAndGreedIndex: boolean;
+  public info: InfoItem;
   public tabs: { iconName: string; path: string }[] = [];
   public user: User;
 
@@ -34,7 +35,7 @@ export class HomePageComponent implements OnDestroy, OnInit {
     private dataService: DataService,
     private userService: UserService
   ) {
-    const { systemMessage } = this.dataService.fetchInfo();
+    this.info = this.dataService.fetchInfo();
 
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
@@ -51,11 +52,11 @@ export class HomePageComponent implements OnDestroy, OnInit {
             hasPermission(
               this.user?.permissions,
               permissions.createUserAccount
-            ) || !!systemMessage;
+            ) || !!this.info.systemMessage;
 
           this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
-            this.user.permissions,
+            this.info?.globalPermissions,
-            permissions.accessFearAndGreedIndex
+            permissions.enableFearAndGreedIndex
           );
 
           if (this.hasPermissionToAccessFearAndGreedIndex) {

apps/client/src/app/pages/markets/markets-page-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
+
+import { MarketsPageComponent } from './markets-page.component';
+
+const routes: Routes = [
+  { path: '', component: MarketsPageComponent, canActivate: [AuthGuard] }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class MarketsPageRoutingModule {}

apps/client/src/app/pages/markets/markets-page.component.ts

@@ -0,0 +1,21 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Subject } from 'rxjs';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-markets-page',
+  styleUrls: ['./markets-page.scss'],
+  templateUrl: './markets-page.html'
+})
+export class MarketsPageComponent implements OnDestroy, OnInit {
+  private unsubscribeSubject = new Subject<void>();
+
+  public constructor() {}
+
+  public ngOnInit() {}
+
+  public ngOnDestroy() {
+    this.unsubscribeSubject.next();
+    this.unsubscribeSubject.complete();
+  }
+}

apps/client/src/app/pages/markets/markets-page.html

@@ -0,0 +1,7 @@
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <gf-home-market></gf-home-market>
+    </div>
+  </div>
+</div>

apps/client/src/app/pages/markets/markets-page.module.ts

@@ -0,0 +1,13 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { GfHomeMarketModule } from '@ghostfolio/client/components/home-market/home-market.module';
+
+import { MarketsPageRoutingModule } from './markets-page-routing.module';
+import { MarketsPageComponent } from './markets-page.component';
+
+@NgModule({
+  declarations: [MarketsPageComponent],
+  imports: [CommonModule, GfHomeMarketModule, MarketsPageRoutingModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class MarketsPageModule {}

apps/client/src/app/pages/markets/markets-page.scss

@@ -0,0 +1,3 @@
+:host {
+  display: block;
+}

apps/client/src/assets/sitemap.xml

@@ -40,6 +40,10 @@
     <loc>https://ghostfol.io/features</loc>
     <lastmod>2022-07-01T00:00:00+00:00</lastmod>
   </url>
+  <url>
+    <loc>https://ghostfol.io/markets</loc>
+    <lastmod>2022-07-01T00:00:00+00:00</lastmod>
+  </url>
   <url>
     <loc>https://ghostfol.io/pricing</loc>
     <lastmod>2022-07-01T00:00:00+00:00</lastmod>

libs/common/src/lib/permissions.ts

@@ -4,7 +4,6 @@ import { UserWithSettings } from './interfaces';
 
 export const permissions = {
   accessAdminControl: 'accessAdminControl',
-  accessFearAndGreedIndex: 'accessFearAndGreedIndex',
   createAccess: 'createAccess',
   createAccount: 'createAccount',
   createOrder: 'createOrder',
@@ -14,6 +13,7 @@ export const permissions = {
   deleteAuthDevice: 'deleteAuthDevice',
   deleteOrder: 'deleteOrder',
   deleteUser: 'deleteUser',
+  enableFearAndGreedIndex: 'enableFearAndGreedIndex',
   enableImport: 'enableImport',
   enableBlog: 'enableBlog',
   enableSocialLogin: 'enableSocialLogin',

libs/ui/src/lib/benchmark/benchmark.component.html

@@ -1,17 +1,26 @@
-<div class="align-items-center d-flex">
+<table class="gf-table w-100">
-  <div *ngIf="benchmark?.name" class="flex-grow-1 text-truncate">
+  <thead>
+    <tr class="mat-header-row">
+      <th class="mat-header-cell px-1 py-2" i18n>Index</th>
+      <th class="mat-header-cell px-1 py-2 text-right">
+        <span class="d-none d-sm-block text-nowrap" i18n
+          >Change from All Time High</span
+        >
+        <span class="d-block d-sm-none text-nowrap" i18n>from ATH</span>
+      </th>
+      <th class="mat-header-cell px-1 py-2 text-right" i18n></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr *ngFor="let benchmark of benchmarks" class="mat-row">
+      <td class="mat-cell px-1 py-2">
+        <div class="d-flex align-items-center">
           {{ benchmark.name }}
         </div>
-  <div *ngIf="!benchmark?.name" class="flex-grow-1">
+      </td>
-    <ngx-skeleton-loader
+      <td class="mat-cell px-1 py-2 text-right">
-      animation="pulse"
-      [theme]="{
-        width: '67%'
-      }"
-    ></ngx-skeleton-loader>
-  </div>
         <gf-value
-    class="mx-2"
+          class="d-inline-block justify-content-end"
           size="medium"
           [isPercent]="true"
           [locale]="locale"
@@ -22,28 +31,20 @@
               benchmark?.performances?.allTimeHigh?.performancePercent > 0
           }"
           [value]="
-      benchmark?.performances?.allTimeHigh?.performancePercent ?? undefined
+            benchmark?.performances?.allTimeHigh?.performancePercent ??
+            undefined
           "
         ></gf-value>
-  <div class="text-muted">
+      </td>
-    <small class="d-none d-sm-block text-nowrap" i18n>from All Time High</small
+      <td class="mat-cell px-1 py-2">
-    ><small class="d-block d-sm-none text-nowrap" i18n>from ATH</small>
-  </div>
-  <div class="ml-2">
         <div
           *ngIf="benchmark?.marketCondition"
+          class="text-center"
           [title]="benchmark?.marketCondition"
         >
           {{ resolveMarketCondition(benchmark.marketCondition).emoji }}
         </div>
-    <ngx-skeleton-loader
+      </td>
-      *ngIf="!benchmark?.marketCondition"
+    </tr>
-      animation="pulse"
+  </tbody>
-      appearance="circle"
+</table>
-      [theme]="{
-        height: '1rem',
-        width: '1rem'
-      }"
-    ></ngx-skeleton-loader>
-  </div>
-</div>

libs/ui/src/lib/benchmark/benchmark.component.ts

@@ -1,4 +1,10 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnChanges
+} from '@angular/core';
+import { locale } from '@ghostfolio/common/config';
 import { resolveMarketCondition } from '@ghostfolio/common/helper';
 import { Benchmark } from '@ghostfolio/common/interfaces';
 
@@ -8,11 +14,17 @@ import { Benchmark } from '@ghostfolio/common/interfaces';
   templateUrl: './benchmark.component.html',
   styleUrls: ['./benchmark.component.scss']
 })
-export class BenchmarkComponent {
+export class BenchmarkComponent implements OnChanges {
-  @Input() benchmark: Benchmark;
+  @Input() benchmarks: Benchmark[];
   @Input() locale: string;
 
   public resolveMarketCondition = resolveMarketCondition;
 
   public constructor() {}
+
+  public ngOnChanges() {
+    if (!this.locale) {
+      this.locale = locale;
+    }
+  }
 }

libs/ui/src/lib/line-chart/line-chart.component.ts

@@ -15,7 +15,11 @@ import {
   getTooltipPositionerMapTop,
   getVerticalHoverLinePlugin
 } from '@ghostfolio/common/chart-helper';
-import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/common/config';
+import {
+  locale,
+  primaryColorRgb,
+  secondaryColorRgb
+} from '@ghostfolio/common/config';
 import {
   getBackgroundColor,
   getDateFormatString,
@@ -97,6 +101,10 @@ export class LineChartComponent implements AfterViewInit, OnChanges, OnDestroy {
         this.changeDetectorRef.markForCheck();
       });
     }
+
+    if (!this.locale) {
+      this.locale = locale;
+    }
   }
 
   public ngOnDestroy() {