Published By
- Publisher)): ?>
- Publisher->Name ?>
+ publisher)): ?>
+ publisher ?>
Anonymous
@@ -87,17 +87,17 @@ if (strlen(trim($desc)) == 0) {
Created On
- TransactionTime > 0 ? $claim->TransactionTime : $claim->Created->format('U'))->format('j M Y H:i:s') ?> UTC
+ transaction_time > 0 ? $claim->transaction_time : $claim->created_at->format('U'))->format('j M Y H:i:s') ?> UTC
Transaction ID
-
+
- ClaimType == 2): ?>
+ claim_type == 1): ?>
Cost
Safe for Work
- IsNSFW ? 'No' : 'Yes' ?>
+ is_nsfw ? 'No' : 'Yes' ?>
@@ -105,11 +105,11 @@ if (strlen(trim($desc)) == 0) {
- ClaimType == 1): ?>
+ claim_type == 2): ?>
Identity Claim
This is an identity claim.
- Title ?>
+ title ?>
', $desc) ?>
@@ -117,18 +117,22 @@ if (strlen(trim($desc)) == 0) {
diff --git a/src/Template/Main/find.ctp b/src/Template/Main/find.ctp
index 4148e81..2c806c8 100644
--- a/src/Template/Main/find.ctp
+++ b/src/Template/Main/find.ctp
@@ -54,77 +54,9 @@
if ($idx % 3 == 0) {
$row++;
}
- $autoThumbText = $claim->getAutoThumbText();
- $cost = '';
- if (isset($claim->Price) && $claim->Price > 0) {
- $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
- } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
- $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
- }
-
- // content type
- $ctTag = $claim->getContentTag();
- ?>
- Content Type
- Author)) > 0 ? $claim->Author : 'Unspecified' ?>
- ContentType)) > 0 ? $claim->ContentType : 'Unspecified' ?>
+ author)) > 0 ? $claim->author : 'Unspecified' ?>
+ content_type)) > 0 ? $claim->content_type : 'Unspecified' ?>
+
+ Language
- License)) > 0): ?> title="License ?>">
- LicenseUrl)) > 0): ?>
+
+
Open in LBRY
@@ -140,7 +144,7 @@ if (strlen(trim($desc)) == 0) {
0): ?>
language)) > 0 ? ($claim->language == 'en' ? 'English' : '') : 'Unspecified' ?>
-
@@ -252,78 +185,9 @@ if (strlen(trim($desc)) == 0) {
if ($idx % 3 == 0) {
$row++;
}
- $autoThumbText = $claim->getAutoThumbText();
- $cost = '';
- if (isset($claim->Price) && $claim->Price > 0) {
- $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
- } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
- $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
- }
-
- // content type
- $ctTag = $claim->getContentTag();
- ?>
- Publisher) ? 'More from the publisher' : 'Published by this identity' ?>
+publisher) ? 'More from the publisher' : 'Published by this identity' ?>
getAutoThumbText();
- $cost = '';
- if (isset($claim->Price) && $claim->Price > 0) {
- $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
- } else if (isset($claim->Fee) && strtolower($claim->FeeCurrency) === 'lbc') {
- $cost = $this->Amount->formatCurrency($claim->Fee) . ' LBC';
- }
-
- // content type
- $ctTag = $claim->getContentTag();
- ?>
-
- 0): ?>
-
-
-
-
-
-
-
-
+ echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
+ $idx++;
+ endforeach; ?>
- IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-  ?>)
-
-
-
-
-
-
-
- 0): ?>
-
-
-
-
-
-
-
-
+ echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
+ $idx++;
+ endforeach; ?>
- IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-
-
-
-
-
-
-
-
- 0): ?>
-
-
-
-
-
-
-
-
+ echo $this->element('claimbox', array('claim' => $claim, 'idx' => $idx, 'last_row' => $last_row));
+ $idx++;
+ endforeach; ?>
- IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-
-
-
-
-
-
-
- No results were found.
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp
index 8b0ecf3..fedcf93 100644
--- a/src/Template/Main/index.ctp
+++ b/src/Template/Main/index.ctp
@@ -129,12 +129,12 @@
Block Height
- Height ?>
+ height ?>
Difficulty
- Difficulty, 2, '.', '') ?>
+ difficulty, 2, '.', '') ?>
@@ -167,13 +167,13 @@
-
- Height ?>
- BlockTime)->diffForHumans(); ?>
- BlockSize / 1024, 2) . 'KB' ?>
- TransactionCount ?>
- Difficulty, 2, '.', '') ?>
- BlockTime)->format('d M Y H:i:s') . ' UTC' ?>
+
+ height ?>
+ block_time)->diffForHumans(); ?>
+ block_size / 1024, 2) . 'KB' ?>
+ transaction_count ?>
+ difficulty, 2, '.', '') ?>
+ block_time)->format('d M Y H:i:s') . ' UTC' ?>
@@ -183,14 +183,15 @@
diff --git a/src/Template/Main/tx.ctp b/src/Template/Main/tx.ctp
index f4f4523..0a7e8aa 100644
--- a/src/Template/Main/tx.ctp
+++ b/src/Template/Main/tx.ctp
@@ -14,22 +14,22 @@
Recent Claims
Claims Explorer - getAutoThumbText(); - $link = $claim->Name; - $rawLink = $claim->Name; - if (isset($claim->Publisher->Name)) { - $link = urlencode($claim->Publisher->Name) . '/' . $link; - $rawLink = $claim->Publisher->Name . '/' . $link; + $link = $claim->name; + $rawLink = $claim->name; + if (isset($claim->publisher)) { + $link = urlencode($claim->publisher) . '/' . $link; + $rawLink = $claim->publisher . '/' . $link; } $link = 'lbry://' . $link; $rawLink = 'lbry://' . $rawLink; @@ -198,35 +199,35 @@ // content type $ctTag = $claim->getContentTag(); ?> -
+
diff --git a/src/Template/Main/realtime.ctp b/src/Template/Main/realtime.ctp
index 3b29f04..45750c0 100644
--- a/src/Template/Main/realtime.ctp
+++ b/src/Template/Main/realtime.ctp
@@ -128,10 +128,10 @@
-
- Height ?>
- BlockTime)->diffForHumans(); ?>
- TransactionCount ?>
+
+ height ?>
+ block_time)->diffForHumans(); ?>
+ transaction_count ?>
@@ -153,12 +153,12 @@
-
- TxTime)->diffForHumans(); ?>
- InputCount ?>
- OutputCount ?>
- Value, 8, '.', '') ?> LBC
+
+ created_at->diffForHumans(); ?>
+ input_count ?>
+ output_count ?>
+ value, 8, '.', '') ?> LBC
diff --git a/src/Template/Main/stats.ctp b/src/Template/Main/stats.ctp
index 84609c2..974b2c9 100644
--- a/src/Template/Main/stats.ctp
+++ b/src/Template/Main/stats.ctp
@@ -47,8 +47,8 @@
Address ?>
- Address, $lbryAddresses)): ?>
+ address ?>
+ address, $lbryAddresses)): ?>
@@ -58,16 +58,14 @@
TagUrl)) > 0): ?>Tag ?>Tag; endif; ?>
- Balance, 8, '.', ',') ?>
- $Balance, $rate, 8), 2, '.', ',') ?>
- FirstSeen->format('d M Y H:i:s') . ' UTC'; ?>
+ balance, 8, '.', ',') ?>
+ $balance, $rate, 8), 2, '.', ',') ?>
+ first_seen->format('d M Y H:i:s') . ' UTC'; ?>
-
-
- IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-  ?>)
+ is_nsfw && strlen(trim($claim->thumbnail_url)) > 0): ?>
+  ?>)
- Transaction
+ Transaction
@@ -58,16 +58,14 @@
TagUrl)) > 0): ?>Tag ?>Tag; endif; ?>
Top500Percent, 5, '.', '') ?>%
LBRY Transaction
-Hash ?>
+hash ?>
Time Created
-Created->format('j M Y H:i:s') . ' UTC '; ?>
+ created_at->format('j M Y H:i:s') . ' UTC '; ?>
Block Time
-TransactionTime == null || strlen(trim($tx->TransactionTime)) == 0) ? 'Not yet confirmed' :
- \DateTime::createFromFormat('U', $tx->TransactionTime)->format('j M Y H:i:s') . ' UTC' ?>
+
transaction_time == null || strlen(trim($tx->transaction_time)) == 0) ? 'Not yet confirmed' :
+ \DateTime::createFromFormat('U', $tx->transaction_time)->format('j M Y H:i:s') . ' UTC' ?>
- TransactionTime > $tx->Created->getTimestamp()):
- $diffSeconds = $tx->TransactionTime - $tx->Created->getTimestamp();
+ transaction_time > $tx->created_at->getTimestamp()):
+ $diffSeconds = $tx->transaction_time - $tx->created_at->getTimestamp();
if ($diffSeconds <= 60) {
echo sprintf(' (+%s second%s)', $diffSeconds, $diffSeconds == 1 ? '' : 's');
} else {
@@ -47,15 +47,15 @@
@@ -66,17 +66,17 @@
@@ -86,28 +86,29 @@
Amount (LBC)
- Amount->format($tx->Value) ?>
+ Amount->format($tx->value) ?>
Block Height
- BlockHash) || strlen(trim($tx->BlockHash)) === 0): ?>
+ block_hash_id) || strlen(trim($tx->block_hash_id)) === 0): ?>
Unconf.
-
+
Size (bytes)
- TransactionSize, 0, '', ',') ?>
+ transaction_size, 0, '', ',') ?>
Inputs
- InputCount ?>
+ input_count ?>
Outputs
- OutputCount ?>
+ output_count ?>
Details
-
InputCount ?> inputInputCount === 1 ? '' : 's'; ?>
+ input_count ?> inputinput_count === 1 ? '' : 's'; ?>
-
-
+
+ is_coinbase): ?>
Block Reward (New Coins)
- Value)) == 0): ?>
+ value)) == 0): ?>
Incomplete data
input_addresses[0];
- if (!isset($setAddressIds[$addr->Address])):
- $setAddressIds[$addr->Address] = 1; ?>
-
+ if (!isset($setAddressIds[$addr->address])):
+ $setAddressIds[$addr->address] = 1; ?>
+
- Amount->format($in['Value']) ?> LBC from
- Address ?>
- (output)
+
Amount->format($in->value) ?> LBC from
+ address ?>
+ (output)
+
Tag) && strlen(trim($addr->Tag)) > 0): ?>
TagUrl)) > 0): ?>Tag ?>Tag; endif; ?>
@@ -125,7 +126,7 @@
-
OutputCount ?> outputOutputCount === 1 ? '' : 's'; ?>
+
output_count ?> outputoutput_count === 1 ? '' : 's'; ?>
0): ?>
Fee Amount->format($fee) ?> LBC
@@ -134,7 +135,7 @@
-
+
Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim)): ?>View
IsSupportClaim): ?>
-
+ value)) == 0): ?>
SUPPORT
@@ -142,19 +143,19 @@
IsClaim): ?>CLAIM
Incomplete data
output_addresses[0];
- if (!isset($setAddressIds[$addr->Address])):
- $setAddressIds[$addr->Address] = 1; ?>
-
+ if (!isset($setAddressIds[$addr->address])):
+ $setAddressIds[$addr->address] = 1; ?>
+
- Amount->format($out['Value']) ?> LBC to
- Address ?>
+
Amount->format($out->value) ?> LBC to
+ address ?>
- IsSpent): ?>(spent)(unspent)
+ is_spent): ?>(spent)(unspent)
Tag) && strlen(trim($addr->Tag)) > 0): ?>
diff --git a/src/View/AjaxView.php b/src/View/AjaxView.php
index 594e2d8..6c20b5e 100644
--- a/src/View/AjaxView.php
+++ b/src/View/AjaxView.php
@@ -15,7 +15,7 @@
namespace App\View;
use Cake\Event\EventManager;
-use Cake\Network\Request;
+use Cake\Http\ServerRequest;
use Cake\Network\Response;
/**
diff --git a/webroot/css/bids-chart.css b/webroot/css/bids-chart.css
new file mode 100644
index 0000000..48a41f4
--- /dev/null
+++ b/webroot/css/bids-chart.css
@@ -0,0 +1,8 @@
+.bids-chart-container { width: 1200px; margin: 0 auto 48px auto; box-shadow: 0 2px 6px rgba(0,0,0,.175); border: 1px solid rgba(0,0,0,.15); padding: 24px 36px; position: relative; overflow: hidden }
+.bids-chart-container .load-progress { position: absolute; top: 0; left: 0; width: 100%; height: 3px; background: #1e88e5; animation: indeterminate 4s linear infinite; }
+.bids-chart-container .chart { height: 414px }
+.bids-chart-container .btn-chart-export { position: absolute; right: 40px; bottom: 36px }
+@keyframes indeterminate {
+ from { left: -70%; }
+ to { left: 100% }
+}
\ No newline at end of file
diff --git a/webroot/css/main.css b/webroot/css/main.css
index b9f9376..2f1a828 100644
--- a/webroot/css/main.css
+++ b/webroot/css/main.css
@@ -81,6 +81,7 @@ border-radius: 0 8px 8px 0 }
.claims-grid .claim-grid-item .thumbnail .autothumb { display: block; margin: 73px auto 0 auto; text-align: center; font-size: 240%; color: #fff; line-height: 54px }
.claims-grid .claim-grid-item .tags > div { display: inline-block; padding: 4px 12px; margin-left: 2px }
.claims-grid .claim-grid-item .tags .nsfw { background: #e53935; text-align: center; color: #fff; position: relative; left: 1px }
+.claims-grid .claim-grid-item .tags .bid-state { background: #551CA1; text-align: center; color: #fff; }
.claims-grid .claim-grid-item .tags .content-type { background: #880e4f; text-align: center; color: #fff; }
.claims-grid .claim-grid-item .metadata { padding: 24px; font-size: 90% }
.claims-grid .claim-grid-item .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap }
diff --git a/webroot/js/bids-chart.js b/webroot/js/bids-chart.js
new file mode 100644
index 0000000..d025d04
--- /dev/null
+++ b/webroot/js/bids-chart.js
@@ -0,0 +1,170 @@
+function buildChartData(claimsData) {
+ var chartData = [];
+ var lastDate = 0;
+ var nbClaimsDay = 0;
+ var nbClaimsTotal = 0;
+ var bidClaimsDay = 0;
+ var bidClaimsTotal = 0;
+ var nbChannelsDay = 0;
+ var nbChannelsTotal = 0;
+ for(var i = 0; i < claimsData.length; i++) {
+ if(claimsData[i].transaction_time == 0) {
+ continue;
+ }
+ var transactionDate = new Date(claimsData[i].transaction_time * 1000);
+ transactionDate.setHours(0,0,0,0)
+ if(lastDate == 0) {
+ lastDate = transactionDate;
+ }
+ if(transactionDate.toString() != lastDate.toString()) {
+ nbClaimsTotal += nbClaimsDay;
+ bidClaimsTotal += bidClaimsDay;
+ var dateData = {
+ date: lastDate,
+ NumberClaims: nbClaimsTotal,
+ BidsClaims: bidClaimsTotal,
+ };
+ chartData.push(dateData);
+ nbClaimsDay = 0;
+ bidClaimsDay = 0;
+ lastDate = transactionDate;
+ }
+ if(claimsData[i].claim_type == 1) {
+ nbClaimsDay += 1;
+ bidClaimsDay += claimsData[i].effective_amount/100000000;
+ }
+ }
+ return chartData;
+}
+
+function loadChartData() {
+ var api_url = "https://chainquery.lbry.io/api/sql?query=";
+ var query = "SELECT c1.claim_type, c1.bid_state, c1.effective_amount, c1.transaction_time, o.transaction_time AS 'spent_time' FROM claim c1 LEFT JOIN (SELECT output.claim_id, tx.transaction_time FROM output INNER JOIN input ON input.prevout_hash = output.transaction_hash AND input.prevout_n = output.vout INNER JOIN transaction tx ON tx.id = input.transaction_id) o ON o.claim_id=c1.claim_id AND c1.bid_state='Spent' ORDER BY c1.transaction_time ASC";
+ var url = api_url + query;
+ var loadProgress = $('.bids-chart-container .load-progress');
+ $.ajax({
+ url: url,
+ type: 'get',
+ dataType: 'json',
+ beforeSend: function() {
+ chartLoadInProgress = true;
+ loadProgress.css({ display: 'block' });
+ },
+ success: function(response) {
+ if(response.success) {
+ chartData = buildChartData(response.data);
+ if(chart) {
+ chart.dataProvider = chartData;
+ chart.validateNow();
+ chart.validateData();
+ }
+ }
+ else {
+ console.log("Could not fetch block data.");
+ }
+ },
+ complete: function() {
+ chartLoadInProgress = false;
+ loadProgress.css({ display: 'none' });
+ }
+});
+}
+
+var chart;
+var chartData = [];
+var chartLoadInProgress = false;
+AmCharts.ready(function() {
+chart = AmCharts.makeChart('bids-chart', {
+type: 'serial',
+theme: 'light',
+mouseWheelZoomEnabled: true,
+height: '100%',
+categoryField: 'date',
+synchronizeGrid: true,
+dataProvider: chartData,
+responsive: {
+ enabled: true,
+},
+valueAxes: [
+{
+ id: 'v-number-claims',
+ axisColor: '#1e88e5',
+ axisThickness: 2,
+ position: 'left',
+},
+{
+ id: 'v-bids-claims',
+ axisColor: '#0b7a06',
+ axisThickness: 2,
+ position: 'left',
+ offset: 75,
+},
+],
+categoryAxis: {
+parseDates: true,
+autoGridCount: false,
+minorGridEnabled: true,
+minorGridAlpha: 0.04,
+axisColor: '#dadada',
+twoLineMode: true
+},
+graphs: [
+{
+ id: 'g-number-claims',
+ valueAxis: 'v-number-claims',
+ title: 'Number of claims',
+ valueField: 'NumberClaims',
+ bullet: 'round',
+ bulletBorderThickness: 1,
+ bulletBorderAlpha: 1,
+ bulletColor: '#ffffff',
+ bulletSize: 5,
+ useLineColorForBulletBorder: true,
+ lineColor: '#1e88e5',
+ hideBulletsCount: 101,
+ balloonText: '[[NumberClaims]]',
+},
+{
+ id: 'g-bids-claims',
+ valueAxis: 'v-bids-claims',
+ title: 'Bids for claims (LBC)',
+ valueField: 'BidsClaims',
+ bullet: 'round',
+ bulletBorderThickness: 1,
+ bulletBorderAlpha: 1,
+ bulletColor: '#ffffff',
+ bulletSize: 5,
+ useLineColorForBulletBorder: true,
+ lineColor: '#0b7a06',
+ balloonText: '[[BidsClaims]] LBC',
+ hideBulletsCount: 101
+},
+],
+chartCursor: {
+cursorAlpha: 0.1,
+fullWidth: true,
+valueLineBalloonEnabled: true,
+categoryBalloonColor: '#333333',
+cursorColor: '#1e88e5'
+},
+chartScrollbar: {
+scrollbarHeight: 36,
+color: '#888888',
+gridColor: '#bbbbbb'
+},
+legend: {
+marginLeft: 110,
+useGraphSettings: true,
+valueText: "",
+spacing: 64,
+
+},
+export: {
+enabled: true,
+fileName: 'lbry-bids-chart',
+position: 'bottom-right',
+divId: 'chart-export'
+}
+});
+loadChartData();
+});
\ No newline at end of file