Merge branch 'main' into feature/upgrade-ng-extract-i18n-merge-to-version-2.7.0

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Upgraded `ng-extract-i18n-merge` from version `2.6.0` to `2.7.0`
+- Upgraded `Nx` from version `16.5.5` to `16.6.0`
+
+### Fixed
+
+- Fixed the styles of various components (card, progress, tab) after the upgrade to `@angular/material` `16`
 
 ## 1.297.4 - 2023-08-05
 

Dockerfile

@@ -58,4 +58,4 @@ RUN apt update && apt install -y \
 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
 WORKDIR /ghostfolio/apps/api
 EXPOSE ${PORT:-3333}
-CMD [  "yarn", "start:production" ]
+CMD [ "yarn", "start:production" ]

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

@@ -10,7 +10,7 @@ import { Controller, Get, Res, VERSION_NEUTRAL, Version } from '@nestjs/common';
 import { format } from 'date-fns';
 import { Response } from 'express';
 
-@Controller('/sitemap.xml')
+@Controller('sitemap.xml')
 export class SitemapController {
   public sitemapXml = '';
 

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

@@ -11,14 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-about-page,
-    gf-changelog-page,
-    gf-privacy-policy-page {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

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

@@ -11,16 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-admin-jobs,
-    gf-admin-market-data,
-    gf-admin-overview,
-    gf-admin-settings,
-    gf-admin-users {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

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

@@ -11,15 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-home-holdings,
-    gf-home-market,
-    gf-home-overview,
-    gf-home-summary {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

apps/client/src/app/pages/portfolio/allocations/allocations-page.scss

@@ -31,6 +31,7 @@
   }
 
   .mat-mdc-progress-bar {
+    --mdc-linear-progress-active-indicator-height: 0.5rem;
     --mdc-linear-progress-track-height: 0.5rem;
     border-radius: 0.25rem;
 

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

@@ -11,16 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-activities-page,
-    gf-allocations-page,
-    gf-analysis-page,
-    gf-holdings-page,
-    gf-fire-page {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

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

@@ -11,13 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-home-holdings,
-    gf-home-overview {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

apps/client/src/styles.scss

@@ -253,6 +253,7 @@ body {
 
     .mat-mdc-card {
       --mdc-elevated-card-container-color: var(--dark-background);
+      --mdc-outlined-card-container-color: var(--dark-background);
     }
 
     .mat-mdc-fab {
@@ -262,7 +263,6 @@ body {
       }
     }
 
-    .mat-mdc-paginator,
     .mat-mdc-paginator {
       background-color: rgba(var(--palette-foreground-base-dark), 0.02);
     }
@@ -421,7 +421,6 @@ ngx-skeleton-loader {
   }
 }
 
-.mat-mdc-paginator,
 .mat-mdc-paginator {
   background-color: rgba(var(--palette-foreground-base-light), 0.02);
 

package.json

@@ -145,21 +145,21 @@
     "@angular/pwa": "16.1.8",
     "@nestjs/schematics": "10.0.1",
     "@nestjs/testing": "10.1.3",
-    "@nx/angular": "16.5.5",
+    "@nx/angular": "16.6.0",
-    "@nx/cypress": "16.5.5",
+    "@nx/cypress": "16.6.0",
-    "@nx/eslint-plugin": "16.5.5",
+    "@nx/eslint-plugin": "16.6.0",
-    "@nx/jest": "16.5.5",
+    "@nx/jest": "16.6.0",
-    "@nx/js": "16.5.5",
+    "@nx/js": "16.6.0",
-    "@nx/nest": "16.5.5",
+    "@nx/nest": "16.6.0",
-    "@nx/node": "16.5.5",
+    "@nx/node": "16.6.0",
-    "@nx/storybook": "16.5.5",
+    "@nx/storybook": "16.6.0",
-    "@nx/web": "16.5.5",
+    "@nx/web": "16.6.0",
-    "@nx/workspace": "16.5.5",
+    "@nx/workspace": "16.6.0",
     "@schematics/angular": "16.1.8",
     "@simplewebauthn/typescript-types": "5.2.1",
-    "@storybook/addon-essentials": "7.0.27",
+    "@storybook/addon-essentials": "7.2.1",
-    "@storybook/angular": "7.0.27",
+    "@storybook/angular": "7.2.1",
-    "@storybook/core-server": "7.0.27",
+    "@storybook/core-server": "7.2.1",
     "@types/big.js": "6.1.6",
     "@types/body-parser": "1.19.2",
     "@types/cache-manager": "3.4.2",
@@ -186,8 +186,8 @@
     "jest": "29.4.3",
     "jest-environment-jsdom": "29.4.3",
     "jest-preset-angular": "13.1.1",
-    "nx": "16.5.5",
+    "nx": "16.6.0",
-    "nx-cloud": "16.1.1",
+    "nx-cloud": "16.2.0",
     "prettier": "2.8.4",
     "prettier-plugin-organize-attributes": "0.0.5",
     "react": "18.2.0",