diff --git a/frontend/app/features/administration/module.ts b/frontend/app/features/administration/module.ts index 57e6060d4..959deb130 100644 --- a/frontend/app/features/administration/module.ts +++ b/frontend/app/features/administration/module.ts @@ -56,9 +56,9 @@ const routes: Routes = [ @NgModule({ imports: [ - SqxSharedModule, + RouterModule.forChild(routes), SqxFrameworkModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ AdministrationAreaComponent, diff --git a/frontend/app/features/api/module.ts b/frontend/app/features/api/module.ts index b4f79462b..c09ad4f7a 100644 --- a/frontend/app/features/api/module.ts +++ b/frontend/app/features/api/module.ts @@ -28,9 +28,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ ApiAreaComponent, diff --git a/frontend/app/features/apps/module.ts b/frontend/app/features/apps/module.ts index f091e3d9e..baa14ada4 100644 --- a/frontend/app/features/apps/module.ts +++ b/frontend/app/features/apps/module.ts @@ -19,9 +19,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ AppsPageComponent, diff --git a/frontend/app/features/assets/module.ts b/frontend/app/features/assets/module.ts index f5a846a6e..68175d0be 100644 --- a/frontend/app/features/assets/module.ts +++ b/frontend/app/features/assets/module.ts @@ -25,9 +25,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ AssetsFiltersPageComponent, diff --git a/frontend/app/features/dashboard/module.ts b/frontend/app/features/dashboard/module.ts index 3c4b1ea67..0de5d53bb 100644 --- a/frontend/app/features/dashboard/module.ts +++ b/frontend/app/features/dashboard/module.ts @@ -25,9 +25,9 @@ const routes: Routes = [ imports: [ ChartModule, GridsterModule, + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ ApiCallsCardComponent, diff --git a/frontend/app/features/rules/module.ts b/frontend/app/features/rules/module.ts index 917e399b1..29298fb4f 100644 --- a/frontend/app/features/rules/module.ts +++ b/frontend/app/features/rules/module.ts @@ -34,9 +34,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ AssetChangedTriggerComponent, diff --git a/frontend/app/features/schemas/module.ts b/frontend/app/features/schemas/module.ts index 8b49ddbc9..105e8876d 100644 --- a/frontend/app/features/schemas/module.ts +++ b/frontend/app/features/schemas/module.ts @@ -37,9 +37,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], providers: [ SchemaMustExistGuard diff --git a/frontend/app/features/settings/module.ts b/frontend/app/features/settings/module.ts index 436bd3183..4e6709dec 100644 --- a/frontend/app/features/settings/module.ts +++ b/frontend/app/features/settings/module.ts @@ -166,9 +166,9 @@ const routes: Routes = [ @NgModule({ imports: [ + RouterModule.forChild(routes), SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) + SqxSharedModule ], declarations: [ BackupComponent, diff --git a/frontend/app/framework/module.ts b/frontend/app/framework/module.ts index 39f08fd50..83e35b0ab 100644 --- a/frontend/app/framework/module.ts +++ b/frontend/app/framework/module.ts @@ -25,15 +25,15 @@ import { AnalyticsService, AutocompleteComponent, AvatarComponent, CachingInterc AutocompleteComponent, AvatarComponent, CheckboxGroupComponent, + CodeComponent, + CodeEditorComponent, ColorPickerComponent, ConfirmClickDirective, ControlErrorsComponent, - CodeComponent, - CodeEditorComponent, CopyDirective, DarkenPipe, - DateTimeEditorComponent, DatePipe, + DateTimeEditorComponent, DayOfWeekPipe, DayPipe, DialogRendererComponent, @@ -69,8 +69,8 @@ import { AnalyticsService, AutocompleteComponent, AvatarComponent, CachingInterc MonthPipe, OnboardingTooltipComponent, PagerComponent, - PanelContainerDirective, PanelComponent, + PanelContainerDirective, ParentLinkDirective, PopupLinkDirective, ProgressBarComponent, @@ -98,10 +98,10 @@ import { AnalyticsService, AutocompleteComponent, AvatarComponent, CachingInterc AutocompleteComponent, AvatarComponent, CheckboxGroupComponent, - CodeEditorComponent, - CommonModule, CodeComponent, + CodeEditorComponent, ColorPickerComponent, + CommonModule, ConfirmClickDirective, ControlErrorsComponent, CopyDirective, @@ -137,15 +137,15 @@ import { AnalyticsService, AutocompleteComponent, AvatarComponent, CachingInterc LightenPipe, ListViewComponent, MarkdownPipe, - ModalDirective, ModalDialogComponent, + ModalDirective, ModalPlacementDirective, MoneyPipe, MonthPipe, OnboardingTooltipComponent, PagerComponent, - PanelContainerDirective, PanelComponent, + PanelContainerDirective, ParentLinkDirective, PopupLinkDirective, ProgressBarComponent, @@ -180,8 +180,8 @@ export class SqxFrameworkModule { CanDeactivateGuard, ClipboardService, DialogService, - LocalStoreService, LoadingService, + LocalStoreService, MessageBus, OnboardingService, ResizeService, diff --git a/frontend/app/shared/module.ts b/frontend/app/shared/module.ts index 219271270..e9b5d9f80 100644 --- a/frontend/app/shared/module.ts +++ b/frontend/app/shared/module.ts @@ -161,13 +161,13 @@ export class SqxSharedModule { RuleEventsState, RulesService, RulesState, - SearchService, SchemaMustExistGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SchemasService, SchemasState, SchemaTagSource, + SearchService, StockPhotoService, TranslationsService, UIService,