diff --git a/clientApp/GUI/app.js b/clientApp/GUI/app.js index 9e21f20..7aa3f05 100644 --- a/clientApp/GUI/app.js +++ b/clientApp/GUI/app.js @@ -10,11 +10,13 @@ angular.module('app', [ 'angularBootstrapMaterial', 'ui.bootstrap', 'toastr', + 'chart.js', 'app.navbar', 'app.main', 'app.signup', 'app.login', - 'app.id' + 'app.id', + 'app.stats' ]). config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) { $locationProvider.hashPrefix('!'); diff --git a/clientApp/GUI/bower.json b/clientApp/GUI/bower.json index ce65efb..998eff3 100644 --- a/clientApp/GUI/bower.json +++ b/clientApp/GUI/bower.json @@ -13,6 +13,7 @@ "angular-bootstrap": "^2.5.0", "components-font-awesome": "^4.7.0", "angular-toastr": "^2.1.1", - "cssMaterialColors": "*" + "cssMaterialColors": "*", + "angular-chart.js": "^1.1.1" } } diff --git a/clientApp/GUI/css/bootstrapMaterial-dark-overwrite.css b/clientApp/GUI/css/bootstrapMaterial-dark-overwrite.css index 259f10a..d95e001 100644 --- a/clientApp/GUI/css/bootstrapMaterial-dark-overwrite.css +++ b/clientApp/GUI/css/bootstrapMaterial-dark-overwrite.css @@ -1,14 +1,32 @@ +/*@font-face { + font-family: Elianto; + src: url('../fonts/Elianto/Elianto-Regular.otf'); +}*/ + body { /*background: #15191e!important;*/ background: #000000!important; color: #ffffff!important; + font-family: 'Open Sans', sans-serif!important; } + .card { - /*background: #1f262d!important;*/ + background: #1f262d!important; /*background: #15191e!important; color: #ffffff!important;*/ /*border: 1px solid #ffffff!important;*/ - background: #000000!important; color: #ffffff!important; } + +h1, h2, h3, h4, h5, h6 { + /*font-family: 'Raleway', sans-serif!important;*/ + font-family: 'Overpass Mono', monospace!important; +} + +.navbar-brand, .card-title { + font-family: 'Overpass Mono', monospace!important; +} +.btn { + font-family: 'Overpass Mono', monospace!important; +} diff --git a/clientApp/GUI/fonts/Blanka/Blanka-Regular.otf b/clientApp/GUI/fonts/Blanka/Blanka-Regular.otf new file mode 100644 index 0000000..60b18d7 Binary files /dev/null and b/clientApp/GUI/fonts/Blanka/Blanka-Regular.otf differ diff --git a/clientApp/GUI/fonts/Blanka/Please Read This.rtf b/clientApp/GUI/fonts/Blanka/Please Read This.rtf new file mode 100644 index 0000000..007f41e --- /dev/null +++ b/clientApp/GUI/fonts/Blanka/Please Read This.rtf @@ -0,0 +1,15 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural + +\f0\fs24 \cf0 Thanks for downloading BLANKA FONT !\ +\ +You can use it for free and commercial.\ +\ +Feedbacks are welcome !\ +\ +\'97\ +Emmeran RICHARD.\ +www.emmeranrichard.fr} \ No newline at end of file diff --git a/clientApp/GUI/fonts/Elianto/Elianto-Regular.otf b/clientApp/GUI/fonts/Elianto/Elianto-Regular.otf new file mode 100644 index 0000000..6ad449c Binary files /dev/null and b/clientApp/GUI/fonts/Elianto/Elianto-Regular.otf differ diff --git a/clientApp/GUI/fonts/Elianto/Elianto-Regular.ttf b/clientApp/GUI/fonts/Elianto/Elianto-Regular.ttf new file mode 100644 index 0000000..2dbbc96 Binary files /dev/null and b/clientApp/GUI/fonts/Elianto/Elianto-Regular.ttf differ diff --git a/clientApp/GUI/index.html b/clientApp/GUI/index.html index 5a0fec6..1b39b44 100644 --- a/clientApp/GUI/index.html +++ b/clientApp/GUI/index.html @@ -8,6 +8,12 @@ + + + + + + @@ -18,7 +24,7 @@
-


+



@@ -48,6 +54,10 @@ Works for both browser and electron with the same code --> + + + + @@ -59,6 +69,7 @@ Works for both browser and electron with the same code --> + +
+
+

{{id.id}}

+ {{id.date | date: "dd.MM.y, HH:mm:ss"}}h -
- -
-
+ Not verified + Verified + Not signed + Signed + in Blockchain +
+
+
+ Send to serverIDsigner +
+
+ Add to blockchain
+ + Use ID +
-
+
+ -
-
-
+
+ +
+ +
+
+
+
+
diff --git a/clientApp/GUI/views/navbar.html b/clientApp/GUI/views/navbar.html index 0ae7ebc..e51ae9d 100755 --- a/clientApp/GUI/views/navbar.html +++ b/clientApp/GUI/views/navbar.html @@ -8,7 +8,10 @@ - darkID + darkID + + + Stats
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 @@ +
+
+
+ +
+
+

+ Stats +

+
+
+
+ + +
+
+ + +
+ +
+
+ +
+
+
+
+
+
+
+ +
+ +
+
diff --git a/clientApp/GUI/views/stats/stats.js b/clientApp/GUI/views/stats/stats.js new file mode 100644 index 0000000..8435d73 --- /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("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