Merge pull request #49 from cubedro/develop

Fixed block time filters

public/css/style.css

@@ -26,6 +26,10 @@ body {
 	background: #F74B4B;
 }
 
+.text-gray {
+	color: #777 !important;
+}
+
 .container-fluid {
 	padding-left: 30px;
 	padding-right: 30px;

public/js/filters.js

@@ -71,15 +71,22 @@ angular.module('netStatsApp.filters', [])
 })
 .filter('timeClass', function() {
 	return function(timestamp) {
+		console.log(timestamp);
 		return timeClass(timestamp);
 	};
 })
 .filter('propagationTimeClass', function() {
-	return function(propagation) {
-		if(propagation <= 3000)
+	return function(block, bestBlock) {
+		if(block.number < bestBlock)
+			return 'text-gray';
+
+		if(block.propagation < 1000)
 			return 'text-success';
 
-		if(propagation <= 7000)
+		if(block.propagation < 3000)
+			return 'text-info';
+
+		if(block.propagation < 7000)
 			return 'text-warning';
 
 		return 'text-danger'
@@ -230,9 +237,7 @@ function peerClass(peers)
 
 function timeClass(timestamp)
 {
-	// var time = Math.floor((new Date()).getTime() / 1000);
-	var time = (new Date()).getTime();
-	var diff = time - timestamp;
+	var diff = ((new Date()).getTime() - timestamp)/1000;
 
 	return blockTimeClass(diff);
 }

views/index.jade

@@ -47,7 +47,7 @@ block content
             span.big-details {{ lastBlock | blockTimeFilter }}
           div.clearfix
       div.col-xs-2.stat-holder
-        div.big-info.avgblocktime(class="{{ avgBlockTime | timeClass }}")
+        div.big-info.avgblocktime(class="{{ avgBlockTime | avgTimeClass }}")
           div.pull-left.icon-full-width
             i.icon-gas
           div.pull-left
@@ -149,5 +149,5 @@ block content
               span.small {{node.stats.block.hash}}
             td(style="padding-left: 14px;") {{node.stats.block.transactions.length || 0}}
             td(class="{{ node.stats.block.received | timeClass }}") {{node.stats.block.received | blockTimeFilter }}
-            td(class="{{ node.stats.block.propagation | propagationTimeClass }}") {{node.stats.block.propagation | blockPropagationFilter}}
+            td(class="{{ node.stats.block | propagationTimeClass : bestBlock }}") {{node.stats.block.propagation | blockPropagationFilter}}
             td(class="{{ node.stats.uptime | upTimeClass }}") {{ node.stats.uptime | upTimeFilter }}