diff --git a/security-c4po-angular/src/app/app.module.ts b/security-c4po-angular/src/app/app.module.ts index 1d4594a..eb5921c 100644 --- a/security-c4po-angular/src/app/app.module.ts +++ b/security-c4po-angular/src/app/app.module.ts @@ -28,6 +28,7 @@ import {httpInterceptorProviders} from '@shared/interceptors'; import {FlexLayoutModule} from '@angular/flex-layout'; import {DialogService} from '@shared/services/dialog-service/dialog.service'; import {ConfirmDialogModule} from '@shared/modules/confirm-dialog/confirm-dialog.module'; +import {OverlayContainer} from '@angular/cdk/overlay'; @NgModule({ declarations: [ @@ -37,14 +38,15 @@ import {ConfirmDialogModule} from '@shared/modules/confirm-dialog/confirm-dialog BrowserModule, AppRoutingModule, RouterModule, - FontAwesomeModule, - NbToastrModule.forRoot(), // used for notification service - BrowserAnimationsModule, - ThemeModule.forRoot(), NbLayoutModule, + NbDialogModule.forRoot(), NbCardModule, NbIconModule, NbButtonModule, + NbToastrModule.forRoot(), // used for notification service + FontAwesomeModule, + BrowserAnimationsModule, + ThemeModule.forRoot(), NbEvaIconsModule, ConfirmDialogModule, NgxsModule.forRoot([SessionState], {developmentMode: !environment.production}), @@ -56,7 +58,6 @@ import {ConfirmDialogModule} from '@shared/modules/confirm-dialog/confirm-dialog deps: [HttpClient] } }), - NbDialogModule.forRoot(), HeaderModule, HomeModule, FlexLayoutModule @@ -69,11 +70,12 @@ import {ConfirmDialogModule} from '@shared/modules/confirm-dialog/confirm-dialog multi: true, deps: [KeycloakService] }, + OverlayContainer, KeycloakService, httpInterceptorProviders, NotificationService, + DialogService, NbDialogService, - DialogService ], bootstrap: [ AppComponent diff --git a/security-c4po-angular/src/app/project-overview/project-overview.module.ts b/security-c4po-angular/src/app/project-overview/project-overview.module.ts index 2c55822..3e74a7b 100644 --- a/security-c4po-angular/src/app/project-overview/project-overview.module.ts +++ b/security-c4po-angular/src/app/project-overview/project-overview.module.ts @@ -2,36 +2,34 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {ProjectOverviewComponent} from './project-overview.component'; import {ProjectOverviewRoutingModule} from './project-overview-routing.module'; -import {NbButtonModule, NbCardModule, NbDialogService, NbProgressBarModule} from '@nebular/theme'; +import {NbButtonModule, NbCardModule, NbProgressBarModule, NbSpinnerModule} from '@nebular/theme'; import {FlexLayoutModule} from '@angular/flex-layout'; import {FontAwesomeModule} from '@fortawesome/angular-fontawesome'; import {TranslateModule} from '@ngx-translate/core'; import {DateTimeFormatPipe} from '@shared/pipes/date-time-format.pipe'; -import {ProjectModule} from './project'; -import {ProjectDialogComponent} from '@shared/modules/project-dialog/project-dialog.component'; -import {DialogService} from '@shared/services/dialog-service/dialog.service'; import {ProjectDialogModule} from '@shared/modules/project-dialog/project-dialog.module'; +import {LoadingSpinnerComponent} from '@shared/widgets/loading-spinner/loading-spinner.component'; @NgModule({ declarations: [ ProjectOverviewComponent, - DateTimeFormatPipe + DateTimeFormatPipe, + LoadingSpinnerComponent ], imports: [ CommonModule, - ProjectOverviewRoutingModule, NbCardModule, NbButtonModule, + NbSpinnerModule, + NbProgressBarModule, + ProjectOverviewRoutingModule, FlexLayoutModule, FontAwesomeModule, TranslateModule, - NbProgressBarModule, - ProjectModule, ProjectDialogModule ], - providers: [ - DialogService, - NbDialogService + exports: [ + LoadingSpinnerComponent ] }) export class ProjectOverviewModule { diff --git a/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts b/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts index c5444ca..1e2d2f2 100644 --- a/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts +++ b/security-c4po-angular/src/app/project-overview/project/project-routing.module.ts @@ -1,12 +1,17 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - +import {NgModule} from '@angular/core'; +import {RouterModule, Routes} from '@angular/router'; +import {ProjectComponent} from './project.component'; +const routes: Routes = [ + { + path: '', + component: ProjectComponent + }, +]; @NgModule({ - declarations: [], - imports: [ - CommonModule - ] + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] }) -export class ProjectRoutingModule { } +export class ProjectRoutingModule { +} diff --git a/security-c4po-angular/src/app/project-overview/project/project.module.ts b/security-c4po-angular/src/app/project-overview/project/project.module.ts index c26c1ab..2bcf2b6 100644 --- a/security-c4po-angular/src/app/project-overview/project/project.module.ts +++ b/security-c4po-angular/src/app/project-overview/project/project.module.ts @@ -2,28 +2,28 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {ProjectComponent} from './project.component'; -import {LoadingSpinnerComponent} from '@shared/widgets/loading-spinner/loading-spinner.component'; -import {NbCardModule, NbLayoutModule, NbSpinnerModule} from '@nebular/theme'; +import {NbCardModule, NbLayoutModule} from '@nebular/theme'; import {FlexLayoutModule} from '@angular/flex-layout'; +import {TranslateModule} from '@ngx-translate/core'; +import {ProjectDialogModule} from '@shared/modules/project-dialog/project-dialog.module'; +import {ProjectRoutingModule} from './project-routing.module'; @NgModule({ declarations: [ - ProjectComponent, - LoadingSpinnerComponent - ], - exports: [ - LoadingSpinnerComponent + ProjectComponent ], imports: [ CommonModule, + NbCardModule, + NbLayoutModule, RouterModule.forChild([{ path: '', component: ProjectComponent }]), - NbCardModule, - NbSpinnerModule, + ProjectRoutingModule, + TranslateModule, FlexLayoutModule, - NbLayoutModule, + ProjectDialogModule, ] }) export class ProjectModule { diff --git a/security-c4po-angular/src/shared/modules/project-dialog/project-dialog.module.ts b/security-c4po-angular/src/shared/modules/project-dialog/project-dialog.module.ts index 0b06202..1482872 100644 --- a/security-c4po-angular/src/shared/modules/project-dialog/project-dialog.module.ts +++ b/security-c4po-angular/src/shared/modules/project-dialog/project-dialog.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; +import {NgModule} from '@angular/core'; +import {CommonModule} from '@angular/common'; import {ProjectDialogComponent} from '@shared/modules/project-dialog/project-dialog.component'; import {NbButtonModule, NbCardModule, NbDialogService, NbFormFieldModule, NbInputModule} from '@nebular/theme'; import {FlexLayoutModule} from '@angular/flex-layout'; @@ -17,12 +17,12 @@ import {ProjectDialogService} from '@shared/modules/project-dialog/service/proje CommonModule, NbCardModule, NbButtonModule, + NbFormFieldModule, + NbInputModule, FlexLayoutModule, FontAwesomeModule, TranslateModule, - ReactiveFormsModule, - NbFormFieldModule, - NbInputModule, + ReactiveFormsModule ], providers: [ DialogService, @@ -33,4 +33,5 @@ import {ProjectDialogService} from '@shared/modules/project-dialog/service/proje ProjectDialogComponent ] }) -export class ProjectDialogModule { } +export class ProjectDialogModule { +}