fixed broken lite version

Gruntfile.js

@@ -37,23 +37,20 @@ var src_lite = 'src-lite/';
 var dest_lite = 'dist-lite/';
 
 var scripts_lite = [
-	'scr-lite/js/app.js',
-	'scr-lite/js/controllers.js',
-	'scr-lite/js/filters.js',
-	'scr-lite/js/directives.js',
-	'scr-lite/js/script.js'
+	'src-lite/js/app.js',
+	'src-lite/js/controllers.js',
+	'src-lite/js/filters.js',
+	'src-lite/js/directives.js',
+	'src-lite/js/script.js'
 ];
 
 var vendor_lite = [
 	'dist-lite/js/lib/jquery-1.11.3.min.js',
 	'dist-lite/js/lib/bootstrap.min.js',
 	'dist-lite/js/lib/angular.min.js',
-	'dist-lite/js/lib/ngStorage.min.js',
 	'dist-lite/js/lib/lodash.min.js',
 	'dist-lite/js/lib/d3.min.js',
 	'dist-lite/js/lib/d3.tip.min.js',
-	'dist-lite/js/lib/topojson.min.js',
-	'dist-lite/js/lib/datamaps.min.js',
 	'dist-lite/js/lib/moment.min.js',
 	'dist-lite/js/lib/moment.en.min.js',
 	'dist-lite/js/lib/toastr.min.js',

lib/express.js

@@ -4,14 +4,14 @@ var path = require('path');
 var bodyParser = require('body-parser');
 
 // view engine setup
-app.set('views', path.join(__dirname, '../src/views'));
+app.set('views', path.join(__dirname, (process.env.LITE === 'true' ? '../src-lite/views' : '../src/views')));
 app.set('view engine', 'jade');
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
-app.use(express.static(path.join(__dirname, '../dist')));
+app.use(express.static(path.join(__dirname, (process.env.LITE === 'true' ? '../dist-lite' : '../dist'))));
 
 app.get('/', function(req, res) {
-  res.render((process.env.LITE === true ? 'index-lite' : 'index'));
+  res.render('index');
 });
 
 // catch 404 and forward to error handler

lib/history.js

@@ -23,7 +23,7 @@ History.prototype.add = function(block, id, trusted, addingHistory)
 
 	if( !_.isUndefined(block) && !_.isUndefined(block.number) && !_.isUndefined(block.uncles) && !_.isUndefined(block.transactions) && !_.isUndefined(block.difficulty) && block.number > 0 )
 	{
-		trusted = (process.env.LITE === true ? true : trusted);
+		trusted = (process.env.LITE === 'true' ? true : trusted);
 		var historyBlock = this.search(block.number);
 		var forkIndex = -1;
 

lib/node.js

@@ -81,7 +81,7 @@ Node.prototype.setInfo = function(data, callback)
 
 	if( !_.isUndefined(data.ip) )
 	{
-		if( trusted.indexOf(data.ip) >= 0 || process.env.LITE === true)
+		if( trusted.indexOf(data.ip) >= 0 || process.env.LITE === 'true')
 		{
 			this.trusted = true;
 		}

src-lite/js/app.js

@@ -2,7 +2,7 @@
 
 /* Init Angular App */
 
-var netStatsApp = angular.module('netStatsApp', ['netStatsApp.filters', 'netStatsApp.directives', 'ngStorage']);
+var netStatsApp = angular.module('netStatsApp', ['netStatsApp.filters', 'netStatsApp.directives']);
 
 
 /* Services */

src-lite/js/controllers.js

@@ -1,7 +1,7 @@
 
 /* Controllers */
 
-netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, socket, _, toastr) {
+netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr) {
 
 	var MAX_BINS = 40;
 
@@ -37,9 +37,9 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 
 	$scope.currentApiVersion = "0.0.16";
 
-	$scope.predicate = $localStorage.predicate || ['-pinned', '-stats.active', '-stats.block.number', 'stats.block.propagation'];
-	$scope.reverse = $localStorage.reverse || false;
-	$scope.pinned = $localStorage.pinned || [];
+	$scope.predicate = ['-pinned', '-stats.active', '-stats.block.number', 'stats.block.propagation'];
+	$scope.reverse = false;
+	$scope.pinned = [];
 
 	$scope.prefixPredicate = ['-pinned', '-stats.active'];
 	$scope.originalPredicate = ['-stats.block.number', 'stats.block.propagation'];
@@ -64,9 +64,6 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 
 			$scope.predicate = _.union($scope.prefixPredicate, predicate);
 		}
-
-		$localStorage.predicate = $scope.predicate;
-		$localStorage.reverse = $scope.reverse;
 	}
 
 	$scope.pinNode = function(id)
@@ -86,8 +83,6 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 				$scope.pinned.splice($scope.pinned.indexOf(id), 1);
 			}
 		}
-
-		$localStorage.pinned = $scope.pinned;
 	}
 
 	var timeout = setInterval(function ()
@@ -329,32 +324,13 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 				if( !_.isEqual($scope.lastBlocksTime, data.blocktime) && data.blocktime.length >= MAX_BINS )
 					$scope.lastBlocksTime = data.blocktime;
 
-				if( !_.isEqual($scope.difficultyChart, data.difficulty) && data.difficulty.length >= MAX_BINS )
-					$scope.difficultyChart = data.difficulty;
-
-				if( !_.isEqual($scope.blockPropagationChart, data.propagation.histogram) ) {
-					$scope.blockPropagationChart = data.propagation.histogram;
-					$scope.blockPropagationAvg = data.propagation.avg;
-				}
-
 				data.uncleCount.reverse();
 
 				if( !_.isEqual($scope.uncleCountChart, data.uncleCount) && data.uncleCount.length >= MAX_BINS ) {
 					$scope.uncleCount = data.uncleCount[data.uncleCount.length-2] + data.uncleCount[data.uncleCount.length-1];
 					$scope.uncleCountChart = data.uncleCount;
 				}
 
-				if( !_.isEqual($scope.transactionDensity, data.transactions) && data.transactions.length >= MAX_BINS )
-					$scope.transactionDensity = data.transactions;
-
-				if( !_.isEqual($scope.gasSpending, data.gasSpending) && data.gasSpending.length >= MAX_BINS )
-					$scope.gasSpending = data.gasSpending;
-
-				if( !_.isEqual($scope.miners, data.miners) ) {
-					$scope.miners = data.miners;
-					getMinersNames();
-				}
-
 				break;
 
 			case "inactive":
@@ -399,35 +375,13 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 
 				break;
 		}
-
-		// $scope.$apply();
 	}
 
 	function findIndex(search)
 	{
 		return _.findIndex($scope.nodes, search);
 	}
 
-	function getMinersNames()
-	{
-		if( $scope.miners.length > 0 )
-		{
-			_.forIn($scope.miners, function (value, key)
-			{
-				if(value.name !== false)
-					return;
-
-				if(value.miner === "0x0000000000000000000000000000000000000000")
-					return;
-
-				var name = _.result(_.find(_.pluck($scope.nodes, 'info'), 'coinbase', value.miner), 'name');
-
-				if( !_.isUndefined(name) )
-					$scope.miners[key].name = name;
-			});
-		}
-	}
-
 	function addNewNode(data)
 	{
 		var index = findIndex({id: data.id});
@@ -476,30 +430,6 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, $localStorage, soc
 			forkFilter(node);
 			return node.stats.active == true;
 		}).length;
-
-		$scope.upTimeTotal = _.reduce($scope.nodes, function (total, node) {
-			return total + node.stats.uptime;
-		}, 0) / $scope.nodes.length;
-
-		$scope.map = _.map($scope.nodes, function (node) {
-			var fill = $filter('bubbleClass')(node.stats, $scope.bestBlock);
-
-			if(node.geo != null)
-				return {
-					radius: 3,
-					latitude: node.geo.ll[0],
-					longitude: node.geo.ll[1],
-					nodeName: node.info.name,
-					fillClass: "text-" + fill,
-					fillKey: fill,
-				};
-			else
-				return {
-					radius: 0,
-					latitude: 0,
-					longitude: 0
-				};
-		});
 	}
 
 	function updateBestBlock()