Commit 9dc8d7a5 authored by liuzheng712's avatar liuzheng712

update

parent 893c9d6e
...@@ -40,6 +40,7 @@ export class User { ...@@ -40,6 +40,7 @@ export class User {
date_joined: string; date_joined: string;
last_login: string; last_login: string;
groups: Array<string>; groups: Array<string>;
logined:boolean;
} }
export class Group { export class Group {
id: number; id: number;
...@@ -183,7 +184,7 @@ export class AppService { ...@@ -183,7 +184,7 @@ export class AppService {
login(user: User) { login(user: User) {
this._logger.log('service.ts:AppService,login'); this._logger.log('service.ts:AppService,login');
DataStore.error['login'] = ''; DataStore.error['login'] = '';
if (user.username.length > 0 && user.password.length > 6 && user.password.length < 100) if (user.username.length > 0 && user.password.length > 6 && user.password.length < 100) {
this.http.post('/api/checklogin', JSON.stringify(user)).map(res => res.json()) this.http.post('/api/checklogin', JSON.stringify(user)).map(res => res.json())
.subscribe( .subscribe(
data => { data => {
...@@ -193,25 +194,26 @@ export class AppService { ...@@ -193,25 +194,26 @@ export class AppService {
err => { err => {
this._logger.error(err); this._logger.error(err);
DataStore.logined = false; DataStore.logined = false;
this._router.navigate(['Login']); this._router.navigate(['login']);
DataStore.error['login'] = '后端错误,请重试'; DataStore.error['login'] = '后端错误,请重试';
}, },
() => { () => {
if (DataStore.logined) { if (DataStore.logined) {
if (jQuery.isEmptyObject(DataStore.Path)) if (jQuery.isEmptyObject(DataStore.Path)) {
this._router.navigate(['Index', '/']); this._router.navigate(['welcome']);
else } else {
this._router.navigate([DataStore.Path['name'], DataStore.Path['res']]); this._router.navigate([DataStore.Path['name'], DataStore.Path['res']]);
}
} else { } else {
DataStore.error['login'] = '请检查用户名和密码'; DataStore.error['login'] = '请检查用户名和密码';
this._router.navigate(['Login']); this._router.navigate(['login']);
} }
// jQuery('angular2').show(); // jQuery('angular2').show();
}); });
else } else {
DataStore.error['login'] = '请检查用户名和密码'; DataStore.error['login'] = '请检查用户名和密码';
}
} }
// //
......
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
import {Component} from '@angular/core'; import {Component} from '@angular/core';
import {Logger} from 'angular2-logger/core'; import {Logger} from 'angular2-logger/core';
import {AppService, DataStore} from './app.service'; import {AppService, DataStore, User} from './app.service';
@Component({ @Component({
selector: 'app-footer', selector: 'app-footer',
templateUrl: './footer.html', templateUrl: './footer.html',
// directives: [NgClass] providers: [AppService]
}) })
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Logger} from 'angular2-logger/core'; import {Logger} from 'angular2-logger/core';
import {AppService, DataStore, User} from './app.service'; import {AppService, DataStore, User} from './app.service';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
...@@ -21,7 +20,6 @@ declare let jQuery: any; ...@@ -21,7 +20,6 @@ declare let jQuery: any;
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
DataStore = DataStore; DataStore = DataStore;
constructor(private _appService: AppService, constructor(private _appService: AppService,
private _logger: Logger, private _logger: Logger,
private _router: Router, private _router: Router,
...@@ -37,7 +35,7 @@ export class LoginComponent implements OnInit { ...@@ -37,7 +35,7 @@ export class LoginComponent implements OnInit {
ngOnInit() { ngOnInit() {
jQuery('#form').fadeIn('slow'); jQuery('#form').fadeIn('slow');
this._router.navigate(['/login']); // this._router.navigate(['login']);
// jQuery('nav').hide(); // jQuery('nav').hide();
const vm = this; const vm = this;
window.onresize = function () { window.onresize = function () {
......
...@@ -10,6 +10,7 @@ form { ...@@ -10,6 +10,7 @@ form {
border-left-color: rgba(255, 255, 255, .4); border-left-color: rgba(255, 255, 255, .4);
border-bottom-color: rgba(60, 60, 60, .4); border-bottom-color: rgba(60, 60, 60, .4);
border-right-color: rgba(60, 60, 60, .4); border-right-color: rgba(60, 60, 60, .4);
z-index: 9;
} }
form input, form button { form input, form button {
...@@ -83,4 +84,24 @@ form button[type=submit] { ...@@ -83,4 +84,24 @@ form button[type=submit] {
cursor: pointer; cursor: pointer;
} }
canvas {
position: fixed;
top: 0;
z-index: 5;
}
.form {
z-index: 9;
}
.black {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 5;
background-color: #000000;
}
/* login form end */ /* login form end */
<div style="position: fixed;top: 0;left:0;width:100%;height:100%;z-index: 5;background-color: #000000;"></div> <div class="black"></div>
<canvas id="q" style="position:fixed;top: 0;z-index: 5;"></canvas> <canvas id="q"></canvas>
<div id="form" style="z-index: 9;display: none;"> <div class="form">
<form (ngSubmit)="onSubmit()" style="z-index:9;"> <form (ngSubmit)="onSubmit()">
<div class="from-group"> <div class="from-group">
<input type="text" name="username" id="username" placeholder="Username" [(ngModel)]="user.username" required> <input type="text" name="username" id="username" placeholder="Username" [(ngModel)]="user.username" required>
<span class="fa fa-user-secret form-control-feedback"></span> <span class="fa fa-user-secret form-control-feedback"></span>
......
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