From 31df200c1d5ce3f62cfe9ee0e7e3729ea364b184 Mon Sep 17 00:00:00 2001 From: paulbert Date: Thu, 2 Oct 2025 11:32:29 -0400 Subject: [PATCH 01/10] Run auto update script for button --- .../configuration/configuration.component.ts | 2 +- src/app/configuration/migration.component.ts | 2 +- src/app/dashboard/dashboard-tile.component.ts | 6 +++--- src/app/dashboard/dashboard.component.html | 6 +++--- src/app/dashboard/dashboard.scss | 2 +- src/app/health/health-update.component.html | 2 +- src/app/home/home.scss | 3 ++- .../manager-dashboard/manager-dashboard.scss | 2 +- .../reports/reports-detail.component.html | 6 +++--- .../reports/reports-detail.scss | 5 +++-- .../reports/reports-health.component.html | 6 +++--- .../reports/reports.component.ts | 8 ++++---- .../add-meetups/meetups-add.component.ts | 16 +++++++-------- src/app/meetups/meetups.component.ts | 18 ++++++++--------- .../page-not-found.component.ts | 14 ++++++------- src/app/resources/resources.scss | 2 +- .../dialogs/dialogs-submissions.component.ts | 2 +- .../forms/planet-rating-stars.component.ts | 14 ++++++------- .../planet-tag-input-dialog.component.html | 10 +++++----- src/app/shared/material.module.ts | 2 +- .../planet-filtered-amount.component.ts | 14 ++++++------- src/app/tasks/tasks.scss | 5 +++-- .../teams/teams-reports-dialog.component.html | 2 +- .../teams/teams-reports-dialog.component.ts | 2 +- src/app/teams/teams-view.component.html | 10 +++++----- src/app/teams/teams-view.scss | 2 +- src/app/users/users.component.ts | 18 ++++++++--------- src/planet-mat-theme.scss | 20 ++++++++++++++----- src/styles.scss | 2 +- 29 files changed, 108 insertions(+), 95 deletions(-) diff --git a/src/app/configuration/configuration.component.ts b/src/app/configuration/configuration.component.ts index e67de40b4f..5a6573063e 100644 --- a/src/app/configuration/configuration.component.ts +++ b/src/app/configuration/configuration.component.ts @@ -24,7 +24,7 @@ const removeProtocol = (str: string) => { selector: 'planet-configuration', templateUrl: './configuration.component.html', styles: [ ` - .mat-raised-button { + .mat-mdc-raised-button { margin: 0px 2px 2px 0px; } .configuration-form { diff --git a/src/app/configuration/migration.component.ts b/src/app/configuration/migration.component.ts index 12b1c08538..a431a76e88 100755 --- a/src/app/configuration/migration.component.ts +++ b/src/app/configuration/migration.component.ts @@ -23,7 +23,7 @@ const getProtocol = (str: string) => /^[^:]+(?=:\/\/)/.exec(str)[0]; selector: 'planet-migration', templateUrl: './migration.component.html', styles: [ ` - .mat-raised-button { + .mat-mdc-raised-button { margin: 0px 2px 2px 0px; } .configuration-form { diff --git a/src/app/dashboard/dashboard-tile.component.ts b/src/app/dashboard/dashboard-tile.component.ts index 550a6cf759..613c35595d 100644 --- a/src/app/dashboard/dashboard-tile.component.ts +++ b/src/app/dashboard/dashboard-tile.component.ts @@ -165,9 +165,9 @@ export class DashboardTileComponent implements AfterViewChecked, OnInit { @Component({ selector: 'planet-dashboard-tile-title', - template: ` - - {{cardTitle}} + template: ` + + {{cardTitle}} `, styleUrls: [ './dashboard-tile-title.scss' ] }) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index d103b66276..7130081deb 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -11,10 +11,10 @@
-

{{displayName | truncateText:(isMobile ? 20 : 40)}} ({{visits | number}})

+

{{displayName | truncateText:(isMobile ? 20 : 40)}} ({{visits | number}})

-

- +

+ , diff --git a/src/app/dashboard/dashboard.scss b/src/app/dashboard/dashboard.scss index 99896477d5..68f42b477f 100644 --- a/src/app/dashboard/dashboard.scss +++ b/src/app/dashboard/dashboard.scss @@ -50,7 +50,7 @@ $top-row-height: calc(#{$dashboard-tile-width} + 0.5rem); display: flex; align-items: center; } - .mat-subheading-2 { + .mat-subtitle-1 { margin: 0; } span { diff --git a/src/app/health/health-update.component.html b/src/app/health/health-update.component.html index c17ffd1a06..95fdb63117 100644 --- a/src/app/health/health-update.component.html +++ b/src/app/health/health-update.component.html @@ -45,7 +45,7 @@
- Emergency Contact + Emergency Contact diff --git a/src/app/home/home.scss b/src/app/home/home.scss index f03168e215..95786365d9 100644 --- a/src/app/home/home.scss +++ b/src/app/home/home.scss @@ -147,7 +147,8 @@ background-color: $primary-text; color: $primary; transition: background-color 0.5s cubic-bezier(0, 0, 0.2, 1), - color 0.5s cubic-bezier(0, 0, 0.2, 1); // Linear out, slow in; + color 0.5s cubic-bezier(0, 0, 0.2, 1); // Linear out, slow in; + /*TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ .mat-button-focus-overlay { background-color: rgba(0, 0, 0, 0.06); transition: background-color 1s ease-in; diff --git a/src/app/manager-dashboard/manager-dashboard.scss b/src/app/manager-dashboard/manager-dashboard.scss index d8d4df44a1..78c5c3b4ff 100644 --- a/src/app/manager-dashboard/manager-dashboard.scss +++ b/src/app/manager-dashboard/manager-dashboard.scss @@ -16,7 +16,7 @@ padding-top: 0; } -.mat-raised-button { +.mat-mdc-raised-button { margin: 0.25rem; } diff --git a/src/app/manager-dashboard/reports/reports-detail.component.html b/src/app/manager-dashboard/reports/reports-detail.component.html index ed253e6ffd..c4f4c6ce47 100644 --- a/src/app/manager-dashboard/reports/reports-detail.component.html +++ b/src/app/manager-dashboard/reports/reports-detail.component.html @@ -135,7 +135,7 @@
-

Members

+

Members

Total Members {{reports?.totalUsers}} @@ -171,7 +171,7 @@

Members

-

Resources

+

Resources

Total Resources {{reports?.totalResources}} @@ -204,7 +204,7 @@

Resources

-

Courses

+

Courses

Total Courses {{reports?.totalCourses}} diff --git a/src/app/manager-dashboard/reports/reports-detail.scss b/src/app/manager-dashboard/reports/reports-detail.scss index 75133d45f0..04b72bb2e9 100644 --- a/src/app/manager-dashboard/reports/reports-detail.scss +++ b/src/app/manager-dashboard/reports/reports-detail.scss @@ -78,11 +78,12 @@ mat-toolbar mat-form-field { .mat-form-field { width: 100%; } - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ mat-button-toggle-group { width: 100%; display: flex; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-toggle { flex: 1; } diff --git a/src/app/manager-dashboard/reports/reports-health.component.html b/src/app/manager-dashboard/reports/reports-health.component.html index b97a3250d1..1f981d60fe 100644 --- a/src/app/manager-dashboard/reports/reports-health.component.html +++ b/src/app/manager-dashboard/reports/reports-health.component.html @@ -5,13 +5,13 @@
Patients Seen: {{headlineData?.unique.length}}
-

Diagnoses

+

Diagnoses

: {{headlineData?.conditions[condition]}}
-

Diagnosis Trend

+

Diagnosis Trend

Select diagnosis to view trend: @@ -25,7 +25,7 @@

Diagnosis Trend

-

Weekly Data

+

Weekly Data

Review Previous Test Attempts

+

Review Previous Test Attempts

diff --git a/src/app/shared/forms/planet-rating-stars.component.ts b/src/app/shared/forms/planet-rating-stars.component.ts index 657f13d293..722ab038ce 100644 --- a/src/app/shared/forms/planet-rating-stars.component.ts +++ b/src/app/shared/forms/planet-rating-stars.component.ts @@ -8,13 +8,13 @@ import { UserService } from '../user.service'; @Component({ selector: 'planet-rating-stars', templateUrl: './planet-rating-stars.component.html', - styles: [ ` - .stars mat-icon { - cursor: default; - } - .stars.stars-enabled mat-icon { - cursor: pointer; - } + styles: [ ` + .stars mat-icon { + cursor: default; + } + .stars.stars-enabled mat-icon { + cursor: pointer; + } ` ], providers: [ { provide: MatFormFieldControl, useExisting: PlanetRatingStarsComponent } diff --git a/src/app/shared/forms/planet-tag-input-dialog.component.html b/src/app/shared/forms/planet-tag-input-dialog.component.html index 0f72c8b71b..3977920cd1 100644 --- a/src/app/shared/forms/planet-tag-input-dialog.component.html +++ b/src/app/shared/forms/planet-tag-input-dialog.component.html @@ -19,7 +19,7 @@ None - {{ tag.name }} + {{ tag.name }} ({{ tag.count || 0 }}) @@ -32,7 +32,7 @@ - {{ tag.name }} + {{ tag.name }} ({{ tag.count || 0 }}) @@ -44,7 +44,7 @@ subdirectory_arrow_right - {{ tag.name }} + {{ tag.name }} ({{ tag.count || 0 }}) @@ -58,7 +58,7 @@ All - {{ tag.name }} + {{ tag.name }} ({{ tag.count || 0 }}) @@ -70,7 +70,7 @@ subdirectory_arrow_right - {{ tag.name }} + {{ tag.name }} ({{ tag.count || 0 }}) diff --git a/src/app/shared/material.module.ts b/src/app/shared/material.module.ts index 2047f27231..ebe6bcf27b 100644 --- a/src/app/shared/material.module.ts +++ b/src/app/shared/material.module.ts @@ -2,7 +2,7 @@ import { NgModule, Injectable } from '@angular/core'; import { DragDropModule } from '@angular/cdk/drag-drop'; import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete'; import { MatBadgeModule } from '@angular/material/badge'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; diff --git a/src/app/shared/planet-filtered-amount.component.ts b/src/app/shared/planet-filtered-amount.component.ts index dccd0fb130..7abdb28bb0 100644 --- a/src/app/shared/planet-filtered-amount.component.ts +++ b/src/app/shared/planet-filtered-amount.component.ts @@ -3,13 +3,13 @@ import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/materia @Component({ template: ` - Showing {{table.filteredData.length}} of {{table.data.length}} - {labelFor, select, - resources {{table.data.length, plural, =0 {resources} =1 {resource} other {resources}}} - courses {{table.data.length, plural, =0 {courses} =1 {course} other {courses}}} - } - - `, + Showing {{table.filteredData.length}} of {{table.data.length}} + {labelFor, select, + resources {{table.data.length, plural, =0 {resources} =1 {resource} other {resources}}} + courses {{table.data.length, plural, =0 {courses} =1 {course} other {courses}}} + } + + `, selector: 'planet-filtered-amount' }) export class FilteredAmountComponent { diff --git a/src/app/tasks/tasks.scss b/src/app/tasks/tasks.scss index 14e3ba9115..0b89a6a94d 100644 --- a/src/app/tasks/tasks.scss +++ b/src/app/tasks/tasks.scss @@ -26,10 +26,11 @@ planet-tasks { .deadline-passed{ color: red } - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ mat-button-toggle-group { font-size: 14px; - + /* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { line-height: 34px; } diff --git a/src/app/teams/teams-reports-dialog.component.html b/src/app/teams/teams-reports-dialog.component.html index e2d00fd271..10a0180374 100644 --- a/src/app/teams/teams-reports-dialog.component.html +++ b/src/app/teams/teams-reports-dialog.component.html @@ -1,6 +1,6 @@

{{teamName}} Financial Report

-

{{ report.startDate | date : 'mediumDate' : '+0000' }} - {{ report.endDate | date : 'mediumDate' : '+0000' }}

+

{{ report.startDate | date : 'mediumDate' : '+0000' }} - {{ report.endDate | date : 'mediumDate' : '+0000' }}

diff --git a/src/app/teams/teams-reports-dialog.component.ts b/src/app/teams/teams-reports-dialog.component.ts index 5ea3b617a1..2e1a8bf4bc 100644 --- a/src/app/teams/teams-reports-dialog.component.ts +++ b/src/app/teams/teams-reports-dialog.component.ts @@ -7,7 +7,7 @@ import { MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/leg h3 { margin-bottom: 0; } - .mat-subheading-1 { + .mat-body-1 { margin-top: 0; } ` ] diff --git a/src/app/teams/teams-view.component.html b/src/app/teams/teams-view.component.html index 26d490641f..86522827f2 100644 --- a/src/app/teams/teams-view.component.html +++ b/src/app/teams/teams-view.component.html @@ -78,11 +78,11 @@

{{configuration { mode, select, team {Plan} enterprise {Mission & Services} services {Services} } -
What is your enterprise's Mission?
+
What is your enterprise's Mission?
-
What are the Services your enterprise provides?
+
What are the Services your enterprise provides?
-
What are the Rules of your enterprise?
+
What are the Rules of your enterprise?
@@ -179,7 +179,7 @@

Members ({{members.length}})

-
+
{{resource.resource.title | truncateText:75}} @@ -216,7 +216,7 @@

Members ({{members.length}})

-
+
{{course.courseTitle | truncateText:75}}
diff --git a/src/app/teams/teams-view.scss b/src/app/teams/teams-view.scss index 7d30ba08f9..c452279d6f 100644 --- a/src/app/teams/teams-view.scss +++ b/src/app/teams/teams-view.scss @@ -43,7 +43,7 @@ margin: 0; } - .mat-subheading-2 b { + .mat-subtitle-1 b { display: inline-block; max-width: 100%; white-space: nowrap; diff --git a/src/app/users/users.component.ts b/src/app/users/users.component.ts index b888ccd491..838c4a745d 100644 --- a/src/app/users/users.component.ts +++ b/src/app/users/users.component.ts @@ -15,15 +15,15 @@ import { DeviceInfoService, DeviceType } from '../shared/device-info.service'; @Component({ selector: 'planet-users', templateUrl: './users.component.html', - styles: [ ` - /* Column Widths */ - .mat-column-select { - max-width: 44px; - } - - .mat-column-profile { - max-width: 100px; - } + styles: [ ` + /* Column Widths */ + .mat-column-select { + max-width: 44px; + } + + .mat-column-profile { + max-width: 100px; + } ` ] }) export class UsersComponent implements OnInit, OnDestroy { diff --git a/src/planet-mat-theme.scss b/src/planet-mat-theme.scss index f38398d6cd..9f1e05495c 100644 --- a/src/planet-mat-theme.scss +++ b/src/planet-mat-theme.scss @@ -12,13 +12,20 @@ // If you specify typography styles for the components you use elsewhere, you should delete this line. // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` +// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());` +/* TODO(mdc-migration): Remove all-legacy-component-typographies once all legacy components are migrated*/ @include mat.all-legacy-component-typographies(); -@include mat.legacy-core(); +@include mat.all-component-typographies(); +/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated*/ +@include mat.legacy-core(); +@include mat.core(); @import './app/_variables'; +/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/ @include mat.all-legacy-component-themes($planet-app-theme); +@include mat.all-component-themes($planet-app-theme); + // Create sub-themes for the different sections which change the accent color. $accent-map: ( library: mat.define-palette(mat.$pink-palette, $accent-hue), @@ -30,8 +37,10 @@ $accent-map: ( @each $section in library, courses, meetups, teams { $accent-palette: map-get($accent-map, #{$section}); $theme: mat.define-light-theme($planet-app-primary, $accent-palette, $planet-app-warn); - .planet-#{$section}-theme { + .planet-#{$section}-theme { + /* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/ @include mat.all-legacy-component-themes($theme); + @include mat.all-component-themes($theme); .accent-color { background-color: mat.get-color-from-palette($accent-palette, $accent-hue); @@ -42,18 +51,19 @@ $accent-map: ( // Custom themed material styles below +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/ .mat-button-toggle-checked { background-color: mat.get-color-from-palette($planet-app-primary, $light-hue); color: mat.get-contrast-color-from-palette($planet-app-primary, $light-hue); } -.mat-raised-button[color="primary"] { +.mat-mdc-raised-button[color="primary"] { transition: background-color 0.3s ease; &:hover { background-color: mat.get-color-from-palette($planet-app-primary, $dark-hue); } } -.mat-raised-button[color="primary"][disabled] { +.mat-mdc-raised-button[color="primary"][disabled] { pointer-events: none; } diff --git a/src/styles.scss b/src/styles.scss index 75c573c212..ce49e7d7c4 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -454,7 +454,7 @@ body { mat-row mat-cell { flex-wrap: wrap; - .mat-raised-button { + .mat-mdc-raised-button { margin: 0.125rem 0.25rem 0.125rem 0; } } From 1fc38f2cc6c63cd4d15c88ec68170c529acd98da Mon Sep 17 00:00:00 2001 From: paulbert Date: Tue, 7 Oct 2025 10:46:21 -0400 Subject: [PATCH 02/10] Fix button alignment on voices card footer --- src/app/news/news-list-item.component.html | 4 ++-- src/app/news/news-list-item.scss | 2 +- src/styles.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/news/news-list-item.component.html b/src/app/news/news-list-item.component.html index ef7f295a88..49464ed177 100644 --- a/src/app/news/news-list-item.component.html +++ b/src/app/news/news-list-item.component.html @@ -64,9 +64,9 @@
- + - - +
@@ -79,8 +81,8 @@
-
From 4bb91468e07a29127b65870aa59ef3a1cd5e0ca6 Mon Sep 17 00:00:00 2001 From: paulbert Date: Thu, 6 Nov 2025 12:47:16 -0500 Subject: [PATCH 10/10] Fix sync button icon alignment --- src/app/manager-dashboard/manager-sync.component.html | 2 +- src/app/manager-dashboard/manager-sync.component.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/manager-dashboard/manager-sync.component.html b/src/app/manager-dashboard/manager-sync.component.html index d3cc5422d3..481116a148 100644 --- a/src/app/manager-dashboard/manager-sync.component.html +++ b/src/app/manager-dashboard/manager-sync.component.html @@ -5,7 +5,7 @@