X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Frd.module.ts;h=4d1fc1fddc8acddde112d3f63d7a4c06193f50b3;hb=4f8259dcd4597a7c96285907bd33941d44ac456a;hp=0e4595c5ad616871cfac42bb903be96113e856c9;hpb=baba2efde0ab32026b1d13941dcc9e9dc95dc640;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/rd.module.ts b/webapp-frontend/src/app/rd.module.ts
index 0e4595c5..4d1fc1fd 100644
--- a/webapp-frontend/src/app/rd.module.ts
+++ b/webapp-frontend/src/app/rd.module.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,13 +33,16 @@ 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 { AcXappComponent } from './ac-xapp/ac-xapp.component';
-import { AddDashboardUserDialogComponent } from './admin/add-dashboard-user-dialog/add-dashboard-user-dialog.component';
+import { AddDashboardUserDialogComponent } from './user/add-dashboard-user-dialog/add-dashboard-user-dialog.component';
 import { AnrEditNcrDialogComponent } from './anr-xapp/anr-edit-ncr-dialog.component';
 import { AnrXappComponent } from './anr-xapp/anr-xapp.component';
+import { AppConfigurationComponent } from './app-configuration/app-configuration.component';
 import { AppControlComponent } from './app-control/app-control.component';
 import { AppMgrService } from './services/app-mgr/app-mgr.service';
+import { CaasIngressComponent } from './caas-ingress/caas-ingress.component';
 import { CatalogCardComponent } from './ui/catalog-card/catalog-card.component';
 import { CatalogComponent } from './catalog/catalog.component';
 import { ConfigEventComponent } from './ui/config-event/config-event.component';
@@ -48,12 +51,16 @@ import { ControlCardComponent } from './ui/control-card/control-card.component';
 import { ControlComponent } from './control/control.component';
 import { DashboardService } from './services/dashboard/dashboard.service';
 import { E2ManagerService } from './services/e2-mgr/e2-mgr.service';
-import { EditDashboardUserDialogComponent } from './admin/edit-dashboard-user-dialog/edit-dashboard-user-dialog.component';
+import { EditDashboardUserDialogComponent } from './user/edit-dashboard-user-dialog/edit-dashboard-user-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 { FooterComponent } from './footer/footer.component';
-import { LoginComponent } from './login/login.component';
+import { LoadingDialogComponent } from './ui/loading-dialog/loading-dialog.component';
+import { MainComponent } from './main/main.component';
+import { MaterialDesignFrameworkModule } from 'angular6-json-schema-form';
 import { ModalEventComponent } from './ui/modal-event/modal-event.component';
+import { PlatformComponent } from './platform/platform.component';
 import { RanControlComponent } from './ran-control/ran-control.component';
 import { RanControlConnectDialogComponent } from './ran-control/ran-connection-dialog.component';
 import { RdComponent } from './rd.component';
@@ -62,8 +69,7 @@ import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.com
 import { StatCardComponent } from './ui/stat-card/stat-card.component';
 import { StatsComponent } from './stats/stats.component';
 import { UiService } from './services/ui/ui.service';
-import { UserComponent } from './admin/user.component';
-import { ToastrModule } from 'ngx-toastr';
+import { UserComponent } from './user/user.component';
 
 @NgModule({
   declarations: [
@@ -71,7 +77,9 @@ import { ToastrModule } from 'ngx-toastr';
     AddDashboardUserDialogComponent,
     AnrEditNcrDialogComponent,
     AnrXappComponent,
+    AppConfigurationComponent,
     AppControlComponent,
+    CaasIngressComponent,
     CatalogCardComponent,
     CatalogComponent,
     ConfigEventComponent,
@@ -81,8 +89,10 @@ import { ToastrModule } from 'ngx-toastr';
     EditDashboardUserDialogComponent,
     ErrorDialogComponent,
     FooterComponent,
-    LoginComponent,
+    LoadingDialogComponent,
+    MainComponent,
     ModalEventComponent,
+    PlatformComponent,
     RanControlComponent,
     RanControlConnectDialogComponent,
     RdComponent,
@@ -95,6 +105,7 @@ import { ToastrModule } from 'ngx-toastr';
     BrowserModule,
     BrowserAnimationsModule,
     ChartsModule,
+    FlexLayoutModule,
     FormsModule,
     HttpClientModule,
     MatButtonModule,
@@ -102,6 +113,7 @@ import { ToastrModule } from 'ngx-toastr';
     MatCardModule,
     MatCheckboxModule,
     MatDialogModule,
+    MaterialDesignFrameworkModule,
     MatExpansionModule,
     MatFormFieldModule,
     MatGridListModule,
@@ -126,31 +138,33 @@ import { ToastrModule } from 'ngx-toastr';
     ToastrModule.forRoot()
   ],
   exports: [
+    ErrorDialogComponent,
     FormsModule,
-    MatDialogModule,
+    MatButtonModule,
     MatButtonToggleModule,
-    MatExpansionModule,
-    MatSliderModule,
     MatCardModule,
-    MatIconModule,
+    MatDialogModule,
+    MatExpansionModule,
+    MatFormFieldModule,
     MatGridListModule,
+    MatIconModule,
+    MatInputModule,
     MatListModule,
     MatSidenavModule,
+    MatSliderModule,
     MatSlideToggleModule,
     MatTabsModule,
-    MatFormFieldModule,
-    MatButtonModule,
-    MatInputModule,
-    RanControlConnectDialogComponent,
-    ErrorDialogComponent,
+    RanControlConnectDialogComponent
   ],
   entryComponents: [
     AddDashboardUserDialogComponent,
     AnrEditNcrDialogComponent,
+    AppConfigurationComponent,
     ConfirmDialogComponent,
     EditDashboardUserDialogComponent,
     ErrorDialogComponent,
-    RanControlConnectDialogComponent,
+    LoadingDialogComponent,
+    RanControlConnectDialogComponent
   ],
   providers: [
     AppMgrService,