Commit 0c6aade2 authored by liuzheng712's avatar liuzheng712

update

parent d70618ae
......@@ -352,6 +352,11 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
"angular2-logger": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/angular2-logger/-/angular2-logger-0.6.0.tgz",
"integrity": "sha1-UBnEeSQn1/H0QslHABZX4QsuP2M="
},
"ansi-escapes": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz",
......@@ -1283,6 +1288,16 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true
},
"clipboard": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
"integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs=",
"requires": {
"good-listener": "1.2.2",
"select": "1.1.2",
"tiny-emitter": "2.0.2"
}
},
"cliui": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
......@@ -1927,6 +1942,11 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true
},
"delegate": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
"integrity": "sha1-moJRp3fXAl+qVXN7w7BxdCEnqf0="
},
"delegates": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
......@@ -3965,6 +3985,14 @@
"minimatch": "3.0.4"
}
},
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"requires": {
"delegate": "3.1.3"
}
},
"graceful-fs": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
......@@ -5839,6 +5867,11 @@
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
"dev": true
},
"ng2-cookies": {
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/ng2-cookies/-/ng2-cookies-1.0.12.tgz",
"integrity": "sha1-Pz5hPgE3sGSbcFxngHS0vQgUnMw="
},
"no-case": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz",
......@@ -7208,6 +7241,27 @@
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
"pty.js": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/pty.js/-/pty.js-0.3.1.tgz",
"integrity": "sha1-gfW+0zLW5eeraFaI0boDc0ENUbU=",
"requires": {
"extend": "1.2.1",
"nan": "2.3.5"
},
"dependencies": {
"extend": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz",
"integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w="
},
"nan": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz",
"integrity": "sha1-gioNwmYpDOTNOhIoLKPn42Rmigg="
}
}
},
"public-encrypt": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
......@@ -7810,6 +7864,11 @@
}
}
},
"select": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
},
"select-hose": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
......@@ -8754,6 +8813,11 @@
"setimmediate": "1.0.5"
}
},
"tiny-emitter": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz",
"integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow=="
},
"tmp": {
"version": "0.0.31",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
......
......@@ -21,7 +21,11 @@
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"angular2-logger": "^0.6.0",
"clipboard": "^1.7.1",
"core-js": "^2.4.1",
"ng2-cookies": "^1.0.12",
"pty.js": "^0.3.1",
"rxjs": "^5.4.2",
"zone.js": "^0.8.14"
},
......
/**
* Created by liuzheng on 2017/8/31.
*/
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {WelcomeComponent} from './welcome.component';
import {PageNotFoundComponent} from './not-found.component';
const appRoutes: Routes = [
// { path: 'crisis-center', component: CrisisListComponent },
{path: 'welcome', component: WelcomeComponent}, // <-- delete this line
{path: '', redirectTo: '/welcome', pathMatch: 'full'},
{path: '**', component: PageNotFoundComponent}
];
@NgModule({
imports: [
RouterModule.forRoot(
appRoutes,
{enableTracing: true} // <-- debugging purposes only
)
],
exports: [
RouterModule
]
})
export class AppRoutingModule {
}
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { FormsModule } from '@angular/forms'; // <-- NgModel lives here
/**
* Created by liuzheng on 2017/8/30.
*/
import { AppComponent } from './app.component';
import {BrowserModule} from '@angular/platform-browser';
import {NgModule} from '@angular/core';
import {FormsModule} from '@angular/forms'; // <-- NgModel lives here
import {Logger, Options, Level as LoggerLevel} from 'angular2-logger/core';
import { HttpModule } from '@angular/http';
import {AppRoutingModule} from './app-routing.module';
import {IndexComponent} from './index.component';
import {WelcomeComponent} from './welcome.component';
import {NavComponent} from './nav.component';
import {PageNotFoundComponent} from './not-found.component';
@NgModule({
imports: [
BrowserModule,
FormsModule // <-- import the FormsModule before binding with [(ngModel)]
FormsModule,
AppRoutingModule,
HttpModule,
],
declarations: [
AppComponent
IndexComponent,
WelcomeComponent,
NavComponent,
PageNotFoundComponent
// HeroListComponent,
// CrisisListComponent,
],
bootstrap: [ AppComponent ]
bootstrap: [IndexComponent],
providers: [
{provide: Options, useValue: {store: false, level: LoggerLevel.WARN}},
Logger
]
})
export class AppModule { }
export class AppModule {}
This diff is collapsed.
/**
* Created by liuzheng on 2017/8/31.
*/
import {Component} from '@angular/core';
import {AppService} from './app.service';
@Component({
selector: 'app-root',
templateUrl: './index.html',
providers: [AppService],
// directives: [LeftbarComponent, TermComponent]
})
export class IndexComponent {
// DataStore = DataStore;
}
<app-nav></app-nav>
<div id="left-bar"></div>
<!--<term id="ngdiv" [ngClass]="{'hideleftbar':DataStore.leftbarhide}"></term>-->
<router-outlet></router-outlet>
/**
* Created by liuzheng on 2017/8/30.
*/
import {Component} from '@angular/core';
import {NgClass} from '@angular/common';
// import {ROUTER_DIRECTIVES} from '@angular/router-deprecated';
import {Logger} from 'angular2-logger/core';
// import 'rxjs/Rx';
// declare var jQuery: any;
// declare var Clipboard: any;
// declare var layer: any;
import {AppService, DataStore} from './app.service';
//noinspection TypeScriptValidateTypes
@Component({
selector: 'app-nav',
templateUrl: './nav.html',
// directives: [NgClass]
})
export class NavComponent {
// DataStore = DataStore;
constructor(private _appService: AppService,
private _logger: Logger) {
this._logger.log('nav.ts:NavComponent');
// this._appService.getnav()
}
// ngOnInit() {
//
// }
//
// click(event) {
// this._logger.debug('nav.ts:NavComponent,click', event);
// if (event === 'ReloadLeftbar') {
// this._appService.ReloadLeftbar();
// } else if (event === 'HideLeft') {
// this._appService.HideLeft();
// } else if (event === 'ShowLeft') {
// this._appService.ShowLeft();
// } else if (event === 'Copy') {
// this._appService.copy();
// } else if (event === 'Disconnect') {
// this._appService.TerminalDisconnect(DataStore.termActive);
// } else if (event === 'DisconnectAll') {
// this._appService.TerminalDisconnectAll();
// } else if (event === 'Website') {
// window.open('http://www.jumpserver.org');
// } else if (event === 'BBS') {
// window.open('http://bbs.jumpserver.org');
// } else if (event === 'EnterLicense') {
// this.EnterLicense();
// }
// }
//
// EnterLicense() {
// layer.prompt({
// formType: 2,
// maxlength: 500,
// title: 'Please Input Code',
// scrollbar: false,
// area: ['400px', '300px'],
// moveOut: true,
// moveType: 1
// }, function (value, index) {
// DataStore.socket.emit('key', value);
// // layer.msg(value); //得到value
// layer.close(index);
//
// });
// }
}
<div class="nav" >
nav
</div>
/**
* Created by liuzheng on 2017/8/31.
*/
import {Component} from '@angular/core';
@Component({
selector: 'app-root',
template: '<h2>Page not found</h2>'
})
export class PageNotFoundComponent {
}
/**
* Created by liuzheng on 2017/8/31.
*/
import {Component} from '@angular/core';
import {AppService} from './app.service';
@Component({
templateUrl: './welcome.html',
providers: [AppService],
// directives: [LeftbarComponent, TermComponent]
})
export class WelcomeComponent {
// DataStore = DataStore;
}
<h2>welcome</h2>
......@@ -9,6 +9,7 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
<app-root></app-root>
<app-root></app-root>
</body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment