Release 1.273.0 (#2014)

* Handle undefined data source

* Update changelog

.env.example

@@ -12,5 +12,5 @@ POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 ALPHA_VANTAGE_API_KEY=
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>

.eslintrc.json

@@ -1,12 +1,12 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -23,12 +23,12 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
@@ -113,5 +113,6 @@
         "radix": "error"
       }
     }
-  ]
+  ],
+  "extends": [null, "plugin:storybook/recommended"]
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -36,6 +36,9 @@ The Issue tracker is **ONLY** used for reporting bugs. New features should be di
 
 <!-- Please complete the following information -->
 
+- [ ] Cloud
+- [ ] Self-hosted
+
 - Ghostfolio Version X.Y.Z
 - Browser
 - OS

.storybook/main.js

@@ -1,8 +0,0 @@
-module.exports = {
-  // uncomment the property below if you want to apply some webpack config globally
-  // webpackFinal: async (config, { configType }) => {
-  //   // Make whatever fine-grained changes you need that should apply to all storybook configs
-  //   // Return the altered config
-  //   return config;
-  // },
-};

.storybook/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "exclude": [
-    "../**/*.spec.js",
-    "../**/*.spec.ts",
-    "../**/*.spec.tsx",
-    "../**/*.spec.jsx"
-  ],
-  "include": ["../**/*"]
-}

.vscode/launch.json

@@ -2,32 +2,33 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Debug Jest File",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/node_modules/@nrwl/cli/bin/nx",
       "args": [
         "test",
         "--codeCoverage=false",
         "--testFile=${workspaceFolder}/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts"
       ],
+      "console": "internalConsole",
       "cwd": "${workspaceFolder}",
-      "console": "internalConsole"
+      "name": "Debug Jest",
+      "program": "${workspaceFolder}/node_modules/@nrwl/cli/bin/nx",
+      "request": "launch",
+      "type": "node"
     },
     {
-      "envFile": "${workspaceFolder}/.env",
-      "type": "node",
-      "request": "launch",
-      "name": "Launch Program",
-      "program": "${workspaceFolder}/apps/api/src/main.ts",
-      "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
-      "outFiles": ["${workspaceFolder}/dist/apps/api/**/*.js"],
       "autoAttachChildProcesses": true,
+      "console": "integratedTerminal",
+      "cwd": "${workspaceFolder}/apps/api",
+      "envFile": "${workspaceFolder}/.env",
+      "name": "Debug API",
+      "outFiles": ["${workspaceFolder}/dist/apps/api/**/*.js"],
+      "program": "${workspaceFolder}/apps/api/src/main.ts",
+      "request": "launch",
+      "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "skipFiles": [
         "${workspaceFolder}/node_modules/**/*.js",
         "<node_internals>/**/*.js"
       ],
-      "console": "integratedTerminal"
+      "type": "node"
     }
   ]
 }

CHANGELOG.md

@@ -5,6 +5,139 @@ 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.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
+
+- Added the cash balance and the value of equity to the account detail dialog
+- Added a check for duplicates to the preview step of the import dividends dialog
+- Added an error message for duplicates to the preview step of the activities import
+- Added a connection timeout to the environment variable `DATABASE_URL`
+- Introduced the _Open Startup_ (`/open`) page with aggregated key metrics including uptime
+
+### Changed
+
+- Improved the mobile layout of the portfolio summary tab on the home page
+- Improved the language localization for German (`de`)
+- Upgraded `prisma` from version `4.13.0` to `4.14.1`
+
+### Fixed
+
+- Improved the _Select all_ activities checkbox state after importing activities including a duplicate
+- Fixed an issue with the data source transformation in the import dividends dialog
+- Fixed the _Storybook_ setup
+
+## 1.269.0 - 2023-05-11
+
+### Added
+
+- Added `FINANCIAL_MODELING_PREP` as a new data source type
+
+### Changed
+
+- Improved the market price on the first buy date in the chart of the position detail dialog
+- Restructured the admin control panel with a new settings tab
+
+### Fixed
+
+- Fixed an error that occurred while editing an activity caused by the cash balance update
+
+## 1.268.0 - 2023-05-08
+
+### Added
+
+- Added `depends_on` and `healthcheck` for the _Postgres_ and _Redis_ services to the `docker-compose` files (`docker-compose.yml` and `docker-compose.build.yml`)
+
+### Changed
+
+- Improved the preview step of the activities import by unchecking duplicates
+- Upgraded `yahoo-finance2` from version `2.3.10` to `2.4.1`
+
+## 1.267.0 - 2023-05-07
+
+### Added
+
+- Added support for the _Stripe_ checkout to the pricing page
+
+### Changed
+
+- Improved the management of platforms in the admin control panel
+- Improved the style of the interstitial for the subscription
+- Improved the language localization for German (`de`)
+- Upgraded `Nx` from version `15.9.2` to `16.0.3`
+
+## 1.266.0 - 2023-05-06
+
+### Added
+
+- Introduced the option to update the cash balance of an account when adding an activity
+- Added support for the management of platforms in the admin control panel
+- Added _DEV Community_ to the _As seen in_ section on the landing page
+
+### Changed
+
+- Upgraded `class-transformer` from version `0.3.2` to `0.5.1`
+- Upgraded `class-validator` from version `0.13.1` to `0.14.0`
+- Upgraded `prisma` from version `4.12.0` to `4.13.0`
+
+### Fixed
+
+- Added a fallback to use `quoteSummary(symbol)` if `quote(symbols)` fails in the _Yahoo Finance_ service
+- Added the missing `dataSource` attribute to the activities import
+
+## 1.265.0 - 2023-05-01
+
+### Changed
+
+- Improved the tooltip of the portfolio proportion chart component
+
+### Fixed
+
+- Fixed the missing platform name in the allocations by platform chart on the allocations page
+
 ## 1.264.0 - 2023-05-01
 
 ### Added
@@ -157,7 +290,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`

README.md

@@ -232,6 +232,7 @@ Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TO
 | Field      | Type                | Description                                        |
 | ---------- | ------------------- | -------------------------------------------------- |
 | accountId  | string (`optional`) | Id of the account                                  |
+| comment    | string (`optional`) | Comment of the activity                            |
 | currency   | string              | `CHF` \| `EUR` \| `USD` etc.                       |
 | dataSource | string              | `MANUAL` (for type `ITEM`) \| `YAHOO`              |
 | date       | string              | Date in the format `ISO-8601`                      |

apps/api/project.json

@@ -33,7 +33,7 @@
       "outputs": ["{options.outputPath}"]
     },
     "serve": {
-      "executor": "@nrwl/node:node",
+      "executor": "@nx/node:node",
       "options": {
         "buildTarget": "api:build"
       }
@@ -45,7 +45,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/api/jest.config.ts",
         "passWithNoTests": true

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

@@ -172,4 +172,47 @@ export class AccountService {
       where
     });
   }
+
+  public async updateAccountBalance({
+    accountId,
+    amount,
+    currency,
+    date,
+    userId
+  }: {
+    accountId: string;
+    amount: number;
+    currency: string;
+    date: Date;
+    userId: string;
+  }) {
+    const { balance, currency: currencyOfAccount } = await this.account({
+      id_userId: {
+        userId,
+        id: accountId
+      }
+    });
+
+    const amountInCurrencyOfAccount =
+      await this.exchangeRateDataService.toCurrencyAtDate(
+        amount,
+        currency,
+        currencyOfAccount,
+        date
+      );
+
+    if (amountInCurrencyOfAccount) {
+      await this.prismaService.account.update({
+        data: {
+          balance: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
+        },
+        where: {
+          id_userId: {
+            userId,
+            id: accountId
+          }
+        }
+      });
+    }
+  }
 }

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

@@ -29,6 +29,7 @@ import { ImportModule } from './import/import.module';
 import { InfoModule } from './info/info.module';
 import { LogoModule } from './logo/logo.module';
 import { OrderModule } from './order/order.module';
+import { PlatformModule } from './platform/platform.module';
 import { PortfolioModule } from './portfolio/portfolio.module';
 import { RedisCacheModule } from './redis-cache/redis-cache.module';
 import { SubscriptionModule } from './subscription/subscription.module';
@@ -63,6 +64,7 @@ import { UserModule } from './user/user.module';
     InfoModule,
     LogoModule,
     OrderModule,
+    PlatformModule,
     PortfolioModule,
     PrismaModule,
     RedisCacheModule,

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/frontend.middleware.ts

@@ -94,6 +94,13 @@ 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}`;
     }
 
     if (

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

@@ -35,6 +35,8 @@ export class ImportController {
 
   @Post()
   @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async import(
     @Body() importData: ImportDataDto,
     @Query('dryRun') isDryRun?: boolean

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

@@ -1,13 +1,13 @@
 import { AccountModule } from '@ghostfolio/api/app/account/account.module';
 import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
+import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';
 import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
-import { PlatformModule } from '@ghostfolio/api/services/platform/platform.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 import { Module } from '@nestjs/common';

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

@@ -1,12 +1,15 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  Activity,
+  ActivityError
+} from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
+import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.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 { PlatformService } from '@ghostfolio/api/services/platform/platform.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import { parseDate } from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
@@ -71,8 +74,25 @@ export class ImportService {
 
         const value = new Big(quantity).mul(marketPrice).toNumber();
 
+        const isDuplicate = orders.some((activity) => {
+          return (
+            activity.SymbolProfile.currency === assetProfile.currency &&
+            activity.SymbolProfile.dataSource === assetProfile.dataSource &&
+            isSameDay(activity.date, parseDate(dateString)) &&
+            activity.quantity === quantity &&
+            activity.SymbolProfile.symbol === assetProfile.symbol &&
+            activity.type === 'DIVIDEND' &&
+            activity.unitPrice === marketPrice
+          );
+        });
+
+        const error: ActivityError = isDuplicate
+          ? { code: 'IS_DUPLICATE' }
+          : undefined;
+
         return {
           Account,
+          error,
           quantity,
           value,
           accountId: Account?.id,
@@ -130,7 +150,7 @@ export class ImportService {
             }
           }
         }),
-        this.platformService.get()
+        this.platformService.getPlatforms()
       ]);
 
       for (const account of accountsDto) {
@@ -204,9 +224,14 @@ export class ImportService {
       userId
     });
 
+    const activitiesExtendedWithErrors = await this.extendActivitiesWithErrors({
+      activitiesDto,
+      userId
+    });
+
     const accounts = (await this.accountService.getAccounts(userId)).map(
-      (account) => {
-        return { id: account.id, name: account.name };
+      ({ id, name }) => {
+        return { id, name };
       }
     );
 
@@ -221,16 +246,14 @@ export class ImportService {
     for (const {
       accountId,
       comment,
-      currency,
-      dataSource,
-      date: dateString,
+      date,
+      error,
       fee,
       quantity,
-      symbol,
+      SymbolProfile: assetProfile,
       type,
       unitPrice
-    } of activitiesDto) {
-      const date = parseISO(<string>(<unknown>dateString));
+    } of activitiesExtendedWithErrors) {
       const validatedAccount = accounts.find(({ id }) => {
         return id === accountId;
       });
@@ -255,6 +278,139 @@ export class ImportService {
           createdAt: new Date(),
           id: uuidv4(),
           isDraft: isAfter(date, endOfToday()),
+          SymbolProfile: {
+            assetClass: assetProfile.assetClass,
+            assetSubClass: assetProfile.assetSubClass,
+            comment: assetProfile.comment,
+            countries: assetProfile.countries,
+            createdAt: assetProfile.createdAt,
+            currency: assetProfile.currency,
+            dataSource: assetProfile.dataSource,
+            id: assetProfile.id,
+            isin: assetProfile.isin,
+            name: assetProfile.name,
+            scraperConfiguration: assetProfile.scraperConfiguration,
+            sectors: assetProfile.sectors,
+            symbol: assetProfile.currency,
+            symbolMapping: assetProfile.symbolMapping,
+            updatedAt: assetProfile.updatedAt,
+            url: assetProfile.url,
+            ...assetProfiles[assetProfile.symbol]
+          },
+          Account: validatedAccount,
+          symbolProfileId: undefined,
+          updatedAt: new Date()
+        };
+      } else {
+        if (error) {
+          continue;
+        }
+
+        order = await this.orderService.createOrder({
+          comment,
+          date,
+          fee,
+          quantity,
+          type,
+          unitPrice,
+          userId,
+          accountId: validatedAccount?.id,
+          SymbolProfile: {
+            connectOrCreate: {
+              create: {
+                currency: assetProfile.currency,
+                dataSource: assetProfile.dataSource,
+                symbol: assetProfile.symbol
+              },
+              where: {
+                dataSource_symbol: {
+                  dataSource: assetProfile.dataSource,
+                  symbol: assetProfile.symbol
+                }
+              }
+            }
+          },
+          updateAccountBalance: false,
+          User: { connect: { id: userId } }
+        });
+      }
+
+      const value = new Big(quantity).mul(unitPrice).toNumber();
+
+      //@ts-ignore
+      activities.push({
+        ...order,
+        error,
+        value,
+        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
+          fee,
+          assetProfile.currency,
+          userCurrency
+        ),
+        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+          value,
+          assetProfile.currency,
+          userCurrency
+        )
+      });
+    }
+
+    return activities;
+  }
+
+  private async extendActivitiesWithErrors({
+    activitiesDto,
+    userId
+  }: {
+    activitiesDto: Partial<CreateOrderDto>[];
+    userId: string;
+  }): Promise<Partial<Activity>[]> {
+    const existingActivities = await this.orderService.orders({
+      include: { SymbolProfile: true },
+      orderBy: { date: 'desc' },
+      where: { userId }
+    });
+
+    return activitiesDto.map(
+      ({
+        accountId,
+        comment,
+        currency,
+        dataSource,
+        date: dateString,
+        fee,
+        quantity,
+        symbol,
+        type,
+        unitPrice
+      }) => {
+        const date = parseISO(<string>(<unknown>dateString));
+        const isDuplicate = existingActivities.some((activity) => {
+          return (
+            activity.SymbolProfile.currency === currency &&
+            activity.SymbolProfile.dataSource === dataSource &&
+            isSameDay(activity.date, date) &&
+            activity.fee === fee &&
+            activity.quantity === quantity &&
+            activity.SymbolProfile.symbol === symbol &&
+            activity.type === type &&
+            activity.unitPrice === unitPrice
+          );
+        });
+
+        const error: ActivityError = isDuplicate
+          ? { code: 'IS_DUPLICATE' }
+          : undefined;
+
+        return {
+          accountId,
+          comment,
+          date,
+          error,
+          fee,
+          quantity,
+          type,
+          unitPrice,
           SymbolProfile: {
             currency,
             dataSource,
@@ -271,62 +427,11 @@ export class ImportService {
             sectors: null,
             symbolMapping: null,
             updatedAt: undefined,
-            url: null,
-            ...assetProfiles[symbol]
-          },
-          Account: validatedAccount,
-          symbolProfileId: undefined,
-          updatedAt: new Date()
+            url: null
+          }
         };
-      } else {
-        order = await this.orderService.createOrder({
-          comment,
-          date,
-          fee,
-          quantity,
-          type,
-          unitPrice,
-          userId,
-          accountId: validatedAccount?.id,
-          SymbolProfile: {
-            connectOrCreate: {
-              create: {
-                currency,
-                dataSource,
-                symbol
-              },
-              where: {
-                dataSource_symbol: {
-                  dataSource,
-                  symbol
-                }
-              }
-            }
-          },
-          User: { connect: { id: userId } }
-        });
       }
-
-      const value = new Big(quantity).mul(unitPrice).toNumber();
-
-      //@ts-ignore
-      activities.push({
-        ...order,
-        value,
-        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          fee,
-          currency,
-          userCurrency
-        ),
-        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          value,
-          currency,
-          userCurrency
-        )
-      });
-    }
-
-    return activities;
+    );
   }
 
   private isUniqueAccount(accounts: AccountWithPlatform[]) {
@@ -355,33 +460,11 @@ export class ImportService {
     const assetProfiles: {
       [symbol: string]: Partial<SymbolProfile>;
     } = {};
-    const existingActivities = await this.orderService.orders({
-      include: { SymbolProfile: true },
-      orderBy: { date: 'desc' },
-      where: { userId }
-    });
 
     for (const [
       index,
-      { currency, dataSource, date, fee, quantity, symbol, type, unitPrice }
+      { currency, dataSource, symbol }
     ] of activitiesDto.entries()) {
-      const duplicateActivity = existingActivities.find((activity) => {
-        return (
-          activity.SymbolProfile.currency === currency &&
-          activity.SymbolProfile.dataSource === dataSource &&
-          isSameDay(activity.date, parseISO(<string>(<unknown>date))) &&
-          activity.fee === fee &&
-          activity.quantity === quantity &&
-          activity.SymbolProfile.symbol === symbol &&
-          activity.type === type &&
-          activity.unitPrice === unitPrice
-        );
-      });
-
-      if (duplicateActivity) {
-        throw new Error(`activities.${index} is a duplicate activity`);
-      }
-
       if (dataSource !== 'MANUAL') {
         const assetProfile = (
           await this.dataProviderService.getAssetProfiles([

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

@@ -1,4 +1,5 @@
 import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
+import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@@ -26,6 +27,7 @@ import { InfoService } from './info.service';
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '30 days' }
     }),
+    PlatformModule,
     PrismaModule,
     PropertyModule,
     RedisCacheModule,

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

@@ -1,4 +1,5 @@
 import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
+import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
@@ -6,6 +7,7 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
+  PROPERTY_BETTER_UPTIME_MONITOR_ID,
   PROPERTY_COUNTRIES_OF_SUBSCRIBERS,
   PROPERTY_DEMO_USER_ID,
   PROPERTY_IS_READ_ONLY_MODE,
@@ -15,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 {
@@ -38,6 +43,7 @@ export class InfoService {
     private readonly configurationService: ConfigurationService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly jwtService: JwtService,
+    private readonly platformService: PlatformService,
     private readonly prismaService: PrismaService,
     private readonly propertyService: PropertyService,
     private readonly redisCacheService: RedisCacheService,
@@ -47,9 +53,12 @@ export class InfoService {
   public async get(): Promise<InfoItem> {
     const info: Partial<InfoItem> = {};
     let isReadOnlyMode: boolean;
-    const platforms = await this.prismaService.platform.findMany({
-      orderBy: { name: 'asc' },
-      select: { id: true, name: true }
+    const platforms = (
+      await this.platformService.getPlatforms({
+        orderBy: { name: 'asc' }
+      })
+    ).map(({ id, name }) => {
+      return { id, name };
     });
     let systemMessage: string;
 
@@ -110,19 +119,28 @@ export class InfoService {
       globalPermissions.push(permissions.createUserAccount);
     }
 
+    const [benchmarks, demoAuthToken, statistics, subscriptions, tags] =
+      await Promise.all([
+        this.benchmarkService.getBenchmarkAssetProfiles(),
+        this.getDemoAuthToken(),
+        this.getStatistics(),
+        this.getSubscriptions(),
+        this.tagService.get()
+      ]);
+
     return {
       ...info,
+      benchmarks,
+      demoAuthToken,
       globalPermissions,
       isReadOnlyMode,
       platforms,
+      statistics,
+      subscriptions,
       systemMessage,
+      tags,
       baseCurrency: this.configurationService.get('BASE_CURRENCY'),
-      benchmarks: await this.benchmarkService.getBenchmarkAssetProfiles(),
-      currencies: this.exchangeRateDataService.getCurrencies(),
-      demoAuthToken: await this.getDemoAuthToken(),
-      statistics: await this.getStatistics(),
-      subscriptions: await this.getSubscriptions(),
-      tags: await this.tagService.get()
+      currencies: this.exchangeRateDataService.getCurrencies()
     };
   }
 
@@ -286,6 +304,7 @@ export class InfoService {
     const gitHubContributors = await this.countGitHubContributors();
     const gitHubStargazers = await this.countGitHubStargazers();
     const slackCommunityUsers = await this.countSlackCommunityUsers();
+    const uptime = await this.getUptime();
 
     statistics = {
       activeUsers1d,
@@ -294,7 +313,8 @@ export class InfoService {
       gitHubContributors,
       gitHubStargazers,
       newUsers30d,
-      slackCommunityUsers
+      slackCommunityUsers,
+      uptime
     };
 
     await this.redisCacheService.set(
@@ -318,4 +338,36 @@ export class InfoService {
 
     return JSON.parse(stripeConfig.value);
   }
+
+  private async getUptime(): Promise<number> {
+    {
+      try {
+        const monitorId = (await this.propertyService.getByKey(
+          PROPERTY_BETTER_UPTIME_MONITOR_ID
+        )) as string;
+
+        const get = bent(
+          `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,
+          {
+            Authorization: `Bearer ${this.configurationService.get(
+              'BETTER_UPTIME_API_KEY'
+            )}`
+          }
+        );
+
+        const { data } = await get();
+        return data.attributes.availability / 100;
+      } catch (error) {
+        Logger.error(error, 'InfoService');
+
+        return undefined;
+      }
+    }
+  }
 }

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

@@ -8,6 +8,7 @@ import {
 import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsArray,
+  IsBoolean,
   IsEnum,
   IsISO8601,
   IsNumber,
@@ -64,4 +65,8 @@ export class CreateOrderDto {
 
   @IsNumber()
   unitPrice: number;
+
+  @IsBoolean()
+  @IsOptional()
+  updateAccountBalance?: boolean;
 }

apps/api/src/app/order/interfaces/activities.interface.ts

@@ -5,7 +5,14 @@ export interface Activities {
 }
 
 export interface Activity extends OrderWithAccount {
+  error?: ActivityError;
   feeInBaseCurrency: number;
+  updateAccountBalance?: boolean;
   value: number;
   valueInBaseCurrency: number;
 }
+
+export interface ActivityError {
+  code: 'IS_DUPLICATE';
+  message?: string;
+}

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

@@ -73,6 +73,7 @@ export class OrderService {
       dataSource?: DataSource;
       symbol?: string;
       tags?: Tag[];
+      updateAccountBalance?: boolean;
       userId: string;
     }
   ): Promise<Order> {
@@ -89,12 +90,16 @@ export class OrderService {
       };
     }
 
+    const accountId = data.accountId;
+    let currency = data.currency;
     const tags = data.tags ?? [];
+    const updateAccountBalance = data.updateAccountBalance ?? false;
+    const userId = data.userId;
 
     if (data.type === 'ITEM') {
       const assetClass = data.assetClass;
       const assetSubClass = data.assetSubClass;
-      const currency = data.SymbolProfile.connectOrCreate.create.currency;
+      currency = data.SymbolProfile.connectOrCreate.create.currency;
       const dataSource: DataSource = 'MANUAL';
       const id = uuidv4();
       const name = data.SymbolProfile.connectOrCreate.create.symbol;
@@ -149,11 +154,12 @@ export class OrderService {
     delete data.dataSource;
     delete data.symbol;
     delete data.tags;
+    delete data.updateAccountBalance;
     delete data.userId;
 
     const orderData: Prisma.OrderCreateInput = data;
 
-    return this.prismaService.order.create({
+    const order = await this.prismaService.order.create({
       data: {
         ...orderData,
         Account,
@@ -165,6 +171,27 @@ export class OrderService {
         }
       }
     });
+
+    if (updateAccountBalance === true) {
+      let amount = new Big(data.unitPrice)
+        .mul(data.quantity)
+        .plus(data.fee)
+        .toNumber();
+
+      if (data.type === 'BUY') {
+        amount = new Big(amount).mul(-1).toNumber();
+      }
+
+      await this.accountService.updateAccountBalance({
+        accountId,
+        amount,
+        currency,
+        userId,
+        date: data.date as Date
+      });
+    }
+
+    return order;
   }
 
   public async deleteOrder(

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

@@ -8,6 +8,7 @@ import {
 import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsArray,
+  IsBoolean,
   IsEnum,
   IsISO8601,
   IsNumber,

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

@@ -0,0 +1,9 @@
+import { IsString } from 'class-validator';
+
+export class CreatePlatformDto {
+  @IsString()
+  name: string;
+
+  @IsString()
+  url: string;
+}

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

@@ -0,0 +1,114 @@
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  HttpException,
+  Inject,
+  Param,
+  Post,
+  Put,
+  UseGuards
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { AuthGuard } from '@nestjs/passport';
+import { Platform } from '@prisma/client';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
+
+import { CreatePlatformDto } from './create-platform.dto';
+import { PlatformService } from './platform.service';
+import { UpdatePlatformDto } from './update-platform.dto';
+
+@Controller('platform')
+export class PlatformController {
+  public constructor(
+    private readonly platformService: PlatformService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
+
+  @Get()
+  @UseGuards(AuthGuard('jwt'))
+  public async getPlatforms() {
+    return this.platformService.getPlatformsWithAccountCount();
+  }
+
+  @Post()
+  @UseGuards(AuthGuard('jwt'))
+  public async createPlatform(
+    @Body() data: CreatePlatformDto
+  ): Promise<Platform> {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.createPlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+    return this.platformService.createPlatform(data);
+  }
+
+  @Put(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async updatePlatform(
+    @Param('id') id: string,
+    @Body() data: UpdatePlatformDto
+  ) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updatePlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const originalPlatform = await this.platformService.getPlatform({
+      id
+    });
+
+    if (!originalPlatform) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.platformService.updatePlatform({
+      data: {
+        ...data
+      },
+      where: {
+        id
+      }
+    });
+  }
+
+  @Delete(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async deletePlatform(@Param('id') id: string) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.deletePlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const originalPlatform = await this.platformService.getPlatform({
+      id
+    });
+
+    if (!originalPlatform) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.platformService.deletePlatform({ id });
+  }
+}

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

@@ -1,9 +1,11 @@
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { Module } from '@nestjs/common';
 
+import { PlatformController } from './platform.controller';
 import { PlatformService } from './platform.service';
 
 @Module({
+  controllers: [PlatformController],
   exports: [PlatformService],
   imports: [PrismaModule],
   providers: [PlatformService]

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

@@ -0,0 +1,83 @@
+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { Injectable } from '@nestjs/common';
+import { Platform, Prisma } from '@prisma/client';
+
+@Injectable()
+export class PlatformService {
+  public constructor(private readonly prismaService: PrismaService) {}
+
+  public async getPlatform(
+    platformWhereUniqueInput: Prisma.PlatformWhereUniqueInput
+  ): Promise<Platform> {
+    return this.prismaService.platform.findUnique({
+      where: platformWhereUniqueInput
+    });
+  }
+
+  public async getPlatforms({
+    cursor,
+    orderBy,
+    skip,
+    take,
+    where
+  }: {
+    cursor?: Prisma.PlatformWhereUniqueInput;
+    orderBy?: Prisma.PlatformOrderByWithRelationInput;
+    skip?: number;
+    take?: number;
+    where?: Prisma.PlatformWhereInput;
+  } = {}) {
+    return this.prismaService.platform.findMany({
+      cursor,
+      orderBy,
+      skip,
+      take,
+      where
+    });
+  }
+
+  public async getPlatformsWithAccountCount() {
+    const platformsWithAccountCount =
+      await this.prismaService.platform.findMany({
+        include: {
+          _count: {
+            select: { Account: true }
+          }
+        }
+      });
+
+    return platformsWithAccountCount.map(({ _count, id, name, url }) => {
+      return {
+        id,
+        name,
+        url,
+        accountCount: _count.Account
+      };
+    });
+  }
+
+  public async createPlatform(data: Prisma.PlatformCreateInput) {
+    return this.prismaService.platform.create({
+      data
+    });
+  }
+
+  public async updatePlatform({
+    data,
+    where
+  }: {
+    data: Prisma.PlatformUpdateInput;
+    where: Prisma.PlatformWhereUniqueInput;
+  }): Promise<Platform> {
+    return this.prismaService.platform.update({
+      data,
+      where
+    });
+  }
+
+  public async deletePlatform(
+    where: Prisma.PlatformWhereUniqueInput
+  ): Promise<Platform> {
+    return this.prismaService.platform.delete({ where });
+  }
+}

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

@@ -0,0 +1,12 @@
+import { IsString } from 'class-validator';
+
+export class UpdatePlatformDto {
+  @IsString()
+  id: string;
+
+  @IsString()
+  name: string;
+
+  @IsString()
+  url: string;
+}

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

@@ -794,16 +794,6 @@ export class PortfolioService {
       let maxPrice = Math.max(orders[0].unitPrice, marketPrice);
       let minPrice = Math.min(orders[0].unitPrice, marketPrice);
 
-      if (!historicalData?.[aSymbol]?.[firstBuyDate]) {
-        // Add historical entry for buy date, if no historical data available
-        historicalDataArray.push({
-          averagePrice: orders[0].unitPrice,
-          date: firstBuyDate,
-          marketPrice: orders[0].unitPrice,
-          quantity: orders[0].quantity
-        });
-      }
-
       if (historicalData[aSymbol]) {
         let j = -1;
         for (const [date, { marketPrice }] of Object.entries(
@@ -815,11 +805,16 @@ export class PortfolioService {
           ) {
             j++;
           }
+
           let currentAveragePrice = 0;
           let currentQuantity = 0;
+
           const currentSymbol = transactionPoints[j].items.find(
-            (item) => item.symbol === aSymbol
+            ({ symbol }) => {
+              return symbol === aSymbol;
+            }
           );
+
           if (currentSymbol) {
             currentAveragePrice = currentSymbol.quantity.eq(0)
               ? 0
@@ -829,14 +824,25 @@ export class PortfolioService {
 
           historicalDataArray.push({
             date,
-            marketPrice,
             averagePrice: currentAveragePrice,
+            marketPrice:
+              historicalDataArray.length > 0
+                ? marketPrice
+                : currentAveragePrice,
             quantity: currentQuantity
           });
 
           maxPrice = Math.max(marketPrice ?? 0, maxPrice);
           minPrice = Math.min(marketPrice ?? Number.MAX_SAFE_INTEGER, minPrice);
         }
+      } else {
+        // Add historical entry for buy date, if no historical data available
+        historicalDataArray.push({
+          averagePrice: orders[0].unitPrice,
+          date: firstBuyDate,
+          marketPrice: orders[0].unitPrice,
+          quantity: orders[0].quantity
+        });
       }
 
       return {
@@ -1727,6 +1733,7 @@ export class PortfolioService {
       currentAccounts = await this.accountService.getAccounts(userId);
     } else if (filters.length === 1 && filters[0].type === 'ACCOUNT') {
       currentAccounts = await this.accountService.accounts({
+        include: { Platform: true },
         where: { id: filters[0].id }
       });
     } else {
@@ -1737,6 +1744,7 @@ export class PortfolioService {
       );
 
       currentAccounts = await this.accountService.accounts({
+        include: { Platform: true },
         where: { id: { in: accountIds } }
       });
     }

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

@@ -4,7 +4,7 @@ import {
   DEFAULT_LANGUAGE_CODE,
   PROPERTY_STRIPE_CONFIG
 } from '@ghostfolio/common/config';
-import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces/subscription.interface';
+import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces';
 import { UserWithSettings } from '@ghostfolio/common/types';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription-type.type';
 import { Injectable, Logger } from '@nestjs/common';

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

@@ -166,7 +166,7 @@ export class UserService {
         this.subscriptionService.getSubscription(Subscription);
 
       if (
-        Analytics?.activityCount % 25 === 0 &&
+        Analytics?.activityCount % 20 === 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/interceptors/transform-data-source-in-request.interceptor.ts

@@ -6,6 +6,7 @@ import {
   Injectable,
   NestInterceptor
 } from '@nestjs/common';
+import { DataSource } from '@prisma/client';
 import { Observable } from 'rxjs';
 
 @Injectable()
@@ -24,11 +25,24 @@ export class TransformDataSourceInRequestInterceptor<T>
     const request = http.getRequest();
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      if (request.body.dataSource) {
+      if (request.body.activities) {
+        request.body.activities = request.body.activities.map((activity) => {
+          if (DataSource[activity.dataSource]) {
+            return activity;
+          } else {
+            return {
+              ...activity,
+              dataSource: decodeDataSource(activity.dataSource)
+            };
+          }
+        });
+      }
+
+      if (request.body.dataSource && !DataSource[request.body.dataSource]) {
         request.body.dataSource = decodeDataSource(request.body.dataSource);
       }
 
-      if (request.params.dataSource) {
+      if (request.params.dataSource && !DataSource[request.params.dataSource]) {
         request.params.dataSource = decodeDataSource(request.params.dataSource);
       }
     }

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

@@ -15,6 +15,7 @@ export class ConfigurationService {
         choices: ['AUD', 'CAD', 'CNY', 'EUR', 'GBP', 'JPY', 'RUB', 'USD'],
         default: 'USD'
       }),
+      BETTER_UPTIME_API_KEY: str({ default: '' }),
       CACHE_TTL: num({ default: 1 }),
       DATA_SOURCE_EXCHANGE_RATES: str({ default: DataSource.YAHOO }),
       DATA_SOURCE_IMPORT: str({ default: DataSource.YAHOO }),
@@ -29,6 +30,7 @@ export class ConfigurationService {
       ENABLE_FEATURE_SUBSCRIPTION: bool({ default: false }),
       ENABLE_FEATURE_SYSTEM_MESSAGE: bool({ default: false }),
       EOD_HISTORICAL_DATA_API_KEY: str({ default: '' }),
+      FINANCIAL_MODELING_PREP_API_KEY: str({ default: '' }),
       GOOGLE_CLIENT_ID: str({ default: 'dummyClientId' }),
       GOOGLE_SECRET: str({ default: 'dummySecret' }),
       GOOGLE_SHEETS_ACCOUNT: str({ default: '' }),

apps/api/src/services/data-gathering/data-gathering.processor.ts

@@ -1,5 +1,6 @@
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import {
   DATA_GATHERING_QUEUE,
   GATHER_ASSET_PROFILE_PROCESS,
@@ -7,7 +8,6 @@ import {
 } from '@ghostfolio/common/config';
 import { DATE_FORMAT, getStartOfUtcDate } from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
-import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { Process, Processor } from '@nestjs/bull';
 import { Injectable, Logger } from '@nestjs/common';
 import { Prisma } from '@prisma/client';

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

@@ -3,6 +3,7 @@ import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cr
 import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
 import { CoinGeckoService } from '@ghostfolio/api/services/data-provider/coingecko/coingecko.service';
 import { EodHistoricalDataService } from '@ghostfolio/api/services/data-provider/eod-historical-data/eod-historical-data.service';
+import { FinancialModelingPrepService } from '@ghostfolio/api/services/data-provider/financial-modeling-prep/financial-modeling-prep.service';
 import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/google-sheets/google-sheets.service';
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
 import { RapidApiService } from '@ghostfolio/api/services/data-provider/rapid-api/rapid-api.service';
@@ -32,6 +33,7 @@ import { DataProviderService } from './data-provider.service';
     CoinGeckoService,
     DataProviderService,
     EodHistoricalDataService,
+    FinancialModelingPrepService,
     GoogleSheetsService,
     ManualService,
     RapidApiService,
@@ -41,6 +43,7 @@ import { DataProviderService } from './data-provider.service';
         AlphaVantageService,
         CoinGeckoService,
         EodHistoricalDataService,
+        FinancialModelingPrepService,
         GoogleSheetsService,
         ManualService,
         RapidApiService,
@@ -51,6 +54,7 @@ import { DataProviderService } from './data-provider.service';
         alphaVantageService,
         coinGeckoService,
         eodHistoricalDataService,
+        financialModelingPrepService,
         googleSheetsService,
         manualService,
         rapidApiService,
@@ -59,6 +63,7 @@ import { DataProviderService } from './data-provider.service';
         alphaVantageService,
         coinGeckoService,
         eodHistoricalDataService,
+        financialModelingPrepService,
         googleSheetsService,
         manualService,
         rapidApiService,

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

@@ -11,8 +11,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';
@@ -399,7 +398,10 @@ export class DataProviderService {
   }
 
   private isPremiumDataSource(aDataSource: DataSource) {
-    const premiumDataSources: DataSource[] = [DataSource.EOD_HISTORICAL_DATA];
+    const premiumDataSources: DataSource[] = [
+      DataSource.EOD_HISTORICAL_DATA,
+      DataSource.FINANCIAL_MODELING_PREP
+    ];
     return premiumDataSources.includes(aDataSource);
   }
 }

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

@@ -0,0 +1,181 @@
+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';
+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 {
+  private apiKey: string;
+  private baseCurrency: string;
+  private readonly URL = 'https://financialmodelingprep.com/api/v3';
+
+  public constructor(
+    private readonly configurationService: ConfigurationService
+  ) {
+    this.apiKey = this.configurationService.get(
+      'FINANCIAL_MODELING_PREP_API_KEY'
+    );
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }
+
+  public canHandle(symbol: string) {
+    return true;
+  }
+
+  public async getAssetProfile(
+    aSymbol: string
+  ): Promise<Partial<SymbolProfile>> {
+    return {
+      dataSource: this.getName(),
+      symbol: aSymbol
+    };
+  }
+
+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
+  public async getHistorical(
+    aSymbol: string,
+    aGranularity: Granularity = 'day',
+    from: Date,
+    to: Date
+  ): Promise<{
+    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
+  }> {
+    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 {
+    return DataSource.FINANCIAL_MODELING_PREP;
+  }
+
+  public async getQuotes(
+    aSymbols: string[]
+  ): Promise<{ [symbol: string]: IDataProviderResponse }> {
+    const results: { [symbol: string]: IDataProviderResponse } = {};
+
+    if (aSymbols.length <= 0) {
+      return {};
+    }
+
+    try {
+      const get = bent(
+        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`,
+        'GET',
+        'json',
+        200
+      );
+      const response = await get();
+
+      for (const { price, symbol } of response) {
+        results[symbol] = {
+          currency: this.baseCurrency,
+          dataProviderInfo: this.getDataProviderInfo(),
+          dataSource: DataSource.FINANCIAL_MODELING_PREP,
+          marketPrice: price,
+          marketState: 'delayed'
+        };
+      }
+    } catch (error) {
+      Logger.error(error, 'FinancialModelingPrepService');
+    }
+
+    return results;
+  }
+
+  public getTestSymbol() {
+    return 'AAPL';
+  }
+
+  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+    let items: LookupItem[] = [];
+
+    try {
+      const get = bent(
+        `${this.URL}/search?query=${aQuery}&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 {
+    return {
+      name: 'Financial Modeling Prep',
+      url: 'https://financialmodelingprep.com/developer/docs'
+    };
+  }
+}

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

@@ -14,6 +14,7 @@ import { DataSource, SymbolProfile } from '@prisma/client';
 import Big from 'big.js';
 import { addDays, format, isSameDay } from 'date-fns';
 import yahooFinance from 'yahoo-finance2';
+import { Quote } from 'yahoo-finance2/dist/esm/src/modules/quote';
 
 @Injectable()
 export class YahooFinanceService implements DataProviderInterface {
@@ -137,8 +138,7 @@ export class YahooFinanceService implements DataProviderInterface {
           marketPrice: this.getConvertedValue({
             symbol: aSymbol,
             value: historicalItem.close
-          }),
-          performance: historicalItem.open - historicalItem.close
+          })
         };
       }
 
@@ -175,7 +175,23 @@ export class YahooFinanceService implements DataProviderInterface {
     try {
       const response: { [symbol: string]: IDataProviderResponse } = {};
 
-      const quotes = await yahooFinance.quote(yahooFinanceSymbols);
+      let quotes: Pick<
+        Quote,
+        'currency' | 'marketState' | 'regularMarketPrice' | 'symbol'
+      >[] = [];
+
+      try {
+        quotes = await yahooFinance.quote(yahooFinanceSymbols);
+      } catch (error) {
+        Logger.error(error, 'YahooFinanceService');
+
+        Logger.warn(
+          'Fallback to yahooFinance.quoteSummary()',
+          'YahooFinanceService'
+        );
+
+        quotes = await this.getQuotesWithQuoteSummary(yahooFinanceSymbols);
+      }
 
       for (const quote of quotes) {
         // Convert symbols back
@@ -358,4 +374,26 @@ export class YahooFinanceService implements DataProviderInterface {
 
     return value;
   }
+
+  private async getQuotesWithQuoteSummary(aYahooFinanceSymbols: string[]) {
+    const quoteSummaryPromises = aYahooFinanceSymbols.map((symbol) => {
+      return yahooFinance.quoteSummary(symbol).catch(() => {
+        Logger.error(
+          `Could not get quote summary for ${symbol}`,
+          'YahooFinanceService'
+        );
+        return null;
+      });
+    });
+
+    const quoteSummaryItems = await Promise.all(quoteSummaryPromises);
+
+    return quoteSummaryItems
+      .filter((item) => {
+        return item !== null;
+      })
+      .map(({ price }) => {
+        return price;
+      });
+  }
 }

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

@@ -4,6 +4,7 @@ export interface Environment extends CleanedEnvAccessors {
   ACCESS_TOKEN_SALT: string;
   ALPHA_VANTAGE_API_KEY: string;
   BASE_CURRENCY: string;
+  BETTER_UPTIME_API_KEY: string;
   CACHE_TTL: number;
   DATA_SOURCE_EXCHANGE_RATES: string;
   DATA_SOURCE_IMPORT: string;
@@ -16,6 +17,7 @@ export interface Environment extends CleanedEnvAccessors {
   ENABLE_FEATURE_SUBSCRIPTION: boolean;
   ENABLE_FEATURE_SYSTEM_MESSAGE: boolean;
   EOD_HISTORICAL_DATA_API_KEY: string;
+  FINANCIAL_MODELING_PREP_API_KEY: string;
   GOOGLE_CLIENT_ID: string;
   GOOGLE_SECRET: string;
   GOOGLE_SHEETS_ACCOUNT: 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/platform/platform.service.ts

@@ -1,11 +0,0 @@
-import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class PlatformService {
-  public constructor(private readonly prismaService: PrismaService) {}
-
-  public async get() {
-    return this.prismaService.platform.findMany();
-  }
-}

apps/client-e2e/project.json

@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/client-e2e/cypress.json",
         "tsConfig": "apps/client-e2e/tsconfig.e2e.json",

apps/client-e2e/src/plugins/index.js

@@ -11,7 +11,7 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
-const { preprocessTypescript } = require('@nrwl/cypress/plugins/preprocessor');
+const { preprocessTypescript } = require('@nx/cypress/plugins/preprocessor');
 
 module.exports = (on, config) => {
   // `on` is used to hook into various events Cypress emits

apps/client/project.json

@@ -195,7 +195,7 @@
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "options": {
         "jestConfig": "apps/client/jest.config.ts",
         "passWithNoTests": true

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

@@ -5,25 +5,46 @@ 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',
+    'ueber-uns'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/about/about-page.module').then((m) => m.AboutPageModule)
-  },
-  {
-    path: 'about/changelog',
+  })),
+  ...[
+    'about/changelog',
+    /////
+    'a-propos/changelog',
+    'informazioni-su/changelog',
+    'over/changelog',
+    'ueber-uns/changelog'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/about/changelog/changelog-page.module').then(
         (m) => m.ChangelogPageModule
       )
-  },
-  {
-    path: 'about/privacy-policy',
+  })),
+  ...[
+    'about/privacy-policy',
+    /////
+    'a-propos/politique-de-confidentialite',
+    'informazioni-su/informativa-sulla-privacy',
+    'over/privacybeleid',
+    'ueber-uns/datenschutzbestimmungen'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/about/privacy-policy/privacy-policy-page.module').then(
         (m) => m.PrivacyPolicyPageModule
       )
-  },
+  })),
   {
     path: 'account',
     loadChildren: () =>
@@ -48,11 +69,11 @@ 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: () =>
@@ -137,34 +158,66 @@ const routes: Routes = [
         './pages/blog/2023/03/1000-stars-on-github/1000-stars-on-github-page.module'
       ).then((m) => m.ThousandStarsOnGitHubPageModule)
   },
+  {
+    path: 'blog/2023/05/unlock-your-financial-potential-with-ghostfolio',
+    loadChildren: () =>
+      import(
+        './pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.module'
+      ).then((m) => m.UnlockYourFinancialPotentialWithGhostfolioPageModule)
+  },
   {
     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',
+    'vaak-gestelde-vragen'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/faq/faq-page.module').then((m) => m.FaqPageModule)
-  },
-  {
-    path: 'features',
+  })),
+  ...[
+    'features',
+    /////
+    'fonctionnalites',
+    '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',
+    'mercati'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/markets/markets-page.module').then(
         (m) => m.MarketsPageModule
       )
+  })),
+  {
+    path: 'open',
+    loadChildren: () =>
+      import('./pages/open/open-page.module').then((m) => m.OpenPageModule)
   },
   {
     path: 'p',
@@ -180,27 +233,48 @@ const routes: Routes = [
         (m) => m.PortfolioPageModule
       )
   },
-  {
-    path: 'pricing',
+  ...[
+    'pricing',
+    /////
+    'preise',
+    'prezzi',
+    'prijzen',
+    'prix'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/pricing/pricing-page.module').then(
         (m) => m.PricingPageModule
       )
-  },
-  {
-    path: 'register',
+  })),
+  ...[
+    'register',
+    /////
+    'enregistrement',
+    'iscrizione',
+    'registratie',
+    'registrierung'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/register/register-page.module').then(
         (m) => m.RegisterPageModule
       )
-  },
-  {
-    path: 'resources',
+  })),
+  ...[
+    'resources',
+    /////
+    'bronnen',
+    'ressourcen',
+    'ressources',
+    'risorse'
+  ].map((path) => ({
+    path,
     loadChildren: () =>
       import('./pages/resources/resources-page.module').then(
         (m) => m.ResourcesPageModule
       )
-  },
+  })),
   {
     path: 'start',
     loadChildren: () =>

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

@@ -13,7 +13,9 @@ import { downloadAsFile } from '@ghostfolio/common/helper';
 import { User } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 import { translate } from '@ghostfolio/ui/i18n';
+import Big from 'big.js';
 import { format, parseISO } from 'date-fns';
+import { isNumber } from 'lodash';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
@@ -28,6 +30,9 @@ import { AccountDetailDialogParams } from './interfaces/interfaces';
 })
 export class AccountDetailDialog implements OnDestroy, OnInit {
   public accountType: string;
+  public balance: number;
+  public currency: string;
+  public equity: number;
   public name: string;
   public orders: OrderWithAccount[];
   public platformName: string;
@@ -58,14 +63,33 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
     this.dataService
       .fetchAccount(this.data.accountId)
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(({ accountType, name, Platform, valueInBaseCurrency }) => {
-        this.accountType = translate(accountType);
-        this.name = name;
-        this.platformName = Platform?.name ?? '-';
-        this.valueInBaseCurrency = valueInBaseCurrency;
+      .subscribe(
+        ({
+          accountType,
+          balance,
+          currency,
+          name,
+          Platform,
+          value,
+          valueInBaseCurrency
+        }) => {
+          this.accountType = translate(accountType);
+          this.balance = balance;
+          this.currency = currency;
 
-        this.changeDetectorRef.markForCheck();
-      });
+          if (isNumber(balance) && isNumber(value)) {
+            this.equity = new Big(value).minus(balance).toNumber();
+          } else {
+            this.equity = null;
+          }
+
+          this.name = name;
+          this.platformName = Platform?.name ?? '-';
+          this.valueInBaseCurrency = valueInBaseCurrency;
+
+          this.changeDetectorRef.markForCheck();
+        }
+      );
 
     this.dataService
       .fetchActivities({

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

@@ -20,6 +20,26 @@
     </div>
 
     <div class="row">
+      <div class="col-6 mb-3">
+        <gf-value
+          i18n
+          size="medium"
+          [currency]="currency"
+          [locale]="user?.settings?.locale"
+          [value]="balance"
+          >Cash Balance</gf-value
+        >
+      </div>
+      <div class="col-6 mb-3">
+        <gf-value
+          i18n
+          size="medium"
+          [currency]="currency"
+          [locale]="user?.settings?.locale"
+          [value]="equity"
+          >Equity</gf-value
+        >
+      </div>
       <div class="col-6 mb-3">
         <gf-value i18n size="medium" [value]="accountType"
           >Account Type</gf-value

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

@@ -143,18 +143,6 @@
               <ion-icon name="ellipsis-vertical"></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"

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

@@ -10,13 +10,13 @@ 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,
   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';
 
@@ -37,9 +37,11 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     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 +53,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 +77,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 = {};
 
@@ -128,6 +136,17 @@ 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 symbolMapping = {};
 

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>
 

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

@@ -0,0 +1,105 @@
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <div class="d-flex justify-content-end">
+        <a
+          color="primary"
+          i18n
+          mat-flat-button
+          [queryParams]="{ createPlatformDialog: true }"
+          [routerLink]="[]"
+        >
+          Add Platform
+        </a>
+      </div>
+      <table
+        class="gf-table w-100"
+        mat-table
+        matSort
+        matSortActive="name"
+        matSortDirection="asc"
+        [dataSource]="dataSource"
+      >
+        <ng-container matColumnDef="name">
+          <th
+            *matHeaderCellDef
+            class="px-1"
+            mat-header-cell
+            mat-sort-header="name"
+          >
+            <ng-container i18n>Name</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1" mat-cell>
+            <gf-symbol-icon
+              *ngIf="element.url"
+              class="d-inline mr-1"
+              [tooltip]="element.name"
+              [url]="element.url"
+            ></gf-symbol-icon>
+            <span>{{ element.name }}</span>
+          </td></ng-container
+        >
+
+        <ng-container matColumnDef="url">
+          <th
+            *matHeaderCellDef
+            class="px-1"
+            mat-header-cell
+            mat-sort-header="url"
+          >
+            <ng-container i18n>Url</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1" mat-cell>
+            {{ element.url }}
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="accounts">
+          <th
+            *matHeaderCellDef
+            class="px-1"
+            mat-header-cell
+            mat-sort-header="accountCount"
+          >
+            <ng-container i18n>Accounts</ng-container>
+          </th>
+          <td *matCellDef="let element" class="px-1" mat-cell>
+            {{ element.accountCount }}
+          </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>
+            <button
+              class="mx-1 no-min-width px-2"
+              mat-button
+              [matMenuTriggerFor]="platformMenu"
+              (click)="$event.stopPropagation()"
+            >
+              <ion-icon name="ellipsis-vertical"></ion-icon>
+            </button>
+            <mat-menu #platformMenu="matMenu" xPosition="before">
+              <button mat-menu-item (click)="onUpdatePlatform(element)">
+                <ion-icon class="mr-2" name="create-outline"></ion-icon>
+                <span i18n>Edit</span>
+              </button>
+              <button mat-menu-item (click)="onDeletePlatform(element.id)">
+                <ion-icon class="mr-2" name="trash-outline"></ion-icon>
+                <span i18n>Delete</span>
+              </button>
+            </mat-menu>
+          </td>
+        </ng-container>
+
+        <tr *matHeaderRowDef="displayedColumns" mat-header-row></tr>
+        <tr *matRowDef="let row; columns: displayedColumns" mat-row></tr>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+@import 'apps/client/src/styles/ghostfolio-style';
+
+:host {
+  display: block;
+}

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

@@ -0,0 +1,203 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild
+} from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSort } from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CreatePlatformDto } from '@ghostfolio/api/app/platform/create-platform.dto';
+import { UpdatePlatformDto } from '@ghostfolio/api/app/platform/update-platform.dto';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { Platform } from '@prisma/client';
+import { get } from 'lodash';
+import { DeviceDetectorService } from 'ngx-device-detector';
+import { Subject, takeUntil } from 'rxjs';
+
+import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog/create-or-update-account-platform.component';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: 'gf-admin-platform',
+  styleUrls: ['./admin-platform.component.scss'],
+  templateUrl: './admin-platform.component.html'
+})
+export class AdminPlatformComponent implements OnInit, OnDestroy {
+  @ViewChild(MatSort) sort: MatSort;
+
+  public dataSource: MatTableDataSource<Platform> = new MatTableDataSource();
+  public deviceType: string;
+  public displayedColumns = ['name', 'url', 'accounts', 'actions'];
+  public platforms: Platform[];
+
+  private unsubscribeSubject = new Subject<void>();
+
+  public constructor(
+    private adminService: AdminService,
+    private changeDetectorRef: ChangeDetectorRef,
+    private deviceService: DeviceDetectorService,
+    private dialog: MatDialog,
+    private route: ActivatedRoute,
+    private router: Router,
+    private userService: UserService
+  ) {
+    this.route.queryParams
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((params) => {
+        if (params['createPlatformDialog']) {
+          this.openCreatePlatformDialog();
+        } else if (params['editPlatformDialog']) {
+          if (this.platforms) {
+            const platform = this.platforms.find(({ id }) => {
+              return id === params['platformId'];
+            });
+
+            this.openUpdatePlatformDialog(platform);
+          } else {
+            this.router.navigate(['.'], { relativeTo: this.route });
+          }
+        }
+      });
+  }
+
+  public ngOnInit() {
+    this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+
+    this.fetchPlatforms();
+  }
+
+  public onDeletePlatform(aId: string) {
+    const confirmation = confirm(
+      $localize`Do you really want to delete this platform?`
+    );
+
+    if (confirmation) {
+      this.deletePlatform(aId);
+    }
+  }
+
+  public onUpdatePlatform({ id }: Platform) {
+    this.router.navigate([], {
+      queryParams: { editPlatformDialog: true, platformId: id }
+    });
+  }
+
+  public ngOnDestroy() {
+    this.unsubscribeSubject.next();
+    this.unsubscribeSubject.complete();
+  }
+
+  private deletePlatform(aId: string) {
+    this.adminService
+      .deletePlatform(aId)
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe({
+        next: () => {
+          this.userService
+            .get(true)
+            .pipe(takeUntil(this.unsubscribeSubject))
+            .subscribe();
+
+          this.fetchPlatforms();
+        }
+      });
+  }
+
+  private fetchPlatforms() {
+    this.adminService
+      .fetchPlatforms()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((platforms) => {
+        this.platforms = platforms;
+        this.dataSource = new MatTableDataSource(platforms);
+        this.dataSource.sort = this.sort;
+        this.dataSource.sortingDataAccessor = get;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+
+  private openCreatePlatformDialog() {
+    const dialogRef = this.dialog.open(CreateOrUpdatePlatformDialog, {
+      data: {
+        platform: {
+          name: null,
+          url: null
+        }
+      },
+
+      height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
+      width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+    });
+
+    dialogRef
+      .afterClosed()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((data) => {
+        const platform: CreatePlatformDto = data?.platform;
+
+        if (platform) {
+          this.adminService
+            .postPlatform(platform)
+            .pipe(takeUntil(this.unsubscribeSubject))
+            .subscribe({
+              next: () => {
+                this.userService
+                  .get(true)
+                  .pipe(takeUntil(this.unsubscribeSubject))
+                  .subscribe();
+
+                this.fetchPlatforms();
+              }
+            });
+        }
+
+        this.router.navigate(['.'], { relativeTo: this.route });
+      });
+  }
+
+  private openUpdatePlatformDialog({ id, name, url }) {
+    const dialogRef = this.dialog.open(CreateOrUpdatePlatformDialog, {
+      data: {
+        platform: {
+          id,
+          name,
+          url
+        }
+      },
+
+      height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
+      width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+    });
+
+    dialogRef
+      .afterClosed()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((data) => {
+        const platform: UpdatePlatformDto = data?.platform;
+
+        if (platform) {
+          this.adminService
+            .putPlatform(platform)
+            .pipe(takeUntil(this.unsubscribeSubject))
+            .subscribe({
+              next: () => {
+                this.userService
+                  .get(true)
+                  .pipe(takeUntil(this.unsubscribeSubject))
+                  .subscribe();
+
+                this.fetchPlatforms();
+              }
+            });
+        }
+
+        this.router.navigate(['.'], { relativeTo: this.route });
+      });
+  }
+}

apps/client/src/app/components/admin-platform/admin-platform.module.ts

@@ -0,0 +1,28 @@
+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 { MatSortModule } from '@angular/material/sort';
+import { MatTableModule } from '@angular/material/table';
+import { RouterModule } from '@angular/router';
+import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';
+
+import { AdminPlatformComponent } from './admin-platform.component';
+import { GfCreateOrUpdatePlatformDialogModule } from './create-or-update-platform-dialog/create-or-update-platform-dialog.module';
+
+@NgModule({
+  declarations: [AdminPlatformComponent],
+  exports: [AdminPlatformComponent],
+  imports: [
+    CommonModule,
+    GfCreateOrUpdatePlatformDialogModule,
+    GfSymbolIconModule,
+    MatButtonModule,
+    MatMenuModule,
+    MatSortModule,
+    MatTableModule,
+    RouterModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfAdminPlatformModule {}

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts

@@ -0,0 +1,30 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Subject } from 'rxjs';
+
+import { CreateOrUpdatePlatformDialogParams } from './interfaces/interfaces';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'h-100' },
+  selector: 'gf-create-or-update-platform-dialog',
+  styleUrls: ['./create-or-update-platform-dialog.scss'],
+  templateUrl: 'create-or-update-platform-dialog.html'
+})
+export class CreateOrUpdatePlatformDialog {
+  private unsubscribeSubject = new Subject<void>();
+
+  public constructor(
+    public dialogRef: MatDialogRef<CreateOrUpdatePlatformDialog>,
+    @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdatePlatformDialogParams
+  ) {}
+
+  public onCancel() {
+    this.dialogRef.close();
+  }
+
+  public ngOnDestroy() {
+    this.unsubscribeSubject.next();
+    this.unsubscribeSubject.complete();
+  }
+}

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html

@@ -0,0 +1,29 @@
+<form #addPlatformForm="ngForm" class="d-flex flex-column h-100">
+  <h1 *ngIf="data.platform.id" i18n mat-dialog-title>Update platform</h1>
+  <h1 *ngIf="!data.platform.id" i18n mat-dialog-title>Add platform</h1>
+  <div class="flex-grow-1 py-3" mat-dialog-content>
+    <div>
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Name</mat-label>
+        <input matInput name="name" required [(ngModel)]="data.platform.name" />
+      </mat-form-field>
+    </div>
+    <div>
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Url</mat-label>
+        <input matInput name="url" required [(ngModel)]="data.platform.url" />
+      </mat-form-field>
+    </div>
+  </div>
+  <div class="justify-content-end" mat-dialog-actions>
+    <button i18n mat-button (click)="onCancel()">Cancel</button>
+    <button
+      color="primary"
+      mat-flat-button
+      [disabled]="!addPlatformForm.form.valid"
+      [mat-dialog-close]="data"
+    >
+      <ng-container i18n>Save</ng-container>
+    </button>
+  </div>
+</form>

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts

@@ -0,0 +1,23 @@
+import { CommonModule } from '@angular/common';
+import { 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 { MatInputModule } from '@angular/material/input';
+
+import { CreateOrUpdatePlatformDialog } from './create-or-update-account-platform.component';
+
+@NgModule({
+  declarations: [CreateOrUpdatePlatformDialog],
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatButtonModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatInputModule,
+    ReactiveFormsModule
+  ]
+})
+export class GfCreateOrUpdatePlatformDialogModule {}

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.scss

@@ -0,0 +1,7 @@
+:host {
+  display: block;
+
+  .mat-mdc-dialog-content {
+    max-height: unset;
+  }
+}

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/interfaces/interfaces.ts

@@ -0,0 +1,5 @@
+import { Platform } from '@prisma/client';
+
+export interface CreateOrUpdatePlatformDialogParams {
+  platform: Platform;
+}

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

@@ -0,0 +1,15 @@
+<div class="container">
+  <div class="mb-5 row">
+    <div class="col">
+      <h3 class="text-center" i18n>Platforms</h3>
+      <gf-admin-platform></gf-admin-platform>
+    </div>
+  </div>
+  <!--
+  <div class="row">
+    <div class="col">
+      <h3 class="text-center" i18n>Tags</h3>
+    </div>
+  </div>
+  -->
+</div>

apps/client/src/app/components/admin-settings/admin-settings.component.scss

@@ -0,0 +1,5 @@
+@import 'apps/client/src/styles/ghostfolio-style';
+
+:host {
+  display: block;
+}

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

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

apps/client/src/app/components/admin-settings/admin-settings.module.ts

@@ -0,0 +1,13 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { GfAdminPlatformModule } from '@ghostfolio/client/components/admin-platform/admin-platform.module';
+
+import { AdminSettingsComponent } from './admin-settings.component';
+
+@NgModule({
+  declarations: [AdminSettingsComponent],
+  imports: [CommonModule, GfAdminPlatformModule, RouterModule],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfAdminSettingsModule {}

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

@@ -13,7 +13,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 +27,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/portfolio-summary/portfolio-summary.component.html

@@ -1,16 +1,16 @@
 <div class="container p-0">
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Time in Market</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Time in Market</div>
+    <div class="justify-content-end">
       <gf-value class="justify-content-end" [value]="timeInMarket"></gf-value>
     </div>
   </div>
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Buy</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Buy</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -19,9 +19,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Sell</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Sell</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -33,9 +33,9 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Investment</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Investment</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -44,9 +44,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Absolute Gross Performance</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Absolute Gross Performance</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -55,9 +55,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1 ml-3" i18n>Gross Performance (TWR)</div>
-    <div class="d-flex flex-column flex-wrap justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>Gross Performance</div>
+    <div class="flex-column flex-wrap justify-content-end">
       <gf-value
         class="justify-content-end"
         position="end"
@@ -70,8 +70,8 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>
       Fees for {{ summary?.ordersCount }} {summary?.ordersCount, plural, =1
       {transaction} other {transactions}}
     </div>
@@ -88,9 +88,9 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Absolute Net Performance</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Absolute Net Performance</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -99,9 +99,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1 ml-3" i18n>Net Performance (TWR)</div>
-    <div class="d-flex flex-column flex-wrap justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate ml-3" i18n>Net Performance</div>
+    <div class="flex-column flex-wrap justify-content-end">
       <gf-value
         class="justify-content-end"
         position="end"
@@ -115,9 +115,9 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Total Assets</div>
-    <div class="d-flex flex-column flex-wrap justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Total Assets</div>
+    <div class="flex-column flex-wrap justify-content-end">
       <gf-value
         class="justify-content-end"
         position="end"
@@ -127,9 +127,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Valuables</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Valuables</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -138,8 +138,8 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Emergency Fund</div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Emergency Fund</div>
     <div
       class="align-items-center d-flex justify-content-end"
       [ngClass]="{ 'cursor-pointer': hasPermissionToUpdateUserSettings }"
@@ -158,9 +158,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Buying Power</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Buying Power</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -169,9 +169,9 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Excluded from Analysis</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Excluded from Analysis</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"
@@ -183,9 +183,9 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1 font-weight-bold" i18n>Net Worth</div>
-    <div class="d-flex justify-content-end">
+  <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"
@@ -194,9 +194,11 @@
       ></gf-value>
     </div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1 ml-3" i18n>Annualized Performance</div>
-    <div class="d-flex flex-column flex-wrap justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>
+      Annualized Performance
+    </div>
+    <div class="flex-column flex-wrap justify-content-end">
       <gf-value
         class="justify-content-end"
         position="end"
@@ -210,9 +212,9 @@
   <div class="row">
     <div class="col"><hr /></div>
   </div>
-  <div class="row px-3 py-1">
-    <div class="d-flex flex-grow-1" i18n>Dividend</div>
-    <div class="d-flex justify-content-end">
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 text-truncate" i18n>Dividend</div>
+    <div class="justify-content-end">
       <gf-value
         class="justify-content-end"
         [currency]="baseCurrency"

apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html

@@ -1,44 +1,55 @@
-<h1 class="align-items-center d-flex" mat-dialog-title>
-  <span>Ghostfolio Premium</span>
-  <gf-premium-indicator
-    class="ml-1"
-    [enableLink]="false"
-  ></gf-premium-indicator>
-</h1>
-<div class="flex-grow-1" mat-dialog-content>
-  <p class="h5" i18n>
-    Are you an ambitious investor who needs the full picture?
-  </p>
-  <p i18n>
-    By upgrading to Ghostfolio Premium, you will get these additional features:
-  </p>
-  <ul class="list-unstyled mb-3">
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>Portfolio Summary</span>
-    </li>
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>Portfolio Allocations</span>
-    </li>
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>Performance Benchmarks</span>
-    </li>
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>FIRE Calculator</span>
-    </li>
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>Professional Data Provider</span>
-    </li>
-    <li class="align-items-center d-flex mb-1">
-      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
-      <span i18n>and more Features...</span>
-    </li>
-  </ul>
-  <p>Refine your personal investment strategy now.</p>
+<div class="flex-grow-1 pt-0" mat-dialog-content>
+  <div class="intro-container">
+    <div class="intro-inner-container mx-auto">
+      <div class="h-100 intro w-100"></div>
+    </div>
+  </div>
+  <div>
+    <h5 class="align-items-center d-flex justify-content-center mb-3">
+      <span>Ghostfolio Premium</span>
+      <gf-premium-indicator
+        class="ml-1"
+        [enableLink]="false"
+      ></gf-premium-indicator>
+    </h5>
+    <div class="font-weight-normal h5 mb-3 text-center" i18n>
+      Are you an ambitious investor who needs the full picture?
+    </div>
+    <p i18n>
+      Upgrade to Ghostfolio Premium today and gain access to exclusive features
+      to enhance your investment experience:
+    </p>
+    <ul class="list-unstyled mb-3 pl-3">
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>Portfolio Summary</span>
+      </li>
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>Portfolio Allocations</span>
+      </li>
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>Performance Benchmarks</span>
+      </li>
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>FIRE Calculator</span>
+      </li>
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>Professional Data Provider</span>
+      </li>
+      <li class="align-items-center d-flex mb-1">
+        <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+        <span i18n>and more Features...</span>
+      </li>
+    </ul>
+    <p class="m-0" i18n>
+      Get the tools to effectively manage your finances and refine your personal
+      investment strategy.
+    </p>
+  </div>
 </div>
 <div class="justify-content-end" mat-dialog-actions>
   <button i18n mat-button (click)="closeDialog()">Skip</button>

apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.scss

@@ -5,7 +5,21 @@
     max-height: unset;
 
     ion-icon[name='checkmark-circle-outline'] {
-      color: rgba(var(--palette-accent-500), 1);
+      color: rgba(var(--palette-primary-500), 1);
+    }
+
+    .intro-container {
+      .intro-inner-container {
+        aspect-ratio: 16 / 9;
+        max-height: 18rem;
+
+        .intro {
+          background-image: url('/assets/intro.jpg');
+          background-position: top left;
+          background-repeat: no-repeat;
+          background-size: contain;
+        }
+      }
     }
   }
 }

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/core/auth.guard.ts

@@ -24,6 +24,7 @@ export class AuthGuard implements CanActivate {
     '/faq',
     '/features',
     '/markets',
+    '/open',
     '/p',
     '/pricing',
     '/register',

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

@@ -1,14 +1,13 @@
 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 { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';
+import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
+import { Statistics, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 
-import { environment } from '../../../environments/environment';
-
 @Component({
   host: { class: 'page' },
   selector: 'gf-about-page',
@@ -16,6 +15,7 @@ import { environment } from '../../../environments/environment';
   templateUrl: './about-page.html'
 })
 export class AboutPageComponent implements OnDestroy, OnInit {
+  public defaultLanguageCode = DEFAULT_LANGUAGE_CODE;
   public hasPermissionForBlog: boolean;
   public hasPermissionForStatistics: boolean;
   public hasPermissionForSubscription: boolean;

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

@@ -7,8 +7,25 @@
           Ghostfolio is a lightweight wealth management application for
           individuals to keep track of stocks, ETFs or cryptocurrencies and make
           solid, data-driven investment decisions. The source code is fully
-          available as open source software (OSS). The project has been
-          initiated by
+          available as
+          <a
+            href="https://github.com/ghostfolio/ghostfolio"
+            title="Find Ghostfolio on GitHub"
+            >open source software</a
+          >
+          (OSS) under the
+          <a
+            href="https://www.gnu.org/licenses/agpl-3.0.html"
+            title="GNU Affero General Public License"
+            >AGPL-3.0 license</a
+          >
+          and we share aggregated
+          <a
+            href="https://ghostfol.io/{{ defaultLanguageCode }}/open"
+            title="Open Startup"
+            >key metrics</a
+          >
+          of the platform’s performance. The project has been initiated by
           <a href="https://dotsilver.ch" title="Website of Thomas Kaul"
             >Thomas Kaul</a
           >
@@ -127,6 +144,7 @@
               <gf-value
                 size="large"
                 subLabel="(Last 24 hours)"
+                [locale]="user?.settings?.locale"
                 [value]="statistics?.activeUsers1d ?? '-'"
                 >Active Users</gf-value
               >
@@ -135,6 +153,7 @@
               <gf-value
                 size="large"
                 subLabel="(Last 30 days)"
+                [locale]="user?.settings?.locale"
                 [value]="statistics?.newUsers30d ?? '-'"
                 >New Users</gf-value
               >
@@ -143,6 +162,7 @@
               <gf-value
                 size="large"
                 subLabel="(Last 30 days)"
+                [locale]="user?.settings?.locale"
                 [value]="statistics?.activeUsers30d ?? '-'"
                 >Active Users</gf-value
               >
@@ -151,6 +171,7 @@
               <a class="d-block" href="https://ghostfolio.slack.com">
                 <gf-value
                   size="large"
+                  [locale]="user?.settings?.locale"
                   [value]="statistics?.slackCommunityUsers ?? '-'"
                   >Users in Slack community</gf-value
                 >
@@ -163,6 +184,7 @@
               >
                 <gf-value
                   size="large"
+                  [locale]="user?.settings?.locale"
                   [value]="statistics?.gitHubContributors ?? '-'"
                   >Contributors on GitHub</gf-value
                 >
@@ -175,6 +197,7 @@
               >
                 <gf-value
                   size="large"
+                  [locale]="user?.settings?.locale"
                   [value]="statistics?.gitHubStargazers ?? '-'"
                   >Stars on GitHub</gf-value
                 >
@@ -198,7 +221,7 @@
     </div>
     <div
       class="col-md-3 col-xs-12 my-2"
-      [ngClass]="{ 'offset-md-4': !hasPermissionForBlog }"
+      [ngClass]="{ 'mx-auto': !hasPermissionForBlog }"
     >
       <a
         class="py-4 w-100"

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

@@ -189,9 +189,11 @@ export class AccountPageComponent implements OnDestroy, OnInit {
       .createCheckoutSession({ couponId: this.couponId, priceId: this.priceId })
       .pipe(
         switchMap(({ sessionId }: { sessionId: string }) => {
-          return this.stripeService.redirectToCheckout({
-            sessionId
-          });
+          return this.stripeService.redirectToCheckout({ sessionId });
+        }),
+        catchError((error) => {
+          alert(error.message);
+          throw error;
         })
       )
       .subscribe((result) => {

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

@@ -32,7 +32,7 @@
                   <button
                     color="primary"
                     mat-flat-button
-                    (click)="onCheckout(priceId)"
+                    (click)="onCheckout()"
                   >
                     <ng-container
                       *ngIf="user.subscription.offer === 'default'"

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

@@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { AdminJobsComponent } from '@ghostfolio/client/components/admin-jobs/admin-jobs.component';
 import { AdminMarketDataComponent } from '@ghostfolio/client/components/admin-market-data/admin-market-data.component';
 import { AdminOverviewComponent } from '@ghostfolio/client/components/admin-overview/admin-overview.component';
+import { AdminSettingsComponent } from '@ghostfolio/client/components/admin-settings/admin-settings.component';
 import { AdminUsersComponent } from '@ghostfolio/client/components/admin-users/admin-users.component';
 import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
 
@@ -24,7 +25,16 @@ const routes: Routes = [
         component: AdminOverviewComponent,
         title: $localize`Admin Control`
       },
-      { path: 'users', component: AdminUsersComponent, title: $localize`Users` }
+      {
+        path: 'settings',
+        component: AdminSettingsComponent,
+        title: $localize`Settings`
+      },
+      {
+        path: 'users',
+        component: AdminUsersComponent,
+        title: $localize`Users`
+      }
     ],
     component: AdminPageComponent,
     path: ''

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

@@ -30,13 +30,18 @@ export class AdminPageComponent implements OnDestroy, OnInit {
         label: $localize`Overview`,
         path: 'overview'
       },
-      { iconName: 'people-outline', label: $localize`Users`, path: 'users' },
+      {
+        iconName: 'settings-outline',
+        label: $localize`Settings`,
+        path: 'settings'
+      },
       {
         iconName: 'server-outline',
         label: $localize`Market Data`,
         path: 'market-data'
       },
-      { iconName: 'flash-outline', label: $localize`Jobs`, path: 'jobs' }
+      { iconName: 'flash-outline', label: $localize`Jobs`, path: 'jobs' },
+      { iconName: 'people-outline', label: $localize`Users`, path: 'users' }
     ];
   }
 

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

@@ -6,6 +6,7 @@
   <a
     #rla="routerLinkActive"
     *ngFor="let tab of tabs"
+    class="px-3"
     mat-tab-link
     routerLinkActive
     [active]="rla.isActive"

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

@@ -4,6 +4,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { GfAdminJobsModule } from '@ghostfolio/client/components/admin-jobs/admin-jobs.module';
 import { GfAdminMarketDataModule } from '@ghostfolio/client/components/admin-market-data/admin-market-data.module';
 import { GfAdminOverviewModule } from '@ghostfolio/client/components/admin-overview/admin-overview.module';
+import { GfAdminSettingsModule } from '@ghostfolio/client/components/admin-settings/admin-settings.module';
 import { GfAdminUsersModule } from '@ghostfolio/client/components/admin-users/admin-users.module';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 
@@ -19,6 +20,7 @@ import { AdminPageComponent } from './admin-page.component';
     GfAdminJobsModule,
     GfAdminMarketDataModule,
     GfAdminOverviewModule,
+    GfAdminSettingsModule,
     GfAdminUsersModule,
     MatTabsModule
   ],

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

@@ -14,6 +14,7 @@
     gf-admin-jobs,
     gf-admin-market-data,
     gf-admin-overview,
+    gf-admin-settings,
     gf-admin-users {
       flex: 1 1 auto;
       overflow-y: auto;

apps/client/src/app/pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.html

@@ -202,7 +202,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Hallo Ghostfolio
             </li>
           </ol>

apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html

@@ -182,7 +182,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Hello Ghostfolio
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html

@@ -179,7 +179,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Ghostfolio: First months in Open Source
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html

@@ -182,7 +182,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Ghostfolio meets Internet Identity
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/07/how-do-i-get-my-finances-in-order/how-do-i-get-my-finances-in-order-page.html

@@ -208,7 +208,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               How do I get my finances in order?
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html

@@ -191,7 +191,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               500 Stars on GitHub
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html

@@ -177,7 +177,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Hacktoberfest 2022
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.html

@@ -137,7 +137,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Black Friday 2022
             </li>
           </ol>

apps/client/src/app/pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.html

@@ -167,7 +167,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               The importance of tracking your personal finances
             </li>
           </ol>

apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.html

@@ -177,7 +177,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Ghostfolio auf Sackgeld.com vorgestellt
             </li>
           </ol>

apps/client/src/app/pages/blog/2023/02/ghostfolio-meets-umbrel/ghostfolio-meets-umbrel-page.html

@@ -199,7 +199,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Ghostfolio meets Umbrel
             </li>
           </ol>

apps/client/src/app/pages/blog/2023/03/1000-stars-on-github/1000-stars-on-github-page.html

@@ -244,7 +244,10 @@
             <li class="breadcrumb-item">
               <a i18n [routerLink]="['/blog']">Blog</a>
             </li>
-            <li aria-current="page" class="breadcrumb-item active">
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
               Ghostfolio reaches 1’000 Stars on GitHub
             </li>
           </ol>

apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
+
+import { UnlockYourFinancialPotentialWithGhostfolioPageComponent } from './unlock-your-financial-potential-with-ghostfolio-page.component';
+
+const routes: Routes = [
+  {
+    canActivate: [AuthGuard],
+    component: UnlockYourFinancialPotentialWithGhostfolioPageComponent,
+    path: '',
+    title: 'Unlock your Financial Potential with Ghostfolio'
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class UnlockYourFinancialPotentialWithGhostfolioRoutingModule {}

apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.component.ts

@@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-unlock-your-financial-potential-with-ghostfolio-page',
+  styleUrls: ['./unlock-your-financial-potential-with-ghostfolio-page.scss'],
+  templateUrl: './unlock-your-financial-potential-with-ghostfolio-page.html'
+})
+export class UnlockYourFinancialPotentialWithGhostfolioPageComponent {}

apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.html

@@ -0,0 +1,244 @@
+<div class="blog container">
+  <div class="row">
+    <div class="col-md-8 offset-md-2">
+      <article>
+        <div class="mb-4 text-center">
+          <h1 class="mb-1">Unlock your Financial Potential with Ghostfolio</h1>
+          <div class="mb-3 text-muted"><small>2023-05-20</small></div>
+          <img
+            alt="Unlock your financial potential with Ghostfolio Teaser"
+            class="border rounded w-100"
+            src="../assets/images/blog/20230520.jpg"
+            title="Unlock your financial potential with Ghostfolio"
+          />
+        </div>
+        <section class="mb-4">
+          <p>
+            Managing personal finances effectively is crucial for those striving
+            for a secure future and financial independence. In today’s digital
+            age, having a reliable wealth management software can greatly
+            simplify the process. Ghostfolio is a powerful
+            <a
+              href="https://github.com/ghostfolio/ghostfolio"
+              title="Find Ghostfolio on GitHub"
+              >open source solution</a
+            >
+            for individuals trading stocks, ETFs, or cryptocurrencies on
+            multiple platforms. This article explores the key reasons why
+            Ghostfolio is the ideal choice for those embracing diversification,
+            pursuing a buy & hold strategy, and seeking portfolio insights while
+            valuing privacy.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Effortless Management for Multi-Platform Investors</h2>
+          <p>
+            Ghostfolio offers a holistic solution to efficiently monitor and
+            manage investment portfolios across multiple platforms. By
+            consolidating data from various accounts, Ghostfolio eliminates the
+            need to switch between platforms, saving users valuable time and
+            effort.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Empowering Buy & Hold Strategies</h2>
+          <p>
+            For those committed to a
+            <a [routerLink]="['/resources']">buy & hold strategy</a>, Ghostfolio
+            provides an intuitive interface to monitor long-term investments.
+            Users can track performance over time, gaining insights into
+            portfolio growth and stability. With strong visualizations and
+            reporting <a [routerLink]="['/features']">features</a>, Ghostfolio
+            equips users to make well-informed decisions aligned with their
+            long-term investment goals.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Deep Portfolio Insights</h2>
+          <p>
+            Understanding portfolio composition is vital for making informed
+            financial decisions. Ghostfolio provides comprehensive insights into
+            asset allocation, sector exposure, geographical diversification, and
+            individual asset performance. These detailed analytics empower users
+            to assess portfolio strengths and weaknesses, making necessary
+            adjustments to optimize their allocation.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Privacy and Data Ownership</h2>
+          <p>
+            In the age of growing data security concerns, Ghostfolio sets itself
+            apart by giving the highest priority to privacy and data ownership.
+            As an open-source software, Ghostfolio ensures that users retain
+            complete control over their financial data. By eliminating the need
+            to trust third-party platforms with sensitive information,
+            Ghostfolio offers peace of mind to those who value privacy and data
+            security.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Streamlined Minimalism for Financial Efficiency</h2>
+          <p>
+            Ghostfolio embraces a lightweight approach to personal finance
+            management, focusing on essential features without overwhelming
+            users. Its streamlined user interface and clean design provide a
+            seamless and clutter-free experience. This minimalist approach
+            enhances user satisfaction and boosts efficiency by eliminating
+            distractions and simplifying the financial management process.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Driving Financial Independence (FIRE)</h2>
+          <p>
+            Achieving
+            <a [routerLink]="['/resources']">financial independence</a>
+            including early retirement (FIRE) requires careful planning,
+            monitoring, and forecasting. Ghostfolio’s robust features equip
+            individuals with tools to analyze, optimize and simulate investment
+            strategies. By providing insights, performance tracking, and
+            portfolio analysis, Ghostfolio serves as a valuable companion in the
+            pursuit of financial freedom.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Farewell to Spreadsheet Hassles</h2>
+          <p>
+            While spreadsheets have traditionally been used to manage personal
+            finances, they can be time-consuming and prone to errors. Ghostfolio
+            offers a user-friendly alternative by automating data aggregation,
+            analysis, and reporting. Users can bid farewell to manual data entry
+            and complex formulas, relying instead on Ghostfolio’s user-friendly
+            and intuitive interface to efficiently manage their finances.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Your Path to Financial Success with Ghostfolio</h2>
+          <p>
+            Ghostfolio, the open-source personal finance software, provides a
+            wide range of benefits for individuals involved in trading stocks,
+            ETFs, or cryptocurrencies. Whether you are pursuing a buy & hold
+            strategy, seeking valuable portfolio insights, or diversifying
+            financial resources while prioritizing privacy and data ownership,
+            Ghostfolio proves to be an invaluable tool on your journey towards
+            unlocking your financial potential. Say goodbye to spreadsheets and
+            embrace the power of Ghostfolio for simplified, secure, and
+            successful financial management.
+          </p>
+        </section>
+        <section class="mb-4 py-3">
+          <h2 class="h4 mb-0 text-center">
+            Would you like to <strong>unlock</strong> your
+            <strong>financial potential</strong>?
+          </h2>
+          <p class="lead mb-2 text-center">
+            Ghostfolio empowers you to manage your personal finances
+            effectively.
+          </p>
+          <div class="text-center">
+            <a color="primary" href="https://ghostfol.io" mat-flat-button>
+              Get Started
+            </a>
+          </div>
+        </section>
+        <section class="mb-4">
+          <ul class="list-inline">
+            <li class="list-inline-item">
+              <span class="badge badge-light">App</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Analysis</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Assets</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Budgeting</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Buy & Hold</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Cryptocurrencies</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Diversification</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">ETFs</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Fintech</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">FIRE</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Ghostfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Investment</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Management</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Minimalism</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Monitoring</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Open Source</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Personal Finance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Planning</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio Tracker</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Privacy</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Retirement</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Software</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Spreadsheet</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Stock</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Strategy</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth</span>
+            </li>
+          </ul>
+        </section>
+        <nav aria-label="breadcrumb">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item">
+              <a i18n [routerLink]="['/blog']">Blog</a>
+            </li>
+            <li
+              aria-current="page"
+              class="active breadcrumb-item text-truncate"
+            >
+              Unlock your Financial Potential with Ghostfolio
+            </li>
+          </ol>
+        </nav>
+      </article>
+    </div>
+  </div>
+</div>

apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.module.ts

@@ -0,0 +1,19 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { RouterModule } from '@angular/router';
+
+import { UnlockYourFinancialPotentialWithGhostfolioRoutingModule } from './unlock-your-financial-potential-with-ghostfolio-page-routing.module';
+import { UnlockYourFinancialPotentialWithGhostfolioPageComponent } from './unlock-your-financial-potential-with-ghostfolio-page.component';
+
+@NgModule({
+  declarations: [UnlockYourFinancialPotentialWithGhostfolioPageComponent],
+  imports: [
+    CommonModule,
+    MatButtonModule,
+    RouterModule,
+    UnlockYourFinancialPotentialWithGhostfolioRoutingModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class UnlockYourFinancialPotentialWithGhostfolioPageModule {}

apps/client/src/app/pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.scss

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