Show block reward in the pool stat page
This commit is contained in:
		
							parent
							
								
									f2abedfbaa
								
							
						
					
					
						commit
						e1f3c662b2
					
				@ -172,7 +172,7 @@ class BlocksRepository {
 | 
			
		||||
    startHeight: number | null = null
 | 
			
		||||
  ): Promise<object[]> {
 | 
			
		||||
    const params: any[] = [];
 | 
			
		||||
    let query = `SELECT height, hash, tx_count, size, weight, pool_id, UNIX_TIMESTAMP(blockTimestamp) as timestamp
 | 
			
		||||
    let query = `SELECT height, hash, tx_count, size, weight, pool_id, UNIX_TIMESTAMP(blockTimestamp) as timestamp, reward
 | 
			
		||||
      FROM blocks
 | 
			
		||||
      WHERE pool_id = ?`;
 | 
			
		||||
    params.push(poolId);
 | 
			
		||||
 | 
			
		||||
@ -1,62 +1,61 @@
 | 
			
		||||
<div class="container-xl">
 | 
			
		||||
<div class="container">
 | 
			
		||||
 | 
			
		||||
  <div *ngIf="poolStats$ | async as poolStats">
 | 
			
		||||
    <h1>
 | 
			
		||||
      {{ poolStats.pool.name }}
 | 
			
		||||
    </h1>
 | 
			
		||||
 | 
			
		||||
    <div class="box pl-0 bg-transparent">
 | 
			
		||||
      <div class="card-header mb-0 mb-lg-4 pr-0 pl-0">
 | 
			
		||||
        <form [formGroup]="radioGroupForm" class="formRadioGroup ml-0">
 | 
			
		||||
          <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'24h'"> 24h
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'3d'"> 3D
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'1w'"> 1W
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'1m'"> 1M
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'3m'"> 3M
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'6m'"> 6M
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'1y'"> 1Y
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'2y'"> 2Y
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'3y'"> 3Y
 | 
			
		||||
            </label>
 | 
			
		||||
            <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
              <input ngbButton type="radio" [value]="'all'"> ALL
 | 
			
		||||
            </label>
 | 
			
		||||
          </div>
 | 
			
		||||
        </form>
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
 | 
			
		||||
    <div class="box">
 | 
			
		||||
      <div class="row">
 | 
			
		||||
        <div class="col-sm">
 | 
			
		||||
          <div class="card-header mb-0 mb-lg-4 pr-0">
 | 
			
		||||
            <form [formGroup]="radioGroupForm" class="formRadioGroup float-right">
 | 
			
		||||
              <div class="btn-group btn-group-toggle" ngbRadioGroup name="radioBasic" formControlName="dateSpan">
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'24h'"> 24h
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'3d'"> 3D
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'1w'"> 1W
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'1m'"> 1M
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'3m'"> 3M
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'6m'"> 6M
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'1y'"> 1Y
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'2y'"> 2Y
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'3y'"> 3Y
 | 
			
		||||
                </label>
 | 
			
		||||
                <label ngbButtonLabel class="btn-primary btn-sm">
 | 
			
		||||
                  <input ngbButton type="radio" [value]="'all'"> ALL
 | 
			
		||||
                </label>
 | 
			
		||||
              </div>
 | 
			
		||||
            </form>
 | 
			
		||||
          </div>
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
      <div class="row">
 | 
			
		||||
        <div class="col-sm">
 | 
			
		||||
          <table class="table table-borderless table-striped">
 | 
			
		||||
          <table class="table table-borderless table-striped" style="table-layout: fixed;">
 | 
			
		||||
            <tbody>
 | 
			
		||||
              <tr>
 | 
			
		||||
                <td>Address</td>
 | 
			
		||||
                <td>{{ poolStats.pool.addresses }}</td>
 | 
			
		||||
                <td class="text-truncate">{{ poolStats.pool.addresses }}</td>
 | 
			
		||||
              </tr>
 | 
			
		||||
              <tr>
 | 
			
		||||
                <td>Coinbase Tag</td>
 | 
			
		||||
                <td>{{ poolStats.pool.regexes }}</td>
 | 
			
		||||
                <td class="text-truncate">{{ poolStats.pool.regexes }}</td>
 | 
			
		||||
              </tr>
 | 
			
		||||
            </tbody>
 | 
			
		||||
          </table>
 | 
			
		||||
@ -84,6 +83,7 @@
 | 
			
		||||
      <th style="width: 15%;" i18n="latest-blocks.height">Height</th>
 | 
			
		||||
      <th class="d-none d-md-block" style="width: 20%;" i18n="latest-blocks.timestamp">Timestamp</th>
 | 
			
		||||
      <th style="width: 20%;" i18n="latest-blocks.mined">Mined</th>
 | 
			
		||||
      <th style="width: 10%;" i18n="latest-blocks.reward">Reward</th>
 | 
			
		||||
      <th class="d-none d-lg-block" style="width: 15%;" i18n="latest-blocks.transactions">Transactions</th>
 | 
			
		||||
      <th style="width: 20%;" i18n="latest-blocks.size">Size</th>
 | 
			
		||||
    </thead>
 | 
			
		||||
@ -92,6 +92,7 @@
 | 
			
		||||
        <td><a [routerLink]="['/block' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height }}</a></td>
 | 
			
		||||
        <td class="d-none d-md-block">‎{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}</td>
 | 
			
		||||
        <td><app-time-since [time]="block.timestamp" [fastRender]="true"></app-time-since></td>
 | 
			
		||||
        <td class=""><app-amount [satoshis]="block['reward']" digitsInfo="1.2-2" [noFiat]="true"></app-amount></td>
 | 
			
		||||
        <td class="d-none d-lg-block">{{ block.tx_count | number }}</td>
 | 
			
		||||
        <td>
 | 
			
		||||
          <div class="progress">
 | 
			
		||||
 | 
			
		||||
@ -0,0 +1,32 @@
 | 
			
		||||
.progress {
 | 
			
		||||
  background-color: #2d3348;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media (min-width: 768px) {
 | 
			
		||||
  .d-md-block {
 | 
			
		||||
      display: table-cell !important;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@media (min-width: 992px) {
 | 
			
		||||
  .d-lg-block {
 | 
			
		||||
      display: table-cell !important;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.formRadioGroup {
 | 
			
		||||
  margin-top: 6px;
 | 
			
		||||
  display: flex;
 | 
			
		||||
  flex-direction: column;
 | 
			
		||||
  @media (min-width: 830px) {
 | 
			
		||||
    margin-left: 2%;
 | 
			
		||||
    flex-direction: row;
 | 
			
		||||
    float: left;
 | 
			
		||||
    margin-top: 0px;
 | 
			
		||||
  }
 | 
			
		||||
  .btn-sm {
 | 
			
		||||
    font-size: 9px;
 | 
			
		||||
    @media (min-width: 830px) {
 | 
			
		||||
      font-size: 14px;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user