diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index 03b9fe5bf..4b480a0a7 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -172,7 +172,7 @@ class BlocksRepository { startHeight: number | null = null ): Promise { 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); diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index 14f8fc924..08e742eb9 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -1,62 +1,61 @@ -
+

{{ poolStats.pool.name }}

+
+
+
+
+ + + + + + + + + + +
+
+
+
+
-
-
-
- - - - - - - - - - -
-
-
-
-
-
-
- +
- + - +
Address{{ poolStats.pool.addresses }}{{ poolStats.pool.addresses }}
Coinbase Tag{{ poolStats.pool.regexes }}{{ poolStats.pool.regexes }}
@@ -84,6 +83,7 @@ Height Timestamp Mined + Reward Transactions Size @@ -92,6 +92,7 @@ {{ block.height }} ‎{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }} + {{ block.tx_count | number }}
diff --git a/frontend/src/app/components/pool/pool.component.scss b/frontend/src/app/components/pool/pool.component.scss index e69de29bb..a1078adc0 100644 --- a/frontend/src/app/components/pool/pool.component.scss +++ b/frontend/src/app/components/pool/pool.component.scss @@ -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; + } + } +}