From 82ca0329e905eeabf47a43926012d5ef36bd0d76 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Tue, 6 Mar 2018 10:38:30 +0300 Subject: [PATCH] Material module imports for the pages and rest of the Fuse + Couple tweaks & fixes --- .../nav-group/nav-vertical-group.component.ts | 8 +- .../nav-item/nav-vertical-item.component.ts | 8 +- .../widget/widget-toggle.directive.ts | 14 +-- src/@fuse/modules/material.module.ts | 112 ------------------ src/app/fuse-config.ts | 8 +- .../components-third-party.module.ts | 27 +++-- .../datatable/ngx-datatable.component.html | 9 +- .../datatable/ngx-datatable.component.ts | 1 - .../google-maps/google-maps.module.ts | 26 ++-- .../angular-material.module.ts | 25 ++-- .../content/components/components.module.ts | 34 ++++-- src/app/main/content/content.component.ts | 9 +- src/app/main/content/content.module.ts | 1 + .../forgot-password-2.module.ts | 9 +- .../forgot-password/forgot-password.module.ts | 9 +- .../pages/authentication/lock/lock.module.ts | 12 +- .../authentication/login-2/login-2.module.ts | 12 +- .../authentication/login/login.module.ts | 12 +- .../mail-confirm/mail-confirm.module.ts | 9 +- .../register-2/register-2.module.ts | 12 +- .../register/register.module.ts | 12 +- .../reset-password-2.module.ts | 11 +- .../reset-password/reset-password.module.ts | 11 +- .../pages/coming-soon/coming-soon.module.ts | 11 +- .../pages/errors/404/error-404.module.ts | 9 +- .../pages/errors/500/error-500.module.ts | 5 +- src/app/main/content/pages/faq/faq.module.ts | 10 +- .../pages/invoices/compact/compact.module.ts | 5 +- .../pages/invoices/modern/modern.module.ts | 5 +- .../dialogs/article/article.component.html | 5 +- .../knowledge-base/knowledge-base.module.ts | 13 +- .../pages/maintenance/maintenence.module.ts | 5 +- .../content/pages/pricing/pricing.module.ts | 10 +- .../content/pages/profile/profile.module.ts | 12 +- .../tabs/timeline/timeline.component.html | 1 + .../content/pages/search/search.module.ts | 16 ++- .../main/content/services/services.module.ts | 17 ++- .../main/content/ui/colors/colors.module.ts | 17 ++- src/app/main/content/ui/forms/forms.module.ts | 18 ++- .../helper-classes/helper-classes.module.ts | 18 ++- src/app/main/content/ui/icons/icons.module.ts | 17 ++- .../ui/page-layouts/page-layouts.module.ts | 18 ++- .../ui/typography/typography.module.ts | 16 ++- 43 files changed, 359 insertions(+), 260 deletions(-) delete mode 100644 src/@fuse/modules/material.module.ts diff --git a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts index 0d5e681f..56151d6f 100644 --- a/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-group/nav-vertical-group.component.ts @@ -1,11 +1,11 @@ -import { Component, HostBinding, Input, OnInit } from '@angular/core'; +import { Component, HostBinding, Input } from '@angular/core'; @Component({ selector : 'fuse-nav-vertical-group', templateUrl: './nav-vertical-group.component.html', styleUrls : ['./nav-vertical-group.component.scss'] }) -export class FuseNavVerticalGroupComponent implements OnInit +export class FuseNavVerticalGroupComponent { @HostBinding('class') classes = 'nav-group nav-item'; @Input() item: any; @@ -14,8 +14,4 @@ export class FuseNavVerticalGroupComponent implements OnInit { } - ngOnInit() - { - } - } diff --git a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts index 74e68198..071ed1ee 100644 --- a/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts +++ b/src/@fuse/components/navigation/vertical/nav-item/nav-vertical-item.component.ts @@ -1,11 +1,11 @@ -import { Component, HostBinding, Input, OnInit } from '@angular/core'; +import { Component, HostBinding, Input } from '@angular/core'; @Component({ selector : 'fuse-nav-vertical-item', templateUrl: './nav-vertical-item.component.html', styleUrls : ['./nav-vertical-item.component.scss'] }) -export class FuseNavVerticalItemComponent implements OnInit +export class FuseNavVerticalItemComponent { @HostBinding('class') classes = 'nav-item'; @Input() item: any; @@ -13,8 +13,4 @@ export class FuseNavVerticalItemComponent implements OnInit constructor() { } - - ngOnInit() - { - } } diff --git a/src/@fuse/components/widget/widget-toggle.directive.ts b/src/@fuse/components/widget/widget-toggle.directive.ts index f777c588..0c278925 100644 --- a/src/@fuse/components/widget/widget-toggle.directive.ts +++ b/src/@fuse/components/widget/widget-toggle.directive.ts @@ -1,21 +1,11 @@ -import { AfterViewInit, Directive, ElementRef, OnInit } from '@angular/core'; +import { Directive, ElementRef } from '@angular/core'; @Directive({ selector: '[fuseWidgetToggle]' }) -export class FuseWidgetToggleDirective implements OnInit, AfterViewInit +export class FuseWidgetToggleDirective { - constructor(public el: ElementRef) { } - - ngOnInit() - { - } - - ngAfterViewInit() - { - } - } diff --git a/src/@fuse/modules/material.module.ts b/src/@fuse/modules/material.module.ts deleted file mode 100644 index 36d357c6..00000000 --- a/src/@fuse/modules/material.module.ts +++ /dev/null @@ -1,112 +0,0 @@ -import { NgModule } from '@angular/core'; -import { - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCheckboxModule, - MatToolbarModule, - MatTooltipModule, - MatCardModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatFormFieldModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatStepperModule -} from '@angular/material'; -import { CdkTableModule } from '@angular/cdk/table'; - -@NgModule({ - imports: [ - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatFormFieldModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatStepperModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatToolbarModule, - MatTooltipModule, - CdkTableModule - ], - exports: [ - MatAutocompleteModule, - MatButtonModule, - MatButtonToggleModule, - MatCardModule, - MatCheckboxModule, - MatChipsModule, - MatDatepickerModule, - MatDialogModule, - MatExpansionModule, - MatGridListModule, - MatIconModule, - MatInputModule, - MatListModule, - MatMenuModule, - MatNativeDateModule, - MatPaginatorModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatRadioModule, - MatRippleModule, - MatSelectModule, - MatSidenavModule, - MatSliderModule, - MatSlideToggleModule, - MatSnackBarModule, - MatStepperModule, - MatSortModule, - MatTableModule, - MatTabsModule, - MatToolbarModule, - MatTooltipModule, - CdkTableModule - ] -}) -export class MaterialModule -{ - -} diff --git a/src/app/fuse-config.ts b/src/app/fuse-config.ts index 2da07496..0cdd3de8 100644 --- a/src/app/fuse-config.ts +++ b/src/app/fuse-config.ts @@ -1,4 +1,10 @@ -// Default Fuse config +/** + * Default Fuse Configuration + * + * You can edit these options to change the default options. All these options also can be changed per component + * basis. See `app/main/content/pages/authentication/login/login.component.ts` constructor method to learn more + * about changing these options per component basis. + */ export const fuseConfig = { layout : { navigation : 'left', // 'right', 'left', 'top', 'none' diff --git a/src/app/main/content/components-third-party/components-third-party.module.ts b/src/app/main/content/components-third-party/components-third-party.module.ts index 23d856a3..afd4ef64 100644 --- a/src/app/main/content/components-third-party/components-third-party.module.ts +++ b/src/app/main/content/components-third-party/components-third-party.module.ts @@ -1,11 +1,16 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatIconModule } from '@angular/material'; + +import { NgxDatatableModule } from '@swimlane/ngx-datatable'; + import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; import { GoogleMapsModule } from './google-maps/google-maps.module'; +import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; + const routes = [ { path : 'datatables/ngx-datatable', @@ -14,14 +19,22 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - GoogleMapsModule - ], declarations: [ FuseNgxDatatableComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatIconModule, + + NgxDatatableModule, + + FuseSharedModule, + + GoogleMapsModule + ], }) export class FuseComponentsThirdPartyModule { diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html index b02758bd..645c07ff 100644 --- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html +++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.html @@ -57,14 +57,11 @@ - - + - - + - - + diff --git a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts index af5f59ca..003dbc7f 100644 --- a/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts +++ b/src/app/main/content/components-third-party/datatable/ngx-datatable.component.ts @@ -14,7 +14,6 @@ export class FuseNgxDatatableComponent implements OnInit constructor(private http: HttpClient) { - } ngOnInit() diff --git a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts b/src/app/main/content/components-third-party/google-maps/google-maps.module.ts index e711802e..92a7b60b 100644 --- a/src/app/main/content/components-third-party/google-maps/google-maps.module.ts +++ b/src/app/main/content/components-third-party/google-maps/google-maps.module.ts @@ -1,8 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; + +import { MatButtonModule, MatIconModule } from '@angular/material'; + import { AgmCoreModule } from '@agm/core'; import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseGoogleMapsDocsComponent } from './google-maps.component'; @@ -14,16 +18,22 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - AgmCoreModule.forRoot({ - apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' - }) - ], declarations: [ FuseGoogleMapsDocsComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + + AgmCoreModule.forRoot({ + apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' + }), + + FuseSharedModule, + FuseHighlightModule + ], }) export class GoogleMapsModule { diff --git a/src/app/main/content/components/angular-material/angular-material.module.ts b/src/app/main/content/components/angular-material/angular-material.module.ts index 8e28ad98..da8cee00 100644 --- a/src/app/main/content/components/angular-material/angular-material.module.ts +++ b/src/app/main/content/components/angular-material/angular-material.module.ts @@ -1,14 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MaterialModule } from 'app/main/content/components/angular-material/material.module'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { EXAMPLE_LIST } from './example-components'; import { FuseExampleViewerComponent } from './example-viewer/example-viewer'; import { FuseAngularMaterialComponent } from './angular-material.component'; -import { MaterialModule } from 'app/main/content/components/angular-material/material.module'; -import { FuseHighlightModule } from '@fuse/components'; const routes: Routes = [ { @@ -23,19 +24,21 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - RouterModule.forChild(routes), - MaterialModule, - FuseSharedModule, - FuseWidgetModule, - FuseHighlightModule - ], - entryComponents: EXAMPLE_LIST, declarations : [ [...EXAMPLE_LIST], FuseAngularMaterialComponent, FuseExampleViewerComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MaterialModule, + + FuseSharedModule, + FuseHighlightModule, + FuseWidgetModule + ], + entryComponents: EXAMPLE_LIST, }) export class FuseAngularMaterialModule { diff --git a/src/app/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index 82bdd260..d2fd419f 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; + +import { MatButtonModule, MatButtonToggleModule, MatFormFieldModule, MatIconModule, MatListModule, MatMenuModule, MatSelectModule, MatSliderModule, MatSlideToggleModule, MatTabsModule } from '@angular/material'; + import { NgxChartsModule } from '@swimlane/ngx-charts'; import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; +import { FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, FuseWidgetModule } from '@fuse/components'; import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; import { FuseCardsDocsComponent } from './cards/cards.component'; @@ -56,13 +59,6 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseWidgetModule, - FuseAngularMaterialModule, - NgxChartsModule - ], declarations: [ FuseCardsDocsComponent, FuseCountdownDocsComponent, @@ -73,6 +69,28 @@ const routes = [ FuseSearchBarDocsComponent, FuseShortcutsDocsComponent, FuseWidgetDocsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatButtonToggleModule, + MatFormFieldModule, + MatIconModule, + MatListModule, + MatMenuModule, + MatSelectModule, + MatSlideToggleModule, + MatTabsModule, + + NgxChartsModule, + + FuseSharedModule, + FuseCountdownModule, + FuseHighlightModule, + FuseMaterialColorPickerModule, + FuseWidgetModule, + FuseAngularMaterialModule ] }) export class FuseComponentsModule diff --git a/src/app/main/content/content.component.ts b/src/app/main/content/content.component.ts index 0e750d92..7cfca410 100644 --- a/src/app/main/content/content.component.ts +++ b/src/app/main/content/content.component.ts @@ -1,4 +1,4 @@ -import { Component, HostBinding, OnInit, OnDestroy } from '@angular/core'; +import { Component, HostBinding, OnDestroy } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { Subscription } from 'rxjs/Subscription'; @@ -14,7 +14,7 @@ import { FuseConfigService } from '@fuse/services/config.service'; styleUrls : ['./content.component.scss'], animations : fuseAnimations }) -export class FuseContentComponent implements OnInit, OnDestroy +export class FuseContentComponent implements OnDestroy { onConfigChanged: Subscription; fuseSettings: any; @@ -64,11 +64,6 @@ export class FuseContentComponent implements OnInit, OnDestroy ); } - ngOnInit() - { - - } - ngOnDestroy() { this.onConfigChanged.unsubscribe(); diff --git a/src/app/main/content/content.module.ts b/src/app/main/content/content.module.ts index f471e0ca..bbccf91f 100644 --- a/src/app/main/content/content.module.ts +++ b/src/app/main/content/content.module.ts @@ -11,6 +11,7 @@ import { FuseContentComponent } from 'app/main/content/content.component'; ], imports : [ RouterModule, + FuseSharedModule, ], exports: [ diff --git a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts index f04f0d94..8192d5d0 100644 --- a/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts +++ b/src/app/main/content/pages/authentication/forgot-password-2/forgot-password-2.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPassword2Component } from './forgot-password-2.component'; @@ -17,8 +19,13 @@ const routes = [ FuseForgotPassword2Component ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) ] }) export class ForgotPassword2Module diff --git a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts b/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts index b701cee0..719e4496 100644 --- a/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts +++ b/src/app/main/content/pages/authentication/forgot-password/forgot-password.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPasswordComponent } from './forgot-password.component'; @@ -17,8 +19,13 @@ const routes = [ FuseForgotPasswordComponent ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) ] }) export class ForgotPasswordModule diff --git a/src/app/main/content/pages/authentication/lock/lock.module.ts b/src/app/main/content/pages/authentication/lock/lock.module.ts index 5e796850..0488d20b 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLockComponent } from './lock.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLockComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + + FuseSharedModule ] }) export class LockModule diff --git a/src/app/main/content/pages/authentication/login-2/login-2.module.ts b/src/app/main/content/pages/authentication/login-2/login-2.module.ts index 1e988755..9f7f932d 100644 --- a/src/app/main/content/pages/authentication/login-2/login-2.module.ts +++ b/src/app/main/content/pages/authentication/login-2/login-2.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLogin2Component } from './login-2.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLogin2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class Login2Module diff --git a/src/app/main/content/pages/authentication/login/login.module.ts b/src/app/main/content/pages/authentication/login/login.module.ts index 2fcf6ecb..e5ea2e03 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLoginComponent } from './login.component'; @@ -17,8 +19,14 @@ const routes = [ FuseLoginComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class LoginModule diff --git a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts index 9916a0d9..1c56c4a9 100644 --- a/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts +++ b/src/app/main/content/pages/authentication/mail-confirm/mail-confirm.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailConfirmComponent } from './mail-confirm.component'; @@ -17,8 +19,11 @@ const routes = [ FuseMailConfirmComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule ] }) export class MailConfirmModule diff --git a/src/app/main/content/pages/authentication/register-2/register-2.module.ts b/src/app/main/content/pages/authentication/register-2/register-2.module.ts index 6beb5b24..68458fb5 100644 --- a/src/app/main/content/pages/authentication/register-2/register-2.module.ts +++ b/src/app/main/content/pages/authentication/register-2/register-2.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegister2Component } from './register-2.component'; @@ -17,8 +19,14 @@ const routes = [ FuseRegister2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class Register2Module diff --git a/src/app/main/content/pages/authentication/register/register.module.ts b/src/app/main/content/pages/authentication/register/register.module.ts index e330153e..f2c80a88 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatCheckboxModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegisterComponent } from './register.component'; @@ -17,8 +19,14 @@ const routes = [ FuseRegisterComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class RegisterModule diff --git a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts index cce11b14..ef10b6f8 100644 --- a/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts +++ b/src/app/main/content/pages/authentication/reset-password-2/reset-password-2.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPassword2Component } from './reset-password-2.component'; @@ -17,8 +19,13 @@ const routes = [ FuseResetPassword2Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class ResetPassword2Module diff --git a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts b/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts index 60ea7781..21f8e358 100644 --- a/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts +++ b/src/app/main/content/pages/authentication/reset-password/reset-password.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPasswordComponent } from './reset-password.component'; @@ -17,8 +19,13 @@ const routes = [ FuseResetPasswordComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + + FuseSharedModule ] }) export class ResetPasswordModule diff --git a/src/app/main/content/pages/coming-soon/coming-soon.module.ts b/src/app/main/content/pages/coming-soon/coming-soon.module.ts index 0f9b1a0f..57350e51 100644 --- a/src/app/main/content/pages/coming-soon/coming-soon.module.ts +++ b/src/app/main/content/pages/coming-soon/coming-soon.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatInputModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseCountdownModule } from '@fuse/components'; import { FuseComingSoonComponent } from './coming-soon.component'; @@ -17,8 +20,14 @@ const routes = [ FuseComingSoonComponent ], imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatInputModule, + FuseSharedModule, - RouterModule.forChild(routes) + FuseCountdownModule ] }) export class ComingSoonModule diff --git a/src/app/main/content/pages/errors/404/error-404.module.ts b/src/app/main/content/pages/errors/404/error-404.module.ts index 77da500d..620a628a 100644 --- a/src/app/main/content/pages/errors/404/error-404.module.ts +++ b/src/app/main/content/pages/errors/404/error-404.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError404Component } from './error-404.component'; @@ -17,8 +19,11 @@ const routes = [ FuseError404Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule ] }) export class Error404Module diff --git a/src/app/main/content/pages/errors/500/error-500.module.ts b/src/app/main/content/pages/errors/500/error-500.module.ts index 909ce8da..6e4ada57 100644 --- a/src/app/main/content/pages/errors/500/error-500.module.ts +++ b/src/app/main/content/pages/errors/500/error-500.module.ts @@ -17,8 +17,9 @@ const routes = [ FuseError500Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ] }) export class Error500Module diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index 70268e65..37980eb9 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatExpansionModule, MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FaqService } from './faq.service'; @@ -21,8 +23,12 @@ const routes = [ FuseFaqComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatExpansionModule, + MatIconModule, + + FuseSharedModule ], providers : [ FaqService diff --git a/src/app/main/content/pages/invoices/compact/compact.module.ts b/src/app/main/content/pages/invoices/compact/compact.module.ts index 02c575ae..fa37fa95 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -21,8 +21,9 @@ const routes = [ FuseInvoiceCompactComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ], providers : [ InvoiceService diff --git a/src/app/main/content/pages/invoices/modern/modern.module.ts b/src/app/main/content/pages/invoices/modern/modern.module.ts index f86c6abc..45f89281 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -21,8 +21,9 @@ const routes = [ FuseInvoiceModernComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ], providers : [ InvoiceService diff --git a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html index ea2f2006..10717189 100644 --- a/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html +++ b/src/app/main/content/pages/knowledge-base/dialogs/article/article.component.html @@ -11,10 +11,7 @@
-
diff --git a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts b/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts index 0fed4168..f6659c74 100644 --- a/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts +++ b/src/app/main/content/pages/knowledge-base/knowledge-base.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDialogModule, MatIconModule, MatListModule, MatToolbarModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { KnowledgeBaseService } from './knowledge-base.service'; @@ -23,8 +25,15 @@ const routes = [ FuseKnowledgeBaseArticleComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDialogModule, + MatIconModule, + MatListModule, + MatToolbarModule, + + FuseSharedModule ], providers : [ KnowledgeBaseService diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index b0bf2d05..c47b4b34 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -17,8 +17,9 @@ const routes = [ FuseMaintenanceComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + FuseSharedModule ] }) export class MaintenanceModule diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index 0ccd5239..d0c2b8bc 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDividerModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FusePricingStyle1Component } from './style-1/style-1.component'; @@ -29,8 +31,12 @@ const routes = [ FusePricingStyle3Component ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDividerModule, + + FuseSharedModule ] }) export class PricingModule diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index 6a90bc0e..39bd5122 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatDividerModule, MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { ProfileService } from './profile.service'; @@ -27,8 +29,14 @@ const routes = [ FuseProfilePhotosVideosComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + + MatButtonModule, + MatDividerModule, + MatIconModule, + MatTabsModule, + + FuseSharedModule ], providers : [ ProfileService diff --git a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html index 2c3b3863..1074f914 100644 --- a/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html +++ b/src/app/main/content/pages/profile/tabs/timeline/timeline.component.html @@ -27,6 +27,7 @@ + diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 52c6fb29..97eff0fe 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -1,5 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { CdkTableModule } from '@angular/cdk/table'; + +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatTableModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; @@ -25,8 +28,17 @@ const routes = [ FuseSearchTableComponent ], imports : [ - FuseSharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + CdkTableModule, + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatTableModule, + MatTabsModule, + + FuseSharedModule ], providers : [ SearchService diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index 7d27ed4c..6c44c3b3 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseConfigServiceDocsComponent } from './config/config.component'; import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-screen.component'; @@ -18,14 +21,18 @@ const routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseConfigServiceDocsComponent, FuseSplashScreenServiceDocsComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + + FuseSharedModule, + FuseHighlightModule + ], }) export class FuseServicesModule diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts index f3023d8d..2c8a6379 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; @@ -14,13 +16,18 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseDemoModule - ], declarations: [ FuseColorsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseDemoModule ] }) export class UIColorsModule diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index 5dd4855d..c9fc1d6e 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatSelectModule, MatStepperModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFormsComponent } from './forms.component'; @@ -13,12 +15,20 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseFormsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatSelectModule, + MatStepperModule, + + FuseSharedModule, ] }) export class UIFormsModule diff --git a/src/app/main/content/ui/helper-classes/helper-classes.module.ts b/src/app/main/content/ui/helper-classes/helper-classes.module.ts index d1a1e095..31ee6c1f 100644 --- a/src/app/main/content/ui/helper-classes/helper-classes.module.ts +++ b/src/app/main/content/ui/helper-classes/helper-classes.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseHelperClassesComponent } from './helper-classes.component'; import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; @@ -15,15 +18,20 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseHelperClassesComponent, FuseHelperClassesPaddingMarginComponent, FuseHelperClassesWidthHeightComponent - ] + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseHighlightModule, + ], }) export class UIHelperClassesModule { diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index afc8dcd5..8e14e039 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatProgressSpinnerModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseIconsComponent } from './icons.component'; @@ -13,12 +15,19 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseIconsComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatProgressSpinnerModule, + + FuseSharedModule ] }) export class UIIconsModule diff --git a/src/app/main/content/ui/page-layouts/page-layouts.module.ts b/src/app/main/content/ui/page-layouts/page-layouts.module.ts index 28622935..f300822f 100644 --- a/src/app/main/content/ui/page-layouts/page-layouts.module.ts +++ b/src/app/main/content/ui/page-layouts/page-layouts.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatSidenavModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; @@ -104,11 +106,6 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes), - FuseDemoModule - ], declarations: [ FuseCardedFullWidthComponent, FuseCardedFullWidth2Component, @@ -129,6 +126,17 @@ const routes: Routes = [ FuseSimpleRightSidenav3Component, FuseTabbedComponent, FuseBlankComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatButtonModule, + MatIconModule, + MatSidenavModule, + MatTabsModule, + + FuseSharedModule, + FuseDemoModule ] }) export class UIPageLayoutsModule diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index 790b019b..bf4e2321 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -1,7 +1,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { MatIconModule, MatTabsModule } from '@angular/material'; + import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseHighlightModule } from '@fuse/components'; import { FuseTypographyComponent } from './typography.component'; import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; @@ -17,16 +20,21 @@ const routes: Routes = [ ]; @NgModule({ - imports : [ - FuseSharedModule, - RouterModule.forChild(routes) - ], declarations: [ FuseTypographyComponent, FuseTypographyHeadingsComponent, FuseTypographyInlineTextElementsComponent, FuseTypographyBlockquotesListsComponent, FuseTypographyHelpersComponent + ], + imports : [ + RouterModule.forChild(routes), + + MatIconModule, + MatTabsModule, + + FuseSharedModule, + FuseHighlightModule ] }) export class UITypographyModule