Skip to content

Commit f1bcbd3

Browse files
wangxp2016wangxp2016
authored
Merge pull request #12 from peersafe/leveldb
Add: login page logic
2 parents 66ff123 + 935a425 commit f1bcbd3

File tree

7 files changed

+49
-50
lines changed

7 files changed

+49
-50
lines changed

‎public/src/css/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ table a{color: #30bfa1;}
123123
.dc{color: #30bfa1;}
124124
/* 黑名单 */
125125
.bla-tit{height: 40px; margin-bottom: 30px;}
126-
.bla-tit input{width: 500px; height: 40px;border-radius: 3px; border: 1px solid #ddd;padding-left: 10px; float: left;background: #fff;}
126+
.bla-tit input{width: 400px; height: 40px;border-radius: 3px; border: 1px solid #ddd;padding-left: 10px; float: left;background: #fff;}
127127
.xg{float: right; margin-top: 10px;font-size: 16px;color: #30bfa1;}
128128
.xg span{cursor: pointer;}
129129
.nb-more{display: none;}

‎public/src/js/controllers/header.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
angular.module('insight.system').controller('HeaderController',
44
function($scope, $rootScope, $modal, getSocket, Global, Block) {
55
$scope.global = Global;
6-
$rootScope.isLogin=false;
76

87
$rootScope.currency = {
98
factor: 1,

‎public/src/js/controllers/login.js

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@
22

33
angular.module('insight.login').controller('loginController',
44
function($scope, $rootScope, $routeParams, $location,Account) {
5-
$rootScope.isLogin=false;
5+
$scope.isLogin = function () {
6+
console.log('insight.logi loginController isLogin:', $rootScope.isLogin);
7+
return $rootScope.isLogin;
8+
}
69
//依赖注入的内容 作用域 本地 账户信息 弹出提示 状态值
710
$scope.login = function () {
811

912
if ($scope.user && $scope.user.name && $scope.user.password) { //如果用户和用户名及密码都是正确的
10-
$location.path('/home');
11-
$rootScope.isLogin=true;
12-
/* Account.signIn($scope.user, function (data) { //account.signIn是登录方法 登录后本地获取用户信息
13-
console.log(data);
14-
$localStorage.userId = data.userId;
15-
$localStorage.username = data.name;
16-
$localStorage.telephone = data.phone;
17-
$location.path('/home'); //登录成功跳转页面
18-
},function(data){
19-
if (data.code !== 200) {
20-
// SweetAlert.swal("", "用户名或密码错误", "warning");
21-
console.log(data);
22-
}
23-
})
24-
*/
13+
$rootScope.isLogin = Account.login($scope.user);
14+
console.log('login user info:', $scope.user.name, $scope.user.password);
15+
if ($rootScope.isLogin) {
16+
$location.path('/home');
17+
}
2518
}
2619
else {
2720
//SweetAlert.swal("", "请重新输入用户名或密码", "warning");

‎public/src/js/services/login.js

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
'use strict';
22

3-
angular.module('insight.login').factory('Account', function () {
4-
var authService = {
5-
userId:1,
6-
name:"admin",
7-
password:123456,
8-
phone:13645784152,
9-
message:"test messafe"
10-
};
3+
angular.module('insight.login')
4+
.factory('Account', function () {
5+
var users = [{
6+
userId: 1,
7+
name: "admin",
8+
password: "123456",
9+
phone: 13645784152,
10+
message: "test messafe"
11+
}];
1112

12-
/* signIn = function (user) {
13-
if(user.name=="admin"&&user.password==123456){
14-
return authService;
15-
}else{
13+
var service = {};
1614

17-
}
18-
return $http
19-
.post('/login', credentials)
20-
.then(function (res) {
21-
Session.create(res.data.id, res.data.user.id,
22-
res.data.user.role);
23-
return res.data.user;
24-
});
25-
};*/
26-
});
15+
service.login = function (user) {
16+
//if this user already in the list, ignore it.
17+
for (i in users) {
18+
// console.log(typeof users[i].name, typeof user.name);
19+
if (users[i].name == user.name && users[i].password == user.password) {
20+
console.log('login user info OKOKOK:', users[i],user);
21+
return true;
22+
}
23+
}
24+
25+
// console.log(typeof users.name, typeof user.name);
26+
// if (users[i].name == user.name && users[i].password == user.password) {
27+
// console.log('login user info OKOKOK:', users[i],user);
28+
// return true;
29+
// }
30+
return false;
31+
};
32+
33+
return service;
34+
35+
});

‎public/views/blacklists.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<hr>
88
<form class="form-horizontal">
9-
<label class="col-sm-2 control-label">地址:</label>
10-
<div class="col-sm-10 bla-tit">
9+
<label class="col-sm-1 control-label">地址:</label>
10+
<div class="col-sm-4 bla-tit">
1111
<input type="text" name="addr" ng-model="newblacklist.addr" ng-disabled="!bedit" placeholder="地址">
1212
</div>
13-
<label class="col-sm-2 control-label">备注:</label>
14-
<div class="col-sm-10 bla-tit">
13+
<label class="col-sm-1 control-label">备注:</label>
14+
<div class="col-sm-4 bla-tit">
1515
<input type="text" name="comment" ng-model="newblacklist.comment" placeholder="备注">
1616
</div>
1717

‎public/views/includes/header.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="container">
2-
<div data-ng-controller="HeaderController">
2+
<div data-ng-controller="HeaderController" data-ng-show="isLogin" >
33
<div class="navbar-header">
44
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" data-ng-click="$root.isCollapsed = !$root.isCollapsed">
55
<span class="sr-only">Toggle navigation</span>
@@ -9,7 +9,7 @@
99
</button>
1010
<a class="insight navbar-brand" href=".">BTCEXPLORER</a>
1111
</div>
12-
<div class="navbar-collapse collapse" data-ng-show="false" collapse="$root.isCollapsed">
12+
<div class="navbar-collapse collapse"collapse="$root.isCollapsed">
1313
<ul class="nav navbar-nav">
1414
<li data-ng-repeat="item in menu" ui-route="{{item.link}}" data-ng-class="{active: $uiRoute}">
1515
<a href="{{item.link}}">{{item.title|translate}}</a>
@@ -45,4 +45,5 @@
4545
</ul> -->
4646
</div>
4747
</div>
48+
<h1 data-ng-hide="isLogin">比特币数据处理平台</h1>
4849
</div>

‎public/views/login.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<div class="login-nav">
2-
<!-- <img src="images/login-logo.png" height="62" width="309" alt=""> -->
3-
<b>比特币数据处理平台</b>
4-
</div>
1+
52
<div class="login-content" data-ng-controller="loginController" >
63
<div class="lon-con">
74
<img src="images/login-bg.png" alt="" width="600">

0 commit comments

Comments
 (0)