Merge branch 'dev'

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config proxy.conf.json",
-    "build": "ng build -prod --base-href=/luna/  --deploy '/luna/'",
+    "build": "ng build --environment prod --build-optimizer=false --base-href=/luna/  --deploy '/luna/'",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
@@ -64,6 +64,7 @@
     "tether": "^1.4.0",
     "uuid-js": "^0.7.5",
     "xterm": "^2.9.2",
+    "tslib": "1.8.1",
     "zone.js": "0.8.20"
   },
   "devDependencies": {
@@ -87,7 +88,6 @@
     "karma-jasmine-html-reporter": "0.2.2",
     "protractor": "5.2.2",
     "ts-node": "3.3.0",
-    "tslib": "1.8.1",
     "tslint": "5.9.1",
     "typescript": "2.4.2"
   }

src/app/app.module.ts

@@ -10,9 +10,10 @@
  * @author   liuzheng <liuzheng712@gmail.com>
  */
 import {BrowserModule} from '@angular/platform-browser';
-import {ClassProvider, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms'; // <-- NgModel lives here
 import {LoggerModule, NGXLogger, NgxLoggerLevel} from 'ngx-logger';
+import {HttpClientModule} from '@angular/common/http';
 
 import {AppRoutingModule} from './app-routing.module';
 
@@ -51,7 +52,6 @@ import {LinuxComponent} from './monitor-page/linux/linux.component';
 import {WindowsComponent} from './monitor-page/windows/windows.component';
 import {NgProgressModule} from 'ngx-progressbar';
 import {TestPageComponent} from './test-page/test-page.component';
-import {HttpClientModule} from '@angular/common/http';
 
 // import {NgxLayerModule} from 'ngx-layer';
 

src/app/elements/iframe/iframe.component.ts

@@ -4,7 +4,6 @@ import {NavList} from '../../ControlPage/control/control.component';
 import {User} from '../../globals';
 import {HttpService, LogService} from '../../app.service';
 import * as Base64 from 'base64-js/base64js.min';
-import {Headers} from '@angular/http';
 
 @Component({
   selector: 'app-element-iframe',