mirror of
https://framagit.org/framasoft/framadate/funky-framadate-front.git
synced 2023-08-25 13:53:14 +02:00
angular upgrade: migrate ng material component
This commit is contained in:
parent
ad9876633b
commit
ea09c4e854
@ -1,9 +1,6 @@
|
|||||||
import { ComponentType } from '@angular/cdk/portal';
|
import { ComponentType } from '@angular/cdk/portal';
|
||||||
import { Injectable, TemplateRef } from '@angular/core';
|
import { Injectable, TemplateRef } from '@angular/core';
|
||||||
import {
|
import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
|
||||||
MatLegacyDialog as MatDialog,
|
|
||||||
MatLegacyDialogConfig as MatDialogConfig,
|
|
||||||
} from '@angular/material/legacy-dialog';
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import {
|
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
|
||||||
MatLegacySnackBar as MatSnackBar,
|
|
||||||
MatLegacySnackBarConfig as MatSnackBarConfig,
|
|
||||||
} from '@angular/material/legacy-snack-bar';
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
|
@ -4,7 +4,7 @@ import { DOCUMENT } from '@angular/common';
|
|||||||
import { UntypedFormGroup } from '@angular/forms';
|
import { UntypedFormGroup } from '@angular/forms';
|
||||||
import { ToastService } from '../../../../../../core/services/toast.service';
|
import { ToastService } from '../../../../../../core/services/toast.service';
|
||||||
import { StorageService } from '../../../../../../core/services/storage.service';
|
import { StorageService } from '../../../../../../core/services/storage.service';
|
||||||
import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { DateChoice } from '../../../../../../core/models/dateChoice.model';
|
import { DateChoice } from '../../../../../../core/models/dateChoice.model';
|
||||||
import { PollService } from '../../../../../../core/services/poll.service';
|
import { PollService } from '../../../../../../core/services/poll.service';
|
||||||
import { DateUtilitiesService } from '../../../../../../core/services/date.utilities.service';
|
import { DateUtilitiesService } from '../../../../../../core/services/date.utilities.service';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { Component, Input, OnInit } from '@angular/core';
|
import { Component, Input, OnInit } from '@angular/core';
|
||||||
import { MatLegacyDialogConfig as MatDialogConfig } from '@angular/material/legacy-dialog';
|
import { MatDialogConfig } from '@angular/material/dialog';
|
||||||
|
|
||||||
import { Answer } from '../../../core/enums/answer.enum';
|
import { Answer } from '../../../core/enums/answer.enum';
|
||||||
import { Choice } from '../../../core/models/choice.model';
|
import { Choice } from '../../../core/models/choice.model';
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
import { Component, Inject, OnInit } from '@angular/core';
|
import { Component, Inject, OnInit } from '@angular/core';
|
||||||
import {
|
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
|
||||||
MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
|
|
||||||
MatLegacyDialogRef as MatDialogRef,
|
|
||||||
} from '@angular/material/legacy-dialog';
|
|
||||||
|
|
||||||
import { Answer } from '../../../core/enums/answer.enum';
|
import { Answer } from '../../../core/enums/answer.enum';
|
||||||
import { Choice } from '../../../core/models/choice.model';
|
import { Choice } from '../../../core/models/choice.model';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog';
|
import { MatDialogRef } from '@angular/material/dialog';
|
||||||
import { Subscription } from 'rxjs';
|
import { Subscription } from 'rxjs';
|
||||||
|
|
||||||
import { Owner } from '../../../core/models/owner.model';
|
import { Owner } from '../../../core/models/owner.model';
|
||||||
|
@ -2,15 +2,15 @@ import { CommonModule } from '@angular/common';
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
|
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
|
||||||
import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
|
import { MatCheckboxModule } from '@angular/material/checkbox';
|
||||||
import { MatDatepickerModule } from '@angular/material/datepicker';
|
import { MatDatepickerModule } from '@angular/material/datepicker';
|
||||||
import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
|
import { MatDialogModule } from '@angular/material/dialog';
|
||||||
import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
|
import { MatFormFieldModule } from '@angular/material/form-field';
|
||||||
import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
|
import { MatInputModule } from '@angular/material/input';
|
||||||
import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||||
import { MatSidenavModule } from '@angular/material/sidenav';
|
import { MatSidenavModule } from '@angular/material/sidenav';
|
||||||
import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
|
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
|
||||||
import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
|
import { MatSnackBarModule } from '@angular/material/snack-bar';
|
||||||
import { MatStepperModule } from '@angular/material/stepper';
|
import { MatStepperModule } from '@angular/material/stepper';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { NgChartsModule } from 'ng2-charts';
|
import { NgChartsModule } from 'ng2-charts';
|
||||||
|
@ -13,9 +13,13 @@
|
|||||||
// If you specify typography styles for the components you use elsewhere, you should delete this line.
|
// 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,
|
// If you don't need the default component typographies but still want the hierarchy styles,
|
||||||
// you can delete this line and instead use:
|
// 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.all-legacy-component-typographies();
|
||||||
|
@include mat.all-component-typographies();
|
||||||
|
/* TODO(mdc-migration): Remove legacy-core once all legacy components are migrated*/
|
||||||
@include mat.legacy-core();
|
@include mat.legacy-core();
|
||||||
|
@include mat.core();
|
||||||
|
|
||||||
// import your custom themes
|
// import your custom themes
|
||||||
@import 'theme-light.scss';
|
@import 'theme-light.scss';
|
||||||
@ -23,13 +27,19 @@
|
|||||||
@import 'theme-contrast.scss';
|
@import 'theme-contrast.scss';
|
||||||
|
|
||||||
.theme-light {
|
.theme-light {
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-light);
|
@include mat.all-legacy-component-themes($theme-light);
|
||||||
|
@include mat.all-component-themes($theme-light);
|
||||||
}
|
}
|
||||||
.theme-dark {
|
.theme-dark {
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-dark);
|
@include mat.all-legacy-component-themes($theme-dark);
|
||||||
|
@include mat.all-component-themes($theme-dark);
|
||||||
}
|
}
|
||||||
.theme-contrast {
|
.theme-contrast {
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-contrast);
|
@include mat.all-legacy-component-themes($theme-contrast);
|
||||||
|
@include mat.all-component-themes($theme-contrast);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -70,6 +70,7 @@ textarea {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// radio input structure
|
// radio input structure
|
||||||
|
/* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/
|
||||||
.mat-checkbox-label,
|
.mat-checkbox-label,
|
||||||
.mat-checkbox-layout .mat-checkbox-label {
|
.mat-checkbox-layout .mat-checkbox-label {
|
||||||
max-width: 90vw;
|
max-width: 90vw;
|
||||||
@ -190,12 +191,13 @@ textarea {
|
|||||||
-moz-border-radius-bottomright: 1em;
|
-moz-border-radius-bottomright: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mat-error {
|
.mat-mdc-form-field-error {
|
||||||
display: block;
|
display: block;
|
||||||
background: $warning;
|
background: $warning;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* TODO(mdc-migration): The following rule targets internal classes of checkbox that may no longer apply for the MDC version.*/
|
||||||
mat-checkbox {
|
mat-checkbox {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
@ -14,4 +14,6 @@ $theme-contrast: mat.define-light-theme($theme-contrast-primary, $theme-contrast
|
|||||||
// Include theme styles for core and each component used in your app.
|
// Include theme styles for core and each component used in your app.
|
||||||
// Alternatively, you can import and @include the theme mixins for each component
|
// Alternatively, you can import and @include the theme mixins for each component
|
||||||
// that you are using.
|
// that you are using.
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-contrast);
|
@include mat.all-legacy-component-themes($theme-contrast);
|
||||||
|
@include mat.all-component-themes($theme-contrast);
|
||||||
|
@ -14,4 +14,6 @@ $theme-dark: mat.define-dark-theme($theme-dark-primary, $theme-dark-accent, $the
|
|||||||
// Include theme styles for core and each component used in your app.
|
// Include theme styles for core and each component used in your app.
|
||||||
// Alternatively, you can import and @include the theme mixins for each component
|
// Alternatively, you can import and @include the theme mixins for each component
|
||||||
// that you are using.
|
// that you are using.
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-dark);
|
@include mat.all-legacy-component-themes($theme-dark);
|
||||||
|
@include mat.all-component-themes($theme-dark);
|
||||||
|
@ -14,4 +14,6 @@ $theme-light: mat.define-light-theme($theme-light-primary, $theme-light-accent,
|
|||||||
// Include theme styles for core and each component used in your app.
|
// Include theme styles for core and each component used in your app.
|
||||||
// Alternatively, you can import and @include the theme mixins for each component
|
// Alternatively, you can import and @include the theme mixins for each component
|
||||||
// that you are using.
|
// that you are using.
|
||||||
|
/* TODO(mdc-migration): Remove all-legacy-component-themes once all legacy components are migrated*/
|
||||||
@include mat.all-legacy-component-themes($theme-light);
|
@include mat.all-legacy-component-themes($theme-light);
|
||||||
|
@include mat.all-component-themes($theme-light);
|
||||||
|
Loading…
Reference in New Issue
Block a user