Merge branch 'main' into feature/add-sub-menu-for-portfolio

3 years ago · ed97d86ab4
22 changed files with 107 additions and 69 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -13,11 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

+- Improved the content of the landing page
+- Improved the content of the Frequently Asked Questions (FAQ) page
 - Set the exposed port as an environment variable (`PORT`) in `Dockerfile`
+- Migrated the style of `AboutPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `BlogPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `ChangelogPageModule` to `@angular/material` `15` (mdc)
 - Migrated the style of `GfHeaderModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `ResourcesPageModule` to `@angular/material` `15` (mdc)
 - Upgraded `chart.js` from version `4.0.1` to `4.2.0`
 - Upgraded `ionicons` from version `6.0.4` to `6.1.2`
 - Upgraded `prettier` from version `2.8.1` to `2.8.4`
+- Upgraded `prisma` from version `4.9.0` to `4.10.1`

 ### Fixed

--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@ -119,7 +119,7 @@
  <div *ngIf="hasPermissionForStatistics" class="mb-5 row">
    <div class="col">
      <h3 class="mb-3 text-center">Ghostfolio in Numbers</h3>
-      <mat-card>
+      <mat-card appearance="outlined">
        <mat-card-content>
          <div class="row">
            <div class="col-xs-12 col-md-4 my-2">
--- a/apps/client/src/app/pages/about/about-page.module.ts
+++ b/apps/client/src/app/pages/about/about-page.module.ts
@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
 import { GfValueModule } from '@ghostfolio/ui/value';

 import { AboutPageRoutingModule } from './about-page-routing.module';
--- a/apps/client/src/app/pages/about/changelog/changelog-page.html
+++ b/apps/client/src/app/pages/about/changelog/changelog-page.html
@ -2,7 +2,7 @@
  <div class="mb-5 row">
    <div class="col">
      <h3 class="mb-3 text-center" i18n>Changelog</h3>
-      <mat-card class="changelog">
+      <mat-card appearance="outlined" class="changelog">
        <mat-card-content>
          <markdown [src]="'../assets/CHANGELOG.md'"></markdown>
        </mat-card-content>
@ -13,7 +13,7 @@
  <div class="row">
    <div class="col">
      <h3 class="mb-3 text-center" i18n>License</h3>
-      <mat-card>
+      <mat-card appearance="outlined">
        <mat-card-content>
          <markdown [src]="'../assets/LICENSE'"></markdown>
        </mat-card-content>
--- a/apps/client/src/app/pages/about/changelog/changelog-page.module.ts
+++ b/apps/client/src/app/pages/about/changelog/changelog-page.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatCardModule } from '@angular/material/card';
 import { MarkdownModule } from 'ngx-markdown';

 import { ChangelogPageRoutingModule } from './changelog-page-routing.module';
--- a/apps/client/src/app/pages/about/changelog/changelog-page.scss
+++ b/apps/client/src/app/pages/about/changelog/changelog-page.scss
@ -2,20 +2,18 @@
  color: rgb(var(--dark-primary-text));
  display: block;

-  .mat-card {
+  .mat-mdc-card {
    &.changelog {
-      a {
-        color: rgba(var(--palette-primary-500), 1);
-        font-weight: 500;
+      ::ng-deep {
+        a {
+          color: rgba(var(--palette-primary-500), 1);
+          font-weight: 500;

-        &:hover {
-          color: rgba(var(--palette-primary-300), 1);
+          &:hover {
+            color: rgba(var(--palette-primary-300), 1);
+          }
        }
-      }
-    }

-    &.changelog {
-      ::ng-deep {
        markdown {
          h1,
          p {
--- a/apps/client/src/app/pages/accounts/accounts-page.component.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.component.ts
@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
 import { UpdateAccountDto } from '@ghostfolio/api/app/account/update-account.dto';
--- a/apps/client/src/app/pages/accounts/accounts-page.html
+++ b/apps/client/src/app/pages/accounts/accounts-page.html
@ -30,7 +30,7 @@
      [queryParams]="{ createDialog: true }"
      [routerLink]="[]"
    >
-      <ion-icon name="add-outline" size="large"></ion-icon>
+      <ion-icon class="mt-2" name="add-outline" size="large"></ion-icon>
    </a>
  </div>
 </div>
--- a/apps/client/src/app/pages/accounts/accounts-page.module.ts
+++ b/apps/client/src/app/pages/accounts/accounts-page.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
 import { GfAccountDetailDialogModule } from '@ghostfolio/client/components/account-detail-dialog/account-detail-dialog.module';
 import { GfAccountsTableModule } from '@ghostfolio/client/components/accounts-table/accounts-table.module';
--- a/apps/client/src/app/pages/admin/admin-page.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page.module.ts
@ -1,15 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
-import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
 import { MatLegacyTabsModule as MatTabsModule } from '@angular/material/legacy-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 { GfAdminUsersModule } from '@ghostfolio/client/components/admin-users/admin-users.module';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
-import { GfValueModule } from '@ghostfolio/ui/value';

 import { AdminPageRoutingModule } from './admin-page-routing.module';
 import { AdminPageComponent } from './admin-page.component';
@ -24,10 +20,6 @@ import { AdminPageComponent } from './admin-page.component';
    GfAdminMarketDataModule,
    GfAdminOverviewModule,
    GfAdminUsersModule,
-    GfValueModule,
-    MatButtonModule,
-    MatCardModule,
-    MatMenuModule,
    MatTabsModule
  ],
  providers: [CacheService],
--- a/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module.ts
+++ b/apps/client/src/app/pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
 import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';

--- a/apps/client/src/app/pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.module.ts
+++ b/apps/client/src/app/pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';

 import { TheImportanceOfTrackingYourPersonalFinancesRoutingModule } from './the-importance-of-tracking-your-personal-finances-page-routing.module';
--- a/apps/client/src/app/pages/blog/blog-page.html
+++ b/apps/client/src/app/pages/blog/blog-page.html
@ -2,7 +2,7 @@
  <div class="mb-5 row">
    <div class="col">
      <h3 class="d-none d-sm-block mb-3 text-center" i18n>Blog</h3>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -28,7 +28,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -54,7 +54,11 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card *ngIf="hasPermissionForSubscription" class="mb-3">
+      <mat-card
+        *ngIf="hasPermissionForSubscription"
+        appearance="outlined"
+        class="mb-3"
+      >
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -78,7 +82,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -102,7 +106,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -126,7 +130,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -152,7 +156,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -178,7 +182,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -204,7 +208,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
@ -228,7 +232,7 @@
          </div>
        </mat-card-content>
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card appearance="outlined" class="mb-3">
        <mat-card-content>
          <div class="container p-0">
            <div class="flex-nowrap no-gutters row">
--- a/apps/client/src/app/pages/blog/blog-page.module.ts
+++ b/apps/client/src/app/pages/blog/blog-page.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatCardModule } from '@angular/material/card';

 import { BlogPageRoutingModule } from './blog-page-routing.module';
 import { BlogPageComponent } from './blog-page.component';
--- a/apps/client/src/app/pages/faq/faq-page.component.ts
+++ b/apps/client/src/app/pages/faq/faq-page.component.ts
@ -1,5 +1,7 @@
-import { Component, OnDestroy } from '@angular/core';
-import { Subject } from 'rxjs';
+import { ChangeDetectorRef, Component, OnDestroy } from '@angular/core';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { User } from '@ghostfolio/common/interfaces';
+import { Subject, takeUntil } from 'rxjs';

@Component({
  host: { class: 'page' },
@ -8,9 +10,26 @@ import { Subject } from 'rxjs';
  templateUrl: './faq-page.html'
 })
 export class FaqPageComponent implements OnDestroy {
+  public user: User;
+
  private unsubscribeSubject = new Subject<void>();

-  public constructor() {}
+  public constructor(
+    private changeDetectorRef: ChangeDetectorRef,
+    private userService: UserService
+  ) {}
+
+  public ngOnInit() {
+    this.userService.stateChanged
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((state) => {
+        if (state?.user) {
+          this.user = state.user;
+
+          this.changeDetectorRef.markForCheck();
+        }
+      });
+  }

  public ngOnDestroy() {
    this.unsubscribeSubject.next();
--- a/apps/client/src/app/pages/faq/faq-page.html
+++ b/apps/client/src/app/pages/faq/faq-page.html
@ -115,7 +115,7 @@
          >.</mat-card-content
        >
      </mat-card>
-      <mat-card class="mb-3">
+      <mat-card *ngIf="user?.subscription?.type === 'Premium'" class="mb-3">
        <mat-card-title
          >I cannot find my broker in the list of platforms. What can I
          do?</mat-card-title
--- a/apps/client/src/app/pages/landing/landing-page.html
+++ b/apps/client/src/app/pages/landing/landing-page.html
@ -52,6 +52,7 @@

  <div *ngIf="hasPermissionForStatistics" class="row mb-5">
    <div
+      *ngIf="hasPermissionForSubscription"
      class="col-md-4 d-flex my-1"
      [ngClass]="{ 'justify-content-center': this.deviceType !== 'mobile' }"
    >
@ -68,6 +69,24 @@
        >
      </a>
    </div>
+    <div
+      *ngIf="!hasPermissionForSubscription"
+      class="col-md-4 d-flex my-1"
+      [ngClass]="{ 'justify-content-center': this.deviceType !== 'mobile' }"
+    >
+      <a
+        class="d-block"
+        title="Ghostfolio in Numbers: Contributors on GitHub"
+        [routerLink]="['/about']"
+      >
+        <gf-value
+          icon="people-outline"
+          size="large"
+          [value]="statistics?.gitHubContributors ?? '-'"
+          >Contributors on GitHub</gf-value
+        >
+      </a>
+    </div>
    <div
      class="col-md-4 d-flex my-1"
      [ngClass]="{ 'justify-content-center': this.deviceType !== 'mobile' }"
@ -300,7 +319,7 @@
    </div>
  </div>

-  <div class="row my-3">
+  <div *ngIf="hasPermissionForSubscription" class="row my-3">
    <div class="col-12">
      <h2 class="h4 mb-1 text-center">
        How does <strong>Ghostfolio</strong> work?
--- a/apps/client/src/app/pages/resources/resources-page.html
+++ b/apps/client/src/app/pages/resources/resources-page.html
@ -1,7 +1,7 @@
 <div class="container">
  <div class="row">
    <div class="col">
-      <h1 class="d-none d-sm-block mb-3 text-center" i18n>Resources</h1>
+      <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Resources</h1>
      <h2 class="h4 mb-3">Guides</h2>
      <div class="mb-5">
        <div class="mb-4 media">
--- a/apps/client/src/app/pages/resources/resources-page.module.ts
+++ b/apps/client/src/app/pages/resources/resources-page.module.ts
@ -1,13 +1,12 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';

 import { ResourcesPageRoutingModule } from './resources-page-routing.module';
 import { ResourcesPageComponent } from './resources-page.component';

@NgModule({
  declarations: [ResourcesPageComponent],
-  imports: [CommonModule, MatCardModule, ResourcesPageRoutingModule],
+  imports: [CommonModule, ResourcesPageRoutingModule],
  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class ResourcesPageModule {}
--- a/apps/client/src/styles.scss
+++ b/apps/client/src/styles.scss
@ -203,7 +203,7 @@ body {

  .blog {
    a {
-      &:not(.mat-flat-button) {
+      &:not(.mdc-button) {
        color: rgba(var(--palette-primary-500), 1) !important;
        font-weight: 500;

--- a/package.json
+++ b/package.json
@ -81,7 +81,7 @@
    "@nestjs/schedule": "2.1.0",
    "@nestjs/serve-static": "3.0.0",
    "@nrwl/angular": "15.6.3",
-    "@prisma/client": "4.9.0",
+    "@prisma/client": "4.10.1",
    "@simplewebauthn/browser": "5.2.1",
    "@simplewebauthn/server": "5.2.1",
    "@stripe/stripe-js": "1.22.0",
@ -119,7 +119,7 @@
    "passport": "0.6.0",
    "passport-google-oauth20": "2.0.0",
    "passport-jwt": "4.0.0",
-    "prisma": "4.9.0",
+    "prisma": "4.10.1",
    "reflect-metadata": "0.1.13",
    "rxjs": "7.5.6",
    "stripe": "8.199.0",
--- a/yarn.lock
+++ b/yarn.lock
@ -4841,22 +4841,22 @@
  dependencies:
    esquery "^1.0.1"

-"@prisma/client@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.9.0.tgz#4a4068f3540732ea5723c008d49ed684d20f9340"
-  integrity sha512-bz6QARw54sWcbyR1lLnF2QHvRW5R/Jxnbbmwh3u+969vUKXtBkXgSgjDA85nji31ZBlf7+FrHDy5x+5ydGyQDg==
+"@prisma/client@4.10.1":
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/@prisma/client/-/client-4.10.1.tgz#c47fd54661ee74b174cee63e9dc418ecf57a6ccd"
+  integrity sha512-VonXLJZybdt8e5XZH5vnIGCRNnIh6OMX1FS3H/yzMGLT3STj5TJ/OkMcednrvELgk8PK89Vo3aSh51MWNO0axA==
  dependencies:
-    "@prisma/engines-version" "4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5"
+    "@prisma/engines-version" "4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19"

-"@prisma/engines-version@4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5":
-  version "4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5"
-  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5.tgz#9d817a5779fc05b107eb02f63d197ad296d60b3c"
-  integrity sha512-M16aibbxi/FhW7z1sJCX8u+0DriyQYY5AyeTH7plQm9MLnURoiyn3CZBqAyIoQ+Z1pS77usCIibYJWSgleBMBA==
+"@prisma/engines-version@4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19":
+  version "4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19"
+  resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-4.10.1-2.aead147aa326ccb985dcfed5b065b4fdabd44b19.tgz#312359d9d00e39e323136d0270876293d315658e"
+  integrity sha512-tsjTho7laDhf9EJ9EnDxAPEf7yrigSMDhniXeU4YoWc7azHAs4GPxRi2P9LTFonmHkJLMOLjR77J1oIP8Ife1w==

-"@prisma/engines@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.9.0.tgz#05a1411964e047c1bc43f777c7a1c69f86a2a26c"
-  integrity sha512-t1pt0Gsp+HcgPJrHFc+d/ZSAaKKWar2G/iakrE07yeKPNavDP3iVKPpfXP22OTCHZUWf7OelwKJxQgKAm5hkgw==
+"@prisma/engines@4.10.1":
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-4.10.1.tgz#c7062747f254e5d5fce98a8cae566c25f9f29fb2"
+  integrity sha512-B3tcTxjx196nuAu1GOTKO9cGPUgTFHYRdkPkTS4m5ptb2cejyBlH9X7GOfSt3xlI7p4zAJDshJP4JJivCg9ouA==

 "@samverschueren/stream-to-observable@^0.3.0":
  version "0.3.1"
@ -18016,12 +18016,12 @@ pretty-hrtime@^1.0.3:
  resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
  integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==

-prisma@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.9.0.tgz#295954b2a89cd35a0e6bcf66b2b036dbf80c75ee"
-  integrity sha512-bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w==
+prisma@4.10.1:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/prisma/-/prisma-4.10.1.tgz#88084695d7b364ae6bebf93d5006f84439c4e7d1"
+  integrity sha512-0jDxgg+DruB1kHVNlcspXQB9au62IFfVg9drkhzXudszHNUAQn0lVuu+T8np0uC2z1nKD5S3qPeCyR8u5YFLnA==
  dependencies:
-    "@prisma/engines" "4.9.0"
+    "@prisma/engines" "4.10.1"

 prismjs@^1.28.0:
  version "1.28.0"