X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp.module.ts;h=7646d022a409aa096b160230a7848609f168f37c;hb=4210eb2e61a0f3577ac73528fa629e1a1fe30847;hp=6cfabc82e8f6321b6fcfaf9c1d493b42936cad15;hpb=5d7de18e40bb0da67d375d9461f9106ec3ea8e51;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index 6cfabc8..7646d02 100644
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -20,47 +20,32 @@
  * ========================LICENSE_END===================================
  */
 import { BrowserModule } from '@angular/platform-browser';
-// tslint:disable-next-line:max-line-length
-import {
-  MatButtonModule, MatButtonToggleModule, MatCardModule, MatCheckboxModule,
-  MatDialogModule, MatExpansionModule, MatFormFieldModule, MatGridListModule,
-  MatIconModule, MatInputModule, MatListModule, MatMenuModule, MatPaginatorModule,
-  MatProgressSpinnerModule, MatSelectModule, MatSidenavModule, MatSliderModule,
-  MatSlideToggleModule, MatSnackBarModule, MatSortModule, MatTableModule,
-  MatTabsModule, MatToolbarModule
-} from '@angular/material';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule} from '@angular/material/list';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatTooltipModule } from '@angular/material/tooltip';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { MatRadioModule } from '@angular/material/radio';
-import { MatTooltipModule } from '@angular/material/tooltip';
-import { ChartsModule } from 'ng2-charts';
 import { MDBBootstrapModule } from 'angular-bootstrap-md';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ToastrModule } from 'ngx-toastr';
-import { ConfirmDialogComponent } from './ui/confirm-dialog/confirm-dialog.component';
-import { ErrorDialogComponent } from './ui/error-dialog/error-dialog.component';
-import { ErrorDialogService } from './services/ui/error-dialog.service';
-import { FlexLayoutModule } from '@angular/flex-layout';
+import { ConfirmDialogComponent } from '@ui/confirm-dialog/confirm-dialog.component';
 import { FooterComponent } from './footer/footer.component';
 import { MainComponent } from './main/main.component';
 import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
-import { NoTypePolicyInstanceDialogComponent } from './policy-control/no-type-policy-instance-dialog.component';
-import { PolicyCardComponent } from './ui/policy-card/policy-card.component';
-import { PolicyControlComponent } from './policy-control/policy-control.component';
-import { PolicyInstanceComponent } from './policy-control/policy-instance.component';
-import { PolicyInstanceDialogComponent } from './policy-control/policy-instance-dialog.component';
+import { PolicyModule } from '@policy/policy.module'
+import { EiCoordinatorModule } from '@ei-coordinator/ei-coordinator.module'
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component';
-import { UiService } from './services/ui/ui.service';
-import { CookieModule } from 'ngx-cookie';
-import { NodeModulesComponent } from './node-modules/node-modules.component';
-import { EICardComponent } from './ui/ei-card/ei-card.component';
-import { EICoordinatorComponent } from './ei-coordinator/ei-coordinator.component';
+import { SidenavListComponent } from '@navigation/sidenav-list/sidenav-list.component';
+import { UiService } from '@services/ui/ui.service';
+import { CookieService } from 'ngx-cookie-service';
 import { HttpMockRequestInterceptor } from './interceptor.mock';
-import { environment } from 'src/environments/environment';
+import { environment } from 'environments/environment';
 import { HttpRequestInterceptor } from './interceptor';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { RicConfigModule } from './ric-config/ricconfig.module';
 
 export const isMock = environment.mock;
 
@@ -68,84 +53,33 @@ export const isMock = environment.mock;
   declarations: [
     AppComponent,
     ConfirmDialogComponent,
-    EICardComponent,
-    EICoordinatorComponent,
-    ErrorDialogComponent,
     FooterComponent,
     MainComponent,
-    NodeModulesComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyCardComponent,
-    PolicyControlComponent,
-    PolicyInstanceComponent,
-    PolicyInstanceDialogComponent,
     SidenavListComponent,
   ],
   imports: [
     AppRoutingModule,
     BrowserModule,
     BrowserAnimationsModule,
-    ChartsModule,
-    CookieModule.forRoot(),
-    FlexLayoutModule,
-    FormsModule,
     HttpClientModule,
-    MatButtonModule,
-    MatButtonToggleModule,
-    MatCardModule,
-    MatCheckboxModule,
     MatDialogModule,
-    MaterialDesignFrameworkModule,
-    MatExpansionModule,
-    MatFormFieldModule,
-    MatGridListModule,
     MatIconModule,
-    MatInputModule,
     MatListModule,
-    MatMenuModule,
-    MatPaginatorModule,
-    MatProgressSpinnerModule,
-    MatRadioModule,
-    MatSelectModule,
-    MatSliderModule,
     MatSidenavModule,
     MatSlideToggleModule,
-    MatSnackBarModule,
-    MatSortModule,
-    MatTableModule,
-    MatTabsModule,
-    MatToolbarModule,
     MatTooltipModule,
+    MaterialDesignFrameworkModule,
     MDBBootstrapModule.forRoot(),
-    ReactiveFormsModule,
+    PolicyModule,
+    EiCoordinatorModule,
+    RicConfigModule,
     ToastrModule.forRoot(),
   ],
-  exports: [
-    ErrorDialogComponent,
-    FormsModule,
-    MatButtonModule,
-    MatButtonToggleModule,
-    MatCardModule,
-    MatDialogModule,
-    MatExpansionModule,
-    MatFormFieldModule,
-    MatGridListModule,
-    MatIconModule,
-    MatInputModule,
-    MatListModule,
-    MatSidenavModule,
-    MatSliderModule,
-    MatSlideToggleModule,
-    MatTabsModule
-  ],
   entryComponents: [
     ConfirmDialogComponent,
-    ErrorDialogComponent,
-    NoTypePolicyInstanceDialogComponent,
-    PolicyInstanceDialogComponent
   ],
   providers: [
-    ErrorDialogService,
+    CookieService,
     UiService,
     {
       provide: HTTP_INTERCEPTORS,