diff --git a/src/app/@theme/components/footer/footer.component.ts b/src/app/@theme/components/footer/footer.component.ts index cf25d6c4..f16cf965 100644 --- a/src/app/@theme/components/footer/footer.component.ts +++ b/src/app/@theme/components/footer/footer.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ - selector: 'footer', + selector: 'ngx-footer', styleUrls: ['./footer.component.scss'], template: ` Created with ♥ by Akveo 2017 diff --git a/src/app/@theme/components/header/header.component.ts b/src/app/@theme/components/header/header.component.ts index bdbfbda3..20049326 100644 --- a/src/app/@theme/components/header/header.component.ts +++ b/src/app/@theme/components/header/header.component.ts @@ -4,7 +4,7 @@ import { NgaSidebarService, NgaMenuService } from '@nga/theme'; import { NgaThemeService } from '@nga/theme/services/theme.service'; @Component({ - selector: 'header', + selector: 'ngx-header', styleUrls: ['./header.component.scss'], template: `
@@ -14,7 +14,7 @@ import { NgaThemeService } from '@nga/theme/services/theme.service';
- + diff --git a/src/app/@theme/components/index.ts b/src/app/@theme/components/index.ts index 7f4d0426..f845745b 100644 --- a/src/app/@theme/components/index.ts +++ b/src/app/@theme/components/index.ts @@ -1,3 +1,4 @@ export * from './header/header.component'; export * from './footer/footer.component'; -export * from '../components/search-input/search-input.component'; +export * from './search-input/search-input.component'; +export * from './tiny-mce/time-mce.component'; diff --git a/src/app/@theme/components/search-input/search-input.component.ts b/src/app/@theme/components/search-input/search-input.component.ts index d70c22e3..f6b12f4b 100644 --- a/src/app/@theme/components/search-input/search-input.component.ts +++ b/src/app/@theme/components/search-input/search-input.component.ts @@ -1,7 +1,7 @@ import { Component, ElementRef, EventEmitter, Output, ViewChild } from '@angular/core'; @Component({ - selector: 'search-input', + selector: 'ngx-search-input', styleUrls: ['./search-input.component.scss'], template: ` (); + + editor: any; + + constructor(private host: ElementRef) { } + + ngAfterViewInit() { + tinymce.init({ + target: this.host.nativeElement, + plugins: ['link', 'paste', 'table'], + skin_url: 'assets/skins/lightgray', + setup: editor => { + this.editor = editor; + editor.on('keyup', () => { + let content = editor.getContent(); + this.editorKeyup.emit(content); + }); + }, + }); + } + + ngOnDestroy() { + tinymce.remove(this.editor); + } +} diff --git a/src/app/@theme/layouts/one-column/one-column.layout.ts b/src/app/@theme/layouts/one-column/one-column.layout.ts index bb7814d0..37a0902a 100644 --- a/src/app/@theme/layouts/one-column/one-column.layout.ts +++ b/src/app/@theme/layouts/one-column/one-column.layout.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; template: ` -
+ @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; -
+ `, diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts index 6a5cd57b..e033ecfa 100644 --- a/src/app/@theme/theme.module.ts +++ b/src/app/@theme/theme.module.ts @@ -13,7 +13,13 @@ import { NgaActionsModule, } from '@nga/theme'; -import { SearchInputComponent, HeaderComponent, FooterComponent } from './components'; +import { + HeaderComponent, + FooterComponent, + SearchInputComponent, + TinyMCEComponent +} from './components'; + import { OneColumnLayoutComponent } from './layouts'; const BASE_MODULES = [ @@ -36,12 +42,8 @@ const COMPONENTS = [ HeaderComponent, FooterComponent, SearchInputComponent, -]; - -const LAYOUTS = [ + TinyMCEComponent, OneColumnLayoutComponent, - HeaderComponent, - FooterComponent, ]; @NgModule({ @@ -54,11 +56,9 @@ const LAYOUTS = [ ...BASE_MODULES, ...NGA_MODULES, ...COMPONENTS, - ...LAYOUTS, ], declarations: [ ...COMPONENTS, - ...LAYOUTS, ], }) export class ThemeModule { diff --git a/src/app/pages/charts/charts.component.ts b/src/app/pages/charts/charts.component.ts index 6b983b05..f908311f 100644 --- a/src/app/pages/charts/charts.component.ts +++ b/src/app/pages/charts/charts.component.ts @@ -6,5 +6,5 @@ import { Component } from '@angular/core';

charts work!

`, }) -export class NgxChartsComponent { +export class ChartsComponent { } diff --git a/src/app/pages/editors/ckeditor.component.ts b/src/app/pages/editors/ckeditor.component.ts index c1e4ad56..8c7b926e 100644 --- a/src/app/pages/editors/ckeditor.component.ts +++ b/src/app/pages/editors/ckeditor.component.ts @@ -20,6 +20,6 @@ import 'ckeditor'; `, }) -export class NgxCKEditorComponent { +export class CKEditorComponent { } diff --git a/src/app/pages/editors/ckeditor/ckeditor.component.ts b/src/app/pages/editors/ckeditor/ckeditor.component.ts new file mode 100644 index 00000000..3b3b670b --- /dev/null +++ b/src/app/pages/editors/ckeditor/ckeditor.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + +import './ckeditor.loader'; +import 'ckeditor'; + +@Component({ + selector: 'ngx-ckeditor', + template: ` + + + + + + `, +}) +export class CKEditorComponent { +} diff --git a/src/app/pages/editors/ckeditor/ckeditor.loader.ts b/src/app/pages/editors/ckeditor/ckeditor.loader.ts new file mode 100644 index 00000000..82322698 --- /dev/null +++ b/src/app/pages/editors/ckeditor/ckeditor.loader.ts @@ -0,0 +1 @@ +window['CKEDITOR_BASEPATH'] = '//cdn.ckeditor.com/4.6.2/full-all/'; diff --git a/src/app/pages/editors/editors-routing.module.ts b/src/app/pages/editors/editors-routing.module.ts index 3f9d6a85..81dfa514 100644 --- a/src/app/pages/editors/editors-routing.module.ts +++ b/src/app/pages/editors/editors-routing.module.ts @@ -1,19 +1,19 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { NgxEditorsComponent } from './editors.component'; -import { NgxTinyMCEComponent, NgxTinyMCEEditorComponent } from './tinyMCE.component'; -import { NgxCKEditorComponent } from './ckeditor.component'; +import { EditorsComponent } from './editors.component'; +import { TinyMCEComponent, TinyMCEEditorComponent } from './tinyMCE.component'; +import { CKEditorComponent } from './ckeditor.component'; const routes: Routes = [{ path: '', - component: NgxEditorsComponent, + component: EditorsComponent, children: [{ path: 'tinymce', - component: NgxTinyMCEComponent, + component: TinyMCEComponent, }, { path: 'ckeditor', - component: NgxCKEditorComponent, + component: CKEditorComponent, }], }]; @@ -21,11 +21,11 @@ const routes: Routes = [{ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class NgxEditorsRoutingModule { } +export class EditorsRoutingModule { } export const routedComponents = [ - NgxEditorsComponent, - NgxTinyMCEComponent, - NgxTinyMCEEditorComponent, - NgxCKEditorComponent, + EditorsComponent, + TinyMCEComponent, + TinyMCEEditorComponent, + CKEditorComponent, ]; diff --git a/src/app/pages/editors/editors.component.ts b/src/app/pages/editors/editors.component.ts index 6b6ecacb..2c176c13 100644 --- a/src/app/pages/editors/editors.component.ts +++ b/src/app/pages/editors/editors.component.ts @@ -6,6 +6,6 @@ import { Component } from '@angular/core'; `, }) -export class NgxEditorsComponent { +export class EditorsComponent { } diff --git a/src/app/pages/editors/editors.module.ts b/src/app/pages/editors/editors.module.ts index 2322b7d2..a342545c 100644 --- a/src/app/pages/editors/editors.module.ts +++ b/src/app/pages/editors/editors.module.ts @@ -1,18 +1,20 @@ import { NgModule } from '@angular/core'; import { CKEditorModule } from 'ng2-ckeditor'; -import { NgxSharedModule } from '../../@shared/shared.module'; +import { SharedModule } from '../../shared.module'; +import { ThemeModule } from '../../@theme/theme.module'; -import { NgxEditorsRoutingModule, routedComponents } from './editors-routing.module'; +import { EditorsRoutingModule, routedComponents } from './editors-routing.module'; @NgModule({ imports: [ - NgxSharedModule, - NgxEditorsRoutingModule, + SharedModule, + ThemeModule, + EditorsRoutingModule, CKEditorModule, ], declarations: [ ...routedComponents, ], }) -export class NgxEditorsModule { } +export class EditorsModule { } diff --git a/src/app/pages/editors/tiny-mce/tiny-mce.component.ts b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts new file mode 100644 index 00000000..3fd7b99c --- /dev/null +++ b/src/app/pages/editors/tiny-mce/tiny-mce.component.ts @@ -0,0 +1,18 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'ngx-tiny-mce-page', + template: ` + + + + + + `, +}) +export class TinyMCEComponent { + + editorKeyup($event) { + console.info('keyup', $event); + } +} diff --git a/src/app/pages/editors/tinyMCE.component.ts b/src/app/pages/editors/tinyMCE.component.ts index c2ba8871..d94dfb63 100644 --- a/src/app/pages/editors/tinyMCE.component.ts +++ b/src/app/pages/editors/tinyMCE.component.ts @@ -6,7 +6,7 @@ import { Component, OnDestroy, AfterViewInit, Input, Output, EventEmitter } from `, }) -export class NgxTinyMCEEditorComponent implements OnDestroy, AfterViewInit { +export class TinyMCEEditorComponent implements OnDestroy, AfterViewInit { @Input() elementId: string; @@ -47,7 +47,7 @@ export class NgxTinyMCEEditorComponent implements OnDestroy, AfterViewInit { `, }) -export class NgxTinyMCEComponent { +export class TinyMCEComponent { editorKeyupHandler($event) { console.info($event); diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.ts b/src/app/pages/forms/form-inputs/form-inputs.component.ts index 202240d7..8944204d 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.ts +++ b/src/app/pages/forms/form-inputs/form-inputs.component.ts @@ -4,7 +4,7 @@ import { Component } from '@angular/core'; selector: 'ngx-form-inputs', templateUrl: './form-inputs.component.html', }) -export class NgxFormInputsComponent { +export class FormInputsComponent { rate1: number = 3; rate2: number = 4; diff --git a/src/app/pages/forms/form-layouts/form-layouts.component.ts b/src/app/pages/forms/form-layouts/form-layouts.component.ts index 69fbb583..aab7e4b6 100644 --- a/src/app/pages/forms/form-layouts/form-layouts.component.ts +++ b/src/app/pages/forms/form-layouts/form-layouts.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-form-layouts', templateUrl: './form-layouts.component.html', }) -export class NgxFormLayoutsComponent { +export class FormLayoutsComponent { } diff --git a/src/app/pages/forms/forms-routing.module.ts b/src/app/pages/forms/forms-routing.module.ts index 89293644..2ce66ace 100644 --- a/src/app/pages/forms/forms-routing.module.ts +++ b/src/app/pages/forms/forms-routing.module.ts @@ -1,19 +1,19 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { NgxFormsComponent } from './forms.component'; -import { NgxFormInputsComponent } from './form-inputs/form-inputs.component'; -import { NgxFormLayoutsComponent } from './form-layouts/form-layouts.component'; +import { FormsComponent } from './forms.component'; +import { FormInputsComponent } from './form-inputs/form-inputs.component'; +import { FormLayoutsComponent } from './form-layouts/form-layouts.component'; const routes: Routes = [{ path: '', - component: NgxFormsComponent, + component: FormsComponent, children: [{ path: 'inputs', - component: NgxFormInputsComponent, + component: FormInputsComponent, }, { path: 'layouts', - component: NgxFormLayoutsComponent, + component: FormLayoutsComponent, }], }]; @@ -25,12 +25,12 @@ const routes: Routes = [{ RouterModule, ], }) -export class NgxFormsRoutingModule { +export class FormsRoutingModule { } export const routedComponents = [ - NgxFormsComponent, - NgxFormInputsComponent, - NgxFormLayoutsComponent, + FormsComponent, + FormInputsComponent, + FormLayoutsComponent, ]; diff --git a/src/app/pages/forms/forms.component.ts b/src/app/pages/forms/forms.component.ts index 64eb5e47..66202993 100644 --- a/src/app/pages/forms/forms.component.ts +++ b/src/app/pages/forms/forms.component.ts @@ -6,6 +6,6 @@ import { Component } from '@angular/core'; `, }) -export class NgxFormsComponent { +export class FormsComponent { } diff --git a/src/app/pages/forms/forms.module.ts b/src/app/pages/forms/forms.module.ts index 8f2096a4..c365c4aa 100644 --- a/src/app/pages/forms/forms.module.ts +++ b/src/app/pages/forms/forms.module.ts @@ -1,16 +1,16 @@ import { NgModule } from '@angular/core'; -import { NgxSharedModule } from '../../@shared/shared.module'; +import { SharedModule } from '../../shared.module'; -import { NgxFormsRoutingModule, routedComponents } from './forms-routing.module'; +import { FormsRoutingModule, routedComponents } from './forms-routing.module'; @NgModule({ imports: [ - NgxSharedModule, - NgxFormsRoutingModule, + SharedModule, + FormsRoutingModule, ], declarations: [ ...routedComponents, ], }) -export class NgxFormsModule { } +export class FormsModule { } diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index 5dd88766..e3a34b9a 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -5,8 +5,7 @@ import { PagesComponent } from './pages.component'; import { DashboardComponent } from './dashboard/dashboard.component'; import { ComponentsComponent } from './components/components.component'; import { MapsComponent } from './maps/maps.component'; -import { NgxChartsComponent } from './charts/charts.component'; -import { NgxEditorsComponent } from './editors/editors.component'; +import { ChartsComponent } from './charts/charts.component'; const routes: Routes = [{ path: '', @@ -16,7 +15,7 @@ const routes: Routes = [{ component: DashboardComponent, }, { path: 'ui-features', - loadChildren: './ui-features/ui-features.module#NgxUiFeaturesModule', + loadChildren: './ui-features/ui-features.module#UiFeaturesModule', }, { path: 'components', component: ComponentsComponent, @@ -25,13 +24,13 @@ const routes: Routes = [{ component: MapsComponent, }, { path: 'charts', - component: NgxChartsComponent, + component: ChartsComponent, }, { path: 'editors', - loadChildren: './editors/editors.module#NgxEditorsModule', + loadChildren: './editors/editors.module#EditorsModule', }, { path: 'forms', - loadChildren: './forms/forms.module#NgxFormsModule', + loadChildren: './forms/forms.module#FormsModule', }, { path: '', redirectTo: 'dashboard', diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 48f62e29..f2f3a0a4 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -10,14 +10,14 @@ import { PagesRoutingModule } from './pages-routing.module'; import { ThemeModule } from '../@theme/theme.module'; import { MapsComponent } from './maps/maps.component'; import { ComponentsComponent } from './components/components.component'; -import { NgxChartsComponent } from './charts/charts.component'; +import { ChartsComponent } from './charts/charts.component'; const PAGES_COMPONENTS = [ PagesComponent, DashboardComponent, MapsComponent, ComponentsComponent, - NgxChartsComponent, + ChartsComponent, ]; @NgModule({ diff --git a/src/app/pages/ui-features/buttons/buttons.component.ts b/src/app/pages/ui-features/buttons/buttons.component.ts index 5e6f0110..29279917 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.ts +++ b/src/app/pages/ui-features/buttons/buttons.component.ts @@ -5,6 +5,6 @@ import { Component } from '@angular/core'; styleUrls: ['./buttons.component.scss'], templateUrl: './buttons.component.html', }) -export class NgxButtonsComponent { +export class ButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/disabled/disabled.component.ts b/src/app/pages/ui-features/buttons/disabled/disabled.component.ts index 23c9e881..5aaff63d 100644 --- a/src/app/pages/ui-features/buttons/disabled/disabled.component.ts +++ b/src/app/pages/ui-features/buttons/disabled/disabled.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-disabled-buttons', templateUrl: './disabled.component.html', }) -export class NgxDisabledButtonsComponent { +export class DisabledButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/dropdown/dropdown.component.ts b/src/app/pages/ui-features/buttons/dropdown/dropdown.component.ts index 5b4b8e17..2ff4409b 100644 --- a/src/app/pages/ui-features/buttons/dropdown/dropdown.component.ts +++ b/src/app/pages/ui-features/buttons/dropdown/dropdown.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-dropdown-buttons', templateUrl: './dropdown.component.html', }) -export class NgxDropdownButtonsComponent { +export class DropdownButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/flat/flat.component.ts b/src/app/pages/ui-features/buttons/flat/flat.component.ts index d20335b9..c1f0699b 100644 --- a/src/app/pages/ui-features/buttons/flat/flat.component.ts +++ b/src/app/pages/ui-features/buttons/flat/flat.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-flat-buttons', templateUrl: './flat.component.html', }) -export class NgxFlatButtonsComponent { +export class FlatButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/group/group.component.ts b/src/app/pages/ui-features/buttons/group/group.component.ts index 2b8a5d8d..4bb27763 100644 --- a/src/app/pages/ui-features/buttons/group/group.component.ts +++ b/src/app/pages/ui-features/buttons/group/group.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-group-buttons', templateUrl: './group.component.html', }) -export class NgxGroupButtonsComponent { +export class GroupButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/icon/icon.component.ts b/src/app/pages/ui-features/buttons/icon/icon.component.ts index 3e684a62..9263db7e 100644 --- a/src/app/pages/ui-features/buttons/icon/icon.component.ts +++ b/src/app/pages/ui-features/buttons/icon/icon.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-icon-buttons', templateUrl: './icon.component.html', }) -export class NgxIconButtonsComponent { +export class IconButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/large/large.component.ts b/src/app/pages/ui-features/buttons/large/large.component.ts index 4c55b977..758d4204 100644 --- a/src/app/pages/ui-features/buttons/large/large.component.ts +++ b/src/app/pages/ui-features/buttons/large/large.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-large-buttons', templateUrl: './large.component.html', }) -export class NgxLargeButtonsComponent { +export class LargeButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/raised/raised.component.ts b/src/app/pages/ui-features/buttons/raised/raised.component.ts index 09e5dd9e..6aceaea6 100644 --- a/src/app/pages/ui-features/buttons/raised/raised.component.ts +++ b/src/app/pages/ui-features/buttons/raised/raised.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-raised-buttons', templateUrl: './raised.component.html', }) -export class NgxRaisedButtonsComponent { +export class RaisedButtonsComponent { } diff --git a/src/app/pages/ui-features/buttons/sized/sized.component.ts b/src/app/pages/ui-features/buttons/sized/sized.component.ts index d2dba568..01d76665 100644 --- a/src/app/pages/ui-features/buttons/sized/sized.component.ts +++ b/src/app/pages/ui-features/buttons/sized/sized.component.ts @@ -4,6 +4,6 @@ import { Component } from '@angular/core'; selector: 'ngx-sized-buttons', templateUrl: './sized.component.html', }) -export class NgxSizedButtonsComponent { +export class SizedButtonsComponent { } diff --git a/src/app/pages/ui-features/grid/grid.component.ts b/src/app/pages/ui-features/grid/grid.component.ts index 44551673..de95892d 100644 --- a/src/app/pages/ui-features/grid/grid.component.ts +++ b/src/app/pages/ui-features/grid/grid.component.ts @@ -5,6 +5,6 @@ import { Component } from '@angular/core'; styleUrls: ['./grid.component.scss'], templateUrl: './grid.component.html', }) -export class NgxGridComponent { +export class GridComponent { } diff --git a/src/app/pages/ui-features/icons/icons.component.ts b/src/app/pages/ui-features/icons/icons.component.ts index bd48f02a..a1e5e3f7 100644 --- a/src/app/pages/ui-features/icons/icons.component.ts +++ b/src/app/pages/ui-features/icons/icons.component.ts @@ -5,7 +5,7 @@ import { Component, Pipe, PipeTransform } from '@angular/core'; styleUrls: ['./icons.component.scss'], templateUrl: './icons.component.html', }) -export class NgxIconsComponent { +export class IconsComponent { icons = { diff --git a/src/app/pages/ui-features/modals/modal/modal.component.ts b/src/app/pages/ui-features/modals/modal/modal.component.ts index 4a8ecee8..d0042352 100644 --- a/src/app/pages/ui-features/modals/modal/modal.component.ts +++ b/src/app/pages/ui-features/modals/modal/modal.component.ts @@ -5,7 +5,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; selector: 'ngx-modal', templateUrl: './modal.component.html', }) -export class NgxModalComponent { +export class ModalComponent { modalHeader: string; modalContent: string = `Lorem ipsum dolor sit amet, diff --git a/src/app/pages/ui-features/modals/modals.component.ts b/src/app/pages/ui-features/modals/modals.component.ts index f0b10fc5..dd0be64d 100644 --- a/src/app/pages/ui-features/modals/modals.component.ts +++ b/src/app/pages/ui-features/modals/modals.component.ts @@ -1,30 +1,30 @@ import { Component } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { NgxModalComponent } from './modal/modal.component'; +import { ModalComponent } from './modal/modal.component'; @Component({ selector: 'ngx-modals', styleUrls: ['./modals.component.scss'], templateUrl: './modals.component.html', }) -export class NgxModalsComponent { +export class ModalsComponent { constructor(private modalService: NgbModal) { } showLargeModal() { - const activeModal = this.modalService.open(NgxModalComponent, { size: 'lg' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'lg' }); activeModal.componentInstance.modalHeader = 'Large Modal'; } showSmallModal() { - const activeModal = this.modalService.open(NgxModalComponent, { size: 'sm' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'sm' }); activeModal.componentInstance.modalHeader = 'Small Modal'; } showStaticModal() { - const activeModal = this.modalService.open(NgxModalComponent, { + const activeModal = this.modalService.open(ModalComponent, { size: 'sm', backdrop: 'static', }); diff --git a/src/app/pages/ui-features/ui-features-routing.module.ts b/src/app/pages/ui-features/ui-features-routing.module.ts index 2329e26b..30e98e94 100644 --- a/src/app/pages/ui-features/ui-features-routing.module.ts +++ b/src/app/pages/ui-features/ui-features-routing.module.ts @@ -1,35 +1,27 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { NgxUiFeaturesComponent } from './ui-features.component'; -import { NgxButtonsComponent } from './buttons/buttons.component'; -import { NgxGridComponent } from './grid/grid.component'; -import { NgxIconsComponent } from './icons/icons.component'; -import { NgxModalsComponent } from './modals/modals.component'; -import { NgxFlatButtonsComponent } from './buttons/flat/flat.component'; -import { NgxRaisedButtonsComponent } from './buttons/raised/raised.component'; -import { NgxSizedButtonsComponent } from './buttons/sized/sized.component'; -import { NgxDisabledButtonsComponent } from './buttons/disabled/disabled.component'; -import { NgxIconButtonsComponent } from './buttons/icon/icon.component'; -import { NgxDropdownButtonsComponent } from './buttons/dropdown/dropdown.component'; -import { NgxLargeButtonsComponent } from './buttons/large/large.component'; -import { NgxGroupButtonsComponent } from './buttons/group/group.component'; +import { UiFeaturesComponent } from './ui-features.component'; +import { ButtonsComponent } from './buttons/buttons.component'; +import { GridComponent } from './grid/grid.component'; +import { IconsComponent } from './icons/icons.component'; +import { ModalsComponent } from './modals/modals.component'; const routes: Routes = [{ path: '', - component: NgxUiFeaturesComponent, + component: UiFeaturesComponent, children: [{ path: 'buttons', - component: NgxButtonsComponent, + component: ButtonsComponent, }, { path: 'grid', - component: NgxGridComponent, + component: GridComponent, }, { path: 'icons', - component: NgxIconsComponent, + component: IconsComponent, }, { path: 'modals', - component: NgxModalsComponent, + component: ModalsComponent, }], }]; @@ -37,4 +29,4 @@ const routes: Routes = [{ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class NgxUiFeaturesRoutingModule { } +export class UiFeaturesRoutingModule { } diff --git a/src/app/pages/ui-features/ui-features.component.ts b/src/app/pages/ui-features/ui-features.component.ts index 79e58f0d..02887154 100644 --- a/src/app/pages/ui-features/ui-features.component.ts +++ b/src/app/pages/ui-features/ui-features.component.ts @@ -6,5 +6,5 @@ import { Component } from '@angular/core'; `, }) -export class NgxUiFeaturesComponent { +export class UiFeaturesComponent { } diff --git a/src/app/pages/ui-features/ui-features.module.ts b/src/app/pages/ui-features/ui-features.module.ts index 77616fe0..21d1f15f 100644 --- a/src/app/pages/ui-features/ui-features.module.ts +++ b/src/app/pages/ui-features/ui-features.module.ts @@ -1,50 +1,50 @@ import { NgModule } from '@angular/core'; -import { NgxSharedModule } from '../../@shared/shared.module'; +import { SharedModule } from '../../shared.module'; -import { NgxUiFeaturesRoutingModule } from './ui-features-routing.module'; -import { NgxUiFeaturesComponent } from './ui-features.component'; -import { NgxButtonsComponent } from './buttons/buttons.component'; -import { NgxGridComponent } from './grid/grid.component'; -import { NgxModalsComponent } from './modals/modals.component'; -import { NgxIconsComponent } from './icons/icons.component'; -import { NgxFlatButtonsComponent } from './buttons/flat/flat.component'; -import { NgxRaisedButtonsComponent } from './buttons/raised/raised.component'; -import { NgxSizedButtonsComponent } from './buttons/sized/sized.component'; -import { NgxDisabledButtonsComponent } from './buttons/disabled/disabled.component'; -import { NgxIconButtonsComponent } from './buttons/icon/icon.component'; -import { NgxDropdownButtonsComponent } from './buttons/dropdown/dropdown.component'; -import { NgxGroupButtonsComponent } from './buttons/group/group.component'; -import { NgxLargeButtonsComponent } from './buttons/large/large.component'; -import { NgxModalComponent } from './modals/modal/modal.component'; +import { UiFeaturesRoutingModule } from './ui-features-routing.module'; +import { UiFeaturesComponent } from './ui-features.component'; +import { ButtonsComponent } from './buttons/buttons.component'; +import { GridComponent } from './grid/grid.component'; +import { ModalsComponent } from './modals/modals.component'; +import { IconsComponent } from './icons/icons.component'; +import { FlatButtonsComponent } from './buttons/flat/flat.component'; +import { RaisedButtonsComponent } from './buttons/raised/raised.component'; +import { SizedButtonsComponent } from './buttons/sized/sized.component'; +import { DisabledButtonsComponent } from './buttons/disabled/disabled.component'; +import { IconButtonsComponent } from './buttons/icon/icon.component'; +import { DropdownButtonsComponent } from './buttons/dropdown/dropdown.component'; +import { GroupButtonsComponent } from './buttons/group/group.component'; +import { LargeButtonsComponent } from './buttons/large/large.component'; +import { ModalComponent } from './modals/modal/modal.component'; -export const NGX_UI_FEATURES_COMPONENTS = [ - NgxUiFeaturesComponent, - NgxButtonsComponent, - NgxGridComponent, - NgxIconsComponent, - NgxModalsComponent, - NgxFlatButtonsComponent, - NgxRaisedButtonsComponent, - NgxSizedButtonsComponent, - NgxDisabledButtonsComponent, - NgxIconButtonsComponent, - NgxDropdownButtonsComponent, - NgxLargeButtonsComponent, - NgxGroupButtonsComponent, - NgxModalComponent, +const COMPONENTS = [ + UiFeaturesComponent, + ButtonsComponent, + GridComponent, + ModalsComponent, + IconsComponent, + FlatButtonsComponent, + RaisedButtonsComponent, + SizedButtonsComponent, + DisabledButtonsComponent, + IconButtonsComponent, + DropdownButtonsComponent, + GroupButtonsComponent, + LargeButtonsComponent, + ModalComponent, ]; @NgModule({ imports: [ - NgxSharedModule, - NgxUiFeaturesRoutingModule, + SharedModule, + UiFeaturesRoutingModule, ], declarations: [ - ...NGX_UI_FEATURES_COMPONENTS, + ...COMPONENTS, ], entryComponents: [ - NgxModalComponent, + ModalComponent, ], }) -export class NgxUiFeaturesModule { } +export class UiFeaturesModule { } diff --git a/src/app/@shared/shared.module.ts b/src/app/shared.module.ts similarity index 92% rename from src/app/@shared/shared.module.ts rename to src/app/shared.module.ts index e0984ce7..ec7f4b52 100644 --- a/src/app/@shared/shared.module.ts +++ b/src/app/shared.module.ts @@ -14,4 +14,4 @@ import { NgaCardModule, NgaBootstrapModule } from '@nga/theme'; NgaBootstrapModule, ], }) -export class NgxSharedModule { } +export class SharedModule { }