Merge pull request #10 from peersafe/cd

wangxp2016 · web-flow · commit 66ff123d3d94 · 2017-08-07T18:47:46.000-07:00
Cd
diff --git a/.gitignore b/.gitignore
@@ -40,11 +40,18 @@ db/testnet/blocks/*
 db/testnet/blocks
 
 public/js/angularjs-all.js
+public/js/angularjs-all.min.js
+public/js/main.min.js
 public/js/main.js
 public/js/vendors.js
+public/js/vendors.min.js
 
 public/css/main.css
 
 README.html
 po/*
 !po/*.po
+
+public/js/main.min.js
+
+public/css/main.min.css
diff --git a/package.json b/package.json
@@ -47,7 +47,10 @@
     "build": "bower install && grunt compile",
     "watch": "grunt"
   },
-  "dependencies": {},
+  "dependencies": {
+    "bitcore-lib": "^0.14.0",
+    "mkdirp": "^0.5.1"
+  },
   "devDependencies": {
     "bower": "~1.8.0",
     "grunt": "~0.4.2",
diff --git a/public/js/main.min.js b/public/js/main.min.js
diff --git a/public/src/css/style.css b/public/src/css/style.css
@@ -133,7 +133,8 @@ table a{color: #30bfa1;}
 .del-pop h5{font-size: 16px; text-align: center;margin: 20px 0; font-weight: normal;}
 .del-pop button{width: 120px; height: 40px; margin-left: 105px; margin-top: 30px; border: none; color: #fff;border-radius: 3px; background: #30bfa1; cursor: pointer;}
 .del-pop button.fou{background: #2fa4d7;}
-.tian-popWrap , #tian-popWrap{width: 100%; height:100%; background: rgba(0,0,0,0.5); position: absolute; left: 0; top: 0; z-index: 999;display: none;}
+.tian-popWrap{width: 100%; height:100%; background: rgba(0,0,0,0.5); position: absolute; left: 0; top: 0; z-index: 999;}
+#tian-popWrap{width: 100%; height:100%; background: rgba(0,0,0,0.5); position: absolute; left: 0; top: 0; z-index: 999;display: none}
 .tian-pop{width: 600px; position: absolute; left: 50%; top: 140px; margin-left: -350px; background: #fff;padding: 50px;}
 .tian-pop img{position: absolute; top: -15px; right:-15px; cursor: pointer;}
 .tian-pop input{width: 500px; height: 35px; border: 1px solid #ddd;background: #fff; padding-left: 10px;}
diff --git a/public/src/js/app.js b/public/src/js/app.js
@@ -23,7 +23,8 @@ angular.module('insight',[
   'insight.status',
   'insight.connection',
   'insight.currency',
-  'insight.messages',
+    'insight.messages',
+    'insight.blacklists',
   'insight.login'
 ]);
 
@@ -38,4 +39,5 @@ angular.module('insight.status', []);
 angular.module('insight.connection', []);
 angular.module('insight.currency', []);
 angular.module('insight.messages', []);
+angular.module('insight.blacklists', []);
 angular.module('insight.login', []);
diff --git a/public/src/js/config.js b/public/src/js/config.js
@@ -51,8 +51,8 @@ angular.module('insight').config(function($routeProvider) {
       templateUrl: 'views/history.html',
       title: 'History'
     }).
-    when('/blacklist', {
-      templateUrl: 'views/blacklist.html',
+    when('/blacklists', {
+      templateUrl: 'views/blacklists.html',
       title: 'Blacklist'
     }).
     when('/messages/verify', {
diff --git a/public/src/js/controllers/blacklists.js b/public/src/js/controllers/blacklists.js
@@ -0,0 +1,37 @@
+'use strict';
+
+angular.module('insight.blacklists').controller('BlacklistsController',
+    function ($scope, $rootScope, $routeParams, BlacklistService) {
+        // $scope.global = Global;
+        // $scope.loading = false;
+
+        console.log("blacklists controller start");
+
+        $scope.blacklists = BlacklistService.list();
+        $scope.bedit = true;
+
+        $scope.saveBlacklist = function () {
+            $scope.addBlackBtn = !$scope.addBlackBtn;
+            BlacklistService.save($scope.newblacklist);
+            $scope.newblacklist = {};
+            $scope.bedit = true;
+        };
+
+        $scope.delete = function (id) {
+            if ($scope.newblacklist.id == id) $scope.newblacklist = {};
+            BlacklistService.delete(id);
+            $scope.bedit = true;
+            $scope.blacklists = BlacklistService.list();
+            console.log("after dellete list=",$scope.blacklists);
+        };
+
+        $scope.edit = function (id) {
+            $scope.newblacklist = angular.copy(BlacklistService.get(id));
+            $scope.bedit = false;
+            $scope.blacklists = BlacklistService.list();
+            console.log("after edit list=",$scope.blacklists);
+        };
+
+        $scope.params = $routeParams;
+
+    });
diff --git a/public/src/js/controllers/header.js b/public/src/js/controllers/header.js
@@ -25,7 +25,7 @@ angular.module('insight.system').controller('HeaderController',
       'link': 'history'
     }, {
       'title': 'Blacklist',
-      'link': 'blacklist'
+      'link': 'blacklists'
     }];
 
     $scope.openScannerModal = function() {
diff --git a/public/src/js/init.js b/public/src/js/init.js
diff --git a/public/src/js/jquery/js.js b/public/src/js/jquery/js.js
@@ -61,14 +61,14 @@ $(document).ready(function(){
 
 
 
- document.getElementById('quanxuan').onclick = function() {
+ $('#quanxuan').click( function() {
       var obj = document.getElementsByTagName('input'); //获取文档中所有的input元素
       for (var i = 0; i < obj.length; i ++) {
           if (obj[i].type == 'checkbox') {
               obj[i].checked = true; //设置复选框元素对象的checked属性值为true就能勾选该复选框；false即为取消选择
           }
       }
-  }
+  });
 
 
 
diff --git a/public/src/js/services/blacklists.js b/public/src/js/services/blacklists.js
@@ -0,0 +1,118 @@
+'use strict';
+
+angular.module('insight.blacklists')
+    .factory('BlacklistService',
+        function () {
+            console.log("blacklists service start");
+            var k = 'blacklist';
+
+            var data = [
+                {
+                    k: "blacklist.user.1",
+                    id: 31,
+                    addr: "0r935lsfgferogerjgerg43g34",
+                    comment: "这是1的hash",
+                    time: new Date()
+                },
+                {
+                    k: "blacklist.user.2",
+                    id: 32,
+                    addr: "1r935lsfgferogerjgerg43g34",
+                    comment: "这是2的hash",
+                    time: new Date()
+                }
+            ];
+            var service = {};
+
+            service.getBlacklists = function () {
+                // $http.get('js/blacklist.json')
+                //     .success(function (Data) {
+                //         // $scope.names = Data;
+                //         console.info(Data);
+                //         return Data;
+                //     });
+                return data;
+                // ldb.find(k, function (key, value) {
+                //     if (key === null) {
+                //         console.log("find Over @", value, " arr=", blacklists);
+                //         return blacklists;
+                //     }
+                //     if (key.startsWith(k)) {
+                //         blacklists.push(JSON.parse(value));
+                //     }
+                //     // console.log(arr.length, ':find ok: ', arr);
+                // });
+            };
+
+            service.setBlacklists = function () {
+                console.log('Blacklists service set start');
+                ldb.put(data[0].k, data[0]);
+                ldb.put(data[1].k, data[1]);
+            };
+
+            //to create unique blacklist id
+            var uid = 1;
+
+            //blacklists array to hold list of all blacklists
+            var blacklists = [];
+
+            //save method create a new blacklist if not already exists
+            //else update the existing object
+            service.save = function (blacklist) {
+                if (blacklist.id == null) {
+                    //if this blacklist already in the list, ignore it.
+                    for (i in blacklists) {
+                        if (blacklists[i].addr == blacklist.addr) {
+                            return;
+                        }
+                    }
+                    //if this is new blacklist, add it in blacklists array
+                    blacklist.id = uid++;
+                    blacklist.time = new Date();
+                    blacklists.push(blacklist);
+                } else {
+                    //for existing blacklist, find this blacklist using id
+                    //and update it.
+                    for (i in blacklists) {
+                        if (blacklists[i].id == blacklist.id) {
+                            blacklist.time = new Date();
+                            blacklists[i] = blacklist;
+                        }
+                    }
+                }
+
+            };
+
+            //simply search blacklists list for given id
+            //and returns the blacklist object if found
+            service.get = function (id) {
+                for (i in blacklists) {
+                    if (blacklists[i].id == id) {
+                        return blacklists[i];
+                    }
+                }
+
+            };
+
+            //iterate through blacklists list and delete 
+            //blacklist if found
+            service.delete = function (id) {
+                for (i in blacklists) {
+                    if (blacklists[i].id == id) {
+                        blacklists.splice(i, 1);
+                    }
+
+                    if (blacklists[i].id > id) {
+                        blacklists[i].id = blacklists[i].id-1;
+                    }
+                }
+                uid--;
+            };
+
+            //simply returns the blacklists list
+            service.list = function () {
+                return blacklists;
+            };
+
+            return service;
+        });
diff --git a/public/views/blacklist.html b/public/views/blacklist.html
diff --git a/public/views/blacklists.html b/public/views/blacklists.html

Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,14 @@ $(document).ready(function(){`
`61`	`61`
`62`	`62`
`63`	`63`
`64`		`- document.getElementById('quanxuan').onclick = function() {`
	`64`	`+ $('#quanxuan').click( function() {`
`65`	`65`	`var obj = document.getElementsByTagName('input'); //获取文档中所有的input元素`
`66`	`66`	`for (var i = 0; i < obj.length; i ++) {`
`67`	`67`	`if (obj[i].type == 'checkbox') {`
`68`	`68`	`obj[i].checked = true; //设置复选框元素对象的checked属性值为true就能勾选该复选框；false即为取消选择`
`69`	`69`	`}`
`70`	`70`	`}`
`71`		`- }`
	`71`	`+ });`
`72`	`72`
`73`	`73`
`74`	`74`