diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts index 01b36ab74..58c383266 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -264,8 +264,8 @@ export class PoolRankingComponent implements OnInit { fontSize: 14, }, itemStyle: { - borderRadius: 2, - borderWidth: 2, + borderRadius: 1, + borderWidth: 1, borderColor: '#000', }, emphasis: { diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html index 3c2b78a34..af71351ad 100644 --- a/frontend/src/app/components/pool/pool.component.html +++ b/frontend/src/app/components/pool/pool.component.html @@ -2,45 +2,50 @@

- + {{ poolStats.pool.name }}

-
+
- + + + + + - - - -
AddressesTags +
+ {{ poolStats.pool.regexes }} +
+
Addresses
{{ address }}
+ [routerLink]="['/address' | relativeUrl, address]">{{ + address }}
~
Coinbase Tags{{ poolStats.pool.regexes }}
-
+
- - + + - - + +
Mined Blocks{{ poolStats.blockCount }}Mined Blocks{{ formatNumber(poolStats.blockCount, this.locale, '1.0-0') }}
Empty Blocks{{ poolStats.emptyBlocks }}Empty Blocks{{ formatNumber(poolStats.emptyBlocks, this.locale, '1.0-0') }}
@@ -54,14 +59,17 @@
- +
- + @@ -113,7 +121,9 @@ - +
Height Timestamp Mined RewardTransactions + Transactions Size
Coinbase Tags
+
+
@@ -123,11 +133,15 @@ Mined Blocks -
+ +
+ Empty Blocks -
+ +
+ diff --git a/frontend/src/app/components/pool/pool.component.scss b/frontend/src/app/components/pool/pool.component.scss index 2dfd85881..291177f73 100644 --- a/frontend/src/app/components/pool/pool.component.scss +++ b/frontend/src/app/components/pool/pool.component.scss @@ -36,7 +36,7 @@ div.scrollable { margin: 0; padding: 0; overflow: auto; - max-height: 100px; + max-height: 75px; } .skeleton-loader { @@ -47,4 +47,20 @@ div.scrollable { .table { margin: 0px auto; max-width: 900px; +} + +.box { + padding-bottom: 0px; +} + +.label { + max-width: 50px; + width: 30%; +} + +.data { + text-align: center; + @media (max-width: 767.98px) { + text-align: right; + } } \ No newline at end of file diff --git a/frontend/src/app/components/pool/pool.component.ts b/frontend/src/app/components/pool/pool.component.ts index 89d398ca3..da05f0403 100644 --- a/frontend/src/app/components/pool/pool.component.ts +++ b/frontend/src/app/components/pool/pool.component.ts @@ -27,6 +27,7 @@ export class PoolComponent implements OnInit { @Input() right: number | string = 45; @Input() left: number | string = 75; + formatNumber = formatNumber; poolStats$: Observable; blocks$: Observable; isLoading = true; diff --git a/frontend/src/app/interfaces/node-api.interface.ts b/frontend/src/app/interfaces/node-api.interface.ts index a05671257..faa78560a 100644 --- a/frontend/src/app/interfaces/node-api.interface.ts +++ b/frontend/src/app/interfaces/node-api.interface.ts @@ -90,7 +90,7 @@ export interface PoolInfo { export interface PoolStat { pool: PoolInfo; blockCount: number; - emptyBlocks: BlockExtended[]; + emptyBlocks: number; } export interface BlockExtension {