Release 1.287.0 (#2136)

* Hide the average buy price if no holding

* Update changelog

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,7 +6,7 @@ labels: ''
 assignees: ''
 ---
 
-The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our [Slack channel](https://ghostfolio.slack.com) or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
+The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed in our [Slack](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) community or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
 
 **Bug Description**
 
@@ -36,6 +36,7 @@ The Issue tracker is **ONLY** used for reporting bugs. New features should be di
 
 <!-- Please complete the following information -->
 
+- Cloud or Self-hosted
 - Ghostfolio Version X.Y.Z
 - Browser
 - OS

.github/workflows/build-code.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         node_version:
-          - 16
+          - 18
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

.nvmrc

@@ -1 +1 @@
-v16
+v18

CHANGELOG.md

@@ -5,6 +5,225 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.287.0 - 2023-07-09
+
+### Changed
+
+- Hid the average buy price in the position detail chart if there is no holding
+- Improved the language localization for French (`fr`)
+- Refactored the blog articles to standalone components
+
+### Fixed
+
+- Fixed the sorting by currency in the activities table
+
+## 1.286.0 - 2023-07-03
+
+### Fixed
+
+- Fixed the creation of (wealth) items and liabilities
+
+## 1.285.0 - 2023-07-01
+
+### Added
+
+- Added a blog post: _Exploring the Path to Financial Independence and Retiring Early (FIRE)_
+- Added pagination to the historical market data table of the admin control panel
+- Added the attribute `headers` to the scraper configuration
+
+### Changed
+
+- Extended the asset profile details dialog in the admin control panel by the scraper configuration
+- Improved the language localization for German (`de`)
+
+## 1.284.0 - 2023-06-27
+
+### Added
+
+- Added the currency to the cash balance in the create or update account dialog
+- Added the ability to add an index for benchmarks as an asset profile in the admin control panel
+
+### Changed
+
+- Upgraded the _Internet Identity_ dependencies from version `0.15.1` to `0.15.7`
+
+### Fixed
+
+- Fixed an issue with the clone functionality of a transaction caused by the symbol search component
+
+## 1.283.5 - 2023-06-25
+
+### Added
+
+- Added the caching for current market prices
+- Added a loading indicator to the import dividends dialog
+- Set up the `helmet` middleware to protect the app from web vulnerabilities by setting HTTP headers
+
+### Changed
+
+- Improved the selected item of the holding selector in the import dividends dialog
+- Extended the symbol search component by asset sub classes
+
+## 1.282.0 - 2023-06-19
+
+### Added
+
+- Added an icon to the external links in the footer navigation
+- Added the ability to add an asset profile in the admin control panel
+
+### Changed
+
+- Harmonized the use of permissions on the about page
+- Harmonized the use of permissions on the landing page
+- Improved the language localization for German (`de`)
+- Improved the language localization for Portuguese (`pt`)
+- Updated the binary targets of `linux-arm64-openssl` for `prisma`
+
+## 1.281.0 - 2023-06-17
+
+### Added
+
+- Extended the feature overview page by liabilities
+- Set up the language localization for Portuguese (`pt`)
+
+### Changed
+
+- Extracted the symbol search to a dedicated component
+- Improved the column headers in the holdings table for mobile
+- Upgraded `prisma` from version `4.14.1` to `4.15.0`
+
+## 1.280.1 - 2023-06-10
+
+### Added
+
+- Added support for liabilities
+
+## 1.279.0 - 2023-06-10
+
+### Added
+
+- Supported a note for accounts
+
+### Changed
+
+- Improved the language localization for French (`fr`)
+
+### Fixed
+
+- Fixed an issue with the value nullification related to the investment streaks
+- Fixed an issue in the public page related to the impersonation service
+
+## 1.278.0 - 2023-06-09
+
+### Changed
+
+- Extended the clone functionality of a transaction by the quantity
+- Changed the direction of the ellipsis icon in various tables
+- Extracted the license to a dedicated tab on the about page
+- Displayed the link to the markets overview in the footer based on a permission
+- Improved the spacing in the benchmark comparator
+- Refreshed the cryptocurrencies list
+- Upgraded `Node.js` from version `16` to `18` (`Dockerfile`)
+
+## 1.277.0 - 2023-06-07
+
+### Added
+
+- Added the investment streaks to the analysis page
+- Added support for a unit in the value component
+- Added a semantic list structure to the header navigation
+- Added a default value for the `includeHistoricalData` attribute in the symbol data endpoint
+
+### Fixed
+
+- Fixed an issue with the date format parsing in the activities import
+
+## 1.276.0 - 2023-06-03
+
+### Added
+
+- Added tabs to the about page
+- Added the `changefreq` attribute to the sitemap
+
+### Changed
+
+- Improved the routes of the tabs
+- Enforced a stricter date format in the activities import: `dd-MM-yyyy` instead of `dd-MM-yy`
+- Updated the URL of the Ghostfolio Slack channel
+- Removed the _Ghostfolio in Numbers_ section from the about page
+
+### Fixed
+
+- Fixed an issue with the price when creating a `Subscription`
+
+## 1.275.0 - 2023-05-30
+
+### Changed
+
+- Extended the footer navigation by the localized Ghostfolio versions
+- Improved the language localization for German (`de`)
+
+### Fixed
+
+- Fixed the exchange rate service for a specific date (indirect calculation via base currency) used in activities with a manual currency
+
+## 1.274.0 - 2023-05-29
+
+### Added
+
+- Extended the footer by a navigation
+- Extended the testimonial section on the landing page
+- Added localized meta descriptions
+- Added support for localized routes in Spanish (`es`)
+
+### Changed
+
+- Improved the activities import dialog
+- Improved the language localization for German (`de`)
+
+## 1.273.0 - 2023-05-28
+
+### Added
+
+- Added a stepper to the activities import dialog
+- Added a link to manage the benchmarks to the benchmark comparator
+- Added support for localized routes
+
+### Fixed
+
+- Fixed an issue in the data source transformation
+
+## 1.272.0 - 2023-05-26
+
+### Added
+
+- Added support to set an asset profile as a benchmark
+
+### Changed
+
+- Decreased the density of the `@angular/material` tables
+- Improved the portfolio proportion chart component by supporting case insensitive names
+- Improved the breadcrumb navigation style in the blog post pages for mobile
+- Improved the error handling in the delete user endpoint
+- Improved the style of the _Changelog & License_ button on the about page
+- Upgraded `ionicons` from version `6.1.2` to `7.1.0`
+
+## 1.271.0 - 2023-05-20
+
+### Added
+
+- Added the historical data and search functionality for the `FINANCIAL_MODELING_PREP` data source type
+- Added a blog post: _Unlock your Financial Potential with Ghostfolio_
+
+### Changed
+
+- Improved the local number formatting in the value component
+- Changed the uptime to the last 90 days on the _Open Startup_ (`/open`) page
+
+### Fixed
+
+- Fixed the vertical alignment in the toggle component
+
 ## 1.270.1 - 2023-05-19
 
 ### Added
@@ -247,7 +466,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Changed the slide toggles to checkboxes on the account page
 - Changed the slide toggles to checkboxes in the admin control panel
-- Decreased the density of the theme
+- Increased the density of the theme
 - Migrated the style of various components to `@angular/material` `15` (mdc)
 - Upgraded `@angular/cdk` and `@angular/material` from version `15.2.5` to `15.2.6`
 - Upgraded `bull` from version `4.10.2` to `4.10.4`
@@ -667,7 +886,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for the dividend timeline grouped by year
 - Added support for the investment timeline grouped by year
 - Set up the language localization for Français (`fr`)
-- Set up the language localization for Português (`pt`)
 
 ### Changed
 
@@ -947,7 +1165,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added support to change the appearance (dark mode) in user settings
 - Added the total amount chart to the investment timeline
-- Setup the `prettier` plugin `prettier-plugin-organize-attributes`
+- Set up the `prettier` plugin `prettier-plugin-organize-attributes`
 
 ### Changed
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:16-slim as builder
+FROM --platform=$BUILDPLATFORM node:18-slim as builder
 
 # Build application and add additional files
 WORKDIR /ghostfolio
@@ -50,7 +50,7 @@ COPY package.json /ghostfolio/dist/apps/api
 RUN yarn database:generate-typings
 
 # Image to run, copy everything needed from builder
-FROM node:16-slim
+FROM node:18-slim
 RUN apt update && apt install -y \
     openssl \
     && rm -rf /var/lib/apt/lists/*

README.md

@@ -145,7 +145,7 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://
 ### Prerequisites
 
 - [Docker](https://www.docker.com/products/docker-desktop)
-- [Node.js](https://nodejs.org/en/download) (version 16)
+- [Node.js](https://nodejs.org/en/download) (version 18+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
 - Create a local copy of this Git repository (clone)
 - Copy the file `.env.example` to `.env` and populate it with your data (`cp .env.example .env`)
@@ -269,7 +269,7 @@ Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TO
 
 Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.
 
-Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) or tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_). We would love to hear from you.
+Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) channel or tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_). We would love to hear from you.
 
 If you like to support this project, get [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) or [**Buy me a coffee**](https://www.buymeacoffee.com/ghostfolio).
 

apps/api/src/app/account/create-account.dto.ts

@@ -1,4 +1,5 @@
 import { AccountType } from '@prisma/client';
+import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsBoolean,
   IsNumber,
@@ -6,6 +7,7 @@ import {
   IsString,
   ValidateIf
 } from 'class-validator';
+import { isString } from 'lodash';
 
 export class CreateAccountDto {
   @IsString()
@@ -14,6 +16,13 @@ export class CreateAccountDto {
   @IsNumber()
   balance: number;
 
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }: TransformFnParams) =>
+    isString(value) ? value.trim() : value
+  )
+  comment?: string;
+
   @IsString()
   currency: string;
 

apps/api/src/app/account/update-account.dto.ts

@@ -1,4 +1,5 @@
 import { AccountType } from '@prisma/client';
+import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsBoolean,
   IsNumber,
@@ -6,6 +7,7 @@ import {
   IsString,
   ValidateIf
 } from 'class-validator';
+import { isString } from 'lodash';
 
 export class UpdateAccountDto {
   @IsString()
@@ -14,6 +16,13 @@ export class UpdateAccountDto {
   @IsNumber()
   balance: number;
 
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }: TransformFnParams) =>
+    isString(value) ? value.trim() : value
+  )
+  comment?: string;
+
   @IsString()
   currency: string;
 

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

@@ -1,7 +1,9 @@
+import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import {
+  DEFAULT_PAGE_SIZE,
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
@@ -26,11 +28,12 @@ import {
   Post,
   Put,
   Query,
-  UseGuards
+  UseGuards,
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { DataSource, MarketData } from '@prisma/client';
+import { DataSource, MarketData, Prisma, SymbolProfile } from '@prisma/client';
 import { isDate } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
@@ -245,7 +248,11 @@ export class AdminController {
   @Get('market-data')
   @UseGuards(AuthGuard('jwt'))
   public async getMarketData(
-    @Query('assetSubClasses') filterByAssetSubClasses?: string
+    @Query('assetSubClasses') filterByAssetSubClasses?: string,
+    @Query('skip') skip?: number,
+    @Query('sortColumn') sortColumn?: string,
+    @Query('sortDirection') sortDirection?: Prisma.SortOrder,
+    @Query('take') take?: number
   ): Promise<AdminMarketData> {
     if (
       !hasPermission(
@@ -270,7 +277,13 @@ export class AdminController {
       })
     ];
 
-    return this.adminService.getMarketData(filters);
+    return this.adminService.getMarketData({
+      filters,
+      sortColumn,
+      sortDirection,
+      skip: isNaN(skip) ? undefined : skip,
+      take: isNaN(take) ? undefined : take
+    });
   }
 
   @Get('market-data/:dataSource/:symbol')
@@ -328,6 +341,28 @@ export class AdminController {
     });
   }
 
+  @Post('profile-data/:dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  public async addProfileData(
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ): Promise<SymbolProfile | never> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.adminService.addAssetProfile({ dataSource, symbol });
+  }
+
   @Delete('profile-data/:dataSource/:symbol')
   @UseGuards(AuthGuard('jwt'))
   public async deleteProfileData(

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

@@ -1,21 +1,24 @@
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
-import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
+import {
+  DEFAULT_PAGE_SIZE,
+  PROPERTY_CURRENCIES
+} from '@ghostfolio/common/config';
 import {
   AdminData,
   AdminMarketData,
   AdminMarketDataDetails,
-  AdminMarketDataItem,
   Filter,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-import { AssetSubClass, Prisma, Property } from '@prisma/client';
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { AssetSubClass, Prisma, Property, SymbolProfile } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
 import { groupBy } from 'lodash';
 
@@ -25,6 +28,7 @@ export class AdminService {
 
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
@@ -35,6 +39,38 @@ export class AdminService {
     this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
   }
 
+  public async addAssetProfile({
+    dataSource,
+    symbol
+  }: UniqueAsset): Promise<SymbolProfile | never> {
+    try {
+      const assetProfiles = await this.dataProviderService.getAssetProfiles([
+        { dataSource, symbol }
+      ]);
+
+      if (!assetProfiles[symbol]?.currency) {
+        throw new BadRequestException(
+          `Asset profile not found for ${symbol} (${dataSource})`
+        );
+      }
+
+      return await this.symbolProfileService.add(
+        assetProfiles[symbol] as Prisma.SymbolProfileCreateInput
+      );
+    } catch (error) {
+      if (
+        error instanceof Prisma.PrismaClientKnownRequestError &&
+        error.code === 'P2002'
+      ) {
+        throw new BadRequestException(
+          `Asset profile of ${symbol} (${dataSource}) already exists`
+        );
+      }
+
+      throw error;
+    }
+  }
+
   public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {
     await this.marketDataService.deleteMany({ dataSource, symbol });
     await this.symbolProfileService.delete({ dataSource, symbol });
@@ -65,7 +101,21 @@ export class AdminService {
     };
   }
 
-  public async getMarketData(filters?: Filter[]): Promise<AdminMarketData> {
+  public async getMarketData({
+    filters,
+    sortColumn,
+    sortDirection,
+    skip,
+    take = DEFAULT_PAGE_SIZE
+  }: {
+    filters?: Filter[];
+    skip?: number;
+    sortColumn?: string;
+    sortDirection?: Prisma.SortOrder;
+    take?: number;
+  }): Promise<AdminMarketData> {
+    let orderBy: Prisma.Enumerable<Prisma.SymbolProfileOrderByWithRelationInput> =
+      [{ symbol: 'asc' }];
     const where: Prisma.SymbolProfileWhereInput = {};
 
     const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
@@ -75,42 +125,33 @@ export class AdminService {
       }
     );
 
-    const marketData = await this.prismaService.marketData.groupBy({
+    const marketDataItems = await this.prismaService.marketData.groupBy({
       _count: true,
       by: ['dataSource', 'symbol']
     });
 
-    let currencyPairsToGather: AdminMarketDataItem[] = [];
-
     if (filtersByAssetSubClass) {
       where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
-    } else {
-      currencyPairsToGather = this.exchangeRateDataService
-        .getCurrencyPairs()
-        .map(({ dataSource, symbol }) => {
-          const marketDataItemCount =
-            marketData.find((marketDataItem) => {
-              return (
-                marketDataItem.dataSource === dataSource &&
-                marketDataItem.symbol === symbol
-              );
-            })?._count ?? 0;
-
-          return {
-            dataSource,
-            marketDataItemCount,
-            symbol,
-            assetClass: 'CASH',
-            countriesCount: 0,
-            sectorsCount: 0
-          };
-        });
     }
 
-    const symbolProfilesToGather: AdminMarketDataItem[] = (
-      await this.prismaService.symbolProfile.findMany({
+    if (sortColumn) {
+      orderBy = [{ [sortColumn]: sortDirection }];
+
+      if (sortColumn === 'activitiesCount') {
+        orderBy = {
+          Order: {
+            _count: sortDirection
+          }
+        };
+      }
+    }
+
+    const [assetProfiles, count] = await Promise.all([
+      this.prismaService.symbolProfile.findMany({
+        orderBy,
+        skip,
+        take,
         where,
-        orderBy: [{ symbol: 'asc' }],
         select: {
           _count: {
             select: { Order: true }
@@ -129,38 +170,48 @@ export class AdminService {
           sectors: true,
           symbol: true
         }
-      })
-    ).map((symbolProfile) => {
-      const countriesCount = symbolProfile.countries
-        ? Object.keys(symbolProfile.countries).length
-        : 0;
-      const marketDataItemCount =
-        marketData.find((marketDataItem) => {
-          return (
-            marketDataItem.dataSource === symbolProfile.dataSource &&
-            marketDataItem.symbol === symbolProfile.symbol
-          );
-        })?._count ?? 0;
-      const sectorsCount = symbolProfile.sectors
-        ? Object.keys(symbolProfile.sectors).length
-        : 0;
-
-      return {
-        countriesCount,
-        marketDataItemCount,
-        sectorsCount,
-        activitiesCount: symbolProfile._count.Order,
-        assetClass: symbolProfile.assetClass,
-        assetSubClass: symbolProfile.assetSubClass,
-        comment: symbolProfile.comment,
-        dataSource: symbolProfile.dataSource,
-        date: symbolProfile.Order?.[0]?.date,
-        symbol: symbolProfile.symbol
-      };
-    });
+      }),
+      this.prismaService.symbolProfile.count({ where })
+    ]);
 
     return {
-      marketData: [...currencyPairsToGather, ...symbolProfilesToGather]
+      count,
+      marketData: assetProfiles.map(
+        ({
+          _count,
+          assetClass,
+          assetSubClass,
+          comment,
+          countries,
+          dataSource,
+          Order,
+          sectors,
+          symbol
+        }) => {
+          const countriesCount = countries ? Object.keys(countries).length : 0;
+          const marketDataItemCount =
+            marketDataItems.find((marketDataItem) => {
+              return (
+                marketDataItem.dataSource === dataSource &&
+                marketDataItem.symbol === symbol
+              );
+            })?._count ?? 0;
+          const sectorsCount = sectors ? Object.keys(sectors).length : 0;
+
+          return {
+            assetClass,
+            assetSubClass,
+            comment,
+            countriesCount,
+            dataSource,
+            symbol,
+            marketDataItemCount,
+            sectorsCount,
+            activitiesCount: _count.Order,
+            date: Order?.[0]?.date
+          };
+        }
+      )
     };
   }
 
@@ -198,12 +249,14 @@ export class AdminService {
   public async patchAssetProfileData({
     comment,
     dataSource,
+    scraperConfiguration,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     await this.symbolProfileService.updateSymbolProfile({
       comment,
       dataSource,
+      scraperConfiguration,
       symbol,
       symbolMapping
     });

apps/api/src/app/admin/update-asset-profile.dto.ts

@@ -1,3 +1,4 @@
+import { Prisma } from '@prisma/client';
 import { IsObject, IsOptional, IsString } from 'class-validator';
 
 export class UpdateAssetProfileDto {
@@ -5,6 +6,10 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   comment?: string;
 
+  @IsObject()
+  @IsOptional()
+  scraperConfiguration?: Prisma.InputJsonObject;
+
   @IsObject()
   @IsOptional()
   symbolMapping?: {

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

@@ -1,24 +1,36 @@
 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 {
+import type {
   BenchmarkMarketDataDetails,
-  BenchmarkResponse
+  BenchmarkResponse,
+  UniqueAsset
 } from '@ghostfolio/common/interfaces';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
+  Body,
   Controller,
   Get,
+  HttpException,
+  Inject,
   Param,
+  Post,
   UseGuards,
   UseInterceptors
 } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { DataSource } from '@prisma/client';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { BenchmarkService } from './benchmark.service';
 
 @Controller('benchmark')
 export class BenchmarkController {
-  public constructor(private readonly benchmarkService: BenchmarkService) {}
+  public constructor(
+    private readonly benchmarkService: BenchmarkService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
 
   @Get()
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
@@ -45,4 +57,41 @@ export class BenchmarkController {
       symbol
     });
   }
+
+  @Post()
+  @UseGuards(AuthGuard('jwt'))
+  public async addBenchmark(@Body() { dataSource, symbol }: UniqueAsset) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    try {
+      const benchmark = await this.benchmarkService.addBenchmark({
+        dataSource,
+        symbol
+      });
+
+      if (!benchmark) {
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.NOT_FOUND),
+          StatusCodes.NOT_FOUND
+        );
+      }
+
+      return benchmark;
+    } catch {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.INTERNAL_SERVER_ERROR),
+        StatusCodes.INTERNAL_SERVER_ERROR
+      );
+    }
+  }
 }

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

@@ -3,6 +3,7 @@ import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 import { Module } from '@nestjs/common';
@@ -17,6 +18,7 @@ import { BenchmarkService } from './benchmark.service';
     ConfigurationModule,
     DataProviderModule,
     MarketDataModule,
+    PrismaModule,
     PropertyModule,
     RedisCacheModule,
     SymbolModule,

apps/api/src/app/benchmark/benchmark.service.spec.ts

@@ -4,7 +4,15 @@ describe('BenchmarkService', () => {
   let benchmarkService: BenchmarkService;
 
   beforeAll(async () => {
-    benchmarkService = new BenchmarkService(null, null, null, null, null, null);
+    benchmarkService = new BenchmarkService(
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
   });
 
   it('calculateChangeInPercentage', async () => {

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

@@ -2,6 +2,7 @@ import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.s
 import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
@@ -11,6 +12,7 @@ import {
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import {
   BenchmarkMarketDataDetails,
+  BenchmarkProperty,
   BenchmarkResponse,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
@@ -18,6 +20,7 @@ import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
 import Big from 'big.js';
 import { format } from 'date-fns';
+import { uniqBy } from 'lodash';
 import ms from 'ms';
 
 @Injectable()
@@ -27,6 +30,7 @@ export class BenchmarkService {
   public constructor(
     private readonly dataProviderService: DataProviderService,
     private readonly marketDataService: MarketDataService,
+    private readonly prismaService: PrismaService,
     private readonly propertyService: PropertyService,
     private readonly redisCacheService: RedisCacheService,
     private readonly symbolProfileService: SymbolProfileService,
@@ -116,9 +120,9 @@ export class BenchmarkService {
 
   public async getBenchmarkAssetProfiles(): Promise<Partial<SymbolProfile>[]> {
     const symbolProfileIds: string[] = (
-      ((await this.propertyService.getByKey(PROPERTY_BENCHMARKS)) as {
-        symbolProfileId: string;
-      }[]) ?? []
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as BenchmarkProperty[]) ?? []
     ).map(({ symbolProfileId }) => {
       return symbolProfileId;
     });
@@ -204,6 +208,43 @@ export class BenchmarkService {
     return response;
   }
 
+  public async addBenchmark({
+    dataSource,
+    symbol
+  }: UniqueAsset): Promise<Partial<SymbolProfile>> {
+    const assetProfile = await this.prismaService.symbolProfile.findFirst({
+      where: {
+        dataSource,
+        symbol
+      }
+    });
+
+    if (!assetProfile) {
+      return;
+    }
+
+    let benchmarks =
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as BenchmarkProperty[]) ?? [];
+
+    benchmarks.push({ symbolProfileId: assetProfile.id });
+
+    benchmarks = uniqBy(benchmarks, 'symbolProfileId');
+
+    await this.propertyService.put({
+      key: PROPERTY_BENCHMARKS,
+      value: JSON.stringify(benchmarks)
+    });
+
+    return {
+      dataSource,
+      symbol,
+      id: assetProfile.id,
+      name: assetProfile.name
+    };
+  }
+
   private getMarketCondition(aPerformanceInPercent: number) {
     return aPerformanceInPercent <= -0.2 ? 'BEAR_MARKET' : 'NEUTRAL_MARKET';
   }

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

@@ -21,6 +21,7 @@ export class ExportService {
       select: {
         accountType: true,
         balance: true,
+        comment: true,
         currency: true,
         id: true,
         isExcluded: true,

apps/api/src/app/frontend.middleware.ts

@@ -19,6 +19,9 @@ export class FrontendMiddleware implements NestMiddleware {
   public indexHtmlNl = '';
   public indexHtmlPt = '';
 
+  private static readonly DEFAULT_DESCRIPTION =
+    'Ghostfolio is a personal finance dashboard to keep track of your assets like stocks, ETFs or cryptocurrencies across multiple platforms.';
+
   public constructor(
     private readonly configurationService: ConfigurationService
   ) {
@@ -94,6 +97,18 @@ export class FrontendMiddleware implements NestMiddleware {
     ) {
       featureGraphicPath = 'assets/images/blog/1000-stars-on-github.jpg';
       title = `Ghostfolio reaches 1’000 Stars on GitHub - ${title}`;
+    } else if (
+      request.path.startsWith(
+        '/en/blog/2023/05/unlock-your-financial-potential-with-ghostfolio'
+      )
+    ) {
+      featureGraphicPath = 'assets/images/blog/20230520.jpg';
+      title = `Unlock your Financial Potential with Ghostfolio - ${title}`;
+    } else if (
+      request.path.startsWith('/en/blog/2023/07/exploring-the-path-to-fire')
+    ) {
+      featureGraphicPath = 'assets/images/blog/20230701.jpg';
+      title = `Exploring the Path to FIRE - ${title}`;
     }
 
     if (
@@ -109,6 +124,8 @@ export class FrontendMiddleware implements NestMiddleware {
           currentDate,
           featureGraphicPath,
           title,
+          description:
+            'Mit dem Finanz-Dashboard Ghostfolio können Sie Ihr Vermögen in Form von Aktien, ETFs oder Kryptowährungen verteilt über mehrere Finanzinstitute überwachen.',
           languageCode: 'de',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -120,6 +137,8 @@ export class FrontendMiddleware implements NestMiddleware {
           currentDate,
           featureGraphicPath,
           title,
+          description:
+            'Ghostfolio es un dashboard de finanzas personales para hacer un seguimiento de tus activos como acciones, ETFs o criptodivisas a través de múltiples plataformas.',
           languageCode: 'es',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -128,7 +147,11 @@ export class FrontendMiddleware implements NestMiddleware {
     } else if (request.path === '/fr' || request.path.startsWith('/fr/')) {
       response.send(
         this.interpolate(this.indexHtmlFr, {
+          currentDate,
           featureGraphicPath,
+          title,
+          description:
+            'Ghostfolio est un dashboard de finances personnelles qui permet de suivre vos actifs comme les actions, les ETF ou les crypto-monnaies sur plusieurs plateformes.',
           languageCode: 'fr',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -140,6 +163,8 @@ export class FrontendMiddleware implements NestMiddleware {
           currentDate,
           featureGraphicPath,
           title,
+          description:
+            'Ghostfolio è un dashboard di finanza personale per tenere traccia delle vostre attività come azioni, ETF o criptovalute su più piattaforme.',
           languageCode: 'it',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -151,6 +176,8 @@ export class FrontendMiddleware implements NestMiddleware {
           currentDate,
           featureGraphicPath,
           title,
+          description:
+            'Ghostfolio is een persoonlijk financieel dashboard om uw activa zoals aandelen, ETF’s of cryptocurrencies over meerdere platforms bij te houden.',
           languageCode: 'nl',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -159,7 +186,11 @@ export class FrontendMiddleware implements NestMiddleware {
     } else if (request.path === '/pt' || request.path.startsWith('/pt/')) {
       response.send(
         this.interpolate(this.indexHtmlPt, {
+          currentDate,
           featureGraphicPath,
+          title,
+          description:
+            'Ghostfolio é um dashboard de finanças pessoais para acompanhar os seus activos como acções, ETFs ou criptomoedas em múltiplas plataformas.',
           languageCode: 'pt',
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')
@@ -171,6 +202,7 @@ export class FrontendMiddleware implements NestMiddleware {
           currentDate,
           featureGraphicPath,
           title,
+          description: FrontendMiddleware.DEFAULT_DESCRIPTION,
           languageCode: DEFAULT_LANGUAGE_CODE,
           path: request.path,
           rootUrl: this.configurationService.get('ROOT_URL')

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

@@ -202,7 +202,7 @@ export class ImportService {
 
     for (const activity of activitiesDto) {
       if (!activity.dataSource) {
-        if (activity.type === 'ITEM') {
+        if (activity.type === 'ITEM' || activity.type === 'LIABILITY') {
           activity.dataSource = DataSource.MANUAL;
         } else {
           activity.dataSource =

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

@@ -17,19 +17,22 @@ import {
   ghostfolioFearAndGreedIndexDataSource
 } from '@ghostfolio/common/config';
 import {
+  DATE_FORMAT,
   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';
 import { JwtService } from '@nestjs/jwt';
 import * as bent from 'bent';
 import * as cheerio from 'cheerio';
-import { subDays } from 'date-fns';
+import { format, subDays } from 'date-fns';
 
 @Injectable()
 export class InfoService {
@@ -344,7 +347,10 @@ export class InfoService {
         )) as string;
 
         const get = bent(
-          `https://betteruptime.com/api/v2/monitors/${monitorId}/sla`,
+          `https://betteruptime.com/api/v2/monitors/${monitorId}/sla?from=${format(
+            subDays(new Date(), 90),
+            DATE_FORMAT
+          )}&to${format(new Date(), DATE_FORMAT)}`,
           'GET',
           'json',
           200,

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

@@ -96,7 +96,7 @@ export class OrderService {
     const updateAccountBalance = data.updateAccountBalance ?? false;
     const userId = data.userId;
 
-    if (data.type === 'ITEM') {
+    if (data.type === 'ITEM' || data.type === 'LIABILITY') {
       const assetClass = data.assetClass;
       const assetSubClass = data.assetSubClass;
       currency = data.SymbolProfile.connectOrCreate.create.currency;
@@ -129,7 +129,10 @@ export class OrderService {
       }
     });
 
-    const isDraft = isAfter(data.date as Date, endOfToday());
+    const isDraft =
+      data.type === 'LIABILITY'
+        ? false
+        : isAfter(data.date as Date, endOfToday());
 
     if (!isDraft) {
       // Gather symbol data of order in the background, if not draft
@@ -201,7 +204,7 @@ export class OrderService {
       where
     });
 
-    if (order.type === 'ITEM') {
+    if (order.type === 'ITEM' || order.type === 'LIABILITY') {
       await this.symbolProfileService.deleteById(order.symbolProfileId);
     }
 
@@ -320,7 +323,11 @@ export class OrderService {
       })
     )
       .filter((order) => {
-        return withExcludedAccounts || order.Account?.isExcluded === false;
+        return (
+          withExcludedAccounts ||
+          !order.Account ||
+          order.Account?.isExcluded === false
+        );
       })
       .map((order) => {
         const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
@@ -368,7 +375,7 @@ export class OrderService {
 
     let isDraft = false;
 
-    if (data.type === 'ITEM') {
+    if (data.type === 'ITEM' || data.type === 'LIABILITY') {
       delete data.SymbolProfile.connect;
     } else {
       delete data.SymbolProfile.update;

apps/api/src/app/portfolio/current-rate.service.spec.ts

@@ -98,7 +98,8 @@ describe('CurrentRateService', () => {
       [],
       null,
       null,
-      propertyService
+      propertyService,
+      null
     );
     exchangeRateDataService = new ExchangeRateDataService(
       null,

apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts

@@ -105,6 +105,40 @@ describe('PortfolioCalculator', () => {
 
       expect(investmentsByMonth).toEqual([
         { date: '2015-01-01', investment: new Big('640.86') },
+        { date: '2015-02-01', investment: new Big('0') },
+        { date: '2015-03-01', investment: new Big('0') },
+        { date: '2015-04-01', investment: new Big('0') },
+        { date: '2015-05-01', investment: new Big('0') },
+        { date: '2015-06-01', investment: new Big('0') },
+        { date: '2015-07-01', investment: new Big('0') },
+        { date: '2015-08-01', investment: new Big('0') },
+        { date: '2015-09-01', investment: new Big('0') },
+        { date: '2015-10-01', investment: new Big('0') },
+        { date: '2015-11-01', investment: new Big('0') },
+        { date: '2015-12-01', investment: new Big('0') },
+        { date: '2016-01-01', investment: new Big('0') },
+        { date: '2016-02-01', investment: new Big('0') },
+        { date: '2016-03-01', investment: new Big('0') },
+        { date: '2016-04-01', investment: new Big('0') },
+        { date: '2016-05-01', investment: new Big('0') },
+        { date: '2016-06-01', investment: new Big('0') },
+        { date: '2016-07-01', investment: new Big('0') },
+        { date: '2016-08-01', investment: new Big('0') },
+        { date: '2016-09-01', investment: new Big('0') },
+        { date: '2016-10-01', investment: new Big('0') },
+        { date: '2016-11-01', investment: new Big('0') },
+        { date: '2016-12-01', investment: new Big('0') },
+        { date: '2017-01-01', investment: new Big('0') },
+        { date: '2017-02-01', investment: new Big('0') },
+        { date: '2017-03-01', investment: new Big('0') },
+        { date: '2017-04-01', investment: new Big('0') },
+        { date: '2017-05-01', investment: new Big('0') },
+        { date: '2017-06-01', investment: new Big('0') },
+        { date: '2017-07-01', investment: new Big('0') },
+        { date: '2017-08-01', investment: new Big('0') },
+        { date: '2017-09-01', investment: new Big('0') },
+        { date: '2017-10-01', investment: new Big('0') },
+        { date: '2017-11-01', investment: new Big('0') },
         { date: '2017-12-01', investment: new Big('-14156.4') }
       ]);
     });

apps/api/src/app/portfolio/portfolio-calculator.ts

@@ -544,7 +544,7 @@ export class PortfolioCalculator {
       return [];
     }
 
-    const investments = [];
+    const investments: { date: string; investment: Big }[] = [];
     let currentDate: Date;
     let investmentByGroup = new Big(0);
 
@@ -554,13 +554,11 @@ export class PortfolioCalculator {
         (groupBy === 'year' || isSameMonth(parseDate(order.date), currentDate))
       ) {
         // Same group: Add up investments
-
         investmentByGroup = investmentByGroup.plus(
           order.quantity.mul(order.unitPrice).mul(this.getFactor(order.type))
         );
       } else {
         // New group: Store previous group and reset
-
         if (currentDate) {
           investments.push({
             date: format(
@@ -595,7 +593,39 @@ export class PortfolioCalculator {
       }
     }
 
-    return investments;
+    // Fill in the missing dates with investment = 0
+    const startDate = parseDate(first(this.orders).date);
+    const endDate = parseDate(last(this.orders).date);
+
+    const allDates: string[] = [];
+    currentDate = startDate;
+
+    while (currentDate <= endDate) {
+      allDates.push(
+        format(
+          set(currentDate, {
+            date: 1,
+            month: groupBy === 'year' ? 0 : currentDate.getMonth()
+          }),
+          DATE_FORMAT
+        )
+      );
+      currentDate.setMonth(currentDate.getMonth() + 1);
+    }
+
+    for (const date of allDates) {
+      const existingInvestment = investments.find((investment) => {
+        return investment.date === date;
+      });
+
+      if (!existingInvestment) {
+        investments.push({ date, investment: new Big(0) });
+      }
+    }
+
+    return sortBy(investments, (investment) => {
+      return investment.date;
+    });
   }
 
   public async calculateTimeline(

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

@@ -162,6 +162,7 @@ export class PortfolioController {
         'excludedAccountsAndActivities',
         'fees',
         'items',
+        'liabilities',
         'netWorth',
         'totalBuy',
         'totalSell'
@@ -258,11 +259,12 @@ export class PortfolioController {
       filterByTags
     });
 
-    let investments = await this.portfolioService.getInvestments({
+    let { investments, streaks } = await this.portfolioService.getInvestments({
       dateRange,
       filters,
       groupBy,
-      impersonationId
+      impersonationId,
+      savingsRate: this.request.user?.Settings?.settings.savingsRate
     });
 
     if (
@@ -278,6 +280,11 @@ export class PortfolioController {
         date: item.date,
         investment: item.investment / maxInvestment
       }));
+
+      streaks = nullifyValuesInObject(streaks, [
+        'currentStreak',
+        'longestStreak'
+      ]);
     }
 
     if (
@@ -287,9 +294,14 @@ export class PortfolioController {
       investments = investments.map((item) => {
         return nullifyValuesInObject(item, ['investment']);
       });
+
+      streaks = nullifyValuesInObject(streaks, [
+        'currentStreak',
+        'longestStreak'
+      ]);
     }
 
-    return { investments };
+    return { investments, streaks };
   }
 
   @Get('performance')

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

@@ -28,6 +28,7 @@ import {
   Filter,
   HistoricalDataItem,
   PortfolioDetails,
+  PortfolioInvestments,
   PortfolioPerformanceResponse,
   PortfolioPosition,
   PortfolioReport,
@@ -252,13 +253,15 @@ export class PortfolioService {
     dateRange,
     filters,
     groupBy,
-    impersonationId
+    impersonationId,
+    savingsRate
   }: {
     dateRange: DateRange;
     filters?: Filter[];
     groupBy?: GroupBy;
     impersonationId: string;
-  }): Promise<InvestmentItem[]> {
+    savingsRate: number;
+  }): Promise<PortfolioInvestments> {
     const userId = await this.getUserId(impersonationId, this.request.user.id);
 
     const { portfolioOrders, transactionPoints } =
@@ -276,7 +279,10 @@ export class PortfolioService {
 
     portfolioCalculator.setTransactionPoints(transactionPoints);
     if (transactionPoints.length === 0) {
-      return [];
+      return {
+        investments: [],
+        streaks: { currentStreak: 0, longestStreak: 0 }
+      };
     }
 
     let investments: InvestmentItem[];
@@ -346,9 +352,23 @@ export class PortfolioService {
       parseDate(investments[0]?.date)
     );
 
-    return investments.filter(({ date }) => {
+    investments = investments.filter(({ date }) => {
       return !isBefore(parseDate(date), startDate);
     });
+
+    let streaks: PortfolioInvestments['streaks'];
+
+    if (savingsRate) {
+      streaks = this.getStreaks({
+        investments,
+        savingsRate: groupBy === 'year' ? 12 * savingsRate : savingsRate
+      });
+    }
+
+    return {
+      investments,
+      streaks
+    };
   }
 
   public async getChart({
@@ -1282,12 +1302,11 @@ export class PortfolioService {
   }: {
     activities: OrderWithAccount[];
     date?: Date;
-
     userCurrency: string;
   }) {
     return activities
       .filter((activity) => {
-        // Filter out all activities before given date and type dividend
+        // Filter out all activities before given date (drafts) and type dividend
         return (
           isBefore(date, new Date(activity.date)) &&
           activity.type === TypeOfOrder.DIVIDEND
@@ -1411,7 +1430,7 @@ export class PortfolioService {
   }) {
     return activities
       .filter((activity) => {
-        // Filter out all activities before given date
+        // Filter out all activities before given date (drafts)
         return isBefore(date, new Date(activity.date));
       })
       .map(({ fee, SymbolProfile }) => {
@@ -1458,19 +1477,37 @@ export class PortfolioService {
     };
   }
 
-  private getItems(orders: OrderWithAccount[], date = new Date(0)) {
-    return orders
-      .filter((order) => {
-        // Filter out all orders before given date and type item
+  private getItems(activities: OrderWithAccount[], date = new Date(0)) {
+    return activities
+      .filter((activity) => {
+        // Filter out all activities before given date (drafts) and type item
         return (
-          isBefore(date, new Date(order.date)) &&
-          order.type === TypeOfOrder.ITEM
+          isBefore(date, new Date(activity.date)) &&
+          activity.type === TypeOfOrder.ITEM
         );
       })
-      .map((order) => {
+      .map(({ quantity, SymbolProfile, unitPrice }) => {
         return this.exchangeRateDataService.toCurrency(
-          new Big(order.quantity).mul(order.unitPrice).toNumber(),
-          order.SymbolProfile.currency,
+          new Big(quantity).mul(unitPrice).toNumber(),
+          SymbolProfile.currency,
+          this.request.user.Settings.settings.baseCurrency
+        );
+      })
+      .reduce(
+        (previous, current) => new Big(previous).plus(current),
+        new Big(0)
+      );
+  }
+
+  private getLiabilities(activities: OrderWithAccount[]) {
+    return activities
+      .filter(({ type }) => {
+        return type === TypeOfOrder.LIABILITY;
+      })
+      .map(({ quantity, SymbolProfile, unitPrice }) => {
+        return this.exchangeRateDataService.toCurrency(
+          new Big(quantity).mul(unitPrice).toNumber(),
+          SymbolProfile.currency,
           this.request.user.Settings.settings.baseCurrency
         );
       })
@@ -1510,6 +1547,28 @@ export class PortfolioService {
     return portfolioStart;
   }
 
+  private getStreaks({
+    investments,
+    savingsRate
+  }: {
+    investments: InvestmentItem[];
+    savingsRate: number;
+  }) {
+    let currentStreak = 0;
+    let longestStreak = 0;
+
+    for (const { investment } of investments) {
+      if (investment >= savingsRate) {
+        currentStreak++;
+        longestStreak = Math.max(longestStreak, currentStreak);
+      } else {
+        currentStreak = 0;
+      }
+    }
+
+    return { currentStreak, longestStreak };
+  }
+
   private async getSummary({
     balanceInBaseCurrency,
     emergencyFundPositionsValueInBaseCurrency,
@@ -1559,6 +1618,7 @@ export class PortfolioService {
     const fees = this.getFees({ activities, userCurrency }).toNumber();
     const firstOrderDate = activities[0]?.date;
     const items = this.getItems(activities).toNumber();
+    const liabilities = this.getLiabilities(activities).toNumber();
 
     const totalBuy = this.getTotalByType(activities, userCurrency, 'BUY');
     const totalSell = this.getTotalByType(activities, userCurrency, 'SELL');
@@ -1591,6 +1651,7 @@ export class PortfolioService {
       .plus(performanceInformation.performance.currentValue)
       .plus(items)
       .plus(excludedAccountsAndActivities)
+      .minus(liabilities)
       .toNumber();
 
     const daysInMarket = differenceInDays(new Date(), firstOrderDate);
@@ -1617,6 +1678,7 @@ export class PortfolioService {
       fees,
       firstOrderDate,
       items,
+      liabilities,
       netWorth,
       totalBuy,
       totalSell,
@@ -1841,13 +1903,6 @@ export class PortfolioService {
     return { accounts, platforms };
   }
 
-  private async getUserId(aImpersonationId: string, aUserId: string) {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(aImpersonationId);
-
-    return impersonationUserId || aUserId;
-  }
-
   private getTotalByType(
     orders: OrderWithAccount[],
     currency: string,
@@ -1874,4 +1929,11 @@ export class PortfolioService {
       this.baseCurrency
     );
   }
+
+  private async getUserId(aImpersonationId: string, aUserId: string) {
+    const impersonationUserId =
+      await this.impersonationService.validateImpersonationId(aImpersonationId);
+
+    return impersonationUserId || aUserId;
+  }
 }

apps/api/src/app/redis-cache/redis-cache.service.ts

@@ -1,4 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
 import { Cache } from 'cache-manager';
 
@@ -13,6 +14,10 @@ export class RedisCacheService {
     return await this.cache.get(key);
   }
 
+  public getQuoteKey({ dataSource, symbol }: UniqueAsset) {
+    return `quote-${dataSource}-${symbol}`;
+  }
+
   public async remove(key: string) {
     await this.cache.del(key);
   }

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

@@ -1,10 +1,6 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
-import {
-  DEFAULT_LANGUAGE_CODE,
-  PROPERTY_STRIPE_CONFIG
-} from '@ghostfolio/common/config';
-import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces/subscription.interface';
+import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
 import { UserWithSettings } from '@ghostfolio/common/types';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription-type.type';
 import { Injectable, Logger } from '@nestjs/common';
@@ -101,19 +97,8 @@ export class SubscriptionService {
         aCheckoutSessionId
       );
 
-      let subscriptions: SubscriptionInterface[] = [];
-
-      const stripeConfig = (await this.prismaService.property.findUnique({
-        where: { key: PROPERTY_STRIPE_CONFIG }
-      })) ?? { value: '{}' };
-
-      subscriptions = [JSON.parse(stripeConfig.value)];
-
-      const coupon = subscriptions[0]?.coupon ?? 0;
-      const price = subscriptions[0]?.price ?? 0;
-
       await this.createSubscription({
-        price: price - coupon,
+        price: session.amount_total / 100,
         userId: session.client_reference_id
       });
 

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

@@ -36,10 +36,12 @@ export class SymbolController {
   @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async lookupSymbol(
-    @Query() { query = '' }
+    @Query('includeIndices') includeIndices: boolean = false,
+    @Query('query') query = ''
   ): Promise<{ items: LookupItem[] }> {
     try {
       return this.symbolService.lookup({
+        includeIndices,
         query: query.toLowerCase(),
         user: this.request.user
       });
@@ -60,7 +62,7 @@ export class SymbolController {
   public async getSymbolData(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string,
-    @Query('includeHistoricalData') includeHistoricalData?: number
+    @Query('includeHistoricalData') includeHistoricalData = 0
   ): Promise<SymbolItem> {
     if (!DataSource[dataSource]) {
       throw new HttpException(

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

@@ -81,9 +81,11 @@ export class SymbolService {
   }
 
   public async lookup({
+    includeIndices = false,
     query,
     user
   }: {
+    includeIndices?: boolean;
     query: string;
     user: UserWithSettings;
   }): Promise<{ items: LookupItem[] }> {
@@ -95,6 +97,7 @@ export class SymbolService {
 
     try {
       const { items } = await this.dataProviderService.search({
+        includeIndices,
         query,
         user
       });

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

@@ -166,7 +166,7 @@ export class UserService {
         this.subscriptionService.getSubscription(Subscription);
 
       if (
-        Analytics?.activityCount % 20 === 0 &&
+        Analytics?.activityCount % 10 === 0 &&
         user.subscription?.type === 'Basic'
       ) {
         currentPermissions.push(permissions.enableSubscriptionInterstitial);
@@ -304,21 +304,29 @@ export class UserService {
   }
 
   public async deleteUser(where: Prisma.UserWhereUniqueInput): Promise<User> {
-    await this.prismaService.access.deleteMany({
-      where: { OR: [{ granteeUserId: where.id }, { userId: where.id }] }
-    });
+    try {
+      await this.prismaService.access.deleteMany({
+        where: { OR: [{ granteeUserId: where.id }, { userId: where.id }] }
+      });
+    } catch {}
 
-    await this.prismaService.account.deleteMany({
-      where: { userId: where.id }
-    });
+    try {
+      await this.prismaService.account.deleteMany({
+        where: { userId: where.id }
+      });
+    } catch {}
 
-    await this.prismaService.analytics.delete({
-      where: { userId: where.id }
-    });
+    try {
+      await this.prismaService.analytics.delete({
+        where: { userId: where.id }
+      });
+    } catch {}
 
-    await this.prismaService.order.deleteMany({
-      where: { userId: where.id }
-    });
+    try {
+      await this.prismaService.order.deleteMany({
+        where: { userId: where.id }
+      });
+    } catch {}
 
     try {
       await this.prismaService.settings.delete({

apps/api/src/helper/object.helper.ts

@@ -16,9 +16,11 @@ export function hasNotDefinedValuesInObject(aObject: Object): boolean {
 export function nullifyValuesInObject<T>(aObject: T, keys: string[]): T {
   const object = cloneDeep(aObject);
 
-  keys.forEach((key) => {
-    object[key] = null;
-  });
+  if (object) {
+    keys.forEach((key) => {
+      object[key] = null;
+    });
+  }
 
   return object;
 }

apps/api/src/main.ts

@@ -1,7 +1,9 @@
 import { Logger, ValidationPipe, VersioningType } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { NestFactory } from '@nestjs/core';
+import type { NestExpressApplication } from '@nestjs/platform-express';
 import * as bodyParser from 'body-parser';
+import helmet from 'helmet';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
@@ -10,11 +12,12 @@ async function bootstrap() {
   const configApp = await NestFactory.create(AppModule);
   const configService = configApp.get<ConfigService>(ConfigService);
 
-  const app = await NestFactory.create(AppModule, {
+  const app = await NestFactory.create<NestExpressApplication>(AppModule, {
     logger: environment.production
       ? ['error', 'log', 'warn']
       : ['debug', 'error', 'log', 'verbose', 'warn']
   });
+
   app.enableCors();
   app.enableVersioning({
     defaultVersion: '1',
@@ -32,6 +35,22 @@ async function bootstrap() {
   // Support 10mb csv/json files for importing activities
   app.use(bodyParser.json({ limit: '10mb' }));
 
+  if (configService.get<string>('ENABLE_FEATURE_SUBSCRIPTION') === 'true') {
+    app.use(
+      helmet({
+        contentSecurityPolicy: {
+          directives: {
+            frameSrc: ["'self'", 'https://js.stripe.com'], // Allow loading frames from Stripe
+            scriptSrc: ["'self'", "'unsafe-inline'", 'https://js.stripe.com'], // Allow inline scripts and scripts from Stripe
+            scriptSrcAttr: ["'self'", "'unsafe-inline'"], // Allow inline event handlers
+            styleSrc: ["'self'", "'unsafe-inline'"] // Allow inline styles
+          }
+        },
+        crossOriginOpenerPolicy: false // Disable Cross-Origin-Opener-Policy header (for Internet Identity)
+      })
+    );
+  }
+
   const BASE_CURRENCY = configService.get<string>('BASE_CURRENCY');
   const HOST = configService.get<string>('HOST') || '0.0.0.0';
   const PORT = configService.get<number>('PORT') || 3333;

apps/api/src/services/configuration/configuration.service.ts

@@ -16,6 +16,7 @@ export class ConfigurationService {
         default: 'USD'
       }),
       BETTER_UPTIME_API_KEY: str({ default: '' }),
+      CACHE_QUOTES_TTL: num({ default: 1 }),
       CACHE_TTL: num({ default: 1 }),
       DATA_SOURCE_EXCHANGE_RATES: str({ default: DataSource.YAHOO }),
       DATA_SOURCE_IMPORT: str({ default: DataSource.YAHOO }),

apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts

@@ -114,8 +114,14 @@ export class AlphaVantageService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    const result = await this.alphaVantage.data.search(aQuery);
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
+    const result = await this.alphaVantage.data.search(query);
 
     return {
       items: result?.bestMatches?.map((bestMatch) => {

apps/api/src/services/data-provider/coingecko/coingecko.service.ts

@@ -164,16 +164,17 @@ export class CoinGeckoService implements DataProviderInterface {
     return 'bitcoin';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     let items: LookupItem[] = [];
 
     try {
-      const get = bent(
-        `${this.URL}/search?query=${aQuery}`,
-        'GET',
-        'json',
-        200
-      );
+      const get = bent(`${this.URL}/search?query=${query}`, 'GET', 'json', 200);
       const { coins } = await get();
 
       items = coins.map(({ id: symbol, name }) => {

apps/api/src/services/data-provider/data-provider.module.ts

@@ -1,3 +1,4 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';
 import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
@@ -26,6 +27,7 @@ import { DataProviderService } from './data-provider.service';
     MarketDataModule,
     PrismaModule,
     PropertyModule,
+    RedisCacheModule,
     SymbolProfileModule
   ],
   providers: [

apps/api/src/services/data-provider/data-provider.service.ts

@@ -1,3 +1,4 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
@@ -11,8 +12,7 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { PROPERTY_DATA_SOURCE_MAPPING } from '@ghostfolio/common/config';
 import { DATE_FORMAT, getStartOfUtcDate } from '@ghostfolio/common/helper';
-import { UserWithSettings } from '@ghostfolio/common/types';
-import { Granularity } from '@ghostfolio/common/types';
+import type { Granularity, UserWithSettings } from '@ghostfolio/common/types';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource, MarketData, SymbolProfile } from '@prisma/client';
 import { format, isValid } from 'date-fns';
@@ -28,7 +28,8 @@ export class DataProviderService {
     private readonly dataProviderInterfaces: DataProviderInterface[],
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
-    private readonly propertyService: PropertyService
+    private readonly propertyService: PropertyService,
+    private readonly redisCacheService: RedisCacheService
   ) {
     this.initialize();
   }
@@ -236,9 +237,43 @@ export class DataProviderService {
     } = {};
     const startTimeTotal = performance.now();
 
-    const itemsGroupedByDataSource = groupBy(items, (item) => item.dataSource);
+    // Get items from cache
+    const itemsToFetch: IDataGatheringItem[] = [];
 
-    const promises = [];
+    for (const { dataSource, symbol } of items) {
+      const quoteString = await this.redisCacheService.get(
+        this.redisCacheService.getQuoteKey({ dataSource, symbol })
+      );
+
+      if (quoteString) {
+        try {
+          const cachedDataProviderResponse = JSON.parse(quoteString);
+          response[symbol] = cachedDataProviderResponse;
+        } catch {}
+      }
+
+      if (!quoteString) {
+        itemsToFetch.push({ dataSource, symbol });
+      }
+    }
+
+    const numberOfItemsInCache = Object.keys(response)?.length;
+
+    if (numberOfItemsInCache) {
+      Logger.debug(
+        `Fetched ${numberOfItemsInCache} quote${
+          numberOfItemsInCache > 1 ? 's' : ''
+        } from cache in ${((performance.now() - startTimeTotal) / 1000).toFixed(
+          3
+        )} seconds`
+      );
+    }
+
+    const itemsGroupedByDataSource = groupBy(itemsToFetch, ({ dataSource }) => {
+      return dataSource;
+    });
+
+    const promises: Promise<any>[] = [];
 
     for (const [dataSource, dataGatheringItems] of Object.entries(
       itemsGroupedByDataSource
@@ -272,6 +307,15 @@ export class DataProviderService {
               result
             )) {
               response[symbol] = dataProviderResponse;
+
+              this.redisCacheService.set(
+                this.redisCacheService.getQuoteKey({
+                  dataSource: DataSource[dataSource],
+                  symbol
+                }),
+                JSON.stringify(dataProviderResponse),
+                this.configurationService.get('CACHE_QUOTES_TTL')
+              );
             }
 
             Logger.debug(
@@ -284,7 +328,7 @@ export class DataProviderService {
             );
 
             try {
-              await this.marketDataService.updateMany({
+              this.marketDataService.updateMany({
                 data: Object.keys(response)
                   .filter((symbol) => {
                     return (
@@ -323,9 +367,11 @@ export class DataProviderService {
   }
 
   public async search({
+    includeIndices = false,
     query,
     user
   }: {
+    includeIndices?: boolean;
     query: string;
     user: UserWithSettings;
   }): Promise<{ items: LookupItem[] }> {
@@ -348,7 +394,12 @@ export class DataProviderService {
     }
 
     for (const dataSource of dataSources) {
-      promises.push(this.getDataProvider(DataSource[dataSource]).search(query));
+      promises.push(
+        this.getDataProvider(DataSource[dataSource]).search({
+          includeIndices,
+          query
+        })
+      );
     }
 
     const searchResults = await Promise.all(promises);

apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@@ -156,7 +156,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
             return !symbol.endsWith('.FOREX');
           })
           .map((symbol) => {
-            return this.search(symbol);
+            return this.search({ query: symbol });
           })
       );
 
@@ -219,8 +219,14 @@ export class EodHistoricalDataService implements DataProviderInterface {
     return 'AAPL.US';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    const searchResult = await this.getSearchResult(aQuery);
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
+    const searchResult = await this.getSearchResult(query);
 
     return {
       items: searchResult

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -5,11 +5,13 @@ import {
   IDataProviderHistoricalResponse,
   IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
 import { DataProviderInfo } from '@ghostfolio/common/interfaces';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
 import bent from 'bent';
+import { format, isAfter, isBefore, isSameDay } from 'date-fns';
 
 @Injectable()
 export class FinancialModelingPrepService implements DataProviderInterface {
@@ -61,9 +63,42 @@ export class FinancialModelingPrepService implements DataProviderInterface {
   ): Promise<{
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
-    return {
-      [aSymbol]: {}
-    };
+    try {
+      const get = bent(
+        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`,
+        'GET',
+        'json',
+        200
+      );
+      const { historical } = await get();
+
+      const result: {
+        [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
+      } = {
+        [aSymbol]: {}
+      };
+
+      for (const { close, date } of historical) {
+        if (
+          (isSameDay(parseDate(date), from) ||
+            isAfter(parseDate(date), from)) &&
+          isBefore(parseDate(date), to)
+        ) {
+          result[aSymbol][date] = {
+            marketPrice: close
+          };
+        }
+      }
+
+      return result;
+    } catch (error) {
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
+    }
   }
 
   public getName(): DataSource {
@@ -108,8 +143,39 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     return 'AAPL';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    return { items: [] };
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
+    let items: LookupItem[] = [];
+
+    try {
+      const get = bent(
+        `${this.URL}/search?query=${query}&apikey=${this.apiKey}`,
+        'GET',
+        'json',
+        200
+      );
+      const result = await get();
+
+      items = result.map(({ currency, name, symbol }) => {
+        return {
+          // TODO: Add assetClass
+          // TODO: Add assetSubClass
+          currency,
+          name,
+          symbol,
+          dataSource: this.getName()
+        };
+      });
+    } catch (error) {
+      Logger.error(error, 'FinancialModelingPrepService');
+    }
+
+    return { items };
   }
 
   private getDataProviderInfo(): DataProviderInfo {

apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts

@@ -153,7 +153,13 @@ export class GoogleSheetsService implements DataProviderInterface {
     return 'INDEXSP:.INX';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     const items = await this.prismaService.symbolProfile.findMany({
       select: {
         assetClass: true,
@@ -169,14 +175,14 @@ export class GoogleSheetsService implements DataProviderInterface {
             dataSource: this.getName(),
             name: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           },
           {
             dataSource: this.getName(),
             symbol: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           }
         ]

apps/api/src/services/data-provider/interfaces/data-provider.interface.ts

@@ -42,5 +42,11 @@ export interface DataProviderInterface {
 
   getTestSymbol(): string;
 
-  search(aQuery: string): Promise<{ items: LookupItem[] }>;
+  search({
+    includeIndices,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }>;
 }

apps/api/src/services/data-provider/manual/manual.service.ts

@@ -67,8 +67,12 @@ export class ManualService implements DataProviderInterface {
       const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
         [{ symbol, dataSource: this.getName() }]
       );
-      const { defaultMarketPrice, selector, url } =
-        symbolProfile.scraperConfiguration ?? {};
+      const {
+        defaultMarketPrice,
+        headers = {},
+        selector,
+        url
+      } = symbolProfile.scraperConfiguration ?? {};
 
       if (defaultMarketPrice) {
         const historical: {
@@ -91,7 +95,7 @@ export class ManualService implements DataProviderInterface {
         return {};
       }
 
-      const get = bent(url, 'GET', 'string', 200, {});
+      const get = bent(url, 'GET', 'string', 200, headers);
 
       const html = await get();
       const $ = cheerio.load(html);
@@ -171,7 +175,13 @@ export class ManualService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     let items = await this.prismaService.symbolProfile.findMany({
       select: {
         assetClass: true,
@@ -187,14 +197,14 @@ export class ManualService implements DataProviderInterface {
             dataSource: this.getName(),
             name: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           },
           {
             dataSource: this.getName(),
             symbol: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           }
         ]

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -117,7 +117,13 @@ export class RapidApiService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     return { items: [] };
   }
 

apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

@@ -138,8 +138,7 @@ export class YahooFinanceService implements DataProviderInterface {
           marketPrice: this.getConvertedValue({
             symbol: aSymbol,
             value: historicalItem.close
-          }),
-          performance: historicalItem.open - historicalItem.close
+          })
         };
       }
 
@@ -276,11 +275,23 @@ export class YahooFinanceService implements DataProviderInterface {
     return 'AAPL';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     const items: LookupItem[] = [];
 
     try {
-      const searchResult = await yahooFinance.search(aQuery);
+      const quoteTypes = ['EQUITY', 'ETF', 'FUTURE', 'MUTUALFUND'];
+
+      if (includeIndices) {
+        quoteTypes.push('INDEX');
+      }
+
+      const searchResult = await yahooFinance.search(query);
 
       const quotes = searchResult.quotes
         .filter((quote) => {
@@ -296,7 +307,7 @@ export class YahooFinanceService implements DataProviderInterface {
                   this.baseCurrency
                 )
               )) ||
-            ['EQUITY', 'ETF', 'FUTURE', 'MUTUALFUND'].includes(quoteType)
+            quoteTypes.includes(quoteType)
           );
         })
         .filter(({ quoteType, symbol }) => {

apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

@@ -186,28 +186,42 @@ export class ExchangeRateDataService {
         factor = marketData?.marketPrice;
       } else {
         // Calculate indirectly via base currency
-        try {
-          const [
-            { marketPrice: marketPriceBaseCurrencyFromCurrency },
-            { marketPrice: marketPriceBaseCurrencyToCurrency }
-          ] = await Promise.all([
-            this.marketDataService.get({
-              dataSource,
-              date: aDate,
-              symbol: `${this.baseCurrency}${aFromCurrency}`
-            }),
-            this.marketDataService.get({
-              dataSource,
-              date: aDate,
-              symbol: `${this.baseCurrency}${aToCurrency}`
-            })
-          ]);
 
-          // Calculate the opposite direction
-          factor =
-            (1 / marketPriceBaseCurrencyFromCurrency) *
-            marketPriceBaseCurrencyToCurrency;
+        let marketPriceBaseCurrencyFromCurrency: number;
+        let marketPriceBaseCurrencyToCurrency: number;
+
+        try {
+          if (this.baseCurrency === aFromCurrency) {
+            marketPriceBaseCurrencyFromCurrency = 1;
+          } else {
+            marketPriceBaseCurrencyFromCurrency = (
+              await this.marketDataService.get({
+                dataSource,
+                date: aDate,
+                symbol: `${this.baseCurrency}${aFromCurrency}`
+              })
+            )?.marketPrice;
+          }
         } catch {}
+
+        try {
+          if (this.baseCurrency === aToCurrency) {
+            marketPriceBaseCurrencyToCurrency = 1;
+          } else {
+            marketPriceBaseCurrencyToCurrency = (
+              await this.marketDataService.get({
+                dataSource,
+                date: aDate,
+                symbol: `${this.baseCurrency}${aToCurrency}`
+              })
+            )?.marketPrice;
+          }
+        } catch {}
+
+        // Calculate the opposite direction
+        factor =
+          (1 / marketPriceBaseCurrencyFromCurrency) *
+          marketPriceBaseCurrencyToCurrency;
       }
     }
 

apps/api/src/services/impersonation/impersonation.service.ts

@@ -12,22 +12,36 @@ export class ImpersonationService {
   ) {}
 
   public async validateImpersonationId(aId = '') {
-    const accessObject = await this.prismaService.access.findFirst({
-      where: {
-        GranteeUser: { id: this.request.user.id },
-        id: aId
-      }
-    });
+    if (this.request.user) {
+      const accessObject = await this.prismaService.access.findFirst({
+        where: {
+          GranteeUser: { id: this.request.user.id },
+          id: aId
+        }
+      });
 
-    if (accessObject?.userId) {
-      return accessObject?.userId;
-    } else if (
-      hasPermission(
-        this.request.user.permissions,
-        permissions.impersonateAllUsers
-      )
-    ) {
-      return aId;
+      if (accessObject?.userId) {
+        return accessObject.userId;
+      } else if (
+        hasPermission(
+          this.request.user.permissions,
+          permissions.impersonateAllUsers
+        )
+      ) {
+        return aId;
+      }
+    } else {
+      // Public access
+      const accessObject = await this.prismaService.access.findFirst({
+        where: {
+          GranteeUser: null,
+          User: { id: aId }
+        }
+      });
+
+      if (accessObject?.userId) {
+        return accessObject.userId;
+      }
     }
 
     return null;

apps/api/src/services/interfaces/environment.interface.ts

@@ -5,6 +5,7 @@ export interface Environment extends CleanedEnvAccessors {
   ALPHA_VANTAGE_API_KEY: string;
   BASE_CURRENCY: string;
   BETTER_UPTIME_API_KEY: string;
+  CACHE_QUOTES_TTL: number;
   CACHE_TTL: number;
   DATA_SOURCE_EXCHANGE_RATES: string;
   DATA_SOURCE_IMPORT: string;

apps/api/src/services/interfaces/interfaces.ts

@@ -23,7 +23,6 @@ export interface IOrder {
 
 export interface IDataProviderHistoricalResponse {
   marketPrice: number;
-  performance?: number;
 }
 
 export interface IDataProviderResponse {

apps/api/src/services/symbol-profile/symbol-profile.service.ts

@@ -15,6 +15,12 @@ import { continents, countries } from 'countries-list';
 export class SymbolProfileService {
   public constructor(private readonly prismaService: PrismaService) {}
 
+  public async add(
+    assetProfile: Prisma.SymbolProfileCreateInput
+  ): Promise<SymbolProfile | never> {
+    return this.prismaService.symbolProfile.create({ data: assetProfile });
+  }
+
   public async delete({ dataSource, symbol }: UniqueAsset) {
     return this.prismaService.symbolProfile.delete({
       where: { dataSource_symbol: { dataSource, symbol } }
@@ -90,11 +96,12 @@ export class SymbolProfileService {
   public updateSymbolProfile({
     comment,
     dataSource,
+    scraperConfiguration,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     return this.prismaService.symbolProfile.update({
-      data: { comment, symbolMapping },
+      data: { comment, scraperConfiguration, symbolMapping },
       where: { dataSource_symbol: { dataSource, symbol } }
     });
   }
@@ -189,6 +196,8 @@ export class SymbolProfileService {
     if (scraperConfiguration) {
       return {
         defaultMarketPrice: scraperConfiguration.defaultMarketPrice as number,
+        headers:
+          scraperConfiguration.headers as ScraperConfiguration['headers'],
         selector: scraperConfiguration.selector as string,
         url: scraperConfiguration.url as string
       };

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

@@ -5,25 +5,19 @@ import { PageTitleStrategy } from '@ghostfolio/client/services/page-title.strate
 import { ModulePreloadService } from './core/module-preload.service';
 
 const routes: Routes = [
-  {
-    path: 'about',
+  ...[
+    'about',
+    /////
+    'a-propos',
+    'informazioni-su',
+    'over',
+    'sobre',
+    'ueber-uns'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/about/about-page.module').then((m) => m.AboutPageModule)
-  },
-  {
-    path: 'about/changelog',
-    loadChildren: () =>
-      import('./pages/about/changelog/changelog-page.module').then(
-        (m) => m.ChangelogPageModule
-      )
-  },
-  {
-    path: 'about/privacy-policy',
-    loadChildren: () =>
-      import('./pages/about/privacy-policy/privacy-policy-page.module').then(
-        (m) => m.PrivacyPolicyPageModule
-      )
-  },
+  })),
   {
     path: 'account',
     loadChildren: () =>
@@ -48,124 +42,64 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/auth/auth-page.module').then((m) => m.AuthPageModule)
   },
-  {
-    path: 'blog',
+  ...['blog'].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/blog/blog-page.module').then((m) => m.BlogPageModule)
-  },
-  {
-    path: 'blog/2021/07/hallo-ghostfolio',
-    loadChildren: () =>
-      import(
-        './pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.module'
-      ).then((m) => m.HalloGhostfolioPageModule)
-  },
-  {
-    path: 'blog/2021/07/hello-ghostfolio',
-    loadChildren: () =>
-      import(
-        './pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.module'
-      ).then((m) => m.HelloGhostfolioPageModule)
-  },
-  {
-    path: 'blog/2022/01/ghostfolio-first-months-in-open-source',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.module'
-      ).then((m) => m.FirstMonthsInOpenSourcePageModule)
-  },
-  {
-    path: 'blog/2022/07/ghostfolio-meets-internet-identity',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.module'
-      ).then((m) => m.GhostfolioMeetsInternetIdentityPageModule)
-  },
-  {
-    path: 'blog/2022/07/how-do-i-get-my-finances-in-order',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/07/how-do-i-get-my-finances-in-order/how-do-i-get-my-finances-in-order-page.module'
-      ).then((m) => m.HowDoIGetMyFinancesInOrderPageModule)
-  },
-  {
-    path: 'blog/2022/08/500-stars-on-github',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.module'
-      ).then((m) => m.FiveHundredStarsOnGitHubPageModule)
-  },
-  {
-    path: 'blog/2022/10/hacktoberfest-2022',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.module'
-      ).then((m) => m.Hacktoberfest2022PageModule)
-  },
-  {
-    path: 'blog/2022/11/black-friday-2022',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module'
-      ).then((m) => m.BlackFriday2022PageModule)
-  },
-  {
-    path: 'blog/2022/12/the-importance-of-tracking-your-personal-finances',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.module'
-      ).then((m) => m.TheImportanceOfTrackingYourPersonalFinancesPageModule)
-  },
-  {
-    path: 'blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.module'
-      ).then((m) => m.GhostfolioAufSackgeldVorgestelltPageModule)
-  },
-  {
-    path: 'blog/2023/02/ghostfolio-meets-umbrel',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/02/ghostfolio-meets-umbrel/ghostfolio-meets-umbrel-page.module'
-      ).then((m) => m.GhostfolioMeetsUmbrelPageModule)
-  },
-  {
-    path: 'blog/2023/03/ghostfolio-reaches-1000-stars-on-github',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/03/1000-stars-on-github/1000-stars-on-github-page.module'
-      ).then((m) => m.ThousandStarsOnGitHubPageModule)
-  },
+  })),
   {
     path: 'demo',
     loadChildren: () =>
       import('./pages/demo/demo-page.module').then((m) => m.DemoPageModule)
   },
-  {
-    path: 'faq',
+  ...[
+    'faq',
+    /////
+    'domande-piu-frequenti',
+    'foire-aux-questions',
+    'haeufig-gestellte-fragen',
+    'perguntas-mais-frequentes',
+    'preguntas-mas-frecuentes',
+    'vaak-gestelde-vragen'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/faq/faq-page.module').then((m) => m.FaqPageModule)
-  },
-  {
-    path: 'features',
+  })),
+  ...[
+    'features',
+    /////
+    'fonctionnalites',
+    'funcionalidades',
+    'funzionalita',
+    'kenmerken'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/features/features-page.module').then(
         (m) => m.FeaturesPageModule
       )
-  },
+  })),
   {
     path: 'home',
     loadChildren: () =>
       import('./pages/home/home-page.module').then((m) => m.HomePageModule)
   },
-  {
-    path: 'markets',
+  ...[
+    'markets',
+    /////
+    'maerkte',
+    'marches',
+    'markten',
+    'mercados',
+    'mercati'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/markets/markets-page.module').then(
         (m) => m.MarketsPageModule
       )
-  },
+  })),
   {
     path: 'open',
     loadChildren: () =>
@@ -185,27 +119,53 @@ const routes: Routes = [
         (m) => m.PortfolioPageModule
       )
   },
-  {
-    path: 'pricing',
+  ...[
+    'pricing',
+    /////
+    'precios',
+    'precos',
+    'preise',
+    'prezzi',
+    'prijzen',
+    'prix'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/pricing/pricing-page.module').then(
         (m) => m.PricingPageModule
       )
-  },
-  {
-    path: 'register',
+  })),
+  ...[
+    'register',
+    /////
+    'enregistrement',
+    'iscrizione',
+    'registo',
+    'registratie',
+    'registrierung',
+    'registro'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/register/register-page.module').then(
         (m) => m.RegisterPageModule
       )
-  },
-  {
-    path: 'resources',
+  })),
+  ...[
+    'resources',
+    /////
+    'bronnen',
+    'recursos',
+    'ressourcen',
+    'ressources',
+    'risorse'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/resources/resources-page.module').then(
         (m) => m.ResourcesPageModule
       )
-  },
+  })),
   {
     path: 'start',
     loadChildren: () =>

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

@@ -44,19 +44,143 @@
 </main>
 
 <footer
-  *ngIf="currentRoute === 'start'"
-  class="footer d-flex justify-content-center w-100"
+  *ngIf="
+    (currentRoute === 'blog' ||
+      currentRoute === 'faq' ||
+      currentRoute === 'features' ||
+      currentRoute === 'markets' ||
+      currentRoute === 'open' ||
+      currentRoute === 'pricing' ||
+      currentRoute === 'resources' ||
+      currentRoute === 'register' ||
+      currentRoute === 'start') &&
+    deviceType !== 'mobile'
+  "
+  class="d-flex justify-content-center py-4 w-100"
 >
-  <div class="container text-center">
-    <div>
-      © 2021 - {{ currentYear }} <a href="https://ghostfol.io">Ghostfolio</a>
-      {{ version }}
+  <div class="container">
+    <div class="mb-3 row">
+      <div class="col-sm">
+        <a [routerLink]="['/']"><gf-logo /></a>
+      </div>
+      <div class="col-sm">
+        <div class="h6 mt-2" i18n>Personal Finance</div>
+        <ul class="list-unstyled">
+          <li *ngIf="hasPermissionToAccessFearAndGreedIndex">
+            <a i18n [routerLink]="['/markets']">Markets</a>
+          </li>
+          <li><a i18n [routerLink]="['/resources']">Resources</a></li>
+        </ul>
+      </div>
+      <div class="col-sm">
+        <div class="h6 mt-2">Ghostfolio</div>
+        <ul class="list-unstyled">
+          <li><a i18n [routerLink]="['/about']">About</a></li>
+          <li *ngIf="hasPermissionForBlog">
+            <a i18n [routerLink]="['/blog']">Blog</a>
+          </li>
+          <li>
+            <a i18n [routerLink]="['/about', 'changelog']">Changelog</a>
+          </li>
+          <li><a i18n [routerLink]="['/features']">Features</a></li>
+          <li *ngIf="hasPermissionForSubscription">
+            <a i18n [routerLink]="['/faq']">Frequently Asked Questions (FAQ)</a>
+          </li>
+          <li>
+            <a i18n [routerLink]="['/about', 'license']">License</a>
+          </li>
+          <li *ngIf="hasPermissionForStatistics">
+            <a [routerLink]="['/open']">Open Startup</a>
+          </li>
+          <li *ngIf="hasPermissionForSubscription">
+            <a i18n [routerLink]="['/pricing']">Pricing</a>
+          </li>
+          <li *ngIf="hasPermissionForSubscription">
+            <a i18n [routerLink]="['/about', 'privacy-policy']"
+              >Privacy Policy</a
+            >
+          </li>
+          <li *ngIf="hasPermissionForSubscription">
+            <a
+              class="align-items-baseline d-flex"
+              href="https://status.ghostfol.io"
+              target="_blank"
+              title="Ghostfolio Status"
+              >Status<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
+          </li>
+        </ul>
+      </div>
+      <div class="col-sm">
+        <div class="h6 mt-2" i18n>Community</div>
+        <ul class="list-unstyled">
+          <li>
+            <a
+              class="align-items-baseline d-flex"
+              href="https://github.com/ghostfolio/ghostfolio"
+              target="_blank"
+              title="Find Ghostfolio on GitHub"
+              >GitHub<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
+          </li>
+          <li>
+            <a
+              class="align-items-baseline d-flex"
+              href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"
+              target="_blank"
+              title="Join the Ghostfolio Slack community"
+              >Slack<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
+          </li>
+          <li>
+            <a
+              class="align-items-baseline d-flex"
+              href="https://twitter.com/ghostfolio_"
+              target="_blank"
+              title="Follow Ghostfolio on Twitter"
+              >Twitter<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
+          </li>
+          <li>&nbsp;</li>
+          <li>
+            <a href="../de" title="Ghostfolio in Deutsch">Deutsch</a>
+          </li>
+          <li>
+            <a href="../en" title="Ghostfolio in English">English</a>
+          </li>
+          <li>
+            <a href="../es" title="Ghostfolio in Español">Español</a>
+          </li>
+          <li>
+            <a href="../fr" title="Ghostfolio en Français">Français</a>
+          </li>
+          <li>
+            <a href="../it" title="Ghostfolio in Italiano">Italiano</a>
+          </li>
+          <li>
+            <a href="../nl" title="Ghostfolio in Nederlands">Nederlands</a>
+          </li>
+          <li>
+            <a href="../pt" title="Ghostfolio in Português">Português</a>
+          </li>
+        </ul>
+      </div>
     </div>
-    <div class="py-2 text-muted">
-      <small i18n
-        >The risk of loss in trading can be substantial. It is not advisable to
-        invest money you may need in the short term.</small
-      >
+
+    <div class="row text-center">
+      <div class="col">
+        © 2021 - {{ currentYear }} <a href="https://ghostfol.io">Ghostfolio</a>
+        {{ version }}
+      </div>
+    </div>
+
+    <div class="row text-center text-muted">
+      <div class="col">
+        <small i18n
+          >The risk of loss in trading can be substantial. It is not advisable
+          to invest money you may need in the short term.</small
+        >
+      </div>
     </div>
   </div>
 </footer>

apps/client/src/app/app.component.scss

@@ -4,6 +4,11 @@
   display: block;
   min-height: 100vh;
 
+  footer {
+    background-color: rgba(var(--palette-foreground-text), 0.05);
+    font-size: 90%;
+  }
+
   main {
     min-height: 100vh;
     padding-top: 5rem;
@@ -25,14 +30,13 @@
       }
     }
   }
-
-  .footer {
-    height: 5rem;
-    line-height: 1;
-  }
 }
 
 :host-context(.is-dark-theme) {
+  footer {
+    background-color: rgba(var(--palette-foreground-text-dark), 0.05);
+  }
+
   main {
     .info-message-container {
       .info-message {

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

@@ -32,6 +32,10 @@ export class AppComponent implements OnDestroy, OnInit {
   public currentRoute: string;
   public currentYear = new Date().getFullYear();
   public deviceType: string;
+  public hasPermissionForBlog: boolean;
+  public hasPermissionForStatistics: boolean;
+  public hasPermissionForSubscription: boolean;
+  public hasPermissionToAccessFearAndGreedIndex: boolean;
   public info: InfoItem;
   public pageTitle: string;
   public user: User;
@@ -55,6 +59,27 @@ export class AppComponent implements OnDestroy, OnInit {
 
   public ngOnInit() {
     this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+    this.info = this.dataService.fetchInfo();
+
+    this.hasPermissionForBlog = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableBlog
+    );
+
+    this.hasPermissionForSubscription = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableSubscription
+    );
+
+    this.hasPermissionForStatistics = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableStatistics
+    );
+
+    this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableFearAndGreedIndex
+    );
 
     this.router.events
       .pipe(filter((event) => event instanceof NavigationEnd))
@@ -64,8 +89,6 @@ export class AppComponent implements OnDestroy, OnInit {
         const urlSegments = urlSegmentGroup.segments;
         this.currentRoute = urlSegments[0].path;
 
-        this.info = this.dataService.fetchInfo();
-
         if (this.deviceType === 'mobile') {
           setTimeout(() => {
             const index = this.title.getTitle().indexOf('–');

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

@@ -14,6 +14,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ServiceWorkerModule } from '@angular/service-worker';
+import { GfLogoModule } from '@ghostfolio/ui/logo';
 import { MarkdownModule } from 'ngx-markdown';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { NgxStripeModule, STRIPE_PUBLISHABLE_KEY } from 'ngx-stripe';
@@ -40,6 +41,7 @@ export function NgxStripeFactory(): string {
     BrowserAnimationsModule,
     BrowserModule,
     GfHeaderModule,
+    GfLogoModule,
     GfSubscriptionInterstitialDialogModule,
     HttpClientModule,
     MarkdownModule.forRoot(),

apps/client/src/app/components/access-table/access-table.component.html

@@ -47,7 +47,7 @@
         [matMenuTriggerFor]="transactionMenu"
         (click)="$event.stopPropagation()"
       >
-        <ion-icon name="ellipsis-vertical"></ion-icon>
+        <ion-icon name="ellipsis-horizontal"></ion-icon>
       </button>
       <mat-menu #transactionMenu="matMenu" xPosition="before">
         <button mat-menu-item (click)="onDeleteAccess(element.id)">
@@ -57,6 +57,6 @@
     </td>
   </ng-container>
 
-  <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-  <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+  <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
+  <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
 </table>

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -12,8 +12,9 @@
       <div class="col-12 d-flex justify-content-center mb-3">
         <gf-value
           size="large"
-          [currency]="user?.settings?.baseCurrency"
+          [isCurrency]="true"
           [locale]="user?.settings?.locale"
+          [unit]="user?.settings?.baseCurrency"
           [value]="valueInBaseCurrency"
         ></gf-value>
       </div>
@@ -24,8 +25,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="currency"
+          [isCurrency]="true"
           [locale]="user?.settings?.locale"
+          [unit]="currency"
           [value]="balance"
           >Cash Balance</gf-value
         >
@@ -34,8 +36,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="currency"
+          [isCurrency]="true"
           [locale]="user?.settings?.locale"
+          [unit]="currency"
           [value]="equity"
           >Equity</gf-value
         >

apps/client/src/app/components/accounts-table/accounts-table.component.html

@@ -207,6 +207,30 @@
     </td>
   </ng-container>
 
+  <ng-container matColumnDef="comment">
+    <th
+      *matHeaderCellDef
+      class="d-none d-lg-table-cell px-1"
+      mat-header-cell
+    ></th>
+    <td *matCellDef="let element" class="d-none d-lg-table-cell px-1" mat-cell>
+      <button
+        *ngIf="element.comment"
+        class="mx-1 no-min-width px-2"
+        mat-button
+        title="Note"
+        (click)="onOpenComment(element.comment); $event.stopPropagation()"
+      >
+        <ion-icon name="document-text-outline"></ion-icon>
+      </button>
+    </td>
+    <td
+      *matFooterCellDef
+      class="d-none d-lg-table-cell px-1"
+      mat-footer-cell
+    ></td>
+  </ng-container>
+
   <ng-container matColumnDef="actions">
     <th *matHeaderCellDef class="px-1 text-center" i18n mat-header-cell></th>
     <td *matCellDef="let element" class="px-1 text-center" mat-cell>
@@ -216,7 +240,7 @@
         [matMenuTriggerFor]="accountMenu"
         (click)="$event.stopPropagation()"
       >
-        <ion-icon name="ellipsis-vertical"></ion-icon>
+        <ion-icon name="ellipsis-horizontal"></ion-icon>
       </button>
       <mat-menu #accountMenu="matMenu" xPosition="before">
         <button mat-menu-item (click)="onUpdateAccount(element)">

apps/client/src/app/components/accounts-table/accounts-table.component.ts

@@ -58,7 +58,8 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
       'balance',
       'value',
       'currency',
-      'valueInBaseCurrency'
+      'valueInBaseCurrency',
+      'comment'
     ];
 
     if (this.showActions) {
@@ -92,6 +93,10 @@ export class AccountsTableComponent implements OnChanges, OnDestroy, OnInit {
     });
   }
 
+  public onOpenComment(aComment: string) {
+    alert(aComment);
+  }
+
   public onUpdateAccount(aAccount: AccountModel) {
     this.accountToUpdate.emit(aAccount);
   }

apps/client/src/app/components/admin-jobs/admin-jobs.html

@@ -108,7 +108,7 @@
                   [matMenuTriggerFor]="jobActionsMenu"
                   (click)="$event.stopPropagation()"
                 >
-                  <ion-icon name="ellipsis-vertical"></ion-icon>
+                  <ion-icon name="ellipsis-horizontal"></ion-icon>
                 </button>
                 <mat-menu #jobActionsMenu="matMenu" xPosition="before">
                   <button mat-menu-item (click)="onViewData(job.data)">

apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@@ -1,4 +1,5 @@
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -7,23 +8,26 @@ import {
   ViewChild
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { MatSort } from '@angular/material/sort';
+import { MatSort, Sort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { getDateFormatString } from '@ghostfolio/common/helper';
 import { Filter, UniqueAsset, User } from '@ghostfolio/common/interfaces';
 import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-data.interface';
 import { translate } from '@ghostfolio/ui/i18n';
-import { AssetSubClass, DataSource } from '@prisma/client';
+import { AssetSubClass, DataSource, Prisma } from '@prisma/client';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
 import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
 
 import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component';
 import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces';
+import { CreateAssetProfileDialog } from './create-asset-profile-dialog/create-asset-profile-dialog.component';
+import { CreateAssetProfileDialogParams } from './create-asset-profile-dialog/interfaces/interfaces';
+import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
+import { MatPaginator, PageEvent } from '@angular/material/paginator';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,7 +35,10 @@ import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/inte
   styleUrls: ['./admin-market-data.scss'],
   templateUrl: './admin-market-data.html'
 })
-export class AdminMarketDataComponent implements OnDestroy, OnInit {
+export class AdminMarketDataComponent
+  implements AfterViewInit, OnDestroy, OnInit
+{
+  @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
   public activeFilters: Filter[] = [];
@@ -73,6 +80,8 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
   public filters$ = new Subject<Filter[]>();
   public isLoading = false;
   public placeholder = '';
+  public pageSize = DEFAULT_PAGE_SIZE;
+  public totalItems = 0;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();
@@ -80,7 +89,6 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
   public constructor(
     private adminService: AdminService,
     private changeDetectorRef: ChangeDetectorRef,
-    private dataService: DataService,
     private deviceService: DeviceDetectorService,
     private dialog: MatDialog,
     private route: ActivatedRoute,
@@ -99,6 +107,8 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
             dataSource: params['dataSource'],
             symbol: params['symbol']
           });
+        } else if (params['createAssetProfileDialog']) {
+          this.openCreateAssetProfileDialog();
         }
       });
 
@@ -113,34 +123,40 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
           );
         }
       });
+
+    this.filters$
+      .pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject))
+      .subscribe((filters) => {
+        this.activeFilters = filters;
+
+        this.loadData();
+      });
+  }
+
+  public ngAfterViewInit() {
+    this.sort.sortChange.subscribe(
+      ({ active: sortColumn, direction }: Sort) => {
+        this.paginator.pageIndex = 0;
+
+        this.loadData({
+          sortColumn,
+          sortDirection: <Prisma.SortOrder>direction,
+          pageIndex: this.paginator.pageIndex
+        });
+      }
+    );
   }
 
   public ngOnInit() {
     this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+  }
 
-    this.filters$
-      .pipe(
-        distinctUntilChanged(),
-        switchMap((filters) => {
-          this.isLoading = true;
-          this.activeFilters = filters;
-          this.placeholder =
-            this.activeFilters.length <= 0 ? $localize`Filter by...` : '';
-
-          return this.dataService.fetchAdminMarketData({
-            filters: this.activeFilters
-          });
-        }),
-        takeUntil(this.unsubscribeSubject)
-      )
-      .subscribe(({ marketData }) => {
-        this.dataSource = new MatTableDataSource(marketData);
-        this.dataSource.sort = this.sort;
-
-        this.isLoading = false;
-
-        this.changeDetectorRef.markForCheck();
-      });
+  public onChangePage(page: PageEvent) {
+    this.loadData({
+      pageIndex: page.pageIndex,
+      sortColumn: this.sort.active,
+      sortDirection: <Prisma.SortOrder>this.sort.direction
+    });
   }
 
   public onDeleteProfileData({ dataSource, symbol }: UniqueAsset) {
@@ -208,6 +224,47 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
     this.unsubscribeSubject.complete();
   }
 
+  private loadData(
+    {
+      pageIndex,
+      sortColumn,
+      sortDirection
+    }: {
+      pageIndex: number;
+      sortColumn?: string;
+      sortDirection?: Prisma.SortOrder;
+    } = { pageIndex: 0 }
+  ) {
+    this.isLoading = true;
+
+    if (pageIndex === 0 && this.paginator) {
+      this.paginator.pageIndex = 0;
+    }
+
+    this.placeholder =
+      this.activeFilters.length <= 0 ? $localize`Filter by...` : '';
+
+    this.adminService
+      .fetchAdminMarketData({
+        sortColumn,
+        sortDirection,
+        filters: this.activeFilters,
+        skip: pageIndex * this.pageSize,
+        take: this.pageSize
+      })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(({ count, marketData }) => {
+        this.totalItems = count;
+
+        this.dataSource = new MatTableDataSource(marketData);
+        this.dataSource.sort = this.sort;
+
+        this.isLoading = false;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+
   private openAssetProfileDialog({
     dataSource,
     symbol
@@ -241,4 +298,53 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
           });
       });
   }
+
+  private openCreateAssetProfileDialog() {
+    this.userService
+      .get()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((user) => {
+        this.user = user;
+
+        const dialogRef = this.dialog.open(CreateAssetProfileDialog, {
+          autoFocus: false,
+          data: <CreateAssetProfileDialogParams>{
+            deviceType: this.deviceType,
+            locale: this.user?.settings?.locale
+          },
+          width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+        });
+
+        dialogRef
+          .afterClosed()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe(({ dataSource, symbol }) => {
+            if (dataSource && symbol) {
+              this.adminService
+                .addAssetProfile({ dataSource, symbol })
+                .pipe(
+                  switchMap(() => {
+                    this.isLoading = true;
+                    this.changeDetectorRef.markForCheck();
+
+                    return this.adminService.fetchAdminMarketData({
+                      filters: this.activeFilters,
+                      take: this.pageSize
+                    });
+                  }),
+                  takeUntil(this.unsubscribeSubject)
+                )
+                .subscribe(({ marketData }) => {
+                  this.dataSource = new MatTableDataSource(marketData);
+                  this.dataSource.sort = this.sort;
+                  this.isLoading = false;
+
+                  this.changeDetectorRef.markForCheck();
+                });
+            }
+
+            this.router.navigate(['.'], { relativeTo: this.route });
+          });
+      });
+  }
 }

apps/client/src/app/components/admin-market-data/admin-market-data.html

@@ -56,7 +56,7 @@
         </ng-container>
 
         <ng-container matColumnDef="date">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>First Activity</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1" mat-cell>
@@ -74,7 +74,7 @@
         </ng-container>
 
         <ng-container matColumnDef="marketDataItemCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Historical Data</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -83,7 +83,7 @@
         </ng-container>
 
         <ng-container matColumnDef="sectorsCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Sectors Count</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -92,7 +92,7 @@
         </ng-container>
 
         <ng-container matColumnDef="countriesCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Countries Count</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -140,21 +140,9 @@
               [matMenuTriggerFor]="assetProfileActionsMenu"
               (click)="$event.stopPropagation()"
             >
-              <ion-icon name="ellipsis-vertical"></ion-icon>
+              <ion-icon name="ellipsis-horizontal"></ion-icon>
             </button>
             <mat-menu #assetProfileActionsMenu="matMenu" xPosition="before">
-              <button
-                mat-menu-item
-                (click)="onGatherSymbol({dataSource: element.dataSource, symbol: element.symbol})"
-              >
-                <ng-container i18n>Gather Historical Data</ng-container>
-              </button>
-              <button
-                mat-menu-item
-                (click)="onGatherProfileDataBySymbol({dataSource: element.dataSource, symbol: element.symbol})"
-              >
-                <ng-container i18n>Gather Profile Data</ng-container>
-              </button>
               <button
                 mat-menu-item
                 [disabled]="element.activitiesCount !== 0"
@@ -174,6 +162,40 @@
           (click)="onOpenAssetProfileDialog({ dataSource: row.dataSource, symbol: row.symbol })"
         ></tr>
       </table>
+
+      <mat-paginator
+        [length]="totalItems"
+        [ngClass]="{
+          'd-none':
+            (isLoading && totalItems === 0) ||
+            totalItems <= pageSize
+        }"
+        [pageSize]="pageSize"
+        [showFirstLastButtons]="true"
+        (page)="onChangePage($event)"
+      ></mat-paginator>
+
+      <ngx-skeleton-loader
+        *ngIf="isLoading && totalItems === 0"
+        animation="pulse"
+        class="px-4 py-3"
+        [theme]="{
+          height: '1.5rem',
+          width: '100%'
+        }"
+      ></ngx-skeleton-loader>
     </div>
   </div>
+
+  <div class="fab-container">
+    <a
+      class="align-items-center d-flex justify-content-center"
+      color="primary"
+      mat-fab
+      [queryParams]="{ createAssetProfileDialog: true }"
+      [routerLink]="[]"
+    >
+      <ion-icon name="add-outline" size="large"></ion-icon>
+    </a>
+  </div>
 </div>

apps/client/src/app/components/admin-market-data/admin-market-data.module.ts

@@ -2,12 +2,16 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatMenuModule } from '@angular/material/menu';
+import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
+import { RouterModule } from '@angular/router';
 import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { AdminMarketDataComponent } from './admin-market-data.component';
 import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile-dialog.module';
+import { GfCreateAssetProfileDialogModule } from './create-asset-profile-dialog/create-asset-profile-dialog.module';
 
 @NgModule({
   declarations: [AdminMarketDataComponent],
@@ -15,10 +19,14 @@ import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile
     CommonModule,
     GfActivitiesFilterModule,
     GfAssetProfileDialogModule,
+    GfCreateAssetProfileDialogModule,
     MatButtonModule,
     MatMenuModule,
+    MatPaginatorModule,
     MatSortModule,
-    MatTableModule
+    MatTableModule,
+    NgxSkeletonLoaderModule,
+    RouterModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

apps/client/src/app/components/admin-market-data/admin-market-data.scss

@@ -2,4 +2,11 @@
 
 :host {
   display: block;
+
+  .fab-container {
+    bottom: 2rem;
+    position: fixed;
+    right: 2rem;
+    z-index: 999;
+  }
 }

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@@ -10,13 +10,14 @@ import { FormBuilder } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { UpdateAssetProfileDto } from '@ghostfolio/api/app/admin/update-asset-profile.dto';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
+import { DataService } from '@ghostfolio/client/services/data.service';
 import {
   AdminMarketDataDetails,
-  EnhancedSymbolProfile,
+  ScraperConfiguration,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { translate } from '@ghostfolio/ui/i18n';
-import { MarketData } from '@prisma/client';
+import { MarketData, SymbolProfile } from '@prisma/client';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
@@ -34,12 +35,15 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
   public assetProfile: AdminMarketDataDetails['assetProfile'];
   public assetProfileForm = this.formBuilder.group({
     comment: '',
+    scraperConfiguration: '',
     symbolMapping: ''
   });
   public assetSubClass: string;
+  public benchmarks: Partial<SymbolProfile>[];
   public countries: {
     [code: string]: { name: string; value: number };
   };
+  public isBenchmark = false;
   public marketDataDetails: MarketData[] = [];
   public sectors: {
     [name: string]: { name: string; value: number };
@@ -51,11 +55,14 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     private adminService: AdminService,
     private changeDetectorRef: ChangeDetectorRef,
     @Inject(MAT_DIALOG_DATA) public data: AssetProfileDialogParams,
+    private dataService: DataService,
     public dialogRef: MatDialogRef<AssetProfileDialog>,
     private formBuilder: FormBuilder
   ) {}
 
   public ngOnInit(): void {
+    this.benchmarks = this.dataService.fetchInfo().benchmarks;
+
     this.initialize();
   }
 
@@ -72,6 +79,9 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
         this.assetClass = translate(this.assetProfile?.assetClass);
         this.assetSubClass = translate(this.assetProfile?.assetSubClass);
         this.countries = {};
+        this.isBenchmark = this.benchmarks.some(({ id }) => {
+          return id === this.assetProfile.id;
+        });
         this.marketDataDetails = marketData;
         this.sectors = {};
 
@@ -95,6 +105,9 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
 
         this.assetProfileForm.setValue({
           comment: this.assetProfile?.comment ?? '',
+          scraperConfiguration: JSON.stringify(
+            this.assetProfile?.scraperConfiguration ?? {}
+          ),
           symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {})
         });
 
@@ -128,9 +141,27 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     }
   }
 
+  public onSetBenchmark({ dataSource, symbol }: UniqueAsset) {
+    this.dataService
+      .postBenchmark({ dataSource, symbol })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        setTimeout(() => {
+          window.location.reload();
+        }, 300);
+      });
+  }
+
   public onSubmit() {
+    let scraperConfiguration = {};
     let symbolMapping = {};
 
+    try {
+      scraperConfiguration = JSON.parse(
+        this.assetProfileForm.controls['scraperConfiguration'].value
+      );
+    } catch {}
+
     try {
       symbolMapping = JSON.parse(
         this.assetProfileForm.controls['symbolMapping'].value
@@ -138,6 +169,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     } catch {}
 
     const assetProfileData: UpdateAssetProfileDto = {
+      scraperConfiguration,
       symbolMapping,
       comment: this.assetProfileForm.controls['comment'].value ?? null
     };

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@@ -37,6 +37,13 @@
       >
         <ng-container i18n>Gather Profile Data</ng-container>
       </button>
+      <button
+        mat-menu-item
+        [disabled]="isBenchmark"
+        (click)="onSetBenchmark({dataSource: data.dataSource, symbol: data.symbol})"
+      >
+        <ng-container i18n>Set as Benchmark</ng-container>
+      </button>
     </mat-menu>
   </div>
 
@@ -155,6 +162,17 @@
         ></textarea>
       </mat-form-field>
     </div>
+    <div *ngIf="assetProfile?.dataSource === 'MANUAL'">
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Scraper Configuration</mat-label>
+        <textarea
+          cdkTextareaAutosize
+          formControlName="scraperConfiguration"
+          matInput
+          type="text"
+        ></textarea>
+      </mat-form-field>
+    </div>
     <div>
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Note</mat-label>

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts

@@ -0,0 +1,53 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators
+} from '@angular/forms';
+import { MatDialogRef } from '@angular/material/dialog';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'h-100' },
+  selector: 'gf-create-asset-profile-dialog',
+  templateUrl: 'create-asset-profile-dialog.html'
+})
+export class CreateAssetProfileDialog implements OnInit, OnDestroy {
+  public createAssetProfileForm: FormGroup;
+
+  public constructor(
+    public readonly adminService: AdminService,
+    public readonly changeDetectorRef: ChangeDetectorRef,
+    public readonly dialogRef: MatDialogRef<CreateAssetProfileDialog>,
+    public readonly formBuilder: FormBuilder
+  ) {}
+
+  public ngOnInit() {
+    this.createAssetProfileForm = this.formBuilder.group({
+      searchSymbol: new FormControl(null, [Validators.required])
+    });
+  }
+
+  public onCancel() {
+    this.dialogRef.close();
+  }
+
+  public onSubmit() {
+    this.dialogRef.close({
+      dataSource:
+        this.createAssetProfileForm.controls['searchSymbol'].value.dataSource,
+      symbol: this.createAssetProfileForm.controls['searchSymbol'].value.symbol
+    });
+  }
+
+  public ngOnDestroy() {}
+}

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html

@@ -0,0 +1,28 @@
+<form
+  class="d-flex flex-column h-100"
+  [formGroup]="createAssetProfileForm"
+  (keyup.enter)="createAssetProfileForm.valid && onSubmit()"
+  (ngSubmit)="onSubmit()"
+>
+  <h1 i18n mat-dialog-title>Add Asset Profile</h1>
+  <div class="flex-grow-1 py-3" mat-dialog-content>
+    <mat-form-field appearance="outline" class="w-100">
+      <mat-label i18n>Name, symbol or ISIN</mat-label>
+      <gf-symbol-autocomplete
+        formControlName="searchSymbol"
+        [includeIndices]="true"
+      />
+    </mat-form-field>
+  </div>
+  <div class="d-flex justify-content-end" mat-dialog-actions>
+    <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
+    <button
+      color="primary"
+      mat-flat-button
+      type="submit"
+      [disabled]="!createAssetProfileForm.valid"
+    >
+      <ng-container i18n>Save</ng-container>
+    </button>
+  </div>
+</form>

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.module.ts

@@ -0,0 +1,24 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { GfSymbolAutocompleteModule } from '@ghostfolio/ui/symbol-autocomplete';
+
+import { CreateAssetProfileDialog } from './create-asset-profile-dialog.component';
+
+@NgModule({
+  declarations: [CreateAssetProfileDialog],
+  imports: [
+    CommonModule,
+    FormsModule,
+    GfSymbolAutocompleteModule,
+    MatDialogModule,
+    MatButtonModule,
+    MatFormFieldModule,
+    ReactiveFormsModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfCreateAssetProfileDialogModule {}

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/interfaces/interfaces.ts

@@ -0,0 +1,4 @@
+export interface CreateAssetProfileDialogParams {
+  deviceType: string;
+  locale: string;
+}

apps/client/src/app/components/admin-overview/admin-overview.component.ts

@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatCheckboxChange } from '@angular/material/checkbox';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -45,6 +46,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    private adminService: AdminService,
     private cacheService: CacheService,
     private changeDetectorRef: ChangeDetectorRef,
     private dataService: DataService,
@@ -197,7 +199,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
   }
 
   private fetchAdminData() {
-    this.dataService
+    this.adminService
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ exchangeRates, settings, transactionCount, userCount }) => {

apps/client/src/app/components/admin-overview/admin-overview.html

@@ -72,19 +72,6 @@
               </div>
             </div>
           </div>
-          <div
-            *ngIf="info?.benchmarks?.length > 0"
-            class="align-items-start d-flex my-3"
-          >
-            <div class="w-50" i18n>Benchmarks</div>
-            <div class="w-50">
-              <table>
-                <tr *ngFor="let benchmark of info.benchmarks">
-                  <td class="pl-1">{{ benchmark.symbol }}</td>
-                </tr>
-              </table>
-            </div>
-          </div>
           <div
             *ngIf="info?.tags?.length > 0"
             class="align-items-start d-flex my-3"

apps/client/src/app/components/admin-platform/admin-platform.component.html

@@ -82,7 +82,7 @@
               [matMenuTriggerFor]="platformMenu"
               (click)="$event.stopPropagation()"
             >
-              <ion-icon name="ellipsis-vertical"></ion-icon>
+              <ion-icon name="ellipsis-horizontal"></ion-icon>
             </button>
             <mat-menu #platformMenu="matMenu" xPosition="before">
               <button mat-menu-item (click)="onUpdatePlatform(element)">

apps/client/src/app/components/admin-users/admin-users.component.ts

@@ -1,4 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -30,6 +31,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    private adminService: AdminService,
     private changeDetectorRef: ChangeDetectorRef,
     private dataService: DataService,
     private impersonationStorageService: ImpersonationStorageService,
@@ -112,7 +114,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   }
 
   private fetchAdminData() {
-    this.dataService
+    this.adminService
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ users }) => {

apps/client/src/app/components/admin-users/admin-users.html

@@ -109,7 +109,7 @@
                   [matMenuTriggerFor]="userMenu"
                   (click)="$event.stopPropagation()"
                 >
-                  <ion-icon name="ellipsis-vertical"></ion-icon>
+                  <ion-icon name="ellipsis-horizontal"></ion-icon>
                 </button>
                 <mat-menu #userMenu="matMenu" xPosition="before">
                   <button

apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.html

@@ -1,6 +1,8 @@
 <div class="mb-2 row">
   <div class="col-md-6 col-xs-12 d-flex">
-    <div class="align-items-center d-flex flex-grow-1 h5 mb-0 text-truncate">
+    <div
+      class="align-items-center d-flex flex-grow-1 h5 mb-0 py-2 text-truncate"
+    >
       <span i18n>Performance</span>
       <gf-premium-indicator
         *ngIf="user?.subscription?.type === 'Basic'"
@@ -13,7 +15,6 @@
       appearance="outline"
       class="w-100 without-hint"
       color="accent"
-      [hidden]="benchmarks?.length === 0"
     >
       <mat-label i18n>Compare with...</mat-label>
       <mat-select
@@ -28,6 +29,12 @@
           [value]="symbolProfile.id"
           >{{ symbolProfile.name }}</mat-option
         >
+        <mat-option
+          *ngIf="hasPermissionToAccessAdminControl"
+          i18n
+          [routerLink]="['/admin', 'market-data']"
+          >Manage Benchmarks</mat-option
+        >
       </mat-select>
     </mat-form-field>
   </div>

apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts

@@ -23,6 +23,7 @@ import {
   parseDate
 } from '@ghostfolio/common/helper';
 import { LineChartItem, User } from '@ghostfolio/common/interfaces';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { ColorScheme } from '@ghostfolio/common/types';
 import { SymbolProfile } from '@prisma/client';
 import {
@@ -59,6 +60,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
   @ViewChild('chartCanvas') chartCanvas;
 
   public chart: Chart<'line'>;
+  public hasPermissionToAccessAdminControl: boolean;
 
   public constructor() {
     Chart.register(
@@ -76,6 +78,11 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
   }
 
   public ngOnChanges() {
+    this.hasPermissionToAccessAdminControl = hasPermission(
+      this.user?.permissions,
+      permissions.accessAdminControl
+    );
+
     if (this.performanceDataItems) {
       this.initialize();
     }

apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts

@@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatSelectModule } from '@angular/material/select';
+import { RouterModule } from '@angular/router';
 import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
@@ -16,7 +17,8 @@ import { BenchmarkComparatorComponent } from './benchmark-comparator.component';
     GfPremiumIndicatorModule,
     MatSelectModule,
     NgxSkeletonLoaderModule,
-    ReactiveFormsModule
+    ReactiveFormsModule,
+    RouterModule
   ]
 })
 export class GfBenchmarkComparatorModule {}

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

@@ -8,216 +8,238 @@
       <gf-logo [label]="pageTitle"></gf-logo>
     </a>
     <span class="spacer"></span>
-    <a
-      class="d-none d-sm-block"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'home' || currentRoute === 'zen',
-        'text-decoration-underline':
-          currentRoute === 'home' || currentRoute === 'zen'
-      }"
-      [routerLink]="['/']"
-      >Overview</a
-    >
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'portfolio',
-        'text-decoration-underline': currentRoute === 'portfolio'
-      }"
-      [routerLink]="['/portfolio']"
-      >Portfolio</a
-    >
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'accounts',
-        'text-decoration-underline': currentRoute === 'accounts'
-      }"
-      [routerLink]="['/accounts']"
-      >Accounts</a
-    >
-    <a
-      *ngIf="hasPermissionToAccessAdminControl"
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'admin',
-        'text-decoration-underline': currentRoute === 'admin'
-      }"
-      [routerLink]="['/admin']"
-      >Admin Control</a
-    >
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'resources',
-        'text-decoration-underline': currentRoute === 'resources'
-      }"
-      [routerLink]="['/resources']"
-      >Resources</a
-    >
-    <a
-      *ngIf="
-        hasPermissionForSubscription && user?.subscription?.type === 'Basic'
-      "
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'pricing',
-        'text-decoration-underline': currentRoute === 'pricing'
-      }"
-      [routerLink]="['/pricing']"
-      >Pricing</a
-    >
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'about',
-        'text-decoration-underline': currentRoute === 'about'
-      }"
-      [routerLink]="['/about']"
-      >About</a
-    >
-    <button
-      class="no-min-width px-1"
-      mat-flat-button
-      [matMenuTriggerFor]="accountMenu"
-      (menuClosed)="onMenuClosed()"
-      (menuOpened)="onMenuOpened()"
-    >
-      <ion-icon
-        class="d-none d-sm-block"
-        name="person-circle-outline"
-        size="large"
-      ></ion-icon>
-      <ion-icon
-        class="d-block d-sm-none"
-        size="large"
-        [name]="isMenuOpen ? 'close-outline' : 'menu-outline'"
-      ></ion-icon>
-    </button>
-    <mat-menu #accountMenu="matMenu" xPosition="before">
-      <ng-container *ngIf="user?.access?.length > 0">
-        <button mat-menu-item (click)="impersonateAccount(null)">
-          <ion-icon
-            *ngIf="user?.access?.length > 0"
-            class="mr-2"
-            [name]="
-              impersonationId
-                ? 'radio-button-off-outline'
-                : 'radio-button-on-outline'
-            "
-          ></ion-icon>
-          <span i18n>Me</span>
-        </button>
-        <button
-          *ngFor="let accessItem of user?.access"
-          mat-menu-item
-          (click)="impersonateAccount(accessItem.id)"
+    <ul class="alig-items-center d-flex list-inline m-0">
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold':
+              currentRoute === 'home' || currentRoute === 'zen',
+            'text-decoration-underline':
+              currentRoute === 'home' || currentRoute === 'zen'
+          }"
+          [routerLink]="['/']"
+          >Overview</a
         >
-          <ion-icon
-            class="mr-2"
-            name="square-outline"
-            [name]="
-              accessItem.id === impersonationId
-                ? 'radio-button-on-outline'
-                : 'radio-button-off-outline'
-            "
-          ></ion-icon>
-          <span *ngIf="accessItem.alias">{{ accessItem.alias }}</span>
-          <span *ngIf="!accessItem.alias" i18n>User</span>
-        </button>
-        <hr class="m-0" />
-      </ng-container>
-      <a
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{
-          'font-weight-bold': currentRoute === 'home' || currentRoute === 'zen'
-        }"
-        [routerLink]="['/']"
-        >Overview</a
-      >
-      <a
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{
-          'font-weight-bold': currentRoute === 'portfolio'
-        }"
-        [routerLink]="['/portfolio']"
-        >Portfolio</a
-      >
-      <a
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{ 'font-weight-bold': currentRoute === 'accounts' }"
-        [routerLink]="['/accounts']"
-        >Accounts</a
-      >
-      <a
-        i18n
-        mat-menu-item
-        [ngClass]="{ 'font-weight-bold': currentRoute === 'account' }"
-        [routerLink]="['/account']"
-        >My Ghostfolio</a
-      >
-      <a
-        *ngIf="hasPermissionToAccessAdminControl"
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{ 'font-weight-bold': currentRoute === 'admin' }"
-        [routerLink]="['/admin']"
-        >Admin Control</a
-      >
-      <hr class="m-0" />
-      <a
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{
-          'font-weight-bold': currentRoute === 'resources'
-        }"
-        [routerLink]="['/resources']"
-        >Resources</a
-      >
-      <a
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'portfolio',
+            'text-decoration-underline': currentRoute === 'portfolio'
+          }"
+          [routerLink]="['/portfolio']"
+          >Portfolio</a
+        >
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'accounts',
+            'text-decoration-underline': currentRoute === 'accounts'
+          }"
+          [routerLink]="['/accounts']"
+          >Accounts</a
+        >
+      </li>
+      <li *ngIf="hasPermissionToAccessAdminControl" class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'admin',
+            'text-decoration-underline': currentRoute === 'admin'
+          }"
+          [routerLink]="['/admin']"
+          >Admin Control</a
+        >
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'resources',
+            'text-decoration-underline': currentRoute === 'resources'
+          }"
+          [routerLink]="['/resources']"
+          >Resources</a
+        >
+      </li>
+      <li
         *ngIf="
           hasPermissionForSubscription && user?.subscription?.type === 'Basic'
         "
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{ 'font-weight-bold': currentRoute === 'pricing' }"
-        [routerLink]="['/pricing']"
-        >Pricing</a
+        class="list-inline-item"
       >
-      <a
-        class="d-flex d-sm-none"
-        i18n
-        mat-menu-item
-        [ngClass]="{ 'font-weight-bold': currentRoute === 'about' }"
-        [routerLink]="['/about']"
-        >About Ghostfolio</a
-      >
-      <hr class="d-flex d-sm-none m-0" />
-      <button mat-menu-item (click)="onSignOut()">Logout</button>
-    </mat-menu>
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'pricing',
+            'text-decoration-underline': currentRoute === 'pricing'
+          }"
+          [routerLink]="['/pricing']"
+          >Pricing</a
+        >
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'about',
+            'text-decoration-underline': currentRoute === 'about'
+          }"
+          [routerLink]="['/about']"
+          >About</a
+        >
+      </li>
+      <li class="list-inline-item">
+        <button
+          class="no-min-width px-1"
+          mat-flat-button
+          [matMenuTriggerFor]="accountMenu"
+          (menuClosed)="onMenuClosed()"
+          (menuOpened)="onMenuOpened()"
+        >
+          <ion-icon
+            class="d-none d-sm-block"
+            name="person-circle-outline"
+            size="large"
+          ></ion-icon>
+          <ion-icon
+            class="d-block d-sm-none"
+            size="large"
+            [name]="isMenuOpen ? 'close-outline' : 'menu-outline'"
+          ></ion-icon>
+        </button>
+        <mat-menu #accountMenu="matMenu" xPosition="before">
+          <ng-container *ngIf="user?.access?.length > 0">
+            <button mat-menu-item (click)="impersonateAccount(null)">
+              <ion-icon
+                *ngIf="user?.access?.length > 0"
+                class="mr-2"
+                [name]="
+                  impersonationId
+                    ? 'radio-button-off-outline'
+                    : 'radio-button-on-outline'
+                "
+              ></ion-icon>
+              <span i18n>Me</span>
+            </button>
+            <button
+              *ngFor="let accessItem of user?.access"
+              mat-menu-item
+              (click)="impersonateAccount(accessItem.id)"
+            >
+              <ion-icon
+                class="mr-2"
+                name="square-outline"
+                [name]="
+                  accessItem.id === impersonationId
+                    ? 'radio-button-on-outline'
+                    : 'radio-button-off-outline'
+                "
+              ></ion-icon>
+              <span *ngIf="accessItem.alias">{{ accessItem.alias }}</span>
+              <span *ngIf="!accessItem.alias" i18n>User</span>
+            </button>
+            <hr class="m-0" />
+          </ng-container>
+          <a
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{
+              'font-weight-bold':
+                currentRoute === 'home' || currentRoute === 'zen'
+            }"
+            [routerLink]="['/']"
+            >Overview</a
+          >
+          <a
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{
+              'font-weight-bold': currentRoute === 'portfolio'
+            }"
+            [routerLink]="['/portfolio']"
+            >Portfolio</a
+          >
+          <a
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{ 'font-weight-bold': currentRoute === 'accounts' }"
+            [routerLink]="['/accounts']"
+            >Accounts</a
+          >
+          <a
+            i18n
+            mat-menu-item
+            [ngClass]="{ 'font-weight-bold': currentRoute === 'account' }"
+            [routerLink]="['/account']"
+            >My Ghostfolio</a
+          >
+          <a
+            *ngIf="hasPermissionToAccessAdminControl"
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{ 'font-weight-bold': currentRoute === 'admin' }"
+            [routerLink]="['/admin']"
+            >Admin Control</a
+          >
+          <hr class="m-0" />
+          <a
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{
+              'font-weight-bold': currentRoute === 'resources'
+            }"
+            [routerLink]="['/resources']"
+            >Resources</a
+          >
+          <a
+            *ngIf="
+              hasPermissionForSubscription &&
+              user?.subscription?.type === 'Basic'
+            "
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{ 'font-weight-bold': currentRoute === 'pricing' }"
+            [routerLink]="['/pricing']"
+            >Pricing</a
+          >
+          <a
+            class="d-flex d-sm-none"
+            i18n
+            mat-menu-item
+            [ngClass]="{ 'font-weight-bold': currentRoute === 'about' }"
+            [routerLink]="['/about']"
+            >About Ghostfolio</a
+          >
+          <hr class="d-flex d-sm-none m-0" />
+          <button mat-menu-item (click)="onSignOut()">Logout</button>
+        </mat-menu>
+      </li>
+    </ul>
   </ng-container>
   <ng-container *ngIf="user === null">
     <a
@@ -231,67 +253,86 @@
       ></gf-logo>
     </a>
     <span class="spacer"></span>
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'features',
-        'text-decoration-underline': currentRoute === 'features'
-      }"
-      [routerLink]="['/features']"
-      >Features</a
-    >
-    <a
-      class="d-none d-sm-block mx-1"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'about',
-        'text-decoration-underline': currentRoute === 'about'
-      }"
-      [routerLink]="['/about']"
-      >About</a
-    >
-    <a
-      *ngIf="hasPermissionForSubscription"
-      i18n
-      mat-flat-button
-      [ngClass]="{
-        'font-weight-bold': currentRoute === 'pricing',
-        'text-decoration-underline': currentRoute === 'pricing'
-      }"
-      [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 no-min-width"
-      href="https://github.com/ghostfolio/ghostfolio"
-      mat-icon-button
-      ><ion-icon name="logo-github"></ion-icon
-    ></a>
-    <button class="mx-1" mat-flat-button (click)="openLoginDialog()">
-      <ng-container i18n>Sign in</ng-container>
-    </button>
-    <a
-      *ngIf="currentRoute !== 'register' && hasPermissionToCreateUser"
-      class="d-none d-sm-block"
-      color="primary"
-      mat-flat-button
-      [routerLink]="['/register']"
-      ><ng-container i18n>Get started</ng-container>
-    </a>
+    <ul class="alig-items-center d-flex list-inline m-0">
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'features',
+            'text-decoration-underline': currentRoute === 'features'
+          }"
+          [routerLink]="['/features']"
+          >Features</a
+        >
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block mx-1"
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'about',
+            'text-decoration-underline': currentRoute === 'about'
+          }"
+          [routerLink]="['/about']"
+          >About</a
+        >
+      </li>
+      <li *ngIf="hasPermissionForSubscription" class="list-inline-item">
+        <a
+          i18n
+          mat-flat-button
+          [ngClass]="{
+            'font-weight-bold': currentRoute === 'pricing',
+            'text-decoration-underline': currentRoute === 'pricing'
+          }"
+          [routerLink]="['/pricing']"
+          >Pricing</a
+        >
+      </li>
+      <li
+        *ngIf="hasPermissionToAccessFearAndGreedIndex"
+        class="list-inline-item"
+      >
+        <a
+          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
+        >
+      </li>
+      <li class="list-inline-item">
+        <a
+          class="d-none d-sm-block no-min-width p-1"
+          href="https://github.com/ghostfolio/ghostfolio"
+          mat-flat-button
+          ><ion-icon name="logo-github"></ion-icon
+        ></a>
+      </li>
+      <li class="list-inline-item">
+        <button class="mx-1" mat-flat-button (click)="openLoginDialog()">
+          <ng-container i18n>Sign in</ng-container>
+        </button>
+      </li>
+      <li
+        *ngIf="currentRoute !== 'register' && hasPermissionToCreateUser"
+        class="list-inline-item"
+      >
+        <a
+          class="d-none d-sm-block"
+          color="primary"
+          mat-flat-button
+          [routerLink]="['/register']"
+          ><ng-container i18n>Get started</ng-container>
+        </a>
+      </li>
+    </ul>
   </ng-container>
 </mat-toolbar>

apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html

@@ -13,8 +13,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.totalBuy"
       ></gf-value>
     </div>
@@ -24,8 +25,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.totalSell"
       ></gf-value>
     </div>
@@ -38,8 +40,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.committedFunds"
       ></gf-value>
     </div>
@@ -49,8 +52,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.currentGrossPerformance"
       ></gf-value>
     </div>
@@ -79,8 +83,9 @@
       <span *ngIf="summary?.fees || summary?.fees === 0" class="mr-1">-</span>
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.fees"
       ></gf-value>
     </div>
@@ -93,8 +98,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.currentNetPerformance"
       ></gf-value>
     </div>
@@ -121,8 +127,9 @@
       <gf-value
         class="justify-content-end"
         position="end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.currentValue"
       ></gf-value>
     </div>
@@ -132,8 +139,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.items"
       ></gf-value>
     </div>
@@ -152,8 +160,9 @@
       ></ion-icon>
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.emergencyFund"
       ></gf-value>
     </div>
@@ -163,8 +172,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.cash"
       ></gf-value>
     </div>
@@ -174,8 +184,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.excludedAccountsAndActivities"
       ></gf-value>
     </div>
@@ -183,13 +194,34 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Liabilities</div>
+    <div class="d-flex justify-content-end">
+      <span
+        *ngIf="summary?.liabilities || summary?.liabilities === 0"
+        class="mr-1"
+        >-</span
+      >
+      <gf-value
+        class="justify-content-end"
+        [isCurrency]="true"
+        [locale]="locale"
+        [unit]="baseCurrency"
+        [value]="isLoading ? undefined : summary?.liabilities"
+      ></gf-value>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col"><hr /></div>
+  </div>
   <div class="flex-nowrap px-3 py-1 row">
     <div class="flex-grow-1 font-weight-bold text-truncate" i18n>Net Worth</div>
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.netWorth"
       ></gf-value>
     </div>
@@ -217,8 +249,9 @@
     <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
-        [currency]="baseCurrency"
+        [isCurrency]="true"
         [locale]="locale"
+        [unit]="baseCurrency"
         [value]="isLoading ? undefined : summary?.dividend"
       ></gf-value>
     </div>

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts

@@ -215,6 +215,15 @@ export class PositionDetailDialog implements OnDestroy, OnInit {
             this.benchmarkDataItems[0].value = this.averagePrice;
           }
 
+          this.benchmarkDataItems = this.benchmarkDataItems.map(
+            ({ date, value }) => {
+              return {
+                date,
+                value: value === 0 ? null : value
+              };
+            }
+          );
+
           if (Number.isInteger(this.quantity)) {
             this.quantityPrecision = 0;
           } else if (this.SymbolProfile?.assetSubClass === 'CRYPTOCURRENCY') {

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html

@@ -12,8 +12,9 @@
       <div class="col-12 d-flex justify-content-center mb-3">
         <gf-value
           size="large"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="data.baseCurrency"
           [value]="value"
         ></gf-value>
       </div>
@@ -40,8 +41,9 @@
           i18n
           size="medium"
           [colorizeSign]="true"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="data.baseCurrency"
           [value]="netPerformance"
           >Change</gf-value
         >
@@ -61,8 +63,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="SymbolProfile?.currency"
           [value]="averagePrice"
           >Average Unit Price</gf-value
         >
@@ -71,8 +74,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="SymbolProfile?.currency"
           [value]="marketPrice"
           >Market Price</gf-value
         >
@@ -81,9 +85,10 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
           [locale]="data.locale"
           [ngClass]="{ 'text-danger': minPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
+          [unit]="SymbolProfile?.currency"
           [value]="minPrice"
           >Minimum Price</gf-value
         >
@@ -92,9 +97,10 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="SymbolProfile?.currency"
+          [isCurrency]="true"
           [locale]="data.locale"
           [ngClass]="{ 'text-success': maxPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
+          [unit]="SymbolProfile?.currency"
           [value]="maxPrice"
           >Maximum Price</gf-value
         >
@@ -113,8 +119,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="data.baseCurrency"
           [value]="investment"
           >Investment</gf-value
         >
@@ -123,8 +130,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="data.baseCurrency"
           [value]="dividendInBaseCurrency"
           >Dividend</gf-value
         >
@@ -133,8 +141,9 @@
         <gf-value
           i18n
           size="medium"
-          [currency]="data.baseCurrency"
+          [isCurrency]="true"
           [locale]="data.locale"
+          [unit]="data.baseCurrency"
           [value]="feeInBaseCurrency"
           >Fees</gf-value
         >

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

@@ -45,8 +45,9 @@
           <gf-value
             class="mr-3"
             [colorizeSign]="true"
-            [currency]="baseCurrency"
+            [isCurrency]="true"
             [locale]="locale"
+            [unit]="baseCurrency"
             [value]="position?.netPerformance"
           ></gf-value>
           <gf-value

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

@@ -1,10 +1,11 @@
 <mat-radio-group
-  class="text-nowrap"
+  class="d-block text-nowrap"
   [formControl]="option"
   (change)="onValueChange()"
 >
   <mat-radio-button
     *ngFor="let option of options"
+    class="d-inline-flex"
     [disabled]="isLoading"
     [ngClass]="{ 'cursor-pointer': !isLoading }"
     [value]="option.value"

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

@@ -7,6 +7,54 @@ import { AboutPageComponent } from './about-page.component';
 const routes: Routes = [
   {
     canActivate: [AuthGuard],
+    children: [
+      {
+        path: '',
+        loadChildren: () =>
+          import('./overview/about-overview-page.module').then(
+            (m) => m.AboutOverviewPageModule
+          )
+      },
+      {
+        path: 'changelog',
+        loadChildren: () =>
+          import('./changelog/changelog-page.module').then(
+            (m) => m.ChangelogPageModule
+          )
+      },
+      ...[
+        'license',
+        /////
+        'licenca',
+        'licence',
+        'licencia',
+        'licentie',
+        'lizenz',
+        'licenza'
+      ].map((path) => ({
+        path,
+        loadChildren: () =>
+          import('./license/license-page.module').then(
+            (m) => m.LicensePageModule
+          )
+      })),
+      ...[
+        'privacy-policy',
+        /////
+        'datenschutzbestimmungen',
+        'informativa-sulla-privacy',
+        'politique-de-confidentialite',
+        'politica-de-privacidad',
+        'politica-de-privacidade',
+        'privacybeleid'
+      ].map((path) => ({
+        path,
+        loadChildren: () =>
+          import('./privacy-policy/privacy-policy-page.module').then(
+            (m) => m.PrivacyPolicyPageModule
+          )
+      }))
+    ],
     component: AboutPageComponent,
     path: '',
     title: $localize`About`

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

@@ -1,29 +1,31 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { environment } from '@ghostfolio/client/../environments/environment';
+import {
+  ChangeDetectorRef,
+  Component,
+  HostBinding,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
 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 { TabConfiguration, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
 @Component({
-  host: { class: 'page' },
   selector: 'gf-about-page',
   styleUrls: ['./about-page.scss'],
   templateUrl: './about-page.html'
 })
 export class AboutPageComponent implements OnDestroy, OnInit {
-  public defaultLanguageCode = DEFAULT_LANGUAGE_CODE;
-  public hasPermissionForBlog: boolean;
-  public hasPermissionForStatistics: boolean;
+  @HostBinding('class.with-info-message') get getHasMessage() {
+    return this.hasMessage;
+  }
+
+  public hasMessage: boolean;
   public hasPermissionForSubscription: boolean;
-  public isLoggedIn: boolean;
-  public statistics: Statistics;
+  public tabs: TabConfiguration[] = [];
   public user: User;
-  public version = environment.version;
 
   private unsubscribeSubject = new Subject<void>();
 
@@ -32,38 +34,55 @@ export class AboutPageComponent implements OnDestroy, OnInit {
     private dataService: DataService,
     private userService: UserService
   ) {
-    const { globalPermissions, statistics } = this.dataService.fetchInfo();
-
-    this.hasPermissionForBlog = hasPermission(
-      globalPermissions,
-      permissions.enableBlog
-    );
-
-    this.hasPermissionForStatistics = hasPermission(
-      globalPermissions,
-      permissions.enableStatistics
-    );
+    const { globalPermissions, systemMessage } = this.dataService.fetchInfo();
 
     this.hasPermissionForSubscription = hasPermission(
       globalPermissions,
       permissions.enableSubscription
     );
 
-    this.statistics = statistics;
-  }
-
-  public ngOnInit() {
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((state) => {
         if (state?.user) {
+          this.tabs = [
+            {
+              iconName: 'reader-outline',
+              label: $localize`About`,
+              path: ['/about']
+            },
+            {
+              iconName: 'sparkles-outline',
+              label: $localize`Changelog`,
+              path: ['/about', 'changelog']
+            },
+            {
+              iconName: 'ribbon-outline',
+              label: $localize`License`,
+              path: ['/about', 'license']
+            },
+            {
+              iconName: 'shield-checkmark-outline',
+              label: $localize`Privacy Policy`,
+              path: ['/about', 'privacy-policy'],
+              showCondition: this.hasPermissionForSubscription
+            }
+          ];
           this.user = state.user;
 
+          this.hasMessage =
+            hasPermission(
+              this.user?.permissions,
+              permissions.createUserAccount
+            ) || !!systemMessage;
+
           this.changeDetectorRef.markForCheck();
         }
       });
   }
 
+  public ngOnInit() {}
+
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();

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

@@ -1,233 +1,21 @@
-<div class="container">
-  <div class="mb-5 row">
-    <div class="col">
-      <h3 class="d-none d-sm-block mb-3 text-center">About Ghostfolio</h3>
-      <div class="about-container">
-        <p>
-          Ghostfolio is a lightweight wealth management application for
-          individuals 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"
-            >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
-          <a href="https://dotsilver.ch" title="Website of Thomas Kaul"
-            >Thomas Kaul</a
-          >
-          and is driven by the efforts of its
-          <a
-            href="https://github.com/ghostfolio/ghostfolio/graphs/contributors"
-            title="Contributors to Ghostfolio"
-            >contributors</a
-          >.
-          <ng-container *ngIf="version">
-            This instance is running Ghostfolio {{ version }}.
-          </ng-container>
-          <ng-container *ngIf="hasPermissionForStatistics"
-            >Check the system status at
-            <a href="https://status.ghostfol.io" title="Ghostfolio status"
-              >status.ghostfol.io</a
-            >.</ng-container
-          >
-        </p>
-        <p>
-          If you encounter a bug or would like to suggest an improvement or a
-          new
-          <a [routerLink]="['/features']">feature</a>, please join the
-          Ghostfolio
-          <a
-            href="https://ghostfolio.slack.com"
-            title="Join the Ghostfolio Slack community"
-            >Slack community</a
-          >, tweet to
-          <a
-            href="https://twitter.com/ghostfolio_"
-            title="Tweet to Ghostfolio on Twitter"
-            >@ghostfolio_</a
-          ><ng-container *ngIf="user?.subscription?.type === 'Premium'"
-            >, send an e-mail to
-            <a href="mailto:hi@ghostfol.io" title="Send an e-mail"
-              >hi@ghostfol.io</a
-            ></ng-container
-          >
-          or start a discussion at
-          <a
-            href="https://github.com/ghostfolio/ghostfolio"
-            title="Find Ghostfolio on GitHub"
-            >GitHub</a
-          >.
-        </p>
-        <p class="text-center">
-          <a
-            class="mx-2"
-            href="https://twitter.com/ghostfolio_"
-            mat-icon-button
-            title="Follow Ghostfolio on Twitter"
-          >
-            <ion-icon name="logo-twitter"></ion-icon>
-          </a>
-          <a
-            *ngIf="user?.subscription?.type === 'Premium'"
-            class="mx-2"
-            href="mailto:hi@ghostfol.io"
-            mat-icon-button
-            title="Send an e-mail"
-          >
-            <ion-icon name="mail"></ion-icon>
-          </a>
-          <a
-            class="mx-2"
-            href="https://ghostfolio.slack.com"
-            mat-icon-button
-            title="Join the Ghostfolio Slack channel"
-          >
-            <ion-icon name="logo-slack"></ion-icon>
-          </a>
-          <a
-            class="mx-2"
-            href="https://github.com/ghostfolio/ghostfolio"
-            mat-icon-button
-            title="Find Ghostfolio on GitHub"
-          >
-            <ion-icon name="logo-github"></ion-icon>
-          </a>
-        </p>
-        <div
-          *ngIf="hasPermissionForSubscription"
-          class="d-flex justify-content-center"
-        >
-          <div
-            class="independent-and-bootstrapped-logo mb-2"
-            title="Ghostfolio is an independent & bootstrapped business"
-          ></div>
-        </div>
-        <div
-          *ngIf="!hasPermissionForSubscription"
-          class="d-flex justify-content-center"
-        >
-          <a
-            href="https://www.buymeacoffee.com/ghostfolio"
-            target="_blank"
-            title="Support Ghostfolio"
-            ><img
-              class="mb-2"
-              src="../assets/images/button-buy-me-a-coffee.png"
-              width="180"
-          /></a>
-        </div>
-      </div>
-    </div>
-  </div>
+<mat-tab-nav-panel #tabPanel class="flex-grow-1 overflow-auto">
+  <router-outlet></router-outlet>
+</mat-tab-nav-panel>
 
-  <div *ngIf="hasPermissionForStatistics" class="mb-5 row">
-    <div class="col">
-      <h3 class="mb-3 text-center">Ghostfolio in Numbers</h3>
-      <mat-card appearance="outlined">
-        <mat-card-content>
-          <div class="row">
-            <div class="col-xs-12 col-md-4 my-2">
-              <gf-value
-                size="large"
-                subLabel="(Last 24 hours)"
-                [value]="statistics?.activeUsers1d ?? '-'"
-                >Active Users</gf-value
-              >
-            </div>
-            <div class="col-xs-12 col-md-4 my-2">
-              <gf-value
-                size="large"
-                subLabel="(Last 30 days)"
-                [value]="statistics?.newUsers30d ?? '-'"
-                >New Users</gf-value
-              >
-            </div>
-            <div class="col-xs-12 col-md-4 my-2">
-              <gf-value
-                size="large"
-                subLabel="(Last 30 days)"
-                [value]="statistics?.activeUsers30d ?? '-'"
-                >Active Users</gf-value
-              >
-            </div>
-            <div class="col-xs-12 col-md-4 my-2">
-              <a class="d-block" href="https://ghostfolio.slack.com">
-                <gf-value
-                  size="large"
-                  [value]="statistics?.slackCommunityUsers ?? '-'"
-                  >Users in Slack community</gf-value
-                >
-              </a>
-            </div>
-            <div class="col-xs-12 col-md-4 my-2">
-              <a
-                class="d-block"
-                href="https://github.com/ghostfolio/ghostfolio/graphs/contributors"
-              >
-                <gf-value
-                  size="large"
-                  [value]="statistics?.gitHubContributors ?? '-'"
-                  >Contributors on GitHub</gf-value
-                >
-              </a>
-            </div>
-            <div class="col-xs-12 col-md-4 my-2">
-              <a
-                class="d-block"
-                href="https://github.com/ghostfolio/ghostfolio/stargazers"
-              >
-                <gf-value
-                  size="large"
-                  [value]="statistics?.gitHubStargazers ?? '-'"
-                  >Stars on GitHub</gf-value
-                >
-              </a>
-            </div>
-          </div>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
-
-  <div class="row">
-    <div *ngIf="hasPermissionForSubscription" class="col-md-3 col-xs-12 my-2">
-      <a
-        class="py-4 w-100"
-        color="primary"
-        mat-flat-button
-        [routerLink]="['/faq']"
-        >FAQ</a
-      >
-    </div>
-    <div
-      class="col-md-3 col-xs-12 my-2"
-      [ngClass]="{ 'offset-md-4': !hasPermissionForBlog }"
+<nav mat-align-tabs="center" mat-tab-nav-bar [tabPanel]="tabPanel">
+  <ng-container *ngFor="let tab of tabs">
+    <a
+      #rla="routerLinkActive"
+      *ngIf="tab.showCondition !== false"
+      class="px-3"
+      mat-tab-link
+      routerLinkActive
+      [active]="rla.isActive"
+      [routerLink]="tab.path"
+      [routerLinkActiveOptions]="{ exact: true }"
     >
-      <a
-        class="py-4 w-100"
-        color="primary"
-        mat-flat-button
-        [routerLink]="['/about', 'changelog']"
-        >Changelog & License</a
-      >
-    </div>
-    <div *ngIf="hasPermissionForSubscription" class="col-md-3 col-xs-12 my-2">
-      <a
-        class="py-4 w-100"
-        color="primary"
-        mat-flat-button
-        [routerLink]="['/about', 'privacy-policy']"
-        >Privacy Policy</a
-      >
-    </div>
-    <div *ngIf="hasPermissionForBlog" class="col-md-3 col-xs-12 my-2">
-      <a
-        class="py-4 w-100"
-        color="primary"
-        mat-flat-button
-        [routerLink]="['/blog']"
-        >Blog</a
-      >
-    </div>
-  </div>
-</div>
+      <ion-icon size="large" [name]="tab.iconName"></ion-icon>
+      <div class="d-none d-sm-block ml-2">{{ tab.label }}</div>
+    </a>
+  </ng-container>
+</nav>

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

@@ -1,21 +1,14 @@
 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 { MatTabsModule } from '@angular/material/tabs';
+import { RouterModule } from '@angular/router';
 
 import { AboutPageRoutingModule } from './about-page-routing.module';
 import { AboutPageComponent } from './about-page.component';
 
 @NgModule({
   declarations: [AboutPageComponent],
-  imports: [
-    AboutPageRoutingModule,
-    CommonModule,
-    GfValueModule,
-    MatButtonModule,
-    MatCardModule
-  ],
+  imports: [CommonModule, MatTabsModule, AboutPageRoutingModule, RouterModule],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class AboutPageModule {}

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

@@ -1,36 +1,35 @@
+@import 'apps/client/src/styles/ghostfolio-style';
+
 :host {
   color: rgb(var(--dark-primary-text));
-  display: block;
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 5rem);
+  overflow-y: auto;
 
-  .about-container {
-    a {
-      color: rgba(var(--palette-primary-500), 1);
-      font-weight: 500;
+  padding-bottom: env(safe-area-inset-bottom);
+  padding-bottom: constant(safe-area-inset-bottom);
 
-      &:hover {
-        color: rgba(var(--palette-primary-300), 1);
-      }
+  ::ng-deep {
+    gf-about-page,
+    gf-changelog-page,
+    gf-privacy-policy-page {
+      flex: 1 1 auto;
+      overflow-y: auto;
     }
 
-    .independent-and-bootstrapped-logo {
-      background-image: url('/assets/bootstrapped-dark.svg');
-      background-position: center;
-      background-repeat: no-repeat;
-      background-size: contain;
-      height: 2rem;
-      opacity: 0.87;
-      width: 10rem;
+    .mat-mdc-tab-link-container {
+      --mdc-tab-indicator-active-indicator-color: transparent;
+
+      .mat-mdc-tab-link {
+        &:hover {
+          opacity: 0.75;
+        }
+      }
     }
   }
 }
 
 :host-context(.is-dark-theme) {
   color: rgb(var(--light-primary-text));
-
-  .about-container {
-    .independent-and-bootstrapped-logo {
-      background-image: url('/assets/bootstrapped-light.svg');
-      opacity: 1;
-    }
-  }
 }

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

@@ -9,7 +9,7 @@ const routes: Routes = [
     canActivate: [AuthGuard],
     component: ChangelogPageComponent,
     path: '',
-    title: $localize`Changelog & License`
+    title: $localize`Changelog`
   }
 ];
 

apps/client/src/app/pages/about/changelog/changelog-page.html

@@ -1,23 +1,10 @@
 <div class="container">
   <div class="mb-5 row">
     <div class="col">
-      <h3 class="mb-3 text-center" i18n>Changelog</h3>
-      <mat-card appearance="outlined" class="changelog">
-        <mat-card-content>
-          <markdown [src]="'../assets/CHANGELOG.md'"></markdown>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col">
-      <h3 class="mb-3 text-center" i18n>License</h3>
-      <mat-card appearance="outlined">
-        <mat-card-content>
-          <markdown [src]="'../assets/LICENSE'"></markdown>
-        </mat-card-content>
-      </mat-card>
+      <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Changelog</h1>
+      <div class="changelog">
+        <markdown [src]="'../assets/CHANGELOG.md'"></markdown>
+      </div>
     </div>
   </div>
 </div>

apps/client/src/app/pages/about/changelog/changelog-page.module.ts

@@ -1,6 +1,5 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatCardModule } from '@angular/material/card';
 import { MarkdownModule } from 'ngx-markdown';
 
 import { ChangelogPageRoutingModule } from './changelog-page-routing.module';
@@ -11,8 +10,7 @@ import { ChangelogPageComponent } from './changelog-page.component';
   imports: [
     ChangelogPageRoutingModule,
     CommonModule,
-    MarkdownModule.forChild(),
-    MatCardModule
+    MarkdownModule.forChild()
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

apps/client/src/app/pages/about/changelog/changelog-page.scss

@@ -2,35 +2,33 @@
   color: rgb(var(--dark-primary-text));
   display: block;
 
-  .mat-mdc-card {
-    &.changelog {
-      ::ng-deep {
-        a {
-          color: rgba(var(--palette-primary-500), 1);
-          font-weight: 500;
+  .changelog {
+    ::ng-deep {
+      a {
+        color: rgba(var(--palette-primary-500), 1);
+        font-weight: 500;
 
-          &:hover {
-            color: rgba(var(--palette-primary-300), 1);
+        &:hover {
+          color: rgba(var(--palette-primary-300), 1);
+        }
+      }
+
+      markdown {
+        h1,
+        p {
+          display: none;
+        }
+
+        h2 {
+          font-size: 18px;
+
+          &:not(:first-of-type) {
+            margin-top: 2rem;
           }
         }
 
-        markdown {
-          h1,
-          p {
-            display: none;
-          }
-
-          h2 {
-            font-size: 18px;
-
-            &:not(:first-of-type) {
-              margin-top: 2rem;
-            }
-          }
-
-          h3 {
-            font-size: 15px;
-          }
+        h3 {
+          font-size: 15px;
         }
       }
     }

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

@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
-import { BlackFriday2022PageComponent } from './black-friday-2022-page.component';
+import { LicensePageComponent } from './license-page.component';
 
 const routes: Routes = [
   {
     canActivate: [AuthGuard],
-    component: BlackFriday2022PageComponent,
+    component: LicensePageComponent,
     path: '',
-    title: 'Black Friday 2022'
+    title: $localize`License`
   }
 ];
 
@@ -17,4 +17,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class BlackFriday2022RoutingModule {}
+export class LicensePageRoutingModule {}

apps/client/src/app/pages/about/license/license-page.component.ts

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

apps/client/src/app/pages/about/license/license-page.html

@@ -0,0 +1,10 @@
+<div class="container">
+  <div class="mb-5 row">
+    <div class="col">
+      <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>License</h1>
+      <div>
+        <markdown [src]="'../assets/LICENSE'"></markdown>
+      </div>
+    </div>
+  </div>
+</div>

apps/client/src/app/pages/about/license/license-page.module.ts

@@ -0,0 +1,13 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MarkdownModule } from 'ngx-markdown';
+
+import { LicensePageRoutingModule } from './license-page-routing.module';
+import { LicensePageComponent } from './license-page.component';
+
+@NgModule({
+  declarations: [LicensePageComponent],
+  imports: [LicensePageRoutingModule, CommonModule, MarkdownModule.forChild()],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class LicensePageModule {}

apps/client/src/app/pages/about/license/license-page.scss

@@ -0,0 +1,8 @@
+:host {
+  color: rgb(var(--dark-primary-text));
+  display: block;
+}
+
+:host-context(.is-dark-theme) {
+  color: rgb(var(--light-primary-text));
+}

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

@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
-import { HalloGhostfolioPageComponent } from './hallo-ghostfolio-page.component';
+import { AboutOverviewPageComponent } from './about-overview-page.component';
 
 const routes: Routes = [
   {
     canActivate: [AuthGuard],
-    component: HalloGhostfolioPageComponent,
+    component: AboutOverviewPageComponent,
     path: '',
-    title: 'Hallo Ghostfolio'
+    title: $localize`About`
   }
 ];
 
@@ -17,4 +17,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class HalloGhostfolioPageRoutingModule {}
+export class AboutOverviewPageRoutingModule {}

apps/client/src/app/pages/about/overview/about-overview-page.component.ts

@@ -0,0 +1,65 @@
+import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+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 { User } from '@ghostfolio/common/interfaces';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-about-overview-page',
+  styleUrls: ['./about-overview-page.scss'],
+  templateUrl: './about-overview-page.html'
+})
+export class AboutOverviewPageComponent implements OnDestroy, OnInit {
+  public hasPermissionForBlog: boolean;
+  public hasPermissionForStatistics: boolean;
+  public hasPermissionForSubscription: boolean;
+  public isLoggedIn: boolean;
+  public user: User;
+  public version = environment.version;
+
+  private unsubscribeSubject = new Subject<void>();
+
+  public constructor(
+    private changeDetectorRef: ChangeDetectorRef,
+    private dataService: DataService,
+    private userService: UserService
+  ) {
+    const { globalPermissions } = this.dataService.fetchInfo();
+
+    this.hasPermissionForBlog = hasPermission(
+      globalPermissions,
+      permissions.enableBlog
+    );
+
+    this.hasPermissionForStatistics = hasPermission(
+      globalPermissions,
+      permissions.enableStatistics
+    );
+
+    this.hasPermissionForSubscription = hasPermission(
+      globalPermissions,
+      permissions.enableSubscription
+    );
+  }
+
+  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();
+    this.unsubscribeSubject.complete();
+  }
+}