From f9e361a9c0a963c20c7179731b65cb6e7a760625 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 5 Mar 2022 17:21:11 +0100 Subject: [PATCH] "view more" links - placeholders --- .../hashrate-chart.component.html | 12 ++--- .../hashrate-chart.component.scss | 7 ++- .../hashrate-chart.component.ts | 2 +- .../hashrate-chart-pools.component.scss | 2 +- .../mining-dashboard.component.html | 42 ++++++++++----- .../mining-dashboard.component.scss | 53 +++++++++++++++++++ .../pool-ranking/pool-ranking.component.scss | 5 +- .../pool-ranking/pool-ranking.component.ts | 4 ++ 8 files changed, 103 insertions(+), 24 deletions(-) diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html index 9c30a3334..eaa9fa809 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.html @@ -31,22 +31,22 @@ -
- +
+
- - + + - - + +
Timestamp AdjustedDifficultyChangeDifficultyChange
‎{{ diffChange.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }} {{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%{{ diffChange.difficultyShorten }}{{ formatNumber(diffChange.change, locale, '1.2-2') }}%
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss index eb97dc067..4d9e0e5fa 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 293px; } .formRadioGroup { @@ -48,3 +48,8 @@ } } } + +.compact td { + padding: 0 !important; + margin: 0.15rem !important; +} \ No newline at end of file diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts index db7d79d93..0ff9115c7 100644 --- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts +++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts @@ -115,7 +115,7 @@ export class HashrateChartComponent implements OnInit { } return { availableTimespanDay: availableTimespanDay, - difficulty: this.tableOnly ? tableData.slice(0, 8) : tableData + difficulty: this.tableOnly ? (this.isMobile() ? tableData.slice(0, 12) : tableData.slice(0, 9)) : tableData }; }), ); diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss index 7c18b0382..4f15e51d6 100644 --- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss +++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss @@ -29,7 +29,7 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 293px; } .formRadioGroup { diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 9d0eebe88..f332aec35 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -20,12 +20,29 @@
-
- - Mining Pools Share (1w) - -
+
+
+
Blocks (1w)
+

+ 1082 +

+
+
+
Miners luck (1w)
+

+ 107.25% +

+
+
+
Miners Gini (1w)
+

+ 0.123 +

+
+
+ +
View more »
@@ -35,11 +52,10 @@
- - Hashrate (1y) - + Hashrate (1y)
+
View more »
@@ -49,11 +65,10 @@
- - Mining Pools Dominance (1y) - + Mining Pools Dominance (1y)
+
View more »
@@ -62,11 +77,10 @@
- - Adjusments - + Adjusments
+
View more »
diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 4f05686a3..b2e9abde9 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -16,6 +16,7 @@ .card-title { font-size: 1rem; + color: #4a68b9; } .card-title > a { color: #4a68b9; @@ -54,3 +55,55 @@ text-align: center; padding-bottom: 3px; } + +.pool-distribution { + min-height: 56px; + display: block; + @media (min-width: 485px) { + display: flex; + flex-direction: row; + } + h5 { + margin-bottom: 10px; + } + .item { + width: 50%; + margin: 0px auto 10px; + display: inline-block; + @media (min-width: 485px) { + margin: 0px auto 10px; + } + @media (min-width: 785px) { + margin: 0px auto 0px; + } + &:last-child { + margin: 0px auto 0px; + } + &:nth-child(2) { + order: 2; + @media (min-width: 485px) { + order: 3; + } + } + &:nth-child(3) { + order: 3; + @media (min-width: 485px) { + order: 2; + display: block; + } + @media (min-width: 768px) { + display: none; + } + @media (min-width: 992px) { + display: block; + } + } + .card-text { + font-size: 18px; + span { + color: #ffffff66; + font-size: 12px; + } + } + } +} \ No newline at end of file diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss index 4ba007598..ee0cf8e85 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss @@ -7,7 +7,10 @@ .chart-widget { width: 100%; height: 100%; - max-height: 325px; + max-height: 270px; + @media (max-width: 767.98px) { + max-height: 200px; + } } .formRadioGroup { 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 cd2970660..ae252330b 100644 --- a/frontend/src/app/components/pool-ranking/pool-ranking.component.ts +++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.ts @@ -208,6 +208,8 @@ export class PoolRankingComponent implements OnInit { let radius: any[] = ['20%', '80%']; let top: any = undefined; let bottom = undefined; let height = undefined; if (this.isMobile() && this.widget) { + top = -30; + height = 270; radius = ['10%', '50%']; } else if (this.isMobile() && !this.widget) { top = 0; @@ -215,6 +217,8 @@ export class PoolRankingComponent implements OnInit { radius = ['10%', '50%']; } else if (this.widget) { radius = ['15%', '60%']; + top = -20; + height = 330; } else { top = 35; }