From 3023eb6fe4e14e3eef2ff7706f153a62021d18d1 Mon Sep 17 00:00:00 2001 From: Mario Colque Date: Thu, 23 Jan 2014 15:09:17 -0300 Subject: [PATCH] reorder services --- public/js/services/blocks.js | 52 +++++++++++------------ public/js/services/global.js | 15 +++---- public/js/services/socket.js | 1 - public/js/services/status.js | 21 +++++---- public/js/services/transactions.js | 68 +++++++++++++++--------------- 5 files changed, 75 insertions(+), 82 deletions(-) diff --git a/public/js/services/blocks.js b/public/js/services/blocks.js index 12d1da1..aa89df5 100644 --- a/public/js/services/blocks.js +++ b/public/js/services/blocks.js @@ -1,33 +1,31 @@ 'use strict'; -angular.module('insight.blocks').factory('Block', - function($resource) { - return $resource('/api/block/:blockHash', { - blockHash: '@blockHash' - }, { - get: { - method: 'GET', - interceptor: { - response: function (res) { - return res.data; - }, - responseError: function (res) { - if (res.status === 404) { - return res; +angular.module('insight.blocks') + .factory('Block', + function($resource) { + return $resource('/api/block/:blockHash', { + blockHash: '@blockHash' + }, { + get: { + method: 'GET', + interceptor: { + response: function (res) { + return res.data; + }, + responseError: function (res) { + if (res.status === 404) { + return res; + } } } } - } + }); + }) + .factory('Blocks', + function($resource) { + return $resource('/api/blocks'); + }) + .factory('BlockByHeight', + function($resource) { + return $resource('/api/block-index/:blockHeight'); }); -}); - -angular.module('insight.blocks').factory('Blocks', - function($resource) { - return $resource('/api/blocks'); -}); - -angular.module('insight.blocks').factory('BlockByHeight', - function($resource) { - return $resource('/api/block-index/:blockHeight'); -}); - diff --git a/public/js/services/global.js b/public/js/services/global.js index f78c621..4bbd022 100755 --- a/public/js/services/global.js +++ b/public/js/services/global.js @@ -1,13 +1,12 @@ 'use strict'; //Global service for global variables -angular.module('insight.system').factory('Global',[ +angular.module('insight.system') + .factory('Global',[ function() { } -]); - -angular.module('insight.system').factory('Version', - function($resource) { - return $resource('/api/version'); -}); - + ]) + .factory('Version', + function($resource) { + return $resource('/api/version'); + }); diff --git a/public/js/services/socket.js b/public/js/services/socket.js index 47932d3..9a2d459 100644 --- a/public/js/services/socket.js +++ b/public/js/services/socket.js @@ -59,4 +59,3 @@ function($rootScope) { return scopedSocket; }; }); - diff --git a/public/js/services/status.js b/public/js/services/status.js index eb80762..e8f0f24 100644 --- a/public/js/services/status.js +++ b/public/js/services/status.js @@ -1,14 +1,13 @@ 'use strict'; -angular.module('insight.status').factory('Status', - function($resource) { - return $resource('/api/status', { - q: '@q' +angular.module('insight.status') + .factory('Status', + function($resource) { + return $resource('/api/status', { + q: '@q' + }); + }) + .factory('Sync', + function($resource) { + return $resource('/api/sync'); }); -}); - -angular.module('insight.status').factory('Sync', - function($resource) { - return $resource('/api/sync'); -}); - diff --git a/public/js/services/transactions.js b/public/js/services/transactions.js index 2520246..d1243ea 100644 --- a/public/js/services/transactions.js +++ b/public/js/services/transactions.js @@ -1,41 +1,39 @@ 'use strict'; -angular.module('insight.transactions').factory('Transaction', - function($resource) { - return $resource('/api/tx/:txId', { - txId: '@txId' - }, { - get: { - method: 'GET', - interceptor: { - response: function (res) { - return res.data; - }, - responseError: function (res) { - if (res.status === 404) { - return res; +angular.module('insight.transactions') + .factory('Transaction', + function($resource) { + return $resource('/api/tx/:txId', { + txId: '@txId' + }, { + get: { + method: 'GET', + interceptor: { + response: function (res) { + return res.data; + }, + responseError: function (res) { + if (res.status === 404) { + return res; + } } } } - } + }); + }) + .factory('TransactionsByBlock', + function($resource) { + return $resource('/api/txs', { + block: '@block' + }); + }) + .factory('TransactionsByAddress', + function($resource) { + return $resource('/api/txs', { + address: '@address' + }); + }) + .factory('Transactions', + function($resource) { + return $resource('/api/txs'); }); -}); - -angular.module('insight.transactions').factory('TransactionsByBlock', - function($resource) { - return $resource('/api/txs', { - block: '@block' - }); -}); - -angular.module('insight.transactions').factory('TransactionsByAddress', - function($resource) { - return $resource('/api/txs', { - address: '@address' - }); -}); - -angular.module('insight.transactions').factory('Transactions', - function($resource) { - return $resource('/api/txs'); -});