From 397c304ab2164f48d36c356b7b93fd3d7b617cba Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Wed, 21 Feb 2018 09:36:41 +0300 Subject: [PATCH] Created modules for custom components and the main fuse components + Changed the Shared Module (WIP) --- .../confirm-dialog.component.ts | 8 +- .../confirm-dialog/confirm-dialog.module.ts | 20 ++++ .../countdown/countdown.component.ts | 3 +- .../components/countdown/countdown.module.ts | 15 +++ src/@fuse/components/demo/demo.module.ts | 10 +- .../components/highlight/highlight.module.ts | 15 +++ src/@fuse/components/index.ts | 11 ++ .../material-color-picker.component.ts | 40 +++---- .../material-color-picker.module.ts | 31 +++++ .../navigation/navigation.module.ts | 10 +- .../search-bar/search-bar.component.ts | 12 +- .../search-bar/search-bar.module.ts | 10 +- .../shortcuts/shortcuts.component.ts | 9 +- .../components/shortcuts/shortcuts.module.ts | 22 +++- .../components/sidebar/sidebar.component.ts | 4 +- .../components/sidebar/sidebar.module.ts | 4 - .../theme-options/theme-options.component.ts | 19 +-- .../theme-options/theme-options.module.ts | 36 ++++++ .../components/widget/widget.component.ts | 9 +- src/@fuse/components/widget/widget.module.ts | 11 +- src/@fuse/directives/directives.ts | 24 ++++ .../fuse-mat-sidenav.directive.ts} | 7 +- .../fuse-mat-sidenav.service.ts} | 0 .../fuse-perfect-scrollbar.directive.ts | 7 +- src/@fuse/fuse.module.ts | 16 ++- .../{matColors.ts => mat-colors/index.ts} | 0 src/@fuse/pipes/filter.pipe.ts | 2 +- src/@fuse/pipes/pipes.module.ts | 3 - .../copier => services}/copier.service.ts | 2 +- src/@fuse/services/match-media.service.ts | 2 +- src/@fuse/shared.module.ts | 35 ++++++ src/@fuse/{fuseUtils.ts => utils/index.ts} | 0 src/app/app.module.ts | 16 ++- .../content/apps/academy/academy.module.ts | 4 +- src/app/main/content/apps/apps.module.ts | 4 +- .../content/apps/calendar/calendar.module.ts | 4 +- .../event-form/event-form.component.ts | 2 +- src/app/main/content/apps/chat/chat.module.ts | 4 +- .../main/content/apps/chat/chat.service.ts | 2 +- .../sidenavs/left/chats/chats.component.ts | 2 +- .../content/apps/contacts/contact.model.ts | 2 +- .../content/apps/contacts/contacts.module.ts | 4 +- .../content/apps/contacts/contacts.service.ts | 2 +- .../dashboards/analytics/analytics.module.ts | 4 +- .../apps/dashboards/project/project.module.ts | 4 +- .../apps/e-commerce/e-commerce.module.ts | 4 +- .../apps/e-commerce/order/order.model.ts | 2 +- .../e-commerce/orders/orders.component.ts | 2 +- .../e-commerce/product/product.component.ts | 2 +- .../apps/e-commerce/product/product.model.ts | 2 +- .../e-commerce/products/products.component.ts | 2 +- .../apps/file-manager/file-manager.module.ts | 4 +- .../content/apps/mail-ngrx/mail.module.ts | 4 +- .../store/selectors/mails.selectors.ts | 2 +- src/app/main/content/apps/mail/mail.module.ts | 4 +- .../main/content/apps/mail/mail.service.ts | 2 +- .../content/apps/scrumboard/board.model.ts | 2 +- .../board/dialogs/card/card.component.ts | 2 +- .../label-selector.component.ts | 2 +- .../board-color-selector.component.ts | 2 +- .../content/apps/scrumboard/card.model.ts | 2 +- .../content/apps/scrumboard/list.model.ts | 2 +- .../apps/scrumboard/scrumboard.module.ts | 4 +- .../todo-details/todo-details.component.ts | 2 +- src/app/main/content/apps/todo/todo.module.ts | 4 +- .../main/content/apps/todo/todo.service.ts | 2 +- .../components-third-party.module.ts | 4 +- .../google-maps/google-maps.module.ts | 4 +- .../angular-material.module.ts | 13 +- .../example-viewer/example-viewer.ts | 5 +- .../angular-material/material.module.ts | 112 ++++++++++++++++++ .../content/components/components.module.ts | 4 +- src/app/main/content/content.module.ts | 22 ++++ .../forgot-password-2.module.ts | 4 +- .../forgot-password/forgot-password.module.ts | 4 +- .../pages/authentication/lock/lock.module.ts | 4 +- .../authentication/login-2/login-2.module.ts | 4 +- .../authentication/login/login.module.ts | 4 +- .../mail-confirm/mail-confirm.module.ts | 4 +- .../register-2/register-2.module.ts | 4 +- .../register/register.module.ts | 4 +- .../reset-password-2.module.ts | 4 +- .../reset-password/reset-password.module.ts | 4 +- .../pages/coming-soon/coming-soon.module.ts | 4 +- .../pages/errors/404/error-404.module.ts | 4 +- .../pages/errors/500/error-500.module.ts | 4 +- .../main/content/pages/faq/faq.component.ts | 2 +- src/app/main/content/pages/faq/faq.module.ts | 4 +- .../pages/invoices/compact/compact.module.ts | 4 +- .../pages/invoices/modern/modern.module.ts | 4 +- .../knowledge-base/knowledge-base.module.ts | 4 +- .../pages/maintenance/maintenence.module.ts | 4 +- .../content/pages/pricing/pricing.module.ts | 4 +- .../content/pages/profile/profile.module.ts | 4 +- .../content/pages/search/search.module.ts | 4 +- .../main/content/services/services.module.ts | 4 +- .../content/ui/colors/colors.component.ts | 2 +- .../main/content/ui/colors/colors.module.ts | 4 +- src/app/main/content/ui/forms/forms.module.ts | 4 +- .../helper-classes/helper-classes.module.ts | 4 +- src/app/main/content/ui/icons/icons.module.ts | 4 +- .../ui/page-layouts/page-layouts.module.ts | 4 +- .../ui/typography/typography.module.ts | 4 +- src/app/main/footer/footer.module.ts | 28 +++++ src/app/main/main.module.ts | 44 +++---- src/app/main/navbar/navbar.module.ts | 28 +++++ .../main/quick-panel/quick-panel.module.ts | 28 +++++ src/app/main/toolbar/toolbar.module.ts | 32 +++++ .../modules => app/shared}/shared.module.ts | 4 +- 109 files changed, 706 insertions(+), 243 deletions(-) create mode 100644 src/@fuse/components/confirm-dialog/confirm-dialog.module.ts create mode 100644 src/@fuse/components/countdown/countdown.module.ts create mode 100644 src/@fuse/components/highlight/highlight.module.ts create mode 100644 src/@fuse/components/index.ts create mode 100644 src/@fuse/components/material-color-picker/material-color-picker.module.ts create mode 100644 src/@fuse/components/theme-options/theme-options.module.ts create mode 100644 src/@fuse/directives/directives.ts rename src/@fuse/directives/{fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts => fuse-mat-sidenav/fuse-mat-sidenav.directive.ts} (90%) rename src/@fuse/directives/{fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts => fuse-mat-sidenav/fuse-mat-sidenav.service.ts} (100%) rename src/@fuse/{matColors.ts => mat-colors/index.ts} (100%) rename src/@fuse/{components/copier => services}/copier.service.ts (98%) create mode 100644 src/@fuse/shared.module.ts rename src/@fuse/{fuseUtils.ts => utils/index.ts} (100%) create mode 100644 src/app/main/content/components/angular-material/material.module.ts create mode 100644 src/app/main/content/content.module.ts create mode 100644 src/app/main/footer/footer.module.ts create mode 100644 src/app/main/navbar/navbar.module.ts create mode 100644 src/app/main/quick-panel/quick-panel.module.ts create mode 100644 src/app/main/toolbar/toolbar.module.ts rename src/{@fuse/modules => app/shared}/shared.module.ts (98%) diff --git a/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts b/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts index 24e22d35..90eac6e5 100644 --- a/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts +++ b/src/@fuse/components/confirm-dialog/confirm-dialog.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { MatDialogRef } from '@angular/material'; @Component({ @@ -6,7 +6,7 @@ import { MatDialogRef } from '@angular/material'; templateUrl: './confirm-dialog.component.html', styleUrls : ['./confirm-dialog.component.scss'] }) -export class FuseConfirmDialogComponent implements OnInit +export class FuseConfirmDialogComponent { public confirmMessage: string; @@ -14,8 +14,4 @@ export class FuseConfirmDialogComponent implements OnInit { } - ngOnInit() - { - } - } diff --git a/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts b/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts new file mode 100644 index 00000000..f6f1f9c7 --- /dev/null +++ b/src/@fuse/components/confirm-dialog/confirm-dialog.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { MatButtonModule, MatDialogModule } from '@angular/material'; + +import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; + +@NgModule({ + declarations: [ + FuseConfirmDialogComponent + ], + imports: [ + MatDialogModule, + MatButtonModule + ], + entryComponents: [ + FuseConfirmDialogComponent + ], +}) +export class FuseConfirmDialogModule +{ +} diff --git a/src/@fuse/components/countdown/countdown.component.ts b/src/@fuse/components/countdown/countdown.component.ts index 5ab95920..6342b804 100644 --- a/src/@fuse/components/countdown/countdown.component.ts +++ b/src/@fuse/components/countdown/countdown.component.ts @@ -1,8 +1,9 @@ import { Component, Input, OnInit } from '@angular/core'; -import * as moment from 'moment'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/observable/interval'; +import * as moment from 'moment'; + @Component({ selector : 'fuse-countdown', templateUrl: './countdown.component.html', diff --git a/src/@fuse/components/countdown/countdown.module.ts b/src/@fuse/components/countdown/countdown.module.ts new file mode 100644 index 00000000..9c68f4e8 --- /dev/null +++ b/src/@fuse/components/countdown/countdown.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; + +import { FuseCountdownComponent } from '@fuse/components/countdown/countdown.component'; + +@NgModule({ + declarations: [ + FuseCountdownComponent + ], + exports: [ + FuseCountdownComponent + ], +}) +export class FuseCountdownModule +{ +} diff --git a/src/@fuse/components/demo/demo.module.ts b/src/@fuse/components/demo/demo.module.ts index 2f9a7882..ea5b615c 100644 --- a/src/@fuse/components/demo/demo.module.ts +++ b/src/@fuse/components/demo/demo.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; import { RouterModule } from '@angular/router'; + +import { MatDividerModule, MatListModule } from '@angular/material'; + import { FuseDemoContentComponent } from './demo-content/demo-content.component'; import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component'; @@ -10,8 +12,10 @@ import { FuseDemoSidenavComponent } from './demo-sidenav/demo-sidenav.component' FuseDemoSidenavComponent ], imports : [ - SharedModule, - RouterModule + RouterModule, + + MatDividerModule, + MatListModule ], exports : [ FuseDemoContentComponent, diff --git a/src/@fuse/components/highlight/highlight.module.ts b/src/@fuse/components/highlight/highlight.module.ts new file mode 100644 index 00000000..d45696df --- /dev/null +++ b/src/@fuse/components/highlight/highlight.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; + +import { FuseHighlightComponent } from '@fuse/components/highlight/highlight.component'; + +@NgModule({ + declarations: [ + FuseHighlightComponent + ], + exports: [ + FuseHighlightComponent + ], +}) +export class FuseHighlightModule +{ +} diff --git a/src/@fuse/components/index.ts b/src/@fuse/components/index.ts new file mode 100644 index 00000000..0a8fb885 --- /dev/null +++ b/src/@fuse/components/index.ts @@ -0,0 +1,11 @@ +export * from './confirm-dialog/confirm-dialog.module'; +export * from './countdown/countdown.module'; +export * from './demo/demo.module'; +export * from './highlight/highlight.module'; +export * from './material-color-picker/material-color-picker.module'; +export * from './navigation/navigation.module'; +export * from './search-bar/search-bar.module'; +export * from './shortcuts/shortcuts.module'; +export * from './sidebar/sidebar.module'; +export * from './theme-options/theme-options.module'; +export * from './widget/widget.module'; diff --git a/src/@fuse/components/material-color-picker/material-color-picker.component.ts b/src/@fuse/components/material-color-picker/material-color-picker.component.ts index cb83c1dd..763ea36c 100644 --- a/src/@fuse/components/material-color-picker/material-color-picker.component.ts +++ b/src/@fuse/components/material-color-picker/material-color-picker.component.ts @@ -1,6 +1,7 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core'; -import { MatColors } from '../../matColors'; -import { fuseAnimations } from '../../animations/index'; +import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core'; + +import { fuseAnimations } from '@fuse/animations'; +import { MatColors } from '@fuse/mat-colors'; @Component({ selector : 'fuse-material-color-picker', @@ -9,7 +10,7 @@ import { fuseAnimations } from '../../animations/index'; animations : fuseAnimations, encapsulation: ViewEncapsulation.None }) -export class FuseMaterialColorPickerComponent implements OnInit, OnChanges +export class FuseMaterialColorPickerComponent implements OnChanges { colors: any; selectedColor: any; @@ -91,11 +92,21 @@ export class FuseMaterialColorPickerComponent implements OnInit, OnChanges this.hues = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900', 'A100', 'A200', 'A400', 'A700']; } - ngOnInit() + ngOnChanges(changes: any) { - + if ( changes.selectedBg && changes.selectedBg.currentValue === '' || + changes.selectedClass && changes.selectedClass.currentValue === '' || + changes.selectedPalette && changes.selectedPalette.currentValue === '' ) + { + this.removeColor(); + return; + } + if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg ) + { + this.updateSelectedColor(); + } } - + selectPalette(palette) { this.selectedPalette = palette; @@ -172,19 +183,4 @@ export class FuseMaterialColorPickerComponent implements OnInit, OnChanges this.view = 'hues'; } } - - ngOnChanges(changes: any) - { - if ( changes.selectedBg && changes.selectedBg.currentValue === '' || - changes.selectedClass && changes.selectedClass.currentValue === '' || - changes.selectedPalette && changes.selectedPalette.currentValue === '' ) - { - this.removeColor(); - return; - } - if ( changes.selectedPalette || changes.selectedHue || changes.selectedClass || changes.selectedBg ) - { - this.updateSelectedColor(); - } - } } diff --git a/src/@fuse/components/material-color-picker/material-color-picker.module.ts b/src/@fuse/components/material-color-picker/material-color-picker.module.ts new file mode 100644 index 00000000..ad105a08 --- /dev/null +++ b/src/@fuse/components/material-color-picker/material-color-picker.module.ts @@ -0,0 +1,31 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatButtonModule, MatIconModule, MatMenuModule } from '@angular/material'; + +import { FusePipesModule } from '@fuse/pipes/pipes.module'; + +import { FuseMaterialColorPickerComponent } from '@fuse/components/material-color-picker/material-color-picker.component'; + +@NgModule({ + declarations: [ + FuseMaterialColorPickerComponent + ], + imports: [ + CommonModule, + + FlexLayoutModule, + + MatButtonModule, + MatIconModule, + MatMenuModule, + + FusePipesModule + ], + exports: [ + FuseMaterialColorPickerComponent + ], +}) +export class FuseMaterialColorPickerModule +{ +} diff --git a/src/@fuse/components/navigation/navigation.module.ts b/src/@fuse/components/navigation/navigation.module.ts index c9cc9efd..dd9927b7 100644 --- a/src/@fuse/components/navigation/navigation.module.ts +++ b/src/@fuse/components/navigation/navigation.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; +import { MatIconModule, MatRippleModule } from '@angular/material'; import { FuseNavigationComponent } from './navigation.component'; import { FuseNavVerticalItemComponent } from './vertical/nav-item/nav-vertical-item.component'; @@ -11,8 +12,11 @@ import { FuseNavHorizontalCollapseComponent } from './horizontal/nav-collapse/na @NgModule({ imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + MatIconModule, + MatRippleModule, ], exports : [ FuseNavigationComponent diff --git a/src/@fuse/components/search-bar/search-bar.component.ts b/src/@fuse/components/search-bar/search-bar.component.ts index f83951b0..5fa75e44 100644 --- a/src/@fuse/components/search-bar/search-bar.component.ts +++ b/src/@fuse/components/search-bar/search-bar.component.ts @@ -1,13 +1,14 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; -import { FuseConfigService } from '../../services/config.service'; +import { Component, EventEmitter, Output } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; +import { FuseConfigService } from '@fuse/services/config.service'; + @Component({ selector : 'fuse-search-bar', templateUrl: './search-bar.component.html', styleUrls : ['./search-bar.component.scss'] }) -export class FuseSearchBarComponent implements OnInit +export class FuseSearchBarComponent { collapsed: boolean; toolbarColor: string; @@ -28,11 +29,6 @@ export class FuseSearchBarComponent implements OnInit ); } - ngOnInit() - { - - } - collapse() { this.collapsed = true; diff --git a/src/@fuse/components/search-bar/search-bar.module.ts b/src/@fuse/components/search-bar/search-bar.module.ts index d996cc9d..bc1a0595 100644 --- a/src/@fuse/components/search-bar/search-bar.module.ts +++ b/src/@fuse/components/search-bar/search-bar.module.ts @@ -1,7 +1,9 @@ import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../modules/shared.module'; +import { MatIconModule } from '@angular/material'; + import { FuseSearchBarComponent } from './search-bar.component'; @NgModule({ @@ -9,8 +11,10 @@ import { FuseSearchBarComponent } from './search-bar.component'; FuseSearchBarComponent ], imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + MatIconModule ], exports : [ FuseSearchBarComponent diff --git a/src/@fuse/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts index bf95bc74..4f99d938 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -1,11 +1,12 @@ import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { FuseNavigationService } from '../navigation/navigation.service'; import { Subscription } from 'rxjs/Subscription'; import { ObservableMedia } from '@angular/flex-layout'; -import { FuseMatchMedia } from '../../services/match-media.service'; -import { FuseConfigService } from '../../services/config.service'; import { CookieService } from 'ngx-cookie-service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { FuseConfigService } from '@fuse/services/config.service'; + import { navigation } from 'app/navigation/navigation'; @Component({ @@ -30,7 +31,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy constructor( private renderer: Renderer2, private observableMedia: ObservableMedia, - private fuseMatchMedia: FuseMatchMedia, + private fuseMatchMedia: FuseMatchMediaService, private fuseNavigationService: FuseNavigationService, private fuseConfig: FuseConfigService, private cookieService: CookieService diff --git a/src/@fuse/components/shortcuts/shortcuts.module.ts b/src/@fuse/components/shortcuts/shortcuts.module.ts index 46cd7069..cefd73de 100644 --- a/src/@fuse/components/shortcuts/shortcuts.module.ts +++ b/src/@fuse/components/shortcuts/shortcuts.module.ts @@ -1,19 +1,35 @@ import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule, MatFormFieldModule, MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatTooltipModule } from '@angular/material'; +import { CookieService } from 'ngx-cookie-service'; import { FuseShortcutsComponent } from './shortcuts.component'; -import { SharedModule } from '../../modules/shared.module'; @NgModule({ declarations: [ FuseShortcutsComponent ], imports : [ - SharedModule, - RouterModule + CommonModule, + RouterModule, + + FlexLayoutModule, + + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatListModule, + MatTooltipModule ], exports : [ FuseShortcutsComponent + ], + providers : [ + CookieService ] }) export class FuseShortcutsModule diff --git a/src/@fuse/components/sidebar/sidebar.component.ts b/src/@fuse/components/sidebar/sidebar.component.ts index 582c023c..5b410ce7 100644 --- a/src/@fuse/components/sidebar/sidebar.component.ts +++ b/src/@fuse/components/sidebar/sidebar.component.ts @@ -4,7 +4,7 @@ import { ObservableMedia } from '@angular/flex-layout'; import { Subscription } from 'rxjs/Subscription'; import { FuseSidebarService } from './sidebar.service'; -import { FuseMatchMedia } from '@fuse/services/match-media.service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; import { DOCUMENT } from '@angular/common'; @Component({ @@ -66,7 +66,7 @@ export class FuseSidebarComponent implements OnInit, OnDestroy private elementRef: ElementRef, private animationBuilder: AnimationBuilder, private sidebarService: FuseSidebarService, - private matchMedia: FuseMatchMedia, + private matchMedia: FuseMatchMediaService, private media: ObservableMedia, @Inject(DOCUMENT) private document: any ) diff --git a/src/@fuse/components/sidebar/sidebar.module.ts b/src/@fuse/components/sidebar/sidebar.module.ts index f26739f3..0f5477f5 100644 --- a/src/@fuse/components/sidebar/sidebar.module.ts +++ b/src/@fuse/components/sidebar/sidebar.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { FuseSidebarComponent } from './sidebar.component'; -import { FuseSidebarService } from './sidebar.service'; @NgModule({ declarations: [ @@ -9,9 +8,6 @@ import { FuseSidebarService } from './sidebar.service'; ], exports : [ FuseSidebarComponent - ], - providers : [ - FuseSidebarService ] }) export class FuseSidebarModule diff --git a/src/@fuse/components/theme-options/theme-options.component.ts b/src/@fuse/components/theme-options/theme-options.component.ts index c2c9c2a2..65688a89 100644 --- a/src/@fuse/components/theme-options/theme-options.component.ts +++ b/src/@fuse/components/theme-options/theme-options.component.ts @@ -1,11 +1,14 @@ import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations'; import { Subscription } from 'rxjs/Subscription'; -import { FuseConfigService } from '../../services/config.service'; -import { fuseAnimations } from '../../animations/index'; -import { FuseNavigationService } from '../navigation/navigation.service'; + +import { fuseAnimations } from '@fuse/animations'; +import { FuseConfigService } from '@fuse/services/config.service'; +import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; + import { navigation } from 'app/navigation/navigation'; + @Component({ selector : 'fuse-theme-options', templateUrl: './theme-options.component.html', @@ -71,6 +74,11 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy }); } + ngOnDestroy() + { + this.onConfigChanged.unsubscribe(); + } + onSettingsChange() { this.fuseConfig.setConfig(this.config); @@ -105,9 +113,4 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy this.player.play(); } - - ngOnDestroy() - { - this.onConfigChanged.unsubscribe(); - } } diff --git a/src/@fuse/components/theme-options/theme-options.module.ts b/src/@fuse/components/theme-options/theme-options.module.ts new file mode 100644 index 00000000..0d79a402 --- /dev/null +++ b/src/@fuse/components/theme-options/theme-options.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { FlexLayoutModule } from '@angular/flex-layout'; +import { MatDividerModule, MatFormFieldModule, MatIconModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule } from '@angular/material'; + +import { FuseMaterialColorPickerModule } from '@fuse/components/material-color-picker/material-color-picker.module'; +import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; + +@NgModule({ + declarations: [ + FuseThemeOptionsComponent + ], + imports : [ + CommonModule, + FormsModule, + + FlexLayoutModule, + + MatDividerModule, + MatFormFieldModule, + MatIconModule, + MatOptionModule, + MatRadioModule, + MatSelectModule, + MatSlideToggleModule, + + FuseMaterialColorPickerModule + ], + exports : [ + FuseThemeOptionsComponent + ] +}) +export class FuseThemeOptionsModule +{ +} diff --git a/src/@fuse/components/widget/widget.component.ts b/src/@fuse/components/widget/widget.component.ts index 659dcc62..46ecdbb2 100644 --- a/src/@fuse/components/widget/widget.component.ts +++ b/src/@fuse/components/widget/widget.component.ts @@ -1,4 +1,4 @@ -import { AfterContentInit, Component, ContentChildren, ElementRef, HostBinding, OnInit, QueryList, Renderer2, ViewEncapsulation } from '@angular/core'; +import { AfterContentInit, Component, ContentChildren, ElementRef, HostBinding, QueryList, Renderer2, ViewEncapsulation } from '@angular/core'; import { FuseWidgetToggleDirective } from './widget-toggle.directive'; @Component({ @@ -8,7 +8,7 @@ import { FuseWidgetToggleDirective } from './widget-toggle.directive'; encapsulation: ViewEncapsulation.None }) -export class FuseWidgetComponent implements OnInit, AfterContentInit +export class FuseWidgetComponent implements AfterContentInit { @HostBinding('class.flipped') flipped = false; @ContentChildren(FuseWidgetToggleDirective, {descendants: true}) toggleButtons: QueryList; @@ -17,11 +17,6 @@ export class FuseWidgetComponent implements OnInit, AfterContentInit { } - ngOnInit() - { - - } - ngAfterContentInit() { setTimeout(() => { diff --git a/src/@fuse/components/widget/widget.module.ts b/src/@fuse/components/widget/widget.module.ts index 1907c5b2..5d7fea3d 100644 --- a/src/@fuse/components/widget/widget.module.ts +++ b/src/@fuse/components/widget/widget.module.ts @@ -1,20 +1,17 @@ import { NgModule } from '@angular/core'; -import { SharedModule } from '../../modules/shared.module'; + import { FuseWidgetComponent } from './widget.component'; import { FuseWidgetToggleDirective } from './widget-toggle.directive'; @NgModule({ - imports : [ - SharedModule + declarations: [ + FuseWidgetComponent, + FuseWidgetToggleDirective ], exports : [ FuseWidgetComponent, FuseWidgetToggleDirective ], - declarations: [ - FuseWidgetComponent, - FuseWidgetToggleDirective - ] }) export class FuseWidgetModule { diff --git a/src/@fuse/directives/directives.ts b/src/@fuse/directives/directives.ts new file mode 100644 index 00000000..91c92607 --- /dev/null +++ b/src/@fuse/directives/directives.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; + +import { FuseIfOnDomDirective } from '@fuse/directives/fuse-if-on-dom/fuse-if-on-dom.directive'; +import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive'; +import { FuseMatSidenavHelperDirective, FuseMatSidenavTogglerDirective } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive'; + +@NgModule({ + declarations: [ + FuseIfOnDomDirective, + FuseMatSidenavHelperDirective, + FuseMatSidenavTogglerDirective, + FusePerfectScrollbarDirective + ], + imports : [], + exports : [ + FuseIfOnDomDirective, + FuseMatSidenavHelperDirective, + FuseMatSidenavTogglerDirective, + FusePerfectScrollbarDirective + ] +}) +export class FuseDirectivesModule +{ +} diff --git a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts similarity index 90% rename from src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts rename to src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts index 4388c7bc..c6a0ad4d 100644 --- a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.directive.ts +++ b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts @@ -2,8 +2,9 @@ import { Directive, Input, OnInit, HostListener, OnDestroy, HostBinding } from ' import { MatSidenav } from '@angular/material'; import { ObservableMedia } from '@angular/flex-layout'; import { Subscription } from 'rxjs/Subscription'; -import { FuseMatchMedia } from '../../services/match-media.service'; -import { FuseMatSidenavHelperService } from './fuse-mat-sidenav-helper.service'; + +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; @Directive({ selector: '[fuseMatSidenavHelper]' @@ -19,7 +20,7 @@ export class FuseMatSidenavHelperDirective implements OnInit, OnDestroy constructor( private fuseMatSidenavService: FuseMatSidenavHelperService, - private fuseMatchMedia: FuseMatchMedia, + private fuseMatchMedia: FuseMatchMediaService, private observableMedia: ObservableMedia, private matSidenav: MatSidenav ) diff --git a/src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts b/src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service.ts similarity index 100% rename from src/@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service.ts rename to src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service.ts diff --git a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts index 49fd75d2..434c6b7f 100644 --- a/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts +++ b/src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts @@ -1,9 +1,12 @@ import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy } from '@angular/core'; -import { FuseConfigService } from '../../services/config.service'; -import { Subscription } from 'rxjs/Subscription'; import { Platform } from '@angular/cdk/platform'; +import { Subscription } from 'rxjs/Subscription'; + import PerfectScrollbar from 'perfect-scrollbar'; +import { FuseConfigService } from '@fuse/services/config.service'; + + @Directive({ selector: '[fusePerfectScrollbar]' }) diff --git a/src/@fuse/fuse.module.ts b/src/@fuse/fuse.module.ts index 7ed75db1..7571fbe0 100644 --- a/src/@fuse/fuse.module.ts +++ b/src/@fuse/fuse.module.ts @@ -1,15 +1,25 @@ import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core'; import { FUSE_CONFIG, FuseConfigService } from '@fuse/services/config.service'; +import { FuseCopierService } from '@fuse/services/copier.service'; +import { FuseMatchMediaService } from '@fuse/services/match-media.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; +import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service'; import { FuseSplashScreenService } from '@fuse/services/splash-screen.service'; +import { FuseTranslationLoaderService } from '@fuse/services/translation-loader.service'; @NgModule({ - declarations: [], - providers : [ + entryComponents: [], + providers : [ FuseConfigService, + FuseCopierService, + FuseMatchMediaService, + FuseMatSidenavHelperService, FuseNavigationService, - FuseSplashScreenService + FuseSidebarService, + FuseSplashScreenService, + FuseTranslationLoaderService ] }) export class FuseModule diff --git a/src/@fuse/matColors.ts b/src/@fuse/mat-colors/index.ts similarity index 100% rename from src/@fuse/matColors.ts rename to src/@fuse/mat-colors/index.ts diff --git a/src/@fuse/pipes/filter.pipe.ts b/src/@fuse/pipes/filter.pipe.ts index 590d9d59..dc709edf 100644 --- a/src/@fuse/pipes/filter.pipe.ts +++ b/src/@fuse/pipes/filter.pipe.ts @@ -1,5 +1,5 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { FuseUtils } from '../fuseUtils'; +import { FuseUtils } from '@fuse/utils'; @Pipe({name: 'filter'}) export class FilterPipe implements PipeTransform diff --git a/src/@fuse/pipes/pipes.module.ts b/src/@fuse/pipes/pipes.module.ts index c4a21aeb..bc5b1349 100644 --- a/src/@fuse/pipes/pipes.module.ts +++ b/src/@fuse/pipes/pipes.module.ts @@ -13,7 +13,6 @@ import { CamelCaseToDashPipe } from './camelCaseToDash.pipe'; HtmlToPlaintextPipe, FilterPipe, CamelCaseToDashPipe - ], imports : [], exports : [ @@ -24,8 +23,6 @@ import { CamelCaseToDashPipe } from './camelCaseToDash.pipe'; CamelCaseToDashPipe ] }) - export class FusePipesModule { - } diff --git a/src/@fuse/components/copier/copier.service.ts b/src/@fuse/services/copier.service.ts similarity index 98% rename from src/@fuse/components/copier/copier.service.ts rename to src/@fuse/services/copier.service.ts index 03227fc4..99880d4e 100644 --- a/src/@fuse/components/copier/copier.service.ts +++ b/src/@fuse/services/copier.service.ts @@ -9,7 +9,7 @@ import { Injectable } from '@angular/core'; @Injectable() -export class CopierService +export class FuseCopierService { private textarea: HTMLTextAreaElement; diff --git a/src/@fuse/services/match-media.service.ts b/src/@fuse/services/match-media.service.ts index 382e9935..b37b2aa1 100644 --- a/src/@fuse/services/match-media.service.ts +++ b/src/@fuse/services/match-media.service.ts @@ -3,7 +3,7 @@ import { Injectable } from '@angular/core'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; @Injectable() -export class FuseMatchMedia +export class FuseMatchMediaService { activeMediaQuery: string; onMediaChange: BehaviorSubject = new BehaviorSubject(''); diff --git a/src/@fuse/shared.module.ts b/src/@fuse/shared.module.ts new file mode 100644 index 00000000..4a65c31f --- /dev/null +++ b/src/@fuse/shared.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; + +import { FlexLayoutModule } from '@angular/flex-layout'; + +import { FusePipesModule } from './pipes/pipes.module'; + +import { FuseDirectivesModule } from '@fuse/directives/directives'; + +@NgModule({ + imports : [ + CommonModule, + FormsModule, + ReactiveFormsModule, + + FlexLayoutModule, + + FuseDirectivesModule, + FusePipesModule + ], + exports : [ + CommonModule, + FormsModule, + ReactiveFormsModule, + + FlexLayoutModule, + + FuseDirectivesModule, + FusePipesModule + ] +}) +export class FuseSharedModule +{ +} diff --git a/src/@fuse/fuseUtils.ts b/src/@fuse/utils/index.ts similarity index 100% rename from src/@fuse/fuseUtils.ts rename to src/@fuse/utils/index.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 13762a65..03b755f1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,16 +5,19 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterModule, Routes } from '@angular/router'; import { InMemoryWebApiModule } from 'angular-in-memory-web-api'; import 'hammerjs'; -import { SharedModule } from '@fuse/modules/shared.module'; + +import { FuseModule } from '@fuse/fuse.module'; +import { FuseSharedModule } from '@fuse/shared.module'; + +// import { SharedModule } from 'app/shared/shared.module'; +import { config } from './config'; + import { AppComponent } from './app.component'; import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service'; import { FuseMainModule } from './main/main.module'; import { TranslateModule } from '@ngx-translate/core'; import { AppStoreModule } from './store/store.module'; -import { FuseModule } from '@fuse/fuse.module'; -import { config } from './config'; - const appRoutes: Routes = [ { path : 'apps', @@ -61,10 +64,11 @@ const appRoutes: Routes = [ passThruUnknownUrl: true }), - SharedModule, + // SharedModule, - // Fuse Module + // Fuse Main and Shared modules FuseModule.forRoot(config), + FuseSharedModule, AppStoreModule, FuseMainModule diff --git a/src/app/main/content/apps/academy/academy.module.ts b/src/app/main/content/apps/academy/academy.module.ts index d344986b..f1110d21 100644 --- a/src/app/main/content/apps/academy/academy.module.ts +++ b/src/app/main/content/apps/academy/academy.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseAcademyCoursesComponent } from './courses/courses.component'; import { FuseAcademyCourseComponent } from './course/course.component'; @@ -31,7 +31,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/apps.module.ts b/src/app/main/content/apps/apps.module.ts index 3cbd2a6e..d18ed1b5 100644 --- a/src/app/main/content/apps/apps.module.ts +++ b/src/app/main/content/apps/apps.module.ts @@ -3,7 +3,7 @@ import { RouterModule } from '@angular/router'; import { FuseAngularMaterialModule } from '../components/angular-material/angular-material.module'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; const routes = [ { @@ -58,7 +58,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseAngularMaterialModule ], diff --git a/src/app/main/content/apps/calendar/calendar.module.ts b/src/app/main/content/apps/calendar/calendar.module.ts index ab75854a..244fc50a 100644 --- a/src/app/main/content/apps/calendar/calendar.module.ts +++ b/src/app/main/content/apps/calendar/calendar.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { CalendarService } from './calendar.service'; import { CalendarModule } from 'angular-calendar'; @@ -21,7 +21,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), CalendarModule.forRoot() ], diff --git a/src/app/main/content/apps/calendar/event-form/event-form.component.ts b/src/app/main/content/apps/calendar/event-form/event-form.component.ts index 428d5443..0730e7b9 100644 --- a/src/app/main/content/apps/calendar/event-form/event-form.component.ts +++ b/src/app/main/content/apps/calendar/event-form/event-form.component.ts @@ -2,7 +2,7 @@ import { Component, Inject, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; import { CalendarEvent } from 'angular-calendar'; import { CalendarEventModel } from '../event.model'; diff --git a/src/app/main/content/apps/chat/chat.module.ts b/src/app/main/content/apps/chat/chat.module.ts index 71d5f75f..cd4a714c 100644 --- a/src/app/main/content/apps/chat/chat.module.ts +++ b/src/app/main/content/apps/chat/chat.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseChatComponent } from './chat.component'; import { ChatService } from './chat.service'; @@ -26,7 +26,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/chat/chat.service.ts b/src/app/main/content/apps/chat/chat.service.ts index 38a76b02..bbed4ee5 100644 --- a/src/app/main/content/apps/chat/chat.service.ts +++ b/src/app/main/content/apps/chat/chat.service.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; @Injectable() export class ChatService implements Resolve diff --git a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts index 191b0ed8..d2261bfd 100644 --- a/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts +++ b/src/app/main/content/apps/chat/sidenavs/left/chats/chats.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ObservableMedia } from '@angular/flex-layout'; import { fuseAnimations } from '@fuse/animations'; -import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav-helper/fuse-mat-sidenav-helper.service'; +import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service'; import { ChatService } from '../../../chat.service'; diff --git a/src/app/main/content/apps/contacts/contact.model.ts b/src/app/main/content/apps/contacts/contact.model.ts index f23229f4..efc5e687 100644 --- a/src/app/main/content/apps/contacts/contact.model.ts +++ b/src/app/main/content/apps/contacts/contact.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Contact { diff --git a/src/app/main/content/apps/contacts/contacts.module.ts b/src/app/main/content/apps/contacts/contacts.module.ts index 8c93248d..45a02229 100644 --- a/src/app/main/content/apps/contacts/contacts.module.ts +++ b/src/app/main/content/apps/contacts/contacts.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseContactsMainSidenavComponent } from './sidenavs/main/main.component'; import { FuseContactsComponent } from './contacts.component'; @@ -22,7 +22,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations : [ diff --git a/src/app/main/content/apps/contacts/contacts.service.ts b/src/app/main/content/apps/contacts/contacts.service.ts index 80e8ddf7..4b15ab2f 100644 --- a/src/app/main/content/apps/contacts/contacts.service.ts +++ b/src/app/main/content/apps/contacts/contacts.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Subject } from 'rxjs/Subject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Contact } from './contact.model'; diff --git a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts index f1a36f4b..6a5eebf6 100644 --- a/src/app/main/content/apps/dashboards/analytics/analytics.module.ts +++ b/src/app/main/content/apps/dashboards/analytics/analytics.module.ts @@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseAnalyticsDashboardComponent } from './analytics.component'; @@ -23,7 +23,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule, diff --git a/src/app/main/content/apps/dashboards/project/project.module.ts b/src/app/main/content/apps/dashboards/project/project.module.ts index 1909a159..e57c260b 100644 --- a/src/app/main/content/apps/dashboards/project/project.module.ts +++ b/src/app/main/content/apps/dashboards/project/project.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseProjectDashboardComponent } from './project.component'; @@ -21,7 +21,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule diff --git a/src/app/main/content/apps/e-commerce/e-commerce.module.ts b/src/app/main/content/apps/e-commerce/e-commerce.module.ts index ac6763ef..8052f814 100644 --- a/src/app/main/content/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/content/apps/e-commerce/e-commerce.module.ts @@ -4,7 +4,7 @@ import { RouterModule, Routes } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseEcommerceDashboardComponent } from './dashboard/dashboard.component'; @@ -65,7 +65,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, NgxChartsModule, diff --git a/src/app/main/content/apps/e-commerce/order/order.model.ts b/src/app/main/content/apps/e-commerce/order/order.model.ts index 0962ceba..9c2fb68d 100644 --- a/src/app/main/content/apps/e-commerce/order/order.model.ts +++ b/src/app/main/content/apps/e-commerce/order/order.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Order { diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.ts b/src/app/main/content/apps/e-commerce/orders/orders.component.ts index 9a38d88e..a2e23a0b 100644 --- a/src/app/main/content/apps/e-commerce/orders/orders.component.ts +++ b/src/app/main/content/apps/e-commerce/orders/orders.component.ts @@ -11,7 +11,7 @@ import 'rxjs/add/operator/distinctUntilChanged'; import 'rxjs/add/observable/fromEvent'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { EcommerceOrdersService } from './orders.service'; diff --git a/src/app/main/content/apps/e-commerce/product/product.component.ts b/src/app/main/content/apps/e-commerce/product/product.component.ts index 79a7619c..e0049456 100644 --- a/src/app/main/content/apps/e-commerce/product/product.component.ts +++ b/src/app/main/content/apps/e-commerce/product/product.component.ts @@ -11,7 +11,7 @@ import 'rxjs/add/observable/fromEvent'; import { Subscription } from 'rxjs/Subscription'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Product } from './product.model'; import { EcommerceProductService } from './product.service'; diff --git a/src/app/main/content/apps/e-commerce/product/product.model.ts b/src/app/main/content/apps/e-commerce/product/product.model.ts index 4a382b94..a77e2596 100644 --- a/src/app/main/content/apps/e-commerce/product/product.model.ts +++ b/src/app/main/content/apps/e-commerce/product/product.model.ts @@ -1,6 +1,6 @@ import { MatChipInputEvent } from '@angular/material'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Product { diff --git a/src/app/main/content/apps/e-commerce/products/products.component.ts b/src/app/main/content/apps/e-commerce/products/products.component.ts index 329d93fa..a463f200 100644 --- a/src/app/main/content/apps/e-commerce/products/products.component.ts +++ b/src/app/main/content/apps/e-commerce/products/products.component.ts @@ -12,7 +12,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { fuseAnimations } from '@fuse/animations'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { EcommerceProductsService } from './products.service'; diff --git a/src/app/main/content/apps/file-manager/file-manager.module.ts b/src/app/main/content/apps/file-manager/file-manager.module.ts index dc208ca2..5273f344 100644 --- a/src/app/main/content/apps/file-manager/file-manager.module.ts +++ b/src/app/main/content/apps/file-manager/file-manager.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFileManagerComponent } from './file-manager.component'; import { FileManagerService } from './file-manager.service'; @@ -22,7 +22,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/apps/mail-ngrx/mail.module.ts b/src/app/main/content/apps/mail-ngrx/mail.module.ts index 541a39a3..33f79a0a 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/content/apps/mail-ngrx/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailNgrxComponent } from './mail.component'; import { FuseMailNgrxMainSidenavComponent } from './sidenavs/main/main-sidenav.component'; @@ -60,7 +60,7 @@ const routes: Routes = [ FuseMailNgrxComposeDialogComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), MailAppStoreModule ], diff --git a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts index af598b08..27d4c19f 100644 --- a/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts +++ b/src/app/main/content/apps/mail-ngrx/store/selectors/mails.selectors.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { createSelector } from '@ngrx/store'; import { getMailAppState, MailAppState, MailsState } from '../reducers'; diff --git a/src/app/main/content/apps/mail/mail.module.ts b/src/app/main/content/apps/mail/mail.module.ts index 822cd233..e8a506ee 100644 --- a/src/app/main/content/apps/mail/mail.module.ts +++ b/src/app/main/content/apps/mail/mail.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { MailService } from './mail.service'; import { FuseMailComponent } from './mail.component'; @@ -70,7 +70,7 @@ const routes: Routes = [ FuseMailComposeDialogComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/mail/mail.service.ts b/src/app/main/content/apps/mail/mail.service.ts index 826f3df1..c0504eeb 100644 --- a/src/app/main/content/apps/mail/mail.service.ts +++ b/src/app/main/content/apps/mail/mail.service.ts @@ -5,7 +5,7 @@ import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/r import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Mail } from './mail.model'; diff --git a/src/app/main/content/apps/scrumboard/board.model.ts b/src/app/main/content/apps/scrumboard/board.model.ts index bd62d4fe..3f061428 100644 --- a/src/app/main/content/apps/scrumboard/board.model.ts +++ b/src/app/main/content/apps/scrumboard/board.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { List } from './list.model'; import { Card } from './card.model'; diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts index a993766a..95d41eaf 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/card.component.ts @@ -3,8 +3,8 @@ import { NgForm } from '@angular/forms/src/forms'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef, MatMenuTrigger } from '@angular/material'; import { Subscription } from 'rxjs/Subscription'; -import { FuseUtils } from '@fuse/fuseUtils'; import { FuseConfirmDialogComponent } from '@fuse/components/confirm-dialog/confirm-dialog.component'; +import { FuseUtils } from '@fuse/utils'; import { ScrumboardService } from '../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts index 1eb69081..81245553 100644 --- a/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/dialogs/card/label-selector/label-selector.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { FuseUtils } from '@fuse/fuseUtils'; import { fuseAnimations } from '@fuse/animations'; +import { FuseUtils } from '@fuse/utils'; import { ScrumboardService } from '../../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts index 1079eb37..9f7483ab 100644 --- a/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts +++ b/src/app/main/content/apps/scrumboard/board/sidenavs/settings/board-color-selector/board-color-selector.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs/Subscription'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; import { ScrumboardService } from '../../../../scrumboard.service'; diff --git a/src/app/main/content/apps/scrumboard/card.model.ts b/src/app/main/content/apps/scrumboard/card.model.ts index 3b5532d9..ddd84436 100644 --- a/src/app/main/content/apps/scrumboard/card.model.ts +++ b/src/app/main/content/apps/scrumboard/card.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class Card { diff --git a/src/app/main/content/apps/scrumboard/list.model.ts b/src/app/main/content/apps/scrumboard/list.model.ts index a34e8668..44d1fa59 100644 --- a/src/app/main/content/apps/scrumboard/list.model.ts +++ b/src/app/main/content/apps/scrumboard/list.model.ts @@ -1,4 +1,4 @@ -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; export class List { diff --git a/src/app/main/content/apps/scrumboard/scrumboard.module.ts b/src/app/main/content/apps/scrumboard/scrumboard.module.ts index 0fd0f694..0157b9d3 100644 --- a/src/app/main/content/apps/scrumboard/scrumboard.module.ts +++ b/src/app/main/content/apps/scrumboard/scrumboard.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { BoardResolve, ScrumboardService } from './scrumboard.service'; import { FuseScrumboardComponent } from './scrumboard.component'; @@ -54,7 +54,7 @@ const routes: Routes = [ FuseScrumboardBoardColorSelectorComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts index 63516683..f64737e0 100644 --- a/src/app/main/content/apps/todo/todo-details/todo-details.component.ts +++ b/src/app/main/content/apps/todo/todo-details/todo-details.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { fuseAnimations } from '@fuse/animations'; import { Todo } from '../todo.model'; diff --git a/src/app/main/content/apps/todo/todo.module.ts b/src/app/main/content/apps/todo/todo.module.ts index 0761767c..368a9b1b 100644 --- a/src/app/main/content/apps/todo/todo.module.ts +++ b/src/app/main/content/apps/todo/todo.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { TodoService } from './todo.service'; import { FuseTodoComponent } from './todo.component'; @@ -68,7 +68,7 @@ const routes: Routes = [ FuseTodoDetailsComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/apps/todo/todo.service.ts b/src/app/main/content/apps/todo/todo.service.ts index 5738bf5f..0e53ca29 100644 --- a/src/app/main/content/apps/todo/todo.service.ts +++ b/src/app/main/content/apps/todo/todo.service.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { Subject } from 'rxjs/Subject'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { Todo } from './todo.model'; 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 7cbac19e..23d856a3 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseNgxDatatableComponent } from './datatable/ngx-datatable.component'; import { GoogleMapsModule } from './google-maps/google-maps.module'; @@ -15,7 +15,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), GoogleMapsModule ], 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 03fb94cc..e711802e 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 @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { AgmCoreModule } from '@agm/core'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseGoogleMapsDocsComponent } from './google-maps.component'; @@ -15,7 +15,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), AgmCoreModule.forRoot({ apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' 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 35eeaccc..8e28ad98 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,12 +1,14 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; 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 = [ { @@ -22,12 +24,11 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, RouterModule.forChild(routes), - FuseWidgetModule - ], - exports : [ - SharedModule + MaterialModule, + FuseSharedModule, + FuseWidgetModule, + FuseHighlightModule ], entryComponents: EXAMPLE_LIST, declarations : [ diff --git a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts index ace53c29..4ce317b8 100644 --- a/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts +++ b/src/app/main/content/components/angular-material/example-viewer/example-viewer.ts @@ -6,8 +6,8 @@ import 'prismjs/components/prism-typescript'; import { EXAMPLE_COMPONENTS } from '../example-components'; -import { CopierService } from '@fuse/components/copier/copier.service'; import { fuseAnimations } from '@fuse/animations'; +import { FuseCopierService } from '@fuse/services/copier.service'; export interface LiveExample { @@ -21,7 +21,6 @@ export interface LiveExample selector : 'fuse-example-viewer', templateUrl : './example-viewer.html', styleUrls : ['./example-viewer.scss'], - providers : [CopierService], encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) @@ -51,7 +50,7 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy constructor( private snackbar: MatSnackBar, - private copier: CopierService, + private copier: FuseCopierService, private _resolver: ComponentFactoryResolver ) { diff --git a/src/app/main/content/components/angular-material/material.module.ts b/src/app/main/content/components/angular-material/material.module.ts new file mode 100644 index 00000000..36d357c6 --- /dev/null +++ b/src/app/main/content/components/angular-material/material.module.ts @@ -0,0 +1,112 @@ +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/main/content/components/components.module.ts b/src/app/main/content/components/components.module.ts index 30f65c50..82bdd260 100644 --- a/src/app/main/content/components/components.module.ts +++ b/src/app/main/content/components/components.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { FuseAngularMaterialModule } from './angular-material/angular-material.module'; @@ -57,7 +57,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseWidgetModule, FuseAngularMaterialModule, diff --git a/src/app/main/content/content.module.ts b/src/app/main/content/content.module.ts new file mode 100644 index 00000000..f471e0ca --- /dev/null +++ b/src/app/main/content/content.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseContentComponent } from 'app/main/content/content.component'; + +@NgModule({ + declarations: [ + FuseContentComponent + ], + imports : [ + RouterModule, + FuseSharedModule, + ], + exports: [ + FuseContentComponent + ] +}) +export class FuseContentModule +{ +} 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 9c27b063..f04f0d94 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPassword2Component } from './forgot-password-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseForgotPassword2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 50994607..b701cee0 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseForgotPasswordComponent } from './forgot-password.component'; @@ -17,7 +17,7 @@ const routes = [ FuseForgotPasswordComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 8d3e306a..5e796850 100644 --- a/src/app/main/content/pages/authentication/lock/lock.module.ts +++ b/src/app/main/content/pages/authentication/lock/lock.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLockComponent } from './lock.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLockComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 91d187dd..1e988755 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLogin2Component } from './login-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLogin2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 4679c403..2fcf6ecb 100644 --- a/src/app/main/content/pages/authentication/login/login.module.ts +++ b/src/app/main/content/pages/authentication/login/login.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseLoginComponent } from './login.component'; @@ -17,7 +17,7 @@ const routes = [ FuseLoginComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 a030c648..9916a0d9 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMailConfirmComponent } from './mail-confirm.component'; @@ -17,7 +17,7 @@ const routes = [ FuseMailConfirmComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 58ab0837..6beb5b24 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegister2Component } from './register-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseRegister2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 ffa07aeb..e330153e 100644 --- a/src/app/main/content/pages/authentication/register/register.module.ts +++ b/src/app/main/content/pages/authentication/register/register.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseRegisterComponent } from './register.component'; @@ -17,7 +17,7 @@ const routes = [ FuseRegisterComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 6f536d7c..cce11b14 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPassword2Component } from './reset-password-2.component'; @@ -17,7 +17,7 @@ const routes = [ FuseResetPassword2Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 eea63226..60ea7781 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseResetPasswordComponent } from './reset-password.component'; @@ -17,7 +17,7 @@ const routes = [ FuseResetPasswordComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 8d4c1617..0f9b1a0f 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,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseComingSoonComponent } from './coming-soon.component'; @@ -17,7 +17,7 @@ const routes = [ FuseComingSoonComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 df632b11..77da500d 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError404Component } from './error-404.component'; @@ -17,7 +17,7 @@ const routes = [ FuseError404Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) 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 e1077394..909ce8da 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 @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseError500Component } from './error-500.component'; @@ -17,7 +17,7 @@ const routes = [ FuseError500Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/faq/faq.component.ts b/src/app/main/content/pages/faq/faq.component.ts index 0e288a4e..81925d2d 100644 --- a/src/app/main/content/pages/faq/faq.component.ts +++ b/src/app/main/content/pages/faq/faq.component.ts @@ -4,7 +4,7 @@ import { Subscription } from 'rxjs/Subscription'; import 'rxjs/add/operator/debounceTime'; import 'rxjs/add/operator/distinctUntilChanged'; -import { FuseUtils } from '@fuse/fuseUtils'; +import { FuseUtils } from '@fuse/utils'; import { FaqService } from './faq.service'; diff --git a/src/app/main/content/pages/faq/faq.module.ts b/src/app/main/content/pages/faq/faq.module.ts index fe5dec69..70268e65 100644 --- a/src/app/main/content/pages/faq/faq.module.ts +++ b/src/app/main/content/pages/faq/faq.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FaqService } from './faq.service'; import { FuseFaqComponent } from './faq.component'; @@ -21,7 +21,7 @@ const routes = [ FuseFaqComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 0332cd32..02c575ae 100644 --- a/src/app/main/content/pages/invoices/compact/compact.module.ts +++ b/src/app/main/content/pages/invoices/compact/compact.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { InvoiceService } from '../invoice.service'; import { FuseInvoiceCompactComponent } from './compact.component'; @@ -21,7 +21,7 @@ const routes = [ FuseInvoiceCompactComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 c968173f..f86c6abc 100644 --- a/src/app/main/content/pages/invoices/modern/modern.module.ts +++ b/src/app/main/content/pages/invoices/modern/modern.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { InvoiceService } from '../invoice.service'; import { FuseInvoiceModernComponent } from './modern.component'; @@ -21,7 +21,7 @@ const routes = [ FuseInvoiceModernComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ 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 367709a2..0fed4168 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { KnowledgeBaseService } from './knowledge-base.service'; import { FuseKnowledgeBaseComponent } from './knowledge-base.component'; @@ -23,7 +23,7 @@ const routes = [ FuseKnowledgeBaseArticleComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/pages/maintenance/maintenence.module.ts b/src/app/main/content/pages/maintenance/maintenence.module.ts index 732b7e1f..b0bf2d05 100644 --- a/src/app/main/content/pages/maintenance/maintenence.module.ts +++ b/src/app/main/content/pages/maintenance/maintenence.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseMaintenanceComponent } from './maintenance.component'; @@ -17,7 +17,7 @@ const routes = [ FuseMaintenanceComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/pricing/pricing.module.ts b/src/app/main/content/pages/pricing/pricing.module.ts index b002e135..0ccd5239 100644 --- a/src/app/main/content/pages/pricing/pricing.module.ts +++ b/src/app/main/content/pages/pricing/pricing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FusePricingStyle1Component } from './style-1/style-1.component'; import { FusePricingStyle2Component } from './style-2/style-2.component'; @@ -29,7 +29,7 @@ const routes = [ FusePricingStyle3Component ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ] }) diff --git a/src/app/main/content/pages/profile/profile.module.ts b/src/app/main/content/pages/profile/profile.module.ts index 2d39909c..6a90bc0e 100644 --- a/src/app/main/content/pages/profile/profile.module.ts +++ b/src/app/main/content/pages/profile/profile.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { ProfileService } from './profile.service'; import { FuseProfileComponent } from './profile.component'; @@ -27,7 +27,7 @@ const routes = [ FuseProfilePhotosVideosComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/pages/search/search.module.ts b/src/app/main/content/pages/search/search.module.ts index 7e47b1da..52c6fb29 100644 --- a/src/app/main/content/pages/search/search.module.ts +++ b/src/app/main/content/pages/search/search.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { SearchService } from './search.service'; import { FuseSearchClassicComponent } from './tabs/classic/classic.component'; @@ -25,7 +25,7 @@ const routes = [ FuseSearchTableComponent ], imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], providers : [ diff --git a/src/app/main/content/services/services.module.ts b/src/app/main/content/services/services.module.ts index bd006620..7d27ed4c 100644 --- a/src/app/main/content/services/services.module.ts +++ b/src/app/main/content/services/services.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseConfigServiceDocsComponent } from './config/config.component'; import { FuseSplashScreenServiceDocsComponent } from './splash-screen/splash-screen.component'; @@ -19,7 +19,7 @@ const routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/ui/colors/colors.component.ts b/src/app/main/content/ui/colors/colors.component.ts index 5e6c3025..65a38fe9 100644 --- a/src/app/main/content/ui/colors/colors.component.ts +++ b/src/app/main/content/ui/colors/colors.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { MatColors } from '@fuse/matColors'; +import { MatColors } from '@fuse/mat-colors'; @Component({ selector : 'fuse-colors', diff --git a/src/app/main/content/ui/colors/colors.module.ts b/src/app/main/content/ui/colors/colors.module.ts index 51fb3525..f3023d8d 100644 --- a/src/app/main/content/ui/colors/colors.module.ts +++ b/src/app/main/content/ui/colors/colors.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; import { FuseColorsComponent } from './colors.component'; @@ -15,7 +15,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseDemoModule ], diff --git a/src/app/main/content/ui/forms/forms.module.ts b/src/app/main/content/ui/forms/forms.module.ts index 04a6a257..5dd4855d 100644 --- a/src/app/main/content/ui/forms/forms.module.ts +++ b/src/app/main/content/ui/forms/forms.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseFormsComponent } from './forms.component'; @@ -14,7 +14,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ 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 bb098647..d1a1e095 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,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHelperClassesComponent } from './helper-classes.component'; import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; @@ -16,7 +16,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/content/ui/icons/icons.module.ts b/src/app/main/content/ui/icons/icons.module.ts index 061fe136..afc8dcd5 100644 --- a/src/app/main/content/ui/icons/icons.module.ts +++ b/src/app/main/content/ui/icons/icons.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseIconsComponent } from './icons.component'; @@ -14,7 +14,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ 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 1916eb4e..28622935 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,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; import { FuseCardedFullWidthComponent } from './carded/fullwidth/fullwidth.component'; @@ -105,7 +105,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes), FuseDemoModule ], diff --git a/src/app/main/content/ui/typography/typography.module.ts b/src/app/main/content/ui/typography/typography.module.ts index 0a025966..790b019b 100644 --- a/src/app/main/content/ui/typography/typography.module.ts +++ b/src/app/main/content/ui/typography/typography.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SharedModule } from '@fuse/modules/shared.module'; +import { FuseSharedModule } from '@fuse/shared.module'; import { FuseTypographyComponent } from './typography.component'; import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; @@ -18,7 +18,7 @@ const routes: Routes = [ @NgModule({ imports : [ - SharedModule, + FuseSharedModule, RouterModule.forChild(routes) ], declarations: [ diff --git a/src/app/main/footer/footer.module.ts b/src/app/main/footer/footer.module.ts new file mode 100644 index 00000000..a7c26d66 --- /dev/null +++ b/src/app/main/footer/footer.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatButtonModule, MatIconModule, MatToolbarModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseFooterComponent } from 'app/main/footer/footer.component'; + +@NgModule({ + declarations: [ + FuseFooterComponent + ], + imports : [ + RouterModule, + + MatButtonModule, + MatIconModule, + MatToolbarModule, + + FuseSharedModule + ], + exports : [ + FuseFooterComponent + ] +}) +export class FuseFooterModule +{ +} diff --git a/src/app/main/main.module.ts b/src/app/main/main.module.ts index 14d25778..f7c03c72 100644 --- a/src/app/main/main.module.ts +++ b/src/app/main/main.module.ts @@ -1,44 +1,46 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { MatSidenavModule } from '@angular/material'; -import { SharedModule } from '@fuse/modules/shared.module'; -import { FuseNavigationModule } from '@fuse/components/navigation/navigation.module'; -import { FuseThemeOptionsComponent } from '@fuse/components/theme-options/theme-options.component'; -import { FuseShortcutsModule } from '@fuse/components/shortcuts/shortcuts.module'; -import { FuseSearchBarModule } from '@fuse/components/search-bar/search-bar.module'; +import { FuseSharedModule } from '@fuse/shared.module'; +import { FuseNavigationModule, FuseSearchBarModule, FuseShortcutsModule, FuseSidebarModule, FuseThemeOptionsModule } from '@fuse/components'; + +import { FuseContentModule } from 'app/main/content/content.module'; +import { FuseFooterModule } from 'app/main/footer/footer.module'; +import { FuseNavbarModule } from 'app/main/navbar/navbar.module'; +import { FuseQuickPanelModule } from 'app/main/quick-panel/quick-panel.module'; +import { FuseToolbarModule } from 'app/main/toolbar/toolbar.module'; import { FuseMainComponent } from './main.component'; -import { FuseContentComponent } from './content/content.component'; -import { FuseFooterComponent } from './footer/footer.component'; -import { FuseNavbarComponent } from './navbar/navbar.component'; -import { FuseToolbarComponent } from './toolbar/toolbar.component'; -import { FuseQuickPanelComponent } from './quick-panel/quick-panel.component'; -import { FuseSidebarModule } from '@fuse/components/sidebar/sidebar.module'; @NgModule({ declarations: [ - FuseContentComponent, - FuseFooterComponent, FuseMainComponent, - FuseNavbarComponent, - FuseToolbarComponent, - FuseThemeOptionsComponent, - FuseQuickPanelComponent ], imports : [ - SharedModule, RouterModule, - FuseSidebarModule, + + MatSidenavModule, + + FuseSharedModule, + + FuseThemeOptionsModule, FuseNavigationModule, + FuseSearchBarModule, FuseShortcutsModule, - FuseSearchBarModule + FuseSidebarModule, + + FuseContentModule, + FuseFooterModule, + FuseNavbarModule, + FuseQuickPanelModule, + FuseToolbarModule, ], exports : [ FuseMainComponent ] }) - export class FuseMainModule { } diff --git a/src/app/main/navbar/navbar.module.ts b/src/app/main/navbar/navbar.module.ts new file mode 100644 index 00000000..886c6558 --- /dev/null +++ b/src/app/main/navbar/navbar.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatIconModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseNavbarComponent } from 'app/main/navbar/navbar.component'; +import { FuseNavigationModule } from '@fuse/components'; + +@NgModule({ + declarations: [ + FuseNavbarComponent + ], + imports : [ + RouterModule, + + MatIconModule, + + FuseSharedModule, + FuseNavigationModule + ], + exports : [ + FuseNavbarComponent + ] +}) +export class FuseNavbarModule +{ +} diff --git a/src/app/main/quick-panel/quick-panel.module.ts b/src/app/main/quick-panel/quick-panel.module.ts new file mode 100644 index 00000000..716461e3 --- /dev/null +++ b/src/app/main/quick-panel/quick-panel.module.ts @@ -0,0 +1,28 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatDividerModule, MatListModule, MatSlideToggleModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseQuickPanelComponent } from 'app/main/quick-panel/quick-panel.component'; + +@NgModule({ + declarations: [ + FuseQuickPanelComponent + ], + imports : [ + RouterModule, + + MatDividerModule, + MatListModule, + MatSlideToggleModule, + + FuseSharedModule, + ], + exports: [ + FuseQuickPanelComponent + ] +}) +export class FuseQuickPanelModule +{ +} diff --git a/src/app/main/toolbar/toolbar.module.ts b/src/app/main/toolbar/toolbar.module.ts new file mode 100644 index 00000000..e7edb246 --- /dev/null +++ b/src/app/main/toolbar/toolbar.module.ts @@ -0,0 +1,32 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material'; + +import { FuseSharedModule } from '@fuse/shared.module'; + +import { FuseToolbarComponent } from 'app/main/toolbar/toolbar.component'; +import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components'; + +@NgModule({ + declarations: [ + FuseToolbarComponent + ], + imports : [ + RouterModule, + + MatIconModule, + MatMenuModule, + MatProgressBarModule, + MatToolbarModule, + + FuseSharedModule, + FuseSearchBarModule, + FuseShortcutsModule + ], + exports : [ + FuseToolbarComponent + ] +}) +export class FuseToolbarModule +{ +} diff --git a/src/@fuse/modules/shared.module.ts b/src/app/shared/shared.module.ts similarity index 98% rename from src/@fuse/modules/shared.module.ts rename to src/app/shared/shared.module.ts index ec121b3d..44fd2cd3 100644 --- a/src/@fuse/modules/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -1,3 +1,4 @@ +/* import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; @@ -36,7 +37,6 @@ import { ChartsModule } from 'ng2-charts'; ], imports : [ FlexLayoutModule, - MaterialModule, CommonModule, FormsModule, FusePipesModule, @@ -48,7 +48,6 @@ import { ChartsModule } from 'ng2-charts'; ], exports : [ FlexLayoutModule, - MaterialModule, CommonModule, FormsModule, FuseMatSidenavHelperDirective, @@ -81,3 +80,4 @@ export class SharedModule { } +*/