feat: reflact

mock.py

@@ -114,10 +114,10 @@ def asset_groups_assets():
         },
         {
           "id": 4,
-          "hostname": "testserver123",
+          "hostname": "windows server",
           "ip": "123.57.183.135",
-          "port": 8022,
-          "system": "linux",
+          "port": 3389,
+          "system": "windows",
           "assets_granted": [
             {
               "id": 1,

src/app/BasicPage/not-found/not-found.component.ts

 import {Component, OnInit} from '@angular/core';
-import {NavComponent} from '../nav/nav.component'
+import {DataStore} from '../../globals';
 
 @Component({
   selector: 'app-not-found',
@@ -13,7 +13,7 @@ export class NotFoundComponent implements OnInit {
   }
 
   ngOnInit() {
-    NavComponent.Hide()
+    DataStore.NavShow = false;
   }
 
 }

src/app/app.component.css

-app-nav {
+app-element-nav {
   font-family: 'Roboto', sans-serif;
   font-size: 13px;
   font-weight: 300;

src/app/app.component.html

-<app-nav *ngIf="DataStore.NavShow"></app-nav>
+<app-element-nav *ngIf="DataStore.NavShow"></app-element-nav>
 <nav *ngIf="DataStore.NavShow"></nav>
 <router-outlet></router-outlet>

src/app/app.module.ts

@@ -18,11 +18,11 @@ import {HttpModule} from '@angular/http';
 import {AppRoutingModule} from './app-routing.module';
 
 import {AppComponent} from './app.component';
+import {ElementFooterComponent} from './elements/footer/footer.component';
 
-import {NavComponent} from './BasicPage/nav/nav.component';
+import {ElementNavComponent} from './elements/nav/nav.component';
 import {LoginComponent} from './BasicPage/login/login.component';
-import {FooterComponent} from './BasicPage/footer/footer.component';
-
+import {ElementPopupComponent} from './elements/popup/popup.component';
 import {IleftbarComponent} from './IndexPage/ileftbar/ileftbar.component';
 import {SearchComponent, SearchFilter} from './ControlPage/search/search.component';
 import {CleftbarComponent} from './ControlPage/cleftbar/cleftbar.component';
@@ -33,7 +33,6 @@ import {SshComponent} from './ControlPage/control/ssh/ssh.component';
 import {ControlPageComponent} from './ControlPage/controlpage.component';
 import {IndexPageComponent} from './IndexPage/index-page.component';
 import {NotFoundComponent} from './BasicPage/not-found/not-found.component';
-import {PopupComponent} from './BasicPage/popup/popup.component';
 import {RdppageComponent} from './rdppage/rdppage.component';
 import {TermpageComponent} from './termpage/termpage.component';
 import {ReplayPageComponent} from './replay-page/replay-page.component';
@@ -54,9 +53,10 @@ import {WindowsComponent} from './monitor-page/windows/windows.component';
   ],
   declarations: [
     AppComponent,
-    NavComponent,
+    ElementNavComponent,
+    ElementFooterComponent,
+    ElementPopupComponent,
     LoginComponent,
-    FooterComponent,
     RdpComponent,
     SshComponent,
     SearchComponent,
@@ -68,7 +68,6 @@ import {WindowsComponent} from './monitor-page/windows/windows.component';
     ControlPageComponent,
     IndexPageComponent,
     NotFoundComponent,
-    PopupComponent,
     RdppageComponent,
     TermpageComponent,
     ReplayPageComponent,

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

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

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

@@ -6,19 +6,16 @@
  * @author   liuzheng <liuzheng712@gmail.com>
  */
 import {Component, OnInit} from '@angular/core';
-import {Logger} from 'angular2-logger/core';
 import {AppService} from '../../app.service';
+import {Logger} from 'angular2-logger/core';
 import {DataStore, User} from '../../globals';
 
 @Component({
-  selector: 'app-footer',
+  selector: 'app-element-footer',
   templateUrl: './footer.component.html',
-  styleUrls: ['./footer.component.css'],
-  providers: [AppService]
-
+  styleUrls: ['./footer.component.css']
 })
-export class FooterComponent implements OnInit {
-
+export class ElementFooterComponent implements OnInit {
   DataStore = DataStore;
   User = User;
 

src/app/BasicPage/nav/nav.component.spec.ts → src/app/elements/nav/nav.component.spec.ts

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

src/app/BasicPage/nav/nav.component.ts → src/app/elements/nav/nav.component.ts

@@ -19,15 +19,15 @@ declare let layer: any;
 declare let jQuery: any;
 
 @Component({
-  selector: 'app-nav',
+  selector: 'app-element-nav',
   templateUrl: './nav.component.html',
   styleUrls: ['./nav.component.css'],
 })
-export class NavComponent implements OnInit {
+export class ElementNavComponent implements OnInit {
   DataStore = DataStore;
 
   static Hide() {
-    jQuery('app-nav').hide();
+    jQuery('app-element-nav').hide();
   }
 
   constructor(private _appService: AppService,

src/app/BasicPage/popup/popup.component.spec.ts → src/app/elements/popup/popup.component.spec.ts

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

src/app/BasicPage/popup/popup.component.ts → src/app/elements/popup/popup.component.ts

 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-popup',
+  selector: 'app-element-popup',
   templateUrl: './popup.component.html',
   styleUrls: ['./popup.component.css']
 })
-export class PopupComponent implements OnInit {
+export class ElementPopupComponent implements OnInit {
 
   constructor() { }