[Update] 移除不用Module

package-lock.json

@@ -388,11 +388,6 @@
           "requires": {
             "tslib": "^1.7.1"
           }
-        },
-        "moment": {
-          "version": "2.22.2",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-          "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
         }
       }
     },
@@ -602,13 +597,6 @@
       "integrity": "sha512-ybPjYizpKVWAI2Z4AqxAS6s3FMkF3+zRpfvxX1wIdSJUFjl83XxQ5f2yn7retX68NSYZZ/JTK9KGnvOzZfrIZw==",
       "requires": {
         "moment": "^2.19.3"
-      },
-      "dependencies": {
-        "moment": {
-          "version": "2.22.2",
-          "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
-          "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
-        }
       }
     },
     "animate.css": {
@@ -2035,9 +2023,9 @@
       }
     },
     "codemirror": {
-      "version": "5.40.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.40.0.tgz",
-      "integrity": "sha512-plTYonQ8SwbtS4m9n88mPDR+G7JwFrAL6774VjvoNH8wQJNSJOx5JdWmgRe3pCyuDI4s+vvi4CIuQnoduUTVug=="
+      "version": "5.48.4",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.4.tgz",
+      "integrity": "sha512-pUhZXDQ6qXSpWdwlgAwHEkd4imA0kf83hINmUEzJpmG80T/XLtDDEzZo8f6PQLuRCcUQhmzqqIo3ZPTRaWByRA=="
     },
     "collection-visit": {
       "version": "1.0.0",
@@ -7385,10 +7373,15 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "mousetrap": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.2.tgz",
-      "integrity": "sha512-jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA=="
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.3.tgz",
+      "integrity": "sha512-bd+nzwhhs9ifsUrC2tWaSgm24/oo2c83zaRyZQF06hYA6sANfsXHtnZ19AbbbDXCDzeH5nZBSQ4NvCjgD62tJA=="
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -8145,11 +8138,6 @@
       "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-5.0.0.tgz",
       "integrity": "sha1-fOyHXOgXilMzxN6Ato6pwYudfDc="
     },
-    "npm-font-open-sans": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/npm-font-open-sans/-/npm-font-open-sans-1.1.0.tgz",
-      "integrity": "sha512-t1y5ShWm6a8FSLwBdINT47XYMcuKY2rkTBsTdz/76YB2MtX0YD89RUkY2eSS2/XOmlZfBe1HFBAwD+b9+/UfmQ=="
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",

package.json

@@ -34,6 +34,7 @@
     "roboto-fontface": "^0.8.0",
     "sass-math": "^1.0.0",
     "tether": "^1.4.4",
+    "npm-font-open-sans": "^1.1.0",
     "utf-8-validate": "^5.0.2"
   },
   "dependencies": {
@@ -72,7 +73,6 @@
     "tslib": "^1.9.0",
     "requirejs": "^2.3.5",
     "ngx-progressbar": "^2.1.1",
-    "npm-font-open-sans": "^1.1.0",
     "font-awesome": "4.7.0"
   },
   "devDependencies": {

src/app/app.module.ts

@@ -6,7 +6,6 @@ import {HttpClientModule} from '@angular/common/http';
 import {CookieService} from 'ngx-cookie-service';
 import {MAT_LABEL_GLOBAL_OPTIONS} from '@angular/material';
 
-
 // service
 import {AppService, HttpService, LocalStorageService, NavService, LogService, UUIDService, TreeFilterService} from './app.service';
 
@@ -15,12 +14,10 @@ import {Pipes} from './pipes/pipes';
 import {AppComponent} from './pages/app.component';
 import {PagesComponents} from './pages/pages.component';
 import {ElementComponents} from './elements/elements.component';
-import {ChangLanWarningDialogComponent, RDPSolutionDialogComponent, FontDialogComponent} from './elements/nav/nav.component';
-import {DialogService, ElementDialogAlertComponent} from './elements/dialog/dialog.service';
+import {PageMainComponent} from '@app/pages/main/main.component';
 import {PluginModules} from './plugins/plugins';
-import {TestPageComponent} from './test-page/test-page.component';
+import {ChangLanWarningDialogComponent, RDPSolutionDialogComponent, FontDialogComponent} from './elements/nav/nav.component';
 import {AssetTreeDialogComponent, ManualPasswordDialogComponent} from './elements/connect/connect.component';
-import {SftpComponent} from './elements/sftp/sftp.component';
 
 
 @NgModule({
@@ -34,19 +31,17 @@ import {SftpComponent} from './elements/sftp/sftp.component';
   ],
   declarations: [
     AppComponent,
-    TestPageComponent,
     ...Pipes,
     ...ElementComponents,
     ...PagesComponents,
-    SftpComponent,
- ],
+  ],
   entryComponents: [
     AssetTreeDialogComponent,
     ManualPasswordDialogComponent,
-    ElementDialogAlertComponent,
     ChangLanWarningDialogComponent,
     RDPSolutionDialogComponent,
-    FontDialogComponent
+    FontDialogComponent,
+    PageMainComponent,
   ],
   bootstrap: [AppComponent],
   providers: [
@@ -58,7 +53,6 @@ import {SftpComponent} from './elements/sftp/sftp.component';
     NavService,
     UUIDService,
     LocalStorageService,
-    DialogService,
     CookieService,
     TreeFilterService,
     NGXLogger,

src/app/elements/elements.component.ts

@@ -5,17 +5,16 @@ import {ElementContentViewComponent} from './content-window/content-window.compo
 import {ElementContentTabComponent} from './content-tab/content-tab.component';
 import {ElementAssetTreeComponent} from './asset-tree/asset-tree.component';
 import {ElementTreeFilterComponent} from './tree-filter/tree-filter.component';
-import {ElementFooterComponent} from './footer/footer.component';
 import {ElementTermComponent} from './term/term.component';
 import {ChangLanWarningDialogComponent, ElementNavComponent} from './nav/nav.component';
 import {ElementRdpComponent} from './rdp/rdp.component';
-import {ElementServerMenuComponent} from './server-menu/server-menu.component';
 import {ElementIframeComponent} from './iframe/iframe.component';
 import {ElementDialogAlertComponent} from './dialog/dialog.service';
 import {ElementGuacamoleComponent} from './guacamole/guacamole.component';
 import {ElementSshTermComponent} from './ssh-term/ssh-term.component';
 import {ElementConnectComponent, AssetTreeDialogComponent, ManualPasswordDialogComponent} from './connect/connect.component';
 import {RDPSolutionDialogComponent, FontDialogComponent} from './nav/nav.component';
+import {ElementSftpComponent} from '@app/elements/sftp/sftp.component';
 
 export const ElementComponents = [
   ElementLeftBarComponent,
@@ -24,19 +23,18 @@ export const ElementComponents = [
   ElementContentViewComponent,
   ElementConnectComponent,
   ElementTreeFilterComponent,
-  ElementFooterComponent,
   ElementTermComponent,
   ElementNavComponent,
-  ChangLanWarningDialogComponent,
   ElementRdpComponent,
-  ElementServerMenuComponent,
   ElementIframeComponent,
   ElementDialogAlertComponent,
   ElementGuacamoleComponent,
   ElementAssetTreeComponent,
   ElementSshTermComponent,
   ElementConnectComponent,
+  ElementSftpComponent,
   AssetTreeDialogComponent,
+  ChangLanWarningDialogComponent,
   ManualPasswordDialogComponent,
   RDPSolutionDialogComponent,
   FontDialogComponent

src/app/elements/footer/footer.component.html

-<div class="footer fixed">
-  <div class="pull-right">
-    Version <strong>{{version}}</strong> GPL.
-  </div>
-  <div>
-    <strong>Copyright</strong> Jumpserver.org Team &copy; 2014-2018
-  </div>
-</div>

src/app/elements/footer/footer.component.spec.ts

-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ElementFooterComponent } from './footer.component';
-
-describe('FooterComponent', () => {
-  let component: ElementFooterComponent;
-  let fixture: ComponentFixture<ElementFooterComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ElementFooterComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ElementFooterComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/elements/footer/footer.component.ts

-/**
- * footer
- *
- * @date     2017-11-07
- * @author   liuzheng <liuzheng712@gmail.com>
- */
-import {Component, OnInit} from '@angular/core';
-import {AppService, LogService} from '@app/app.service';
-import {DataStore, User} from '@app/globals';
-import {version} from '@src/environments/environment';
-
-@Component({
-  selector: 'elements-footer',
-  templateUrl: './footer.component.html',
-  styleUrls: ['./footer.component.css']
-})
-export class ElementFooterComponent implements OnInit {
-  DataStore = DataStore;
-  User = User;
-  version = version;
-
-  constructor(private _appService: AppService,
-              private _logger: LogService) {
-    this._logger.log('nav.ts:NavComponent');
-    // this._appService.getnav()
-  }
-
-  ngOnInit() {
-  }
-
-}

src/app/elements/server-menu/server-menu.component.html

-<div class="ES-menu" [ngStyle]="{'top':top,'left':left}">
-  <ul class="dropdown-content">
-    <li [ngClass]="m.type" *ngFor="let m of MenuList">
-      <a (click)="m.action" *ngIf="m.type!='line'">{{m.name}}</a>
-    </li>
-  </ul>
-</div>

src/app/elements/server-menu/server-menu.component.scss

-.ES-menu {
-  display: block;
-  width: 120px;
-  background-color: #2f2a2a;
-  position: absolute;
-}
-
-.ES-menu ul {
-  list-style-type: none;
-  line-height: 24px;
-}
-
-.ES-menu li {
-  display: inline-block;
-}
-
-.dropdown {
-  position: relative;
-  display: inline-block;
-}
-
-.dropdown:hover {
-  background-color: #2d2828;
-}
-
-.dropdown-content {
-  position: absolute;
-  background-color: black;
-  color: #c6bcbc;
-  padding: 4px 0;
-  z-index: 999;
-  float: none;
-  list-style: none;
-  line-height: normal;
-  direction: ltr;
-  width: auto;
-  top: auto;
-  left: 0px;
-  margin-left: 0px;
-  margin-top: 0px;
-  min-width: 150px;
-}
-
-.ES-menu:hover .dropdown-content {
-  display: block;
-}
-
-.ES-menu .dropdown-content li {
-  float: left;
-  display: flex;
-}
-
-.ES-menu .dropdown-content li a {
-  padding: 6px 14px 6px 14px;
-  white-space: nowrap;
-  font-family: 'Roboto', sans-serif;
-  font-size: 13px;
-  font-weight: 300;
-  position: relative;
-  text-decoration: none;
-  min-width: 150px;
-  line-height: normal;
-}
-
-.ES-menu .dropdown-content li a span {
-  float: right;
-}
-
-.dropdown-content li:hover {
-  background-color: #3a3333;
-  color: black;
-  width: 100%;
-}
-
-.dropdown-content li.disabled:hover {
-  background-color: black;
-}
-
-.dropdown-content li.disabled a {
-  color: #c5babc;
-}
-
-.dropdown-content li.disabled a:hover {
-  cursor: default;
-  color: #c5babc;
-}
-
-.ES-menu a {
-  color: #f0f0f1;
-  text-align: center;
-  text-decoration: none;
-  padding: 6px 15px 6px 15px;
-
-}
-
-.ES-menu a:hover {
-  color: #fff;
-  cursor: pointer
-}
-
-.ES-menu .line {
-  height: 1px;
-  width: 100%;
-  background-color: white;
-}

src/app/elements/server-menu/server-menu.component.spec.ts

-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ElementServerMenuComponent } from './server-menu.component';
-
-describe('ElementServerMenuComponent', () => {
-  let component: ElementServerMenuComponent;
-  let fixture: ComponentFixture<ElementServerMenuComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ ElementServerMenuComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ElementServerMenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/elements/server-menu/server-menu.component.ts

-import {Component, OnInit} from '@angular/core';
-import {DialogService} from '../dialog/dialog.service';
-
-
-export class Menu {
-  name: string;
-  type: string;
-  action: any;
-}
-
-@Component({
-  selector: 'elements-server-menu',
-  templateUrl: './server-menu.component.html',
-  styleUrls: ['./server-menu.component.scss'],
-})
-export class ElementServerMenuComponent implements OnInit {
-  MenuList: Array<any>;
-  top: number;
-  left: number;
-
-  constructor(private _dialog: DialogService) {
-  }
-
-  ngOnInit() {
-    const m = new Menu();
-    const line = new Menu();
-    m.action = '';
-    m.name = 'test';
-    m.type = 'lll';
-    line.type = 'line';
-    this.MenuList = [m, m, line, m, m];
-    this._dialog.alert('sss');
-  }
-
-  public contextmenu(top: number, left: number) {
-    this.top = top;
-    this.left = left;
-  }
-
-}

src/app/elements/sftp/sftp.component.spec.ts

 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { SftpComponent } from './sftp.component';
+import { ElementSftpComponent } from './sftp.component';
 
-describe('SftpComponent', () => {
-  let component: SftpComponent;
-  let fixture: ComponentFixture<SftpComponent>;
+describe('ElementSftpComponent', () => {
+  let component: ElementSftpComponent;
+  let fixture: ComponentFixture<ElementSftpComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ SftpComponent ]
+      declarations: [ ElementSftpComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SftpComponent);
+    fixture = TestBed.createComponent(ElementSftpComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/elements/sftp/sftp.component.ts

@@ -7,7 +7,7 @@ import {DomSanitizer} from '@angular/platform-browser';
   templateUrl: './sftp.component.html',
   styleUrls: ['./sftp.component.scss']
 })
-export class SftpComponent implements OnInit {
+export class ElementSftpComponent implements OnInit {
   @Input() host: any;
   target: any;
   @ViewChild('sftp') el: ElementRef;

src/app/pages/main/main.component.html

 <elements-nav></elements-nav>
-<div fxLayout="row" id="container" class="container-fluid row" ngxSplit="row">
+<div fxLayout="row wrap" id="container" class="container-fluid row" ngxSplit="row">
   <div fxFlex="1 1 20%" minBasis="100px" maxBasis="800px" fxFlexFill ngxSplitArea *ngIf="DataStore.showLeftBar">
     <elements-left-bar></elements-left-bar>
   </div>

src/app/plugins/MaterialModule.component.ts

 import {NgModule} from '@angular/core';
 import {
-  MatAutocompleteModule,
+  // MatAutocompleteModule,
   MatButtonModule,
-  MatButtonToggleModule,
-  MatCardModule,
-  MatCheckboxModule,
+  // MatButtonToggleModule,
+  // MatCardModule,
+  // MatCheckboxModule,
   MatChipsModule,
-  MatDatepickerModule,
+  // MatDatepickerModule,
   MatDialogModule,
-  MatExpansionModule,
-  MatGridListModule,
-  MatIconModule,
+  // MatExpansionModule,
+  // MatGridListModule,
+  // MatIconModule,
   MatInputModule,
-  MatListModule,
-  MatMenuModule,
-  MatNativeDateModule,
-  MatPaginatorModule,
-  MatProgressBarModule,
-  MatProgressSpinnerModule,
+  // MatListModule,
+  // MatMenuModule,
+  // MatNativeDateModule,
+  // MatPaginatorModule,
+  // MatProgressBarModule,
+  // MatProgressSpinnerModule,
   MatRadioModule,
-  MatRippleModule,
+  // MatRippleModule,
   MatSelectModule,
-  MatSidenavModule,
-  MatSliderModule,
-  MatSlideToggleModule,
-  MatSnackBarModule,
-  MatSortModule,
-  MatTableModule,
-  MatTabsModule,
-  MatToolbarModule,
-  MatTooltipModule,
-  MatStepperModule,
+  // MatSidenavModule,
+  // MatSliderModule,
+  // MatSlideToggleModule,
+  // MatSnackBarModule,
+  // MatSortModule,
+  // MatTableModule,
+  // MatTabsModule,
+  // MatToolbarModule,
+  // MatTooltipModule,
+  // MatStepperModule,
 } from '@angular/material';
 import {CdkTableModule} from '@angular/cdk/table';
 
 @NgModule({
   exports: [
     CdkTableModule,
-    MatAutocompleteModule,
+    // MatAutocompleteModule,
     MatButtonModule,
-    MatButtonToggleModule,
-    MatCardModule,
-    MatCheckboxModule,
+    // MatButtonToggleModule,
+    // MatCardModule,
+    // MatCheckboxModule,
     MatChipsModule,
-    MatStepperModule,
-    MatDatepickerModule,
+    // MatStepperModule,
+    // MatDatepickerModule,
     MatDialogModule,
-    MatExpansionModule,
-    MatGridListModule,
-    MatIconModule,
+    // MatExpansionModule,
+    // MatGridListModule,
+    // MatIconModule,
     MatInputModule,
-    MatListModule,
-    MatMenuModule,
-    MatNativeDateModule,
-    MatPaginatorModule,
-    MatProgressBarModule,
-    MatProgressSpinnerModule,
+    // MatListModule,
+    // MatMenuModule,
+    // MatNativeDateModule,
+    // MatPaginatorModule,
+    // MatProgressBarModule,
+    // MatProgressSpinnerModule,
     MatRadioModule,
-    MatRippleModule,
+    // MatRippleModule,
     MatSelectModule,
-    MatSidenavModule,
-    MatSliderModule,
-    MatSlideToggleModule,
-    MatSnackBarModule,
-    MatSortModule,
-    MatTableModule,
-    MatTabsModule,
-    MatToolbarModule,
-    MatTooltipModule,
+    // MatSidenavModule,
+    // MatSliderModule,
+    // MatSlideToggleModule,
+    // MatSnackBarModule,
+    // MatSortModule,
+    // MatTableModule,
+    // MatTabsModule,
+    // MatToolbarModule,
+    // MatTooltipModule,
   ]
 })
 export class MaterialModule {

src/app/plugins/plugins.ts

@@ -3,17 +3,16 @@ import {NgxUIModule, SplitModule} from '@swimlane/ngx-ui';
 import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {NgProgressModule} from 'ngx-progressbar';
-import {FlexLayoutModule} from '@angular/flex-layout';
+// import {FlexLayoutModule} from '@angular/flex-layout';
 
 
 export const PluginModules = [
   BrowserAnimationsModule,
   NgProgressModule,
   MaterialModule,
-  FlexLayoutModule,
+  // FlexLayoutModule,
   LoggerModule.forRoot({level: NgxLoggerLevel.DEBUG, serverLogLevel: NgxLoggerLevel.ERROR}),
-  NgxUIModule,
-  SplitModule
+  NgxUIModule, SplitModule
 ];
 
 

src/app/router/router.module.ts

@@ -2,20 +2,18 @@ import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 
 import {PagesBlankComponent} from '../pages/blank/blank.component';
-import {TestPageComponent} from '../test-page/test-page.component';
 import {PagesConnectComponent} from '../pages/connect/connect.component';
 import {PagesReplayComponent} from '../pages/replay/replay.component';
 import {PageMainComponent} from '../pages/main/main.component';
 import {PagesMonitorComponent} from '../pages/monitor/monitor.component';
-import {SftpComponent} from '../elements/sftp/sftp.component';
+import {ElementSftpComponent} from '../elements/sftp/sftp.component';
 
 
 const appRoutes: Routes = [
   {path: 'replay/:token', component: PagesReplayComponent},
   {path: 'monitor/:token', component: PagesMonitorComponent},
-  {path: 'test', component: TestPageComponent},
   {path: 'connect', component: PagesConnectComponent},
-  {path: 'sftp', component: SftpComponent},
+  {path: 'sftp', component: ElementSftpComponent},
   {path: 'undefined', component: PagesBlankComponent},
   {path: '', component: PageMainComponent},
   // {path: '**', component: PagesNotFoundComponent}

src/app/test-page/test-page.component.html

-<!--<tree-root [nodes]="nodes" [options]="options"></tree-root>-->
-<!--<app-replay-mp4></app-replay-mp4>-->
-<!--<elements-tree [TreeData]="nodes1"></elements-tree>-->
-<elements-asset-tree></elements-asset-tree>
-

src/app/test-page/test-page.component.scss

-:host {
-  display: block;
-  width: 100%;
-  margin: 50px 0;
-}
-.btns {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-}

src/app/test-page/test-page.component.spec.ts

-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TestPageComponent } from './test-page.component';
-
-describe('TestPageComponent', () => {
-  let component: TestPageComponent;
-  let fixture: ComponentFixture<TestPageComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ TestPageComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TestPageComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});