Merge pull request #108 from jumpserver/dev_beta

[Update] 去掉组件

Merge pull request #108 from jumpserver/dev_beta
[Update] 去掉组件
fbb88dce · 老广 · GitHub · ff227aea · 8ff84f5b · fbb88dce
Unverified Commit fbb88dce authored Sep 11, 2019 by 老广 Committed by GitHub Sep 11, 2019
6 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -8906,11 +8906,6 @@
        "vlq": "^1.0.0"
      }
    },
-    "ngx-progressbar": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ngx-progressbar/-/ngx-progressbar-2.1.1.tgz",
-      "integrity": "sha512-RyfW1Dhp9G+QZRhp0SsVZJOxvfXHq335aea9rAwVOORSzch6NFBuE+XYx3etlEh2avOYfigyWUX8vAlEXrHXKQ=="
-    },
    "nice-try": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",

--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
    "neffos.js": "^0.1.19",
    "ngx-cookie-service": "^1.0.10",
    "ngx-logger": "4.0.4",
-    "ngx-progressbar": "^2.1.1",
    "popper.js": "^1.14.7",
    "requirejs": "^2.3.5",
    "rxjs": "~6.3.3",

--- a/src/app/pages/app.component.html
+++ b/src/app/pages/app.component.html
-<ng-progress></ng-progress>
 <router-outlet></router-outlet>
-<!--<elements-interactive></elements-interactive>-->
--- a/src/app/pages/app.component.ts
+++ b/src/app/pages/app.component.ts
 import {Component} from '@angular/core';
-import {DataStore} from '../globals';
 import {AppService} from '../app.service';

 @Component({
@@ -9,9 +8,8 @@ import {AppService} from '../app.service';
 })

 export class AppComponent {
-  DataStore = DataStore;

-  constructor(appSrv: AppService) {
+  constructor(private appSrv: AppService) {
  }
 }

--- a/src/app/plugins/plugins.ts
+++ b/src/app/plugins/plugins.ts
@@ -4,12 +4,10 @@ import {SplitModule} from '@app/plugins/split/split.module';
 import {FlexLayoutModule} from '@angular/flex-layout';
 import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {NgProgressModule} from 'ngx-progressbar';


 export const PluginModules = [
  BrowserAnimationsModule,
-  NgProgressModule,
  MaterialModule,
  LoggerModule.forRoot({level: NgxLoggerLevel.DEBUG, serverLogLevel: NgxLoggerLevel.ERROR}),
  FlexLayoutModule,

--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
  <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-<app-root></app-root>
+<app-root>Loading...</app-root>
 <span id="marker" style="display: none;font-size: 14px">marker</span>

 </body>