From 8710ce410d1b96ca09b4124a66c3474716623585 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Tue, 18 Feb 2014 12:48:43 -0300 Subject: [PATCH 1/3] limit list of addr to 6 with a show more link. --- public/views/transaction/tx.html | 109 ++++++++++++++++--------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html index d84c895..8fd3b58 100644 --- a/public/views/transaction/tx.html +++ b/public/views/transaction/tx.html @@ -26,8 +26,8 @@
-
-
+
+
{{$root.currency.getConvertion(vin.value)}}
{{vin.addr}} @@ -41,32 +41,38 @@
-
-
-
{{$root.currency.getConvertion(vin.value)}}
-
-    - {{vin.addr}} - {{vin.addr}} -
-
(Input unconfirmed)
-
Incoherence in levelDB detected, please resync
-
Double spent attempt detected. From tx: +
+
+
+
{{$root.currency.getConvertion(vin.value)}}
+
+    + {{vin.addr}} + {{vin.addr}} +
+
(Input unconfirmed)
+
Incoherence in levelDB detected, please resync
+
Double spent attempt detected. From tx: {{vin.doubleSpentTxID}},{{vin.doubleSpentIndex}} -
+
-
-
-
-
- - scriptSig - {{vin.scriptSig.asm}} - +
+
+
+
+ + scriptSig + {{vin.scriptSig.asm}} + +
+
+ more... + ...less +
-
-
+
+
@@ -97,46 +103,45 @@
-
-
-
{{$root.currency.getConvertion(vout.value)}} -<<<<<<< HEAD - (U) -    -======= - (U) -    ->>>>>>> 8e733340d31053254750053c5ca686eac87c5139 - - - - +
+
+
+
+ {{$root.currency.getConvertion(vout.value)}} + (U) +    + +
+
+ {{address}} +
-
- {{address}} -
-
-
-
-
- -

+

+
+
+ +

Type {{vout.scriptPubKey.type}} -

-

+

+

scriptPubKey {{vout.scriptPubKey.asm}} -

- +

+ +
+
+ more... + ...less +
-
+
BlockHash From 88e39d0c1b95c71350ddcec89225c64053caf445 Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 19 Feb 2014 03:05:06 -0300 Subject: [PATCH 2/3] improved performance of list of transactions --- app/views/layouts/default.jade | 2 +- public/src/css/common.css | 8 +++ public/src/js/filters.js | 10 ++- public/views/transaction/tx.html | 104 ++++++++++++++++++------------- 4 files changed, 79 insertions(+), 45 deletions(-) diff --git a/app/views/layouts/default.jade b/app/views/layouts/default.jade index 4bf285f..45ba09c 100644 --- a/app/views/layouts/default.jade +++ b/app/views/layouts/default.jade @@ -1,5 +1,5 @@ doctype -html(lang='en', data-ng-app='insight') +html(lang='en', data-ng-app='insight' data-ng-csp) include ../includes/head body #wrap diff --git a/public/src/css/common.css b/public/src/css/common.css index 9d3496a..12358f4 100644 --- a/public/src/css/common.css +++ b/public/src/css/common.css @@ -1,5 +1,7 @@ /* Sticky footer styles -------------------------------------------------- */ +@charset "UTF-8"; + html, body { color: #373D42; @@ -13,6 +15,12 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { font-family: 'Ubuntu', sans-serif; } +[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], +.ng-cloak, .x-ng-cloak, +.ng-hide { + display: none !important; +} + /* Styling for the ngProgress itself */ #ngProgress { background-color: #373D42 !important; diff --git a/public/src/js/filters.js b/public/src/js/filters.js index a726efc..a1cad32 100644 --- a/public/src/js/filters.js +++ b/public/src/js/filters.js @@ -1 +1,9 @@ -'use strict'; \ No newline at end of file +'use strict'; + +angular.module('insight') + .filter('startFrom', function() { + return function(input, start) { + start = +start; //parse to int + return input.slice(start); + } +}); diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html index 8fd3b58..0b7528f 100644 --- a/public/views/transaction/tx.html +++ b/public/views/transaction/tx.html @@ -1,4 +1,4 @@ -
+
@@ -18,31 +18,41 @@
-
+
No Inputs (Newly Generated Coins)
-
-
-
-
{{$root.currency.getConvertion(vin.value)}}
-
- {{vin.addr}} - {{vin.addr}} - {{vin.addr}} -
-
(Input unconfirmed)
-
Incoherence in levelDB detected, please resync
-
Double spent attempt detected. From tx: +
+ + +
+
+
+
{{$root.currency.getConvertion(vin.value)}}
+
+ {{vin.addr}} + {{vin.addr}} + {{vin.addr}} +
+
(Input unconfirmed)
+
Incoherence in levelDB detected, please resync
+
Double spent attempt detected. From tx: {{vin.doubleSpentTxID}},{{vin.doubleSpentIndex}} +
+
+ ...less + more... +
-
-
+ + +
+
{{$root.currency.getConvertion(vin.value)}}
@@ -68,10 +78,10 @@
-
-
- more... - ...less +
+ ...less + more... +
@@ -83,28 +93,36 @@
-
-
-
- - {{$root.currency.getConvertion(vout.value)}} - (S) - (U) - + +
+
+
+
+ + + {{$root.currency.getConvertion(vout.value)}} + (S) + (U) + +
+ +
+ {{vout.addr}} + {{vout.addr}} + {{address}} +
- -
- {{vout.addr}} - {{vout.addr}} - {{address}} -
- - +
+
+ ...less + more...
-
-
+ + +
+
{{$root.currency.getConvertion(vout.value)}} @@ -133,10 +151,10 @@
-
-
- more... - ...less +
+ ...less + more... +
@@ -150,7 +168,7 @@
-
+
Fees: {{$root.currency.getConvertion(tx.fees)}}
From afe5c2421cdc2ae02ce4da83289d8ef914d819bb Mon Sep 17 00:00:00 2001 From: Gustavo Cortez Date: Wed, 19 Feb 2014 03:45:26 -0300 Subject: [PATCH 3/3] message of current loading insted the empty box --- public/views/address.html | 85 +++++++++++++------------- public/views/block.html | 40 ++++++++----- public/views/block_list.html | 23 ++++--- public/views/transaction.html | 96 +++++++++++++++++------------- public/views/transaction/list.html | 2 +- 5 files changed, 139 insertions(+), 107 deletions(-) diff --git a/public/views/address.html b/public/views/address.html index d2f050a..9028b94 100644 --- a/public/views/address.html +++ b/public/views/address.html @@ -3,54 +3,59 @@

Address

-
- +
+ Loading Address Information...
-
- - {{address.addrStr}} -
-
-

Summary

-
Confirmed
- - - - - - - - - - - - - - - - - - - -
Total Received{{$root.currency.getConvertion(address.totalReceived)}}
Total Sent{{$root.currency.getConvertion(address.totalSent)}}
Final Balance{{$root.currency.getConvertion(address.balance)}}
No. Transactions{{address.txApperances}}
-
-
Unconfirmed
- +
+
+ +
+
+ + {{address.addrStr}} +
+
+

Summary

+
Confirmed
+
- - + + + + + + + + + + - + - - +
Unconfirmed Txs Balance{{$root.currency.getConvertion(address.unconfirmedBalance)}}Total Received{{$root.currency.getConvertion(address.totalReceived)}}
Total Sent{{$root.currency.getConvertion(address.totalSent)}}
Final Balance{{$root.currency.getConvertion(address.balance)}}
No. Transactions{{address.unconfirmedTxApperances}}{{address.txApperances}}
-
- -
+
+
Unconfirmed
+ + + + + + + + + + + + +
Unconfirmed Txs Balance{{$root.currency.getConvertion(address.unconfirmedBalance)}}
No. Transactions{{address.unconfirmedTxApperances}}
+
+ +
+
diff --git a/public/views/block.html b/public/views/block.html index e983dbd..91918aa 100644 --- a/public/views/block.html +++ b/public/views/block.html @@ -3,18 +3,22 @@

Block

-
- -

#{{block.height}}

+
+ Loading Block...
-
- - {{block.hash}} -
-
-

Hashes

- - +
+
+ +

#{{block.height}}

+
+
+ + {{block.hash}} +
+
+

Hashes

+
+ @@ -23,15 +27,21 @@ - -
Previous Block {{block.height-1}} Next Block {{block.height+1}}
-
+ + +
+

Summary

-
+
+
+ Loading Block Details... +
+
+
diff --git a/public/views/block_list.html b/public/views/block_list.html index 99d9ffd..1532870 100644 --- a/public/views/block_list.html +++ b/public/views/block_list.html @@ -8,18 +8,23 @@

Blocks
mined on:

-

+

+ Loading Selected Date... +
+
+

{{pagination.current}} UTC -

-

 

-

Today

-

{{humanSince(pagination.currentTs)}} -

 

+

+

 

+

Today

+

{{humanSince(pagination.currentTs)}} +

 

-
- ← {{pagination.prev}} - {{pagination.next}} → +
+ ← {{pagination.prev}} + {{pagination.next}} → +
diff --git a/public/views/transaction.html b/public/views/transaction.html index 5105dde..21e61e5 100644 --- a/public/views/transaction.html +++ b/public/views/transaction.html @@ -1,49 +1,60 @@
-
-
-

Transaction

-
- -
-
- -
- {{tx.txid}} + +
+
+

Transaction

+
+ Loading Transaction...
+
+
+ +
+
+ +
+ {{tx.txid}} +
+
+

Summary

+
+ + + + + + + + + + + + + + + + + +
Size {{tx.size}} (bytes)
Received Time {{tx.firstSeenTs * 1000|date:'medium'}}N/A
Mined Time {{tx.time * 1000|date:'medium'}}N/A
+
+
-

Summary

- - - - - - - - - - - - - - - - - - -
Size {{tx.size}} (bytes)
Received Time {{tx.firstSeenTs * 1000|date:'medium'}}N/A
Mined Time {{tx.time * 1000|date:'medium'}}N/A
-
-
-
-

- Details - View information about a bitcoin transaction -

-
-
-
-
-

Inputs and Outputs

+
+

+ Details + View information about a bitcoin transaction +

+
+
+ Loading Transaction Details... +
+
+
+
+
+
+

Inputs and Outputs

@@ -60,6 +71,7 @@
+
diff --git a/public/views/transaction/list.html b/public/views/transaction/list.html index ad7a3db..4dcfd41 100644 --- a/public/views/transaction/list.html +++ b/public/views/transaction/list.html @@ -4,6 +4,6 @@
- Loading... + Loading Transactions...