Browse Source

UI Dialog service refactoring

pull/2411/head
Igor Kulikov 7 years ago
parent
commit
1edf87336d
  1. 8
      ui-ngx/src/app/core/core.module.ts
  2. 6
      ui-ngx/src/app/core/services/dialog.service.ts
  3. 0
      ui-ngx/src/app/shared/components/dialog/alert-dialog.component.html
  4. 0
      ui-ngx/src/app/shared/components/dialog/alert-dialog.component.scss
  5. 0
      ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
  6. 0
      ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html
  7. 0
      ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.scss
  8. 0
      ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
  9. 0
      ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html
  10. 0
      ui-ngx/src/app/shared/components/dialog/todo-dialog.component.scss
  11. 0
      ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts
  12. 6
      ui-ngx/src/app/shared/shared.module.ts

8
ui-ngx/src/app/core/core.module.ts

@ -35,12 +35,9 @@ import { TbMissingTranslationHandler } from './translate/missing-translate-handl
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
import { FlexLayoutModule } from '@angular/flex-layout';
import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler';
import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';
import { WINDOW_PROVIDERS } from '@core/services/window.service';
import {TodoDialogComponent} from '@core/services/dialog/todo-dialog.component';
import { HotkeyModule } from 'angular2-hotkeys';
export function HttpLoaderFactory(http: HttpClient) {
@ -48,11 +45,6 @@ export function HttpLoaderFactory(http: HttpClient) {
}
@NgModule({
declarations: [
ConfirmDialogComponent,
AlertDialogComponent,
TodoDialogComponent
],
imports: [
CommonModule,
HttpClientModule,

6
ui-ngx/src/app/core/services/dialog.service.ts

@ -17,10 +17,7 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
import { TranslateService } from '@ngx-translate/core';
import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';
import { TodoDialogComponent } from '@core/services/dialog/todo-dialog.component';
import { AuthService } from '@core/auth/auth.service';
import {
ColorPickerDialogComponent,
@ -30,6 +27,9 @@ import {
MaterialIconsDialogComponent,
MaterialIconsDialogData
} from '@shared/components/dialog/material-icons-dialog.component';
import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component';
import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component';
@Injectable(
{

0
ui-ngx/src/app/core/services/dialog/alert-dialog.component.html → ui-ngx/src/app/shared/components/dialog/alert-dialog.component.html

0
ui-ngx/src/app/core/services/dialog/alert-dialog.component.scss → ui-ngx/src/app/shared/components/dialog/alert-dialog.component.scss

0
ui-ngx/src/app/core/services/dialog/alert-dialog.component.ts → ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts

0
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.html → ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html

0
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.scss → ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.scss

0
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.ts → ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts

0
ui-ngx/src/app/core/services/dialog/todo-dialog.component.html → ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html

0
ui-ngx/src/app/core/services/dialog/todo-dialog.component.scss → ui-ngx/src/app/shared/components/dialog/todo-dialog.component.scss

0
ui-ngx/src/app/core/services/dialog/todo-dialog.component.ts → ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts

6
ui-ngx/src/app/shared/shared.module.ts

@ -108,6 +108,9 @@ import { MatChipDraggableDirective } from '@shared/components/mat-chip-draggable
import { ColorInputComponent } from '@shared/components/color-input.component';
import { JsFuncComponent } from '@shared/components/js-func.component';
import { JsonFormComponent } from '@shared/components/json-form/json-form.component';
import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component';
import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component';
import { MaterialIconsDialogComponent } from '@shared/components/dialog/material-icons-dialog.component';
import { MaterialIconSelectComponent } from '@shared/components/material-icon-select.component';
import { ImageInputComponent } from '@shared/components/image-input.component';
@ -178,6 +181,9 @@ import { LedLightComponent } from '@shared/components/led-light.component';
FabActionsDirective,
FabToolbarComponent,
WidgetsBundleSelectComponent,
ConfirmDialogComponent,
AlertDialogComponent,
TodoDialogComponent,
ColorPickerDialogComponent,
MaterialIconsDialogComponent,
ColorInputComponent,

Loading…
Cancel
Save