Merge branch 'master' into bootstrap4

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

@@ -5,7 +5,11 @@
 import {Component} from '@angular/core';
 import {Logger} from 'angular2-logger/core';
 
+<<<<<<< HEAD:src/app/footer.component.ts
 import {AppService, DataStore, User} from './app.service';
+=======
+import {AppService, DataStore} from '../app.service';
+>>>>>>> master:src/app/BasicPage/footer.component.ts
 
 
 @Component({

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

@@ -13,7 +13,11 @@ import {Logger} from 'angular2-logger/core';
 // declare var layer: any;
 
 
+<<<<<<< HEAD:src/app/nav.component.ts
 import {AppService, DataStore, User} from './app.service';
+=======
+import {AppService, DataStore} from '../app.service';
+>>>>>>> master:src/app/BasicPage/nav.component.ts
 
 
 //noinspection TypeScriptValidateTypes

src/app/leftbar.component.ts → src/app/IndexPage/leftbar.component.ts

@@ -5,7 +5,7 @@
 import {Component} from '@angular/core';
 import {Logger} from 'angular2-logger/core';
 
-import {AppService, DataStore} from './app.service';
+import {AppService, DataStore} from '../app.service';
 
 
 //noinspection TypeScriptValidateTypes

src/app/welcome.component.ts → src/app/IndexPage/welcome.component.ts

 /**
  * Created by liuzheng on 2017/8/31.
  */
+<<<<<<< HEAD:src/app/welcome.component.ts
 import {Component, OnInit} from '@angular/core';
 import {AppService, DataStore, User} from './app.service';
+=======
+import {Component} from '@angular/core';
+import {AppService} from '../app.service';
+>>>>>>> master:src/app/IndexPage/welcome.component.ts
 
 @Component({
   templateUrl: './welcome.html',

src/app/app-routing.module.ts

@@ -3,10 +3,15 @@
  */
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
-import {WelcomeComponent} from './welcome.component';
-import {PageNotFoundComponent} from './not-found.component';
 import {environment} from '../environments/environment';
+<<<<<<< HEAD
 import {LoginComponent} from './login.component';
+=======
+
+import {WelcomeComponent} from './IndexPage/welcome.component';
+import {PageNotFoundComponent} from './BasicPage/not-found.component';
+
+>>>>>>> master
 const appRoutes: Routes = [
   // { path: 'crisis-center', component: CrisisListComponent },
   {path: 'welcome', component: WelcomeComponent}, // <-- delete this line

src/app/app.module.ts

@@ -12,6 +12,7 @@ import {AppRoutingModule} from './app-routing.module';
 
 
 import {AppComponent} from './app.component';
+<<<<<<< HEAD
 import {WelcomeComponent} from './welcome.component';
 import {NavComponent} from './nav.component';
 import {FooterComponent} from './footer.component';
@@ -19,6 +20,15 @@ import {LeftbarComponent} from './leftbar.component';
 import {PageNotFoundComponent} from './not-found.component';
 import {LoginComponent} from './login.component';
 
+=======
+
+import {NavComponent} from './BasicPage/nav.component';
+import {PageNotFoundComponent} from './BasicPage/not-found.component';
+import {FooterComponent} from './BasicPage/footer.component';
+
+import {WelcomeComponent} from './IndexPage/welcome.component';
+import {LeftbarComponent} from './IndexPage/leftbar.component';
+>>>>>>> master
 
 @NgModule({
   imports: [

src/app/app.service.ts

@@ -27,20 +27,6 @@ import * as io from 'socket.io-client';
 import {Router} from '@angular/router';
 
 
-// export class User {
-//   id: number;
-//   name: string;
-//   username: string;
-//   password: string;
-//   phone: string;
-//   avatar: string;
-//   role: string;
-//   email: string;
-//   is_active: boolean;
-//   date_joined: string;
-//   last_login: string;
-//   groups: Array<string>;
-// }
 export class Group {
   id: number;
   name: string;
@@ -60,7 +46,7 @@ export let User: {
   is_active: boolean;
   date_joined: string;
   last_login: string;
-  groups: Array<string>;
+  groups: Array<Group>;
   logined: boolean;
 } = {
   id: 0,
@@ -77,6 +63,18 @@ export let User: {
   groups: [],
   logined: false,
 };
+
+export class Term {
+  nick: string;
+  edit: boolean;
+  machine: string;
+  connected: boolean;
+  closed: boolean;
+  socket: any;
+  term: any;
+  hide: boolean;
+}
+
 export let DataStore: {
   socket: any;
   Nav: Array<{}>;
@@ -89,7 +87,7 @@ export let DataStore: {
   leftbar: string;
   leftbarrightclick: string;
   loglevel: number;
-  term: Array<{}>;
+  term: Array<Term>;
   termActive: number;
   leftbarhide: boolean;
   termlist: Array<string>;
@@ -106,7 +104,7 @@ export let DataStore: {
   leftbar: '/api/leftbar',
   leftbarrightclick: '/api/leftbarrightclick',
   loglevel: 0,
-  term: [],
+  term: [new Term()],
   termActive: 0,
   leftbarhide: false,
   termlist: [],
@@ -372,19 +370,4 @@ export class AppService {
 //     });
 //
 //   }
-//
-//
-//   // getLeftbarRightclick() {
-//   //     this._logger.log('service.ts:AppService,getLeftbarRightclick');
-//   //     return this.http.get('/api/leftbarrightclick')
-//   //         .map(res => res.json())
-//   //         .subscribe(response => {
-//   //             DataStore.leftbarrightclick = response;
-//   //             this._logger.debug("DataStore.leftbarrightclick:", DataStore.leftbarrightclick)
-//   //             // this._logger.warn(this._dataStore.user);
-//   //             // this._logger.warn(DataStore.user)
-//   //         });
-//   //
-//   // }
-
 }