Commit 2b68de5c authored by liuzheng712's avatar liuzheng712

update

parent 1a97e0a4
This diff is collapsed.
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"ng2-cookies": "^1.0.12", "ng2-cookies": "^1.0.12",
"pty.js": "^0.3.1", "pty.js": "^0.3.1",
"rxjs": "^5.4.2", "rxjs": "^5.4.2",
"socket.io": "^2.0.3",
"zone.js": "^0.8.14" "zone.js": "^0.8.14"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -10,10 +10,11 @@ import 'rxjs/add/operator/map'; ...@@ -10,10 +10,11 @@ import 'rxjs/add/operator/map';
// import {DynamicRouteConfigurator} from './dynamicRouteConfigurator' // import {DynamicRouteConfigurator} from './dynamicRouteConfigurator'
// import 'rxjs/add/operator/share'; // import 'rxjs/add/operator/share';
// import 'rxjs/Rx'; // import 'rxjs/Rx';
// declare var jQuery: any; declare let jQuery: any;
// declare var Terminal: any; // declare var Terminal: any;
// declare var Clipboard: any; // declare var Clipboard: any;
// declare var io: any; import * as io from 'socket.io-client';
// declare let io: any;
// declare var layer: any; // declare var layer: any;
// @Injectable() // @Injectable()
// export class Logger { // export class Logger {
...@@ -25,7 +26,7 @@ import 'rxjs/add/operator/map'; ...@@ -25,7 +26,7 @@ import 'rxjs/add/operator/map';
// } // }
export interface User { export class User {
id: number; id: number;
name: string; name: string;
username: string; username: string;
...@@ -33,20 +34,20 @@ export interface User { ...@@ -33,20 +34,20 @@ export interface User {
phone: string; phone: string;
avatar: string; avatar: string;
role: string; role: string;
email: string ; email: string;
is_active: boolean; is_active: boolean;
date_joined: string; date_joined: string;
last_login: string; last_login: string;
groups: Array<string>; groups: Array<string>;
} }
export interface Group { export class Group {
id: number; id: number;
name: string; name: string;
membercount: number; membercount: number;
comment: string; comment: string;
} }
export interface DataStore { export let DataStore: {
socket: any; socket: any;
user: User; user: User;
Nav: Array<{}>; Nav: Array<{}>;
...@@ -65,28 +66,26 @@ export interface DataStore { ...@@ -65,28 +66,26 @@ export interface DataStore {
leftbarhide: boolean; leftbarhide: boolean;
termlist: Array<string>; termlist: Array<string>;
windowsize: Array<number>; windowsize: Array<number>;
} } = {
// = { socket: io.connect(),
// socket: io.connect(), user: new User,
// user: new User, Nav: [{}],
// Nav: [{}], logined: false,
// logined: false, lastNavigationAttempt: '',
// lastNavigationAttempt: '', route: [{}],
// route: [{}], activenav: {},
// activenav: {}, Path: {},
// Path: {}, error: {},
// error: {}, msg: {},
// msg: {}, leftbar: '/api/leftbar',
// leftbar: '/api/leftbar', leftbarrightclick: '/api/leftbarrightclick',
// leftbarrightclick: '/api/leftbarrightclick', loglevel: 0,
// loglevel: 0, term: [],
// term: [], termActive: 0,
// termActive: 0, leftbarhide: false,
// leftbarhide: false, termlist: [],
// termlist: [], windowsize: [],
// windowsize: [], };
// };
@Injectable() @Injectable()
...@@ -104,7 +103,7 @@ export class AppService { ...@@ -104,7 +103,7 @@ export class AppService {
// 3.- Level.INFO // 3.- Level.INFO
// 4.- Level.DEBUG // 4.- Level.DEBUG
// 5.- Level.LOG // 5.- Level.LOG
this._logger.level = parseInt(Cookie.get('loglevel')); this._logger.level = parseInt(Cookie.get('loglevel'), 10);
// this._logger.debug('Your debug stuff'); // this._logger.debug('Your debug stuff');
// this._logger.info('An info'); // this._logger.info('An info');
// this._logger.warn('Take care '); // this._logger.warn('Take care ');
...@@ -115,24 +114,26 @@ export class AppService { ...@@ -115,24 +114,26 @@ export class AppService {
// this._logger.level = parseInt(Cookie.getCookie('loglevel')); // this._logger.level = parseInt(Cookie.getCookie('loglevel'));
this._logger.level = 0; this._logger.level = 0;
} }
// let vm = this; const vm = this;
// DataStore.socket.on('connect', function () { DataStore.socket.on('connect', function () {
// console.log('DatsStore socket connected'); console.log('DatsStore socket connected');
// DataStore.socket.on('nav', function (data) { DataStore.socket.on('nav', function (data) {
// DataStore.Nav = JSON.parse(data); DataStore.Nav = JSON.parse(data);
// }); });
// DataStore.socket.on('leftbar', function (data) { DataStore.socket.on('leftbar', function (data) {
// if (data == 'changed') if (data === 'changed') {
// vm.ReloadLeftbar(); vm.ReloadLeftbar();
// }); }
// // DataStore.socket.on('popup', function (data) { });
// // layer.msg(data); // DataStore.socket.on('popup', function (data) {
// // }); // layer.msg(data);
// // });
// // DataStore.socket.emit('api', 'all');
// }); // DataStore.socket.emit('api', 'all');
// // this.checklogin(); });
// } // this.checklogin();
}
// //
// checklogin() { // checklogin() {
// this._logger.log('service.ts:AppService,checklogin'); // this._logger.log('service.ts:AppService,checklogin');
...@@ -248,19 +249,19 @@ export class AppService { ...@@ -248,19 +249,19 @@ export class AppService {
// //
// } // }
// //
// ReloadLeftbar() { ReloadLeftbar() {
// jQuery('#left-bar').fancytree('getTree').reload(); jQuery('#left-bar').fancytree('getTree').reload();
// } }
//
// // setMyinfo(user:User) { // setMyinfo(user:User) {
// // // Update data store // // Update data store
// // this._dataStore.user = user; // this._dataStore.user = user;
// // this._logger.log("service.ts:AppService,setMyinfo"); // this._logger.log("service.ts:AppService,setMyinfo");
// // this._logger.debug(user); // this._logger.debug(user);
// // // Push the new list of todos into the Observable stream // // Push the new list of todos into the Observable stream
// // // this._dataObserver.next(user); // // this._dataObserver.next(user);
// // // this.myinfo$ = new Observable(observer => this._dataObserver = observer).share() // // this.myinfo$ = new Observable(observer => this._dataObserver = observer).share()
// // } // }
// //
// getMyinfo() { // getMyinfo() {
// this._logger.log('service.ts:AppService,getMyinfo'); // this._logger.log('service.ts:AppService,getMyinfo');
...@@ -476,8 +477,8 @@ export class AppService { ...@@ -476,8 +477,8 @@ export class AppService {
// ); // );
// this._logger.log(q); // this._logger.log(q);
// } // }
}
} }
// }
// //
// @Pipe({ // @Pipe({
// name: 'join' // name: 'join'
......
...@@ -25,7 +25,7 @@ import {AppService, DataStore} from './app.service'; ...@@ -25,7 +25,7 @@ import {AppService, DataStore} from './app.service';
export class NavComponent { export class NavComponent {
// DataStore = DataStore; DataStore = DataStore;
constructor(private _appService: AppService, constructor(private _appService: AppService,
private _logger: Logger) { private _logger: Logger) {
......
<div class="nav" > <div class="nav" >
nav nav{{DataStore.leftbar}}
</div> </div>
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