Fix layout bugs

This commit is contained in:
Ben van Hartingsveldt 2025-06-28 15:17:05 +02:00
parent 64435a917e
commit 5872a04187
No known key found for this signature in database
GPG key ID: 261AA214130CE7AB
4 changed files with 19 additions and 10 deletions

View file

@ -23,6 +23,7 @@ use Endroid\QrCode\Writer\PngWriter;
use Exception;
use Illuminate\Database\Query\Builder;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Response;
@ -61,12 +62,13 @@ class MainController extends Controller{
public function __construct(){
$this->redis = RedisFacade::connection()->client();
$this->rpcUrl = config('lbry.rpc_url');
try {
try{
$this->redis->info('mem');
} catch (RedisException) {
}catch(RedisException){
$this->redis = null;
}
$this->rpcUrl = config('lbry.rpc_url');
}
/**
@ -118,7 +120,10 @@ class MainController extends Controller{
}
}
$lbcUsdPrice = (isset($priceInfo->price) && ($priceInfo->price > 0)) ? '$' . $priceInfo->price : 'N/A';
$lbcUsdPrice = 'N/A';
if(isset($priceInfo->price) && $priceInfo->price>0){
$lbcUsdPrice = '$'.$priceInfo->price;
}
return $lbcUsdPrice;
}
@ -419,7 +424,7 @@ class MainController extends Controller{
$input->input_addresses = $inputAddresses;
}
$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();
$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();
for ($i = 0; $i < count($outputs); $i++) {
$outputs[$i]->IsClaim = (strpos($outputs[$i]->script_pub_key_asm, 'CLAIM') > -1);
$outputs[$i]->IsSupportClaim = (strpos($outputs[$i]->script_pub_key_asm, 'SUPPORT_CLAIM') > -1);
@ -557,6 +562,7 @@ class MainController extends Controller{
'RIGHT JOIN (SELECT transaction_id, debit_amount, credit_amount FROM transaction_address ' .
' WHERE address_id = ?) TA ON TA.transaction_id = T.id ' .
'ORDER BY transaction_time DESC LIMIT %d, %d', $offset, $pageLimit), [$address->id]);
$recentTxs = $stmt->fetchAll(PDO::FETCH_OBJ);
foreach($transactionAddresses as $ta) {

View file

@ -21,6 +21,9 @@ use Illuminate\Database\Eloquent\Model;
*/
class Transaction extends Model{
protected $casts = [
'created_at' => 'datetime',
];
protected $table = 'transaction';
public $timestamps = false;

View file

@ -115,12 +115,12 @@
<div class="box">
<div class="title">Received (LBC)</div>
<div class="value">{{ \App\Helpers\AmountHelper::format(($totalReceived) }}</div>
<div class="value">{{ \App\Helpers\AmountHelper::format($totalReceived) }}</div>
</div>
<div class="box last">
<div class="title">Sent (LBC)</div>
<div class="value">{{ \App\Helpers\AmountHelper::format(($totalSent) }}</div>
<div class="value">{{ \App\Helpers\AmountHelper::format($totalSent) }}</div>
</div>
<div class="clear"></div>

View file

@ -97,7 +97,7 @@
<div class="subtitle">{{ $tx->input_count }} input{{ $tx->input_count === 1 ? '' : 's' }}</div>
@php($setAddressIds = [])
@foreach($inputs as $in)
<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">
<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">
@if($in->is_coinbase)
<div>Block Reward (New Coins)</div>
@else
@ -132,7 +132,7 @@
</div>
<div class="divider">
<img src="/img/right-arrow.png" alt="" />
<img src="{{ '/img/right-arrow.png' }}" alt="->" />
</div>
<div class="outputs">
@ -143,7 +143,7 @@
@endif
</div>
@foreach($outputs as $out)
<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">
<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">
<div class="labels">
@if($out->Claim && ($out->IsClaim or $out->IsSupportClaim or $out->IsUpdateClaim))<a class="view-claim" href="{{ $out->Claim->getExplorerLink() }}">View</a>@endif
@if($out->IsSupportClaim)<div class="support">SUPPORT</div>@endif