Showing
12 changed files
with
9 additions
and
11 deletions
@@ -35,12 +35,9 @@ import { TbMissingTranslationHandler } from './translate/missing-translate-handl | @@ -35,12 +35,9 @@ import { TbMissingTranslationHandler } from './translate/missing-translate-handl | ||
35 | import { MatButtonModule } from '@angular/material/button'; | 35 | import { MatButtonModule } from '@angular/material/button'; |
36 | import { MatDialogModule } from '@angular/material/dialog'; | 36 | import { MatDialogModule } from '@angular/material/dialog'; |
37 | import { MatSnackBarModule } from '@angular/material/snack-bar'; | 37 | import { MatSnackBarModule } from '@angular/material/snack-bar'; |
38 | -import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component'; | ||
39 | import { FlexLayoutModule } from '@angular/flex-layout'; | 38 | import { FlexLayoutModule } from '@angular/flex-layout'; |
40 | import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler'; | 39 | import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler'; |
41 | -import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component'; | ||
42 | import { WINDOW_PROVIDERS } from '@core/services/window.service'; | 40 | import { WINDOW_PROVIDERS } from '@core/services/window.service'; |
43 | -import {TodoDialogComponent} from '@core/services/dialog/todo-dialog.component'; | ||
44 | import { HotkeyModule } from 'angular2-hotkeys'; | 41 | import { HotkeyModule } from 'angular2-hotkeys'; |
45 | 42 | ||
46 | export function HttpLoaderFactory(http: HttpClient) { | 43 | export function HttpLoaderFactory(http: HttpClient) { |
@@ -48,11 +45,6 @@ export function HttpLoaderFactory(http: HttpClient) { | @@ -48,11 +45,6 @@ export function HttpLoaderFactory(http: HttpClient) { | ||
48 | } | 45 | } |
49 | 46 | ||
50 | @NgModule({ | 47 | @NgModule({ |
51 | - declarations: [ | ||
52 | - ConfirmDialogComponent, | ||
53 | - AlertDialogComponent, | ||
54 | - TodoDialogComponent | ||
55 | - ], | ||
56 | imports: [ | 48 | imports: [ |
57 | CommonModule, | 49 | CommonModule, |
58 | HttpClientModule, | 50 | HttpClientModule, |
@@ -17,10 +17,7 @@ | @@ -17,10 +17,7 @@ | ||
17 | import { Injectable } from '@angular/core'; | 17 | import { Injectable } from '@angular/core'; |
18 | import { Observable } from 'rxjs'; | 18 | import { Observable } from 'rxjs'; |
19 | import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; | 19 | import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; |
20 | -import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component'; | ||
21 | import { TranslateService } from '@ngx-translate/core'; | 20 | import { TranslateService } from '@ngx-translate/core'; |
22 | -import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component'; | ||
23 | -import { TodoDialogComponent } from '@core/services/dialog/todo-dialog.component'; | ||
24 | import { AuthService } from '@core/auth/auth.service'; | 21 | import { AuthService } from '@core/auth/auth.service'; |
25 | import { | 22 | import { |
26 | ColorPickerDialogComponent, | 23 | ColorPickerDialogComponent, |
@@ -30,6 +27,9 @@ import { | @@ -30,6 +27,9 @@ import { | ||
30 | MaterialIconsDialogComponent, | 27 | MaterialIconsDialogComponent, |
31 | MaterialIconsDialogData | 28 | MaterialIconsDialogData |
32 | } from '@shared/components/dialog/material-icons-dialog.component'; | 29 | } from '@shared/components/dialog/material-icons-dialog.component'; |
30 | +import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component'; | ||
31 | +import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component'; | ||
32 | +import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component'; | ||
33 | 33 | ||
34 | @Injectable( | 34 | @Injectable( |
35 | { | 35 | { |
ui-ngx/src/app/shared/components/dialog/alert-dialog.component.html
renamed from
ui-ngx/src/app/core/services/dialog/alert-dialog.component.html
ui-ngx/src/app/shared/components/dialog/alert-dialog.component.scss
renamed from
ui-ngx/src/app/core/services/dialog/alert-dialog.component.scss
ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
renamed from
ui-ngx/src/app/core/services/dialog/alert-dialog.component.ts
ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html
renamed from
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.html
ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.scss
renamed from
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.scss
ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
renamed from
ui-ngx/src/app/core/services/dialog/confirm-dialog.component.ts
ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html
renamed from
ui-ngx/src/app/core/services/dialog/todo-dialog.component.html
ui-ngx/src/app/shared/components/dialog/todo-dialog.component.scss
renamed from
ui-ngx/src/app/core/services/dialog/todo-dialog.component.scss
ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts
renamed from
ui-ngx/src/app/core/services/dialog/todo-dialog.component.ts
@@ -108,6 +108,9 @@ import { MatChipDraggableDirective } from '@shared/components/mat-chip-draggable | @@ -108,6 +108,9 @@ import { MatChipDraggableDirective } from '@shared/components/mat-chip-draggable | ||
108 | import { ColorInputComponent } from '@shared/components/color-input.component'; | 108 | import { ColorInputComponent } from '@shared/components/color-input.component'; |
109 | import { JsFuncComponent } from '@shared/components/js-func.component'; | 109 | import { JsFuncComponent } from '@shared/components/js-func.component'; |
110 | import { JsonFormComponent } from '@shared/components/json-form/json-form.component'; | 110 | import { JsonFormComponent } from '@shared/components/json-form/json-form.component'; |
111 | +import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component'; | ||
112 | +import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component'; | ||
113 | +import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component'; | ||
111 | import { MaterialIconsDialogComponent } from '@shared/components/dialog/material-icons-dialog.component'; | 114 | import { MaterialIconsDialogComponent } from '@shared/components/dialog/material-icons-dialog.component'; |
112 | import { MaterialIconSelectComponent } from '@shared/components/material-icon-select.component'; | 115 | import { MaterialIconSelectComponent } from '@shared/components/material-icon-select.component'; |
113 | import { ImageInputComponent } from '@shared/components/image-input.component'; | 116 | import { ImageInputComponent } from '@shared/components/image-input.component'; |
@@ -178,6 +181,9 @@ import { LedLightComponent } from '@shared/components/led-light.component'; | @@ -178,6 +181,9 @@ import { LedLightComponent } from '@shared/components/led-light.component'; | ||
178 | FabActionsDirective, | 181 | FabActionsDirective, |
179 | FabToolbarComponent, | 182 | FabToolbarComponent, |
180 | WidgetsBundleSelectComponent, | 183 | WidgetsBundleSelectComponent, |
184 | + ConfirmDialogComponent, | ||
185 | + AlertDialogComponent, | ||
186 | + TodoDialogComponent, | ||
181 | ColorPickerDialogComponent, | 187 | ColorPickerDialogComponent, |
182 | MaterialIconsDialogComponent, | 188 | MaterialIconsDialogComponent, |
183 | ColorInputComponent, | 189 | ColorInputComponent, |