From a08290763d29070b28a351fe4e4d656a14ba5234 Mon Sep 17 00:00:00 2001 From: SuriyaR Date: Tue, 13 Aug 2019 19:24:35 +0530 Subject: [PATCH 1/3] Multiple axis ui issue fixed --- .../graph-view/graph-detail/graph-detail.component.ts | 8 ++++++++ src/app/view/home/graph-list/graph-list.component.ts | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.ts b/src/app/view/graph-view/graph-detail/graph-detail.component.ts index 6c2702b..1789de9 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.ts +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.ts @@ -60,6 +60,8 @@ export class GraphDetailComponent implements OnInit { this.hashdata = this.comp.linearTotalGraphData; console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData); this.hashdata.layout.height = 300; + this.hashdata.layout.xaxis.domain = [0.1,0.9]; + this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Total Difficulty'; this.selectedItem = 6; this.titleService.setTitle( @@ -74,6 +76,8 @@ export class GraphDetailComponent implements OnInit { this.hashdata = this.comp.linearGraphData; console.log('this.comp.linearGraphData',this.comp.linearGraphData); this.hashdata.layout.height = 300; + this.hashdata.layout.xaxis.domain = [0.1,0.9]; + this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Target Difficulty'; this.selectedItem = 6; this.titleService.setTitle( @@ -222,6 +226,8 @@ export class GraphDetailComponent implements OnInit { this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => { this.hashdata = this.comp.linearGraphData; this.hashdata.layout.height = 300; + this.hashdata.layout.xaxis.domain = [0.1,0.9]; + this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Target Difficulty'; }); break; @@ -229,6 +235,8 @@ export class GraphDetailComponent implements OnInit { this.comp.Difficultyreq('total',p1, p2, p3, p4).then(res => { this.hashdata = this.comp.linearTotalGraphData; this.hashdata.layout.height = 300; + this.hashdata.layout.xaxis.domain = [0.1,0.9]; + this.hashdata.layout.yaxis2.position = 2.25; this.title = 'Total Difficulty'; }); break; diff --git a/src/app/view/home/graph-list/graph-list.component.ts b/src/app/view/home/graph-list/graph-list.component.ts index ccce9d0..1d0cb2b 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -533,6 +533,7 @@ export class GraphListComponent implements OnInit { tickangle: -45, tickformat: tickformat, fixedrange: true, + domain: [0.2, 0.8] // showgrid: true }, yaxis: { @@ -548,7 +549,7 @@ export class GraphListComponent implements OnInit { // range: range, overlaying: 'y', side: 'left', - position: 0.25 + position: 1.25 }, yaxis3: { title: 'RandomX', @@ -1138,6 +1139,7 @@ export class GraphListComponent implements OnInit { tickangle: -45, tickformat: tickformat, fixedrange: true, + domain: [0.2, 0.8] // showgrid: true }, yaxis: { @@ -1153,7 +1155,7 @@ export class GraphListComponent implements OnInit { // range: range, overlaying: 'y', side: 'left', - position: 0.25 + position: 1.25 }, yaxis3: { title: 'RandomX', From c5897da2f8efb9bc6accfc9c908637b775086075 Mon Sep 17 00:00:00 2001 From: SuriyaR Date: Wed, 14 Aug 2019 11:07:34 +0530 Subject: [PATCH 2/3] Graph place changes --- .../graph-detail/graph-detail.component.html | 8 +- .../home/graph-list/graph-list.component.html | 212 +++++++++--------- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.html b/src/app/view/graph-view/graph-detail/graph-detail.component.html index 60a1e08..9b59282 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.html +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.html @@ -157,8 +157,8 @@ diff --git a/src/app/view/home/graph-list/graph-list.component.html b/src/app/view/home/graph-list/graph-list.component.html index 81e76ac..c6c8194 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -1,81 +1,71 @@
-
-
-

{{'home.TOTAL_DIFFICULTY' | translate}}

- - -
- - - -
@@ -521,10 +511,10 @@
--> -
+
-

{{'home.TARGET_DIFFICULTY' | translate}}

+

{{'home.TOTAL_DIFFICULTY' | translate}}

@@ -532,21 +522,26 @@ From fa5583b6793082b47922153110dc6e3beee73233 Mon Sep 17 00:00:00 2001 From: Prema Date: Wed, 14 Aug 2019 14:51:04 +0530 Subject: [PATCH 3/3] UI changes --- .../components/header/header.component.html | 28 +++++++++++++++++-- src/assets/css/responsive.css | 6 ++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html index c664e5a..26886be 100755 --- a/src/app/shared/components/header/header.component.html +++ b/src/app/shared/components/header/header.component.html @@ -1,8 +1,32 @@
+
+ Epic Cash + You are viewing + + +