From 1b7b0820035a4b667e03647b4cf2e083d1fea336 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 8 Apr 2023 15:33:27 +0200 Subject: [PATCH] Feature/migrate various components to angular material 15 (#1836) * Migrate components to Angular Material 15 * Update changelog --- CHANGELOG.md | 6 +++ apps/client/src/app/app.module.ts | 2 +- .../access-table/access-table.component.ts | 2 +- .../access-table/access-table.module.ts | 6 +-- .../account-detail-dialog.module.ts | 2 +- .../accounts-table.component.scss | 25 +---------- .../accounts-table.component.ts | 2 +- .../accounts-table/accounts-table.module.ts | 6 +-- .../admin-jobs/admin-jobs.module.ts | 4 +- .../admin-market-data.component.ts | 2 +- .../admin-market-data.module.ts | 6 +-- .../asset-profile-dialog.module.ts | 4 +- .../admin-overview/admin-overview.html | 6 +-- .../admin-overview/admin-overview.module.ts | 2 +- .../admin-overview/admin-overview.scss | 18 -------- .../components/admin-users/admin-users.html | 43 ++++++++++--------- .../admin-users/admin-users.module.ts | 4 +- .../components/admin-users/admin-users.scss | 4 +- .../dialog-footer/dialog-footer.module.ts | 2 +- .../dialog-header/dialog-header.module.ts | 2 +- .../home-holdings/home-holdings.module.ts | 2 +- .../home-summary/home-summary.component.ts | 8 ++-- .../login-with-access-token-dialog.html | 2 +- .../login-with-access-token-dialog.module.ts | 2 +- .../position-detail-dialog.module.ts | 2 +- .../components/positions/positions.module.ts | 2 +- .../src/app/components/rules/rules.module.ts | 2 +- ...subscription-interstitial-dialog.module.ts | 2 +- .../src/app/core/http-response.interceptor.ts | 8 ++-- .../pages/account/account-page.component.ts | 8 ++-- .../app/pages/account/account-page.module.ts | 2 +- .../src/app/pages/account/account-page.scss | 9 ---- .../create-or-update-access-dialog.module.ts | 2 +- .../create-or-update-account-dialog.module.ts | 2 +- .../pages/features/features-page.module.ts | 2 +- .../src/app/pages/landing/landing-page.html | 40 ++++++----------- .../app/pages/landing/landing-page.module.ts | 2 +- .../src/app/pages/landing/landing-page.scss | 4 +- .../import-activities-dialog.component.ts | 2 +- .../import-activities-dialog.module.ts | 2 +- .../allocations/allocations-page.module.ts | 2 +- .../allocations/allocations-page.scss | 18 +++----- .../holdings/holdings-page.module.ts | 2 +- .../app/pages/pricing/pricing-page.module.ts | 2 +- .../app/pages/public/public-page.module.ts | 2 +- .../src/app/pages/register/register-page.html | 2 +- .../pages/register/register-page.module.ts | 2 +- .../src/app/pages/register/register-page.scss | 4 +- .../show-access-token-dialog.module.ts | 2 +- .../pages/webauthn/webauthn-page.module.ts | 4 +- apps/client/src/styles.scss | 23 +++++++--- apps/client/src/styles/table.scss | 19 ++++++++ .../activities-table.component.scss | 19 -------- 53 files changed, 149 insertions(+), 205 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71a7548c..3c87c505 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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). +## Unreleased + +### Changed + +- Migrated the style of various components to `@angular/material` `15` (mdc) + ## 1.251.0 - 2023-04-07 ### Changed diff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.ts index 3bf551aa..3534e538 100644 --- a/apps/client/src/app/app.module.ts +++ b/apps/client/src/app/app.module.ts @@ -9,7 +9,7 @@ import { } from '@angular/material/core'; import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips'; -import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/apps/client/src/app/components/access-table/access-table.component.ts b/apps/client/src/app/components/access-table/access-table.component.ts index e0bd426b..c0db8fb2 100644 --- a/apps/client/src/app/components/access-table/access-table.component.ts +++ b/apps/client/src/app/components/access-table/access-table.component.ts @@ -7,7 +7,7 @@ import { OnInit, Output } from '@angular/core'; -import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; +import { MatTableDataSource } from '@angular/material/table'; import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config'; import { Access } from '@ghostfolio/common/interfaces'; diff --git a/apps/client/src/app/components/access-table/access-table.module.ts b/apps/client/src/app/components/access-table/access-table.module.ts index 7f8091c2..111f0e2f 100644 --- a/apps/client/src/app/components/access-table/access-table.module.ts +++ b/apps/client/src/app/components/access-table/access-table.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTableModule } from '@angular/material/table'; import { AccessTableComponent } from './access-table.component'; diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts index d12891dc..20426fd3 100644 --- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts +++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.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 { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module'; import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module'; diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.scss b/apps/client/src/app/components/accounts-table/accounts-table.component.scss index ccb23a20..39e455dc 100644 --- a/apps/client/src/app/components/accounts-table/accounts-table.component.scss +++ b/apps/client/src/app/components/accounts-table/accounts-table.component.scss @@ -3,17 +3,7 @@ :host { display: block; - .mat-table { - td { - &.mat-footer-cell { - border-top: 1px solid - rgba( - var(--palette-foreground-divider), - var(--palette-foreground-divider-alpha) - ); - } - } - + .mat-mdc-table { th { ::ng-deep { .mat-sort-header-container { @@ -23,16 +13,3 @@ } } } - -:host-context(.is-dark-theme) { - .mat-table { - td { - &.mat-footer-cell { - border-top-color: rgba( - var(--palette-foreground-divider-dark), - var(--palette-foreground-divider-dark-alpha) - ); - } - } - } -} diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.ts b/apps/client/src/app/components/accounts-table/accounts-table.component.ts index a2dbd6c7..03b52a6d 100644 --- a/apps/client/src/app/components/accounts-table/accounts-table.component.ts +++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts @@ -9,7 +9,7 @@ import { Output, ViewChild } from '@angular/core'; -import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; +import { MatTableDataSource } from '@angular/material/table'; import { MatSort } from '@angular/material/sort'; import { Router } from '@angular/router'; import { Account as AccountModel } from '@prisma/client'; diff --git a/apps/client/src/app/components/accounts-table/accounts-table.module.ts b/apps/client/src/app/components/accounts-table/accounts-table.module.ts index cf66c620..b8e38b30 100644 --- a/apps/client/src/app/components/accounts-table/accounts-table.module.ts +++ b/apps/client/src/app/components/accounts-table/accounts-table.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTableModule } from '@angular/material/table'; import { MatSortModule } from '@angular/material/sort'; import { RouterModule } from '@angular/router'; import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module'; diff --git a/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts b/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts index ad313544..5dd8d16d 100644 --- a/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts +++ b/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; import { AdminJobsComponent } from './admin-jobs.component'; diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts index 6869bc39..d01e3a4d 100644 --- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts +++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts @@ -7,7 +7,7 @@ import { ViewChild } from '@angular/core'; import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table'; +import { MatTableDataSource } from '@angular/material/table'; import { MatSort } from '@angular/material/sort'; import { ActivatedRoute, Router } from '@angular/router'; import { AdminService } from '@ghostfolio/client/services/admin.service'; diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts index eb1a9983..6db2de91 100644 --- a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts +++ b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatTableModule } from '@angular/material/table'; import { MatSortModule } from '@angular/material/sort'; import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module'; diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts index 5bc3c723..6a4d87e7 100644 --- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts +++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts @@ -2,10 +2,10 @@ import { TextFieldModule } from '@angular/cdk/text-field'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatButtonModule } from '@angular/material/button'; import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { GfAdminMarketDataDetailModule } from '@ghostfolio/client/components/admin-market-data-detail/admin-market-data-detail.module'; import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.module'; import { GfValueModule } from '@ghostfolio/ui/value'; diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.html index 5ca7a5c2..d2798d0f 100644 --- a/apps/client/src/app/components/admin-overview/admin-overview.html +++ b/apps/client/src/app/components/admin-overview/admin-overview.html @@ -51,7 +51,7 @@