Sort out some dependencies

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / app.module.ts

diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index 6cfabc8..ecd0e42 100644 (file)
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -20,20 +20,31 @@
  * ========================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 { MatButtonModule } from '@angular/material/button';
+import { MatButtonToggleModule } from '@angular/material/button-toggle';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatGridListModule } from '@angular/material/grid-list';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatListModule } from '@angular/material/list';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatPaginatorModule } from '@angular/material/paginator';
+import { MatSelectModule } from '@angular/material/select';
+import { MatSidenavModule } from '@angular/material/sidenav';
+import { MatSliderModule } from '@angular/material/slider';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatSortModule } from '@angular/material/sort';
+import { MatTableModule } from '@angular/material/table';
+import { MatTabsModule } from '@angular/material/tabs';
+import { MatToolbarModule } from '@angular/material/toolbar';
 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';
@@ -54,7 +65,7 @@ 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 { CookieService } from 'ngx-cookie-service';
 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';
@@ -86,7 +97,6 @@ export const isMock = environment.mock;
     BrowserModule,
     BrowserAnimationsModule,
     ChartsModule,
-    CookieModule.forRoot(),
     FlexLayoutModule,
     FormsModule,
     HttpClientModule,
@@ -95,7 +105,6 @@ export const isMock = environment.mock;
     MatCardModule,
     MatCheckboxModule,
     MatDialogModule,
-    MaterialDesignFrameworkModule,
     MatExpansionModule,
     MatFormFieldModule,
     MatGridListModule,
@@ -104,18 +113,16 @@ export const isMock = environment.mock;
     MatListModule,
     MatMenuModule,
     MatPaginatorModule,
-    MatProgressSpinnerModule,
-    MatRadioModule,
     MatSelectModule,
-    MatSliderModule,
     MatSidenavModule,
+    MatSliderModule,
     MatSlideToggleModule,
     MatSnackBarModule,
     MatSortModule,
     MatTableModule,
     MatTabsModule,
     MatToolbarModule,
-    MatTooltipModule,
+    MaterialDesignFrameworkModule,
     MDBBootstrapModule.forRoot(),
     ReactiveFormsModule,
     ToastrModule.forRoot(),
@@ -145,6 +152,7 @@ export const isMock = environment.mock;
     PolicyInstanceDialogComponent
   ],
   providers: [
+    CookieService,
     ErrorDialogService,
     UiService,
     {