Skip to content

Commit 5872a04

Browse files
committed
Fix layout bugs
1 parent 64435a9 commit 5872a04

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

app/Http/Controllers/MainController.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
use Exception;
2525

26+
use Illuminate\Database\Query\Builder;
2627
use Illuminate\Http\JsonResponse;
2728
use Illuminate\Http\RedirectResponse;
2829
use Illuminate\Http\Response;
@@ -61,12 +62,13 @@ class MainController extends Controller{
6162

6263
public function __construct(){
6364
$this->redis = RedisFacade::connection()->client();
64-
$this->rpcUrl = config('lbry.rpc_url');
65-
try {
65+
try{
6666
$this->redis->info('mem');
67-
} catch (RedisException) {
67+
}catch(RedisException){
6868
$this->redis = null;
6969
}
70+
71+
$this->rpcUrl = config('lbry.rpc_url');
7072
}
7173

7274
/**
@@ -118,7 +120,10 @@ protected function _getLatestPrice(): string{
118120
}
119121
}
120122

121-
$lbcUsdPrice = (isset($priceInfo->price) && ($priceInfo->price > 0)) ? '$' . $priceInfo->price : 'N/A';
123+
$lbcUsdPrice = 'N/A';
124+
if(isset($priceInfo->price) && $priceInfo->price>0){
125+
$lbcUsdPrice = '$'.$priceInfo->price;
126+
}
122127
return $lbcUsdPrice;
123128
}
124129

@@ -419,7 +424,7 @@ public function tx($hash = null): JsonResponse|Response|RedirectResponse|View{
419424
$input->input_addresses = $inputAddresses;
420425
}
421426

422-
$outputs = Output::query()->addSelect(['spend_input_hash' => 'I.transaction_hash', 'spend_input_id' => 'I.id'])->where('Outputs.transaction_id',$tx->id)->leftJoin('Inputs','id','=','Outputs.spent_by_input_id')->orderBy('Outputs.vout')->get();
427+
$outputs = Output::query()->where('output.transaction_id',$tx->id)->leftJoin('input AS i','i.id','=','output.spent_by_input_id')->addSelect('output.*')->addSelect(['i.transaction_hash AS spend_input_hash','i.id AS spend_input_id'])->orderBy('output.vout')->get();
423428
for ($i = 0; $i < count($outputs); $i++) {
424429
$outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
425430
$outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
@@ -557,6 +562,7 @@ public function address($addr = null): JsonResponse|Response|RedirectResponse|Vi
557562
'RIGHT JOIN (SELECT transaction_id, debit_amount, credit_amount FROM transaction_address ' .
558563
' WHERE address_id = ?) TA ON TA.transaction_id = T.id ' .
559564
'ORDER BY transaction_time DESC LIMIT %d, %d', $offset, $pageLimit), [$address->id]);
565+
560566
$recentTxs = $stmt->fetchAll(PDO::FETCH_OBJ);
561567

562568
foreach($transactionAddresses as $ta) {

app/Models/Transaction.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
*/
2222
class Transaction extends Model{
2323

24+
protected $casts = [
25+
'created_at' => 'datetime',
26+
];
2427
protected $table = 'transaction';
2528
public $timestamps = false;
2629

resources/views/main/address.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@
115115

116116
<div class="box">
117117
<div class="title">Received (LBC)</div>
118-
<div class="value">{{ \App\Helpers\AmountHelper::format(($totalReceived) }}</div>
118+
<div class="value">{{ \App\Helpers\AmountHelper::format($totalReceived) }}</div>
119119
</div>
120120

121121
<div class="box last">
122122
<div class="title">Sent (LBC)</div>
123-
<div class="value">{{ \App\Helpers\AmountHelper::format(($totalSent) }}</div>
123+
<div class="value">{{ \App\Helpers\AmountHelper::format($totalSent) }}</div>
124124
</div>
125125

126126
<div class="clear"></div>

resources/views/main/tx.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<div class="subtitle">{{ $tx->input_count }} input{{ $tx->input_count === 1 ? '' : 's' }}</div>
9898
@php($setAddressIds = [])
9999
@foreach($inputs as $in)
100-
<div id="input-{{ $in->id }}" class="input @if(isset($in->input_addresses) && count($in->input_addresses) > 0 && $in->input_addresses[0]->address == $sourceAddress)is-source@endif">
100+
<div id="input-{{ $in->id }}" class="{{ 'input ' }}@if(isset($in->input_addresses) && count($in->input_addresses) > 0 && $in->input_addresses[0]->address == $sourceAddress){{ 'is-source' }}@endif">
101101
@if($in->is_coinbase)
102102
<div>Block Reward (New Coins)</div>
103103
@else
@@ -132,7 +132,7 @@
132132
</div>
133133

134134
<div class="divider">
135-
<img src="/img/right-arrow.png" alt="" />
135+
<img src="{{ '/img/right-arrow.png' }}" alt="->" />
136136
</div>
137137

138138
<div class="outputs">
@@ -143,7 +143,7 @@
143143
@endif
144144
</div>
145145
@foreach($outputs as $out)
146-
<div id="output-{{ $out->vout }}" class="output @if(isset($out->output_addresses) && count($out->output_addresses) > 0 && $out->output_addresses[0]->address == $sourceAddress)is-source@endif">
146+
<div id="output-{{ $out->vout }}" class="{{ 'output ' }}@if(isset($out->output_addresses) && count($out->output_addresses) > 0 && $out->output_addresses[0]->address == $sourceAddress){{ 'is-source' }}@endif">
147147
<div class="labels">
148148
@if($out->Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim))<a class="view-claim" href="{{ $out->Claim->getExplorerLink() }}">View</a>@endif
149149
@if($out->IsSupportClaim)<div class="support">SUPPORT</div>@endif

0 commit comments

Comments
 (0)