fixed merge errors. renamed missleading name in the system information component

Author: janniclas

client/package-lock.json

@@ -27,6 +27,7 @@
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
+    "ngx-device-detector": "^1.3.3",
     "popper.js": "^1.14.4",
     "rxjs": "^6.2.2",
     "rxjs-compat": "^6.2.2",

client/package.json

@@ -30,7 +30,7 @@
     <div class="col-md-1 col-sm-4">
     </div>
     <div class="col-md-2 col-sm-4">
-    <!--<app-statuscard></app-statuscard>-->
+    <app-statuscard></app-statuscard>
   </div>
 </div>
 </div>

client/src/app/dashboard/dashboard-overview/dashboard-overview.component.html

@@ -16,54 +16,54 @@
  * limitations under the License.
  */
 
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { WebappComponent } from './webapp/webapp.component';
-import { DashboardComponent } from './dashboard.component';
-import { DashboardOverviewComponent } from './dashboard-overview/dashboard-overview.component';
-import { CrawlerComponent } from './crawler/crawler.component';
-import { UserManagementComponent } from './user-management/user-management.component';
-import { WebApiComponent } from './webapi/web-api.component';
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {WebappComponent} from './webapp/webapp.component';
+import {DashboardComponent} from './dashboard.component';
+import {DashboardOverviewComponent} from './dashboard-overview/dashboard-overview.component';
+import {CrawlerComponent} from './crawler/crawler.component';
+import {UserManagementComponent} from './user-management/user-management.component';
+import {WebApiComponent} from './webapi/web-api.component';
 import {UserProfileComponent} from './user-profile/user-profile.component';
 import {HelpComponent} from '../help/help.component';
 
 
 const dashboardRoutes: Routes = [
-   {
-   path: 'dashboard',
-  component: DashboardComponent,
-  children: [
+  {
+    path: 'dashboard',
+    component: DashboardComponent,
+    children: [
       {
-      path: '',
-      component: DashboardOverviewComponent
-   },
-   {
-    path: 'webapp',
-    component: WebappComponent
-   },
-   {
-     path: 'crawler',
-     component: CrawlerComponent
-   },
-   {
-     path: 'webapi',
-     component: WebapiComponent
-   },
-   {
-      path: 'usermanagement',
-      component: UserManagementComponent
-   },
-    {
-      path: 'userProfile',
-      component: UserProfileComponent
-    },
-    {
-      path: 'help',
-      component: HelpComponent
-    }
-  ]}
-    ];
-  
+        path: '',
+        component: DashboardOverviewComponent
+      },
+      {
+        path: 'webapp',
+        component: WebappComponent
+      },
+      {
+        path: 'crawler',
+        component: CrawlerComponent
+      },
+      {
+        path: 'webApi',
+        component: WebApiComponent
+      },
+      {
+        path: 'userManagement',
+        component: UserManagementComponent
+      },
+      {
+        path: 'userProfile',
+        component: UserProfileComponent
+      },
+      {
+        path: 'help',
+        component: HelpComponent
+      }
+    ]
+  }];
+
 
 @NgModule({
   imports: [
@@ -80,4 +80,5 @@ const dashboardRoutes: Routes = [
  * rendered once and load the routed components in
  * between.
  */
-export class DashboardRoutingModule { }
+export class DashboardRoutingModule {
+}

client/src/app/dashboard/dashboard-routing.module.ts

@@ -36,10 +36,9 @@ import { DashboardOverviewComponent } from './dashboard-overview/dashboard-overv
 import { TableAllComponent } from './table-all/table-all.component';
 import { HeaderComponent } from './header/header.component';
 import { StatusCardComponent } from './status-card/status-card.component';
-import { DeviceDetectorModule } from 'ngx-device-detector'; 
+import { DeviceDetectorModule } from 'ngx-device-detector';
 import { DeletedialogComponent } from './deletedialog/deletedialog.component';
 import { UserManagementComponent } from './user-management/user-management.component';
-import { HelpComponent } from './help/help.component';
 import {ApiService} from '../api';
 import { UserProfileComponent } from './user-profile/user-profile.component';
 
@@ -58,9 +57,8 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
     MatFormFieldModule,
     MatInputModule,
     DashboardRoutingModule,
-    HttpClientModule, 
-    DashboardRoutingModule, 
-    DeviceDetectorModule.forRoot() 
+    DashboardRoutingModule,
+    DeviceDetectorModule.forRoot()
   ],
   declarations: [
     DashboardCardComponent,
@@ -73,8 +71,8 @@ import { UserProfileComponent } from './user-profile/user-profile.component';
     HeaderComponent,
     StatusCardComponent,
     DeletedialogComponent,
-    UserManagementComponent,
-    HelpComponent
+    UserProfileComponent,
+    UserManagementComponent
   ],
   entryComponents: [
     DeletedialogComponent

client/src/app/dashboard/dashboard.module.ts

@@ -23,7 +23,7 @@
     <div class="navbar-nav">
 
   <a class="nav-item nav-link" href="/dashboard"><i class="fa fa-fw fa-home"></i> Dashboard</a>
-  <a class="nav-item nav-link" href="/dashboard/usermanagement"><i class="fa fa-users"></i> User Management</a>
+  <a class="nav-item nav-link" href="/dashboard/userManagement"><i class="fa fa-users"></i> User Management</a>
   <a class="nav-item nav-link" href="/dashboard/help"><i class="fa fa-question-circle"></i> Help</a>
     </div>