Commit f28e7506 authored by liuzheng712's avatar liuzheng712

update

parent 900f0899
...@@ -38,15 +38,26 @@ server.run = function (options) { ...@@ -38,15 +38,26 @@ server.run = function (options) {
var app = express(); var app = express();
var server = http.createServer(app); var server = http.createServer(app);
var apis = express.Router();
app.use("/", express.static(__dirname + '/dist/')); // 创建服务端 app.use("/", express.static(__dirname + '/dist/')); // 创建服务端
app.use("/socket.io/", express.static(__dirname + '/api/')); // 创建服务端 // app.use("/socket.io/", express.static(__dirname + '/api/')); // 创建服务端
// let term.js handle req/res // let term.js handle req/res
// app.use(terminal.middleware()); // app.use(terminal.middleware());
apis.route('/checklogin')
.post(function (req, res) {
res.json({logined: true, user: {id: 1, username: "liuzheng", name: "liuzheng"}})
})
.get(function (req, res) {
res.json({logined: false, user: {id: 1, username: "liuzheng", name: "liuzheng"}})
});
app.use("/api", apis);
// let server listen on the port // let server listen on the port
options = options || {}; options = options || {};
server.listen(options.port || 8080); server.listen(options.port || 3000);
// let socket.io handle sockets // let socket.io handle sockets
io = io.listen(server, {log: false}); io = io.listen(server, {log: false});
...@@ -77,6 +88,6 @@ server.run = function (options) { ...@@ -77,6 +88,6 @@ server.run = function (options) {
}; };
server.run({port: 8888}); server.run({port: 3000});
console.log('Please open your browser with http://127.0.0.1:8888'); console.log('Please open your browser with http://127.0.0.1:3000');
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
......
{
"/api": {
"target": "http://localhost:3000",
"secure": false
},
"/socket.io/": {
"target": "http://localhost:3000",
"secure": false
}
}
...@@ -40,7 +40,7 @@ export class User { ...@@ -40,7 +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; logined: boolean;
} }
export class Group { export class Group {
id: number; id: number;
...@@ -196,6 +196,7 @@ export class AppService { ...@@ -196,6 +196,7 @@ export class AppService {
DataStore.logined = false; DataStore.logined = false;
this._router.navigate(['login']); this._router.navigate(['login']);
DataStore.error['login'] = '后端错误,请重试'; DataStore.error['login'] = '后端错误,请重试';
return '后端错误,请重试';
}, },
() => { () => {
if (DataStore.logined) { if (DataStore.logined) {
...@@ -205,14 +206,16 @@ export class AppService { ...@@ -205,14 +206,16 @@ export class AppService {
this._router.navigate([DataStore.Path['name'], DataStore.Path['res']]); this._router.navigate([DataStore.Path['name'], DataStore.Path['res']]);
} }
} else { } else {
DataStore.error['login'] = '请检查用户名和密码';
this._router.navigate(['login']); this._router.navigate(['login']);
DataStore.error['login'] = '请检查用户名和密码';
return '请检查用户名和密码';
} }
// jQuery('angular2').show(); // jQuery('angular2').show();
}); });
} else { } else {
DataStore.error['login'] = '请检查用户名和密码'; DataStore.error['login'] = '请检查用户名和密码';
return '请检查用户名和密码';
} }
} }
......
...@@ -18,6 +18,7 @@ declare let jQuery: any; ...@@ -18,6 +18,7 @@ declare let jQuery: any;
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
DataStore = DataStore; DataStore = DataStore;
loginBotton = 'login to your account';
constructor(private _appService: AppService, constructor(private _appService: AppService,
private _logger: Logger, private _logger: Logger,
...@@ -27,8 +28,7 @@ export class LoginComponent implements OnInit { ...@@ -27,8 +28,7 @@ export class LoginComponent implements OnInit {
onSubmit() { onSubmit() {
this._logger.log(DataStore); this._logger.error(this._appService.login(this.user));
this._appService.login(this.user);
} }
ngOnInit() { ngOnInit() {
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
(ngEnter)="onSubmit()"> (ngEnter)="onSubmit()">
<span class="fa fa-key form-control-feedback"></span> <span class="fa fa-key form-control-feedback"></span>
</div> </div>
<button type="submit">login to your account</button> <button type="submit">{{loginBotton}}</button>
</form> </form>
</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