+
+
+
{{id.pubK}}
+ {{id.date | date: "dd.MM.y, HH:mm:ss"}}h + + Not verified + Verified + Not signed + Signed + in Blockchain +
-
- Not verified
- Verified
+
+ Send to serverIDsigner
-
+
+
+
+
+
+
+
+
+
diff --git a/clientApp/GUI/views/main/main.js b/clientApp/GUI/views/main/main.js
index 1563896..c7058f4 100755
--- a/clientApp/GUI/views/main/main.js
+++ b/clientApp/GUI/views/main/main.js
@@ -9,7 +9,11 @@ angular.module('app.main', ['ngRoute'])
});
}])
- .controller('MainCtrl', function($scope, $http) {
+ .controller('MainCtrl', function($scope, $rootScope, $http) {
+
+ $rootScope.server = JSON.parse(localStorage.getItem("old_darkID_server"));
+
+ $scope.generatingID = false;
$scope.ids = [];
$http.get(clientapi + 'ids')
.then(function(data) {
@@ -22,19 +26,32 @@ angular.module('app.main', ['ngRoute'])
});
$scope.newID = function() {
+ $scope.generatingID = true;
$http.get(clientapi + 'newid')
.then(function(data) {
console.log('data success');
console.log(data);
$scope.ids = data.data;
+ $scope.generatingID = false;
}, function(data) {
console.log('data error');
});
};
- $scope.blindAndSendToSign = function(pubK) {
- $http.get(clientapi + 'blindandsendtosign/' + pubK)
+ $scope.blindAndSendToSign = function(id) {
+ $http.get(clientapi + 'blindandsendtosign/' + id)
+ .then(function(data) {
+ console.log('data success');
+ console.log(data);
+ $scope.ids = data.data;
+
+ }, function(data) {
+ console.log('data error');
+ });
+ };
+ $scope.verify = function(id) {
+ $http.get(clientapi + 'verify/' + id)
.then(function(data) {
console.log('data success');
console.log(data);
@@ -44,8 +61,8 @@ angular.module('app.main', ['ngRoute'])
console.log('data error');
});
};
- $scope.verify = function(pubK) {
- $http.get(clientapi + 'verify/' + pubK)
+ $scope.clientApp = function(route, param) {
+ $http.get(clientapi + route + '/' + param)
.then(function(data) {
console.log('data success');
console.log(data);
diff --git a/clientApp/GUI/views/navbar.html b/clientApp/GUI/views/navbar.html
index 77da717..85eb44d 100755
--- a/clientApp/GUI/views/navbar.html
+++ b/clientApp/GUI/views/navbar.html
@@ -7,12 +7,29 @@
-
- 
blockchainIDsystem
+
+ 
darkID
blockchainIDsystem
+
+ darkID
+
-
+
- + + {{server}} + +
-
{{user.email}}
diff --git a/clientApp/GUI/views/navbar.js b/clientApp/GUI/views/navbar.js
index 6da0b72..65a6cb9 100755
--- a/clientApp/GUI/views/navbar.js
+++ b/clientApp/GUI/views/navbar.js
@@ -9,13 +9,15 @@ angular.module('app.navbar', ['ngRoute'])
});
}])
- .controller('NavbarCtrl', function($scope, $http, $routeParams, $location) {
+ .controller('NavbarCtrl', function($scope, $rootScope, $http, $routeParams, $location) {
+ $rootScope.server = JSON.parse(localStorage.getItem("old_darkID_server"));
- $scope.user = JSON.parse(localStorage.getItem("blid_user"));
+ $scope.user = JSON.parse(localStorage.getItem("old_darkID_user"));
$scope.logout = function() {
- localStorage.removeItem("blid_token");
- localStorage.removeItem("blid_user");
+ localStorage.removeItem("old_darkID_token");
+ localStorage.removeItem("old_darkID_user");
+ localStorage.removeItem("old_darkID_server");
window.location.reload();
};
diff --git a/clientApp/GUI/views/signup/signup.html b/clientApp/GUI/views/signup/signup.html
index 3245144..bdbd1bd 100755
--- a/clientApp/GUI/views/signup/signup.html
+++ b/clientApp/GUI/views/signup/signup.html
@@ -1,40 +1,32 @@
-+-+-----
Signup
--- --- --- --- --- -- + -+diff --git a/clientApp/GUI/views/signup/signup.js b/clientApp/GUI/views/signup/signup.js index dbcfa2c..399f3eb 100755 --- a/clientApp/GUI/views/signup/signup.js +++ b/clientApp/GUI/views/signup/signup.js @@ -9,35 +9,27 @@ angular.module('app.signup', ['ngRoute']) }); }]) -.controller('SignupCtrl', function($scope, $http, $routeParams) { +.controller('SignupCtrl', function($scope, $http, $routeParams, $rootScope) { $scope.user = {}; - $scope.doSignup = function() { - console.log('Doing login', $scope.user); - + $scope.signup = function() { + console.log('Doing signup', $scope.user); $http({ - url: urlapi + 'signup', - method: "POST", - data: $scope.user - }) - .then(function(response) { - console.log("response: "); - console.log(response.data); - if (response.data.success == true) - { - localStorage.setItem("cr_webapp_token", response.data.token); - localStorage.setItem("cr_webapp_userdata", JSON.stringify(response.data.user)); - window.location.reload(); - }else{ - console.log("signup failed"); - toastr.error('Signup failed'); - } - + url: $rootScope.server + 'signup', + method: "POST", + headers: { + "Content-Type": undefined + }, + data: $scope.user + }) + .then(function(data) { + console.log("data: "); + console.log(data.data); + window.location="/"; - }, - function(response) { // optional - // failed - console.log(response); - }); + }, + function(data) { + console.log(data); + }); }; }); diff --git a/clientApp/GUI/views/stats/stats.html b/clientApp/GUI/views/stats/stats.html new file mode 100644 index 0000000..07bb7af --- /dev/null +++ b/clientApp/GUI/views/stats/stats.html @@ -0,0 +1,39 @@ ++diff --git a/clientApp/GUI/views/stats/stats.js b/clientApp/GUI/views/stats/stats.js new file mode 100644 index 0000000..d28cc33 --- /dev/null +++ b/clientApp/GUI/views/stats/stats.js @@ -0,0 +1,136 @@ +'use strict'; + +angular.module('app.stats', ['ngRoute']) + + .config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/stats', { + templateUrl: 'views/stats/stats.html', + controller: 'StatsCtrl' + }); + }]) + + .controller('StatsCtrl', function($scope, $rootScope, $http, $filter) { + + $rootScope.server = JSON.parse(localStorage.getItem("old_darkID_server")); + + $scope.generatingID = false; + $scope.ids = []; + $http.get(clientapi + 'ids') + .then(function(data) { + console.log('data success'); + console.log(data); + $scope.ids = data.data; + $scope.idsToChart(); + }, function(data) { + console.log('data error'); + }); + + $scope.newID = function() { + $scope.generatingID = true; + $http.get(clientapi + 'newid') + .then(function(data) { + console.log('data success'); + console.log(data); + $scope.ids = data.data; + $scope.generatingID = false; + + }, function(data) { + console.log('data error'); + }); + }; + + $scope.blindAndSendToSign = function(id) { + $http.get(clientapi + 'blindandsendtosign/' + id) + .then(function(data) { + console.log('data success'); + console.log(data); + $scope.ids = data.data; + + }, function(data) { + console.log('data error'); + }); + }; + $scope.verify = function(id) { + $http.get(clientapi + 'verify/' + id) + .then(function(data) { + console.log('data success'); + console.log(data); + $scope.ids = data.data; + + }, function(data) { + console.log('data error'); + }); + }; + $scope.clientApp = function(route, param) { + $http.get(clientapi + route + '/' + param) + .then(function(data) { + console.log('data success'); + console.log(data); + $scope.ids = data.data; + + }, function(data) { + console.log('data error'); + }); + }; + + //chartjs + $scope.chart1 = { + colours: ['#4DD0E1', '#9575CD', '#F06292', '#FFF176'], + labels: [], + data: [] + }; + $scope.chart2 = { + colours: ['#4DD0E1', '#9575CD', '#F06292', '#FFF176'], + labels: [], + data: [] + }; + $scope.idsToChart = function() { + //chart1 + var dictionary = {}; + var ids = $scope.ids; + for(var i=0; i+++ +++++ Stats +
+++ ++++ +++ ++ ++++ +++ ++ +
+