EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
raja.blaze 2019-08-14 16:32:56 +05:30
commit 94b5c68aea
6 changed files with 156 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/shared/components/header/header.component.html
View File

@ -1,4 +1,33 @@
<header class="headerbg"> <header class="headerbg">
<div class="home_tst_net mt-3 d-block d-sm-none">
<a href="https://epic.tech/" target="_blank" class="text_underline mr-2">Epic Cash</a>
<span>You are viewing </span>
<select (change)="onChangeNetwork($event.target.value)">
<option value="Floonet" [selected]="'Floonet' == getNetwork()" >FlooNet</option>
<option value="Testnet" [selected]="'Testnet' == getNetwork()">TestNet</option>
<option disabled value="Mainnet">MainNet</option>
</select>
<!-- <ul class="list-unstyled d-inline-block mb-0">
<li class="nav-item dropdown">
<a
class="nav-link dropdown-toggle bg-white"
id="navbarDropdown"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
TestNet
</a>
<div class="dropdown-menu net_dropdwn" aria-labelledby="navbarDropdown">
<a class="dropdown-item p-2 disabled" style="background-color: #00000024;" target = '_blank' href="#">MainNet</a
>
</div>
</li>
</ul> -->
</div>
<nav class="navbar navbar-expand navbar-light bg-transparent"> <nav class="navbar navbar-expand navbar-light bg-transparent">
<div class="container-fluid"> <div class="container-fluid">
<div class="collapse navbar-collapse home_mble_hdr" id="navbarSupportedContent"> <div class="collapse navbar-collapse home_mble_hdr" id="navbarSupportedContent">
@ -15,7 +44,7 @@
</ul> </ul>
</li> --> </li> -->
<li class="home_tst_net mr-3"> <li class="home_tst_net mr-3 d-none d-sm-inline-block">
<a href="https://epic.tech/" target="_blank" class="text_underline mr-2">Epic Cash</a> <a href="https://epic.tech/" target="_blank" class="text_underline mr-2">Epic Cash</a>
<span>You are viewing </span> <span>You are viewing </span>
<select (change)="onChangeNetwork($event.target.value)"> <select (change)="onChangeNetwork($event.target.value)">

8
src/app/view/graph-view/graph-detail/graph-detail.component.html
View File

@ -157,8 +157,8 @@
<div class="box_shadow_large bg-white p-3"> <div class="box_shadow_large bg-white p-3">
<h2 class="chart_heading mb-2 d-inline-block">{{'home.EXPLORE' | translate}}</h2> <h2 class="chart_heading mb-2 d-inline-block">{{'home.EXPLORE' | translate}}</h2>
<ul class="list-unstyled pl-3"> <ul class="list-unstyled pl-3">
<li class="mb-1" *ngIf="this.title!='Total Difficulty'"><a <li class="mb-1" *ngIf="this.title!='Target Difficulty'"><a
routerLink="/chart/total-difficulty">{{'total-difficulty' | translate}}</a></li> routerLink="/chart/target-difficulty">{{'target-difficulty' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Transactions over time'"><a <li class="mb-1" *ngIf="this.title!='Transactions over time'"><a
routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li> routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Blocks'"><a <li class="mb-1" *ngIf="this.title!='Blocks'"><a
@ -176,8 +176,8 @@
routerLink="/chart/transactions-by-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li> routerLink="/chart/transactions-by-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/blocks-by-algorithm">Blocks by Algorithm</a> <li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/blocks-by-algorithm">Blocks by Algorithm</a>
</li> </li>
<li class="mb-1" *ngIf="this.title!='Target Difficulty'"><a <li class="mb-1" *ngIf="this.title!='Total Difficulty'"><a
routerLink="/chart/target-difficulty">{{'target-difficulty' | translate}}</a></li> routerLink="/chart/total-difficulty">{{'total-difficulty' | translate}}</a></li>
<!-- <li class="mb-1" *ngIf="this.title!='Pie Chart'"><a routerLink="/chart/piechart">Pie Chart</a></li> --> <!-- <li class="mb-1" *ngIf="this.title!='Pie Chart'"><a routerLink="/chart/piechart">Pie Chart</a></li> -->
</ul> </ul>
</div> </div>

8
src/app/view/graph-view/graph-detail/graph-detail.component.ts
View File

@ -60,6 +60,8 @@ export class GraphDetailComponent implements OnInit {
this.hashdata = this.comp.linearTotalGraphData; this.hashdata = this.comp.linearTotalGraphData;
console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData); console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData);
this.hashdata.layout.height = 300; 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.title = 'Total Difficulty';
this.selectedItem = 6; this.selectedItem = 6;
this.titleService.setTitle( this.titleService.setTitle(
@ -74,6 +76,8 @@ export class GraphDetailComponent implements OnInit {
this.hashdata = this.comp.linearGraphData; this.hashdata = this.comp.linearGraphData;
console.log('this.comp.linearGraphData',this.comp.linearGraphData); console.log('this.comp.linearGraphData',this.comp.linearGraphData);
this.hashdata.layout.height = 300; 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.title = 'Target Difficulty';
this.selectedItem = 6; this.selectedItem = 6;
this.titleService.setTitle( this.titleService.setTitle(
@ -222,6 +226,8 @@ export class GraphDetailComponent implements OnInit {
this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => { this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => {
this.hashdata = this.comp.linearGraphData; this.hashdata = this.comp.linearGraphData;
this.hashdata.layout.height = 300; 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.title = 'Target Difficulty';
}); });
break; break;
@ -229,6 +235,8 @@ export class GraphDetailComponent implements OnInit {
this.comp.Difficultyreq('total',p1, p2, p3, p4).then(res => { this.comp.Difficultyreq('total',p1, p2, p3, p4).then(res => {
this.hashdata = this.comp.linearTotalGraphData; this.hashdata = this.comp.linearTotalGraphData;
this.hashdata.layout.height = 300; 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.title = 'Total Difficulty';
}); });
break; break;

204
src/app/view/home/graph-list/graph-list.component.html
View File

@ -1,81 +1,71 @@
<div class="row"> <div class="row">
<div class="col-md-6 col-lg-4 mb-4"> <div class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow"> <div class="box_shadow">
<div class="blocks"> <div class="blocks">
<h2 class="chart_heading d-inline-block">{{'home.TOTAL_DIFFICULTY' | translate}}</h2> <h2 class="chart_heading d-inline-block">{{'home.TARGET_DIFFICULTY' | translate}}</h2>
<!-- <span class="txn_count" *ngIf="this.lg_last.length > 0"><span *ngFor="let l of lg_last">{{ <!-- <span class="txn_count" *ngIf="this.lg_last.length > 0"><span *ngFor="let l of lg_last">{{
this.l | number</span> this.l | number</span>
}}</span> --> }}</span> -->
<div class="chart_show"> <div class="chart_show">
<!-- <div class="difficulty_filter day_filter p-0 bg-transparent mt-2"> <!-- <div class="difficulty_filter day_filter p-0 bg-transparent mt-2">
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('total', '', '', TdifficultyRange,'all'); selectedTarget12 = 4 Difficultyreq('target', '', '', difficultyRange,'all'); selectedItem12 = 4
" id="4" #itemtarget124 " id="4" #item124 [ngClass]="{ active: selectedItem12 == item124.id, txt_primay: true }">All</a>
[ngClass]="{ active: selectedTarget12 == itemtarget124.id, txt_primay: true }">All</a> <a href="JavaScript:void(0);" (click)="
<a href="JavaScript:void(0);" (click)=" Difficultyreq('target', '', '', difficultyRange,'cuckatoo'); selectedItem12 = 1
Difficultyreq('total', '', '', TdifficultyRange,'cuckatoo'); selectedTarget12 = 1 " id="1" #item121 [ngClass]="{ active: selectedItem12 == item121.id, txt_primay: true }">Cuckoo</a>
" id="1" #itemtarget121 <a href="JavaScript:void(0);" (click)="
[ngClass]="{ active: selectedTarget12 == itemtarget121.id, txt_primay: true }">Cuckoo</a> Difficultyreq('target', '', '', difficultyRange,'progpow'); selectedItem12 = 2
<a href="JavaScript:void(0);" (click)=" " id="2" #item122 [ngClass]="{ active: selectedItem12 == item122.id, txt_primay: true }">ProgPow</a>
Difficultyreq('total', '', '', TdifficultyRange,'progpow'); selectedTarget12 = 2 <a href="JavaScript:void(0);" (click)="
" id="2" #itemtarget122 Difficultyreq('target', '', '', difficultyRange,'randomx'); selectedItem12 = 3
[ngClass]="{ active: selectedTarget12 == itemtarget122.id, txt_primay: true }">ProgPow</a> " id="3" #item123 [ngClass]="{ active: selectedItem12 == item123.id, txt_primay: true }">RandomX</a>
<a href="JavaScript:void(0);" (click)=" </div> -->
Difficultyreq('total', '', '', TdifficultyRange,'randomx'); selectedTarget12 = 3 <epic-explorer-plotly *ngIf="linearGraphData.data" [data]="linearGraphData.data" [layout]="linearGraphData.layout">
" id="3" #itemtarget123 </epic-explorer-plotly>
[ngClass]="{ active: selectedTarget12 == itemtarget123.id, txt_primay: true }">RandomX</a> <div *ngIf="!linearGraphData.data" class="feedback_div news_desc text-center">
</div> --> <div class="graph_img background_loading mx-auto mb-3"></div>
<epic-explorer-plotly *ngIf="linearTotalGraphData.data" [data]="linearTotalGraphData.data" <div class=" p-3 bg-white">
[layout]="linearTotalGraphData.layout"> <p class="mb-2 background_loading para_load"></p>
</epic-explorer-plotly> <p class="mb-2 background_loading para_load"></p>
<div *ngIf="!linearTotalGraphData.data" class="feedback_div news_desc text-center"> <p class="mb-2 background_loading para_load"></p>
<div class="graph_img background_loading mx-auto mb-3"></div> <p class="mb-2 background_loading para_load"></p>
<div class=" p-3 bg-white"> <p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p> <p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p> <p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p>
<p class="mb-2 background_loading para_load"></p>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="day_filter"> </div>
<a href="JavaScript:void(0);" (click)=" <div class="day_filter">
Difficultyreq('total', '', '', '1 day',''); selectedTarget = 6; TdifficultyRange = '1 day' <a href="JavaScript:void(0);" (click)="
" id="6" #itemtarget6 [ngClass]="{ active: selectedTarget == itemtarget6.id, txt_primay: true }">1 day</a> Difficultyreq('target', '', '', '1 day',''); selectedItem = 6; difficultyRange = '1 day'
<a href="JavaScript:void(0);" (click)=" " id="6" #item6 [ngClass]="{ active: selectedItem == item6.id, txt_primay: true }">1 day</a>
Difficultyreq('total', '', '', '1 week',''); selectedTarget = 1; TdifficultyRange = '1 week' <a href="JavaScript:void(0);" (click)="
" id="1" #itemtarget1 [ngClass]="{ active: selectedTarget == itemtarget1.id, txt_primay: true }">1 Difficultyreq('target', '', '', '1 week',''); selectedItem = 1; difficultyRange = '1 week'
{{'home.WEEK' | translate}}</a> " id="1" #item1 [ngClass]="{ active: selectedItem == item1.id, txt_primay: true }">1 {{'home.WEEK' | translate}}</a>
<!-- <a href="JavaScript:void(0);" (click)=" <!-- <a href="JavaScript:void(0);" (click)="
Difficultyreq('total', '', '', '15 days',''); selectedTarget = 2; TdifficultyRange = '15 days' Difficultyreq('target', '', '', '15 days',''); selectedItem = 2; difficultyRange = '15 days'
" id="2" #itemtarget2 [ngClass]="{ active: selectedTarget == itemtarget2.id, day15_txt: true }">15 " id="2" #item2 [ngClass]="{ active: selectedItem == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}}</a> -->
{{'home.DAYS' | translate}}</a> --> <a href="JavaScript:void(0);" (click)="
<a href="JavaScript:void(0);" (click)=" Difficultyreq('target', '', '', '30 days',''); selectedItem = 3; difficultyRange = '30 days'
Difficultyreq('total', '', '', '30 days',''); selectedTarget = 3; TdifficultyRange = '30 days' " id="3" #item3 [ngClass]="{ active: selectedItem == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}}</a>
" id="3" #itemtarget3 [ngClass]="{ active: selectedTarget == itemtarget3.id, day30_txt: true }">30 <a href="JavaScript:void(0);" (click)="
{{'home.DAYS' | translate}}</a> Difficultyreq('target', '', '', '60 days',''); selectedItem = 4; difficultyRange = '60 days'
<a href="JavaScript:void(0);" (click)=" " id="4" #item4 [ngClass]="{ active: selectedItem == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}}</a>
Difficultyreq('total', '', '', '60 days',''); selectedTarget = 4; TdifficultyRange = '60 days' <a href="JavaScript:void(0);" (click)="
" id="4" #itemtarget4 [ngClass]="{ active: selectedTarget == itemtarget4.id, day60_txt: true }">60 Difficultyreq('target', '', '', '3 months',''); selectedItem = 5; difficultyRange = '3 months'
{{'home.DAYS' | translate}}</a> " id="5" #item5 [ngClass]="{ active: selectedItem == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
<a href="JavaScript:void(0);" (click)=" </div>
Difficultyreq('total', '', '', '3 months',''); selectedTarget = 5; TdifficultyRange = '3 months'
" id="5" #itemtarget5 [ngClass]="{ active: selectedTarget == itemtarget5.id, day3m_txt: true }">3
{{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right"> <div class="explore_all text-right">
<a routerLink="/chart/total-difficulty"><span class="text-uppercase">{{'home.EXPLORE_IT' | translate}} <i <a routerLink="/chart/target-difficulty"><span class="text-uppercase">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a> class="fa fa-long-arrow-right"></i></span></a>
</div>
</div> </div>
</div> </div>
</div>
<div class="col-md-6 col-lg-4 mb-4"> <div class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow"> <div class="box_shadow">
<div class="blocks"> <div class="blocks">
@ -521,10 +511,10 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<div *ngIf="viewchartvar" class="col-md-6 col-lg-4 mb-4"> <div *ngIf="viewchartvar" class="col-md-6 col-lg-4 mb-4">
<div class="box_shadow"> <div class="box_shadow">
<div class="blocks"> <div class="blocks">
<h2 class="chart_heading d-inline-block">{{'home.TARGET_DIFFICULTY' | translate}}</h2> <h2 class="chart_heading d-inline-block">{{'home.TOTAL_DIFFICULTY' | translate}}</h2>
<!-- <span class="txn_count" *ngIf="this.lg_last.length > 0"><span *ngFor="let l of lg_last">{{ <!-- <span class="txn_count" *ngIf="this.lg_last.length > 0"><span *ngFor="let l of lg_last">{{
this.l | number</span> this.l | number</span>
}}</span> --> }}</span> -->
@ -532,21 +522,26 @@
<div class="chart_show"> <div class="chart_show">
<!-- <div class="difficulty_filter day_filter p-0 bg-transparent mt-2"> <!-- <div class="difficulty_filter day_filter p-0 bg-transparent mt-2">
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('target', '', '', difficultyRange,'all'); selectedItem12 = 4 Difficultyreq('total', '', '', TdifficultyRange,'all'); selectedTarget12 = 4
" id="4" #item124 [ngClass]="{ active: selectedItem12 == item124.id, txt_primay: true }">All</a> " id="4" #itemtarget124
[ngClass]="{ active: selectedTarget12 == itemtarget124.id, txt_primay: true }">All</a>
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('target', '', '', difficultyRange,'cuckatoo'); selectedItem12 = 1 Difficultyreq('total', '', '', TdifficultyRange,'cuckatoo'); selectedTarget12 = 1
" id="1" #item121 [ngClass]="{ active: selectedItem12 == item121.id, txt_primay: true }">Cuckoo</a> " id="1" #itemtarget121
<a href="JavaScript:void(0);" (click)=" [ngClass]="{ active: selectedTarget12 == itemtarget121.id, txt_primay: true }">Cuckoo</a>
Difficultyreq('target', '', '', difficultyRange,'progpow'); selectedItem12 = 2 <a href="JavaScript:void(0);" (click)="
" id="2" #item122 [ngClass]="{ active: selectedItem12 == item122.id, txt_primay: true }">ProgPow</a> Difficultyreq('total', '', '', TdifficultyRange,'progpow'); selectedTarget12 = 2
<a href="JavaScript:void(0);" (click)=" " id="2" #itemtarget122
Difficultyreq('target', '', '', difficultyRange,'randomx'); selectedItem12 = 3 [ngClass]="{ active: selectedTarget12 == itemtarget122.id, txt_primay: true }">ProgPow</a>
" id="3" #item123 [ngClass]="{ active: selectedItem12 == item123.id, txt_primay: true }">RandomX</a> <a href="JavaScript:void(0);" (click)="
Difficultyreq('total', '', '', TdifficultyRange,'randomx'); selectedTarget12 = 3
" id="3" #itemtarget123
[ngClass]="{ active: selectedTarget12 == itemtarget123.id, txt_primay: true }">RandomX</a>
</div> --> </div> -->
<epic-explorer-plotly *ngIf="linearGraphData.data" [data]="linearGraphData.data" [layout]="linearGraphData.layout"> <epic-explorer-plotly *ngIf="linearTotalGraphData.data" [data]="linearTotalGraphData.data"
[layout]="linearTotalGraphData.layout">
</epic-explorer-plotly> </epic-explorer-plotly>
<div *ngIf="!linearGraphData.data" class="feedback_div news_desc text-center"> <div *ngIf="!linearTotalGraphData.data" class="feedback_div news_desc text-center">
<div class="graph_img background_loading mx-auto mb-3"></div> <div class="graph_img background_loading mx-auto mb-3"></div>
<div class=" p-3 bg-white"> <div class=" p-3 bg-white">
<p class="mb-2 background_loading para_load"></p> <p class="mb-2 background_loading para_load"></p>
@ -561,29 +556,34 @@
</div> </div>
</div> </div>
<div class="day_filter"> <div class="day_filter">
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('target', '', '', '1 day',''); selectedItem = 6; difficultyRange = '1 day' Difficultyreq('total', '', '', '1 day',''); selectedTarget = 6; TdifficultyRange = '1 day'
" id="6" #item6 [ngClass]="{ active: selectedItem == item6.id, txt_primay: true }">1 day</a> " id="6" #itemtarget6 [ngClass]="{ active: selectedTarget == itemtarget6.id, txt_primay: true }">1 day</a>
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('target', '', '', '1 week',''); selectedItem = 1; difficultyRange = '1 week' Difficultyreq('total', '', '', '1 week',''); selectedTarget = 1; TdifficultyRange = '1 week'
" id="1" #item1 [ngClass]="{ active: selectedItem == item1.id, txt_primay: true }">1 {{'home.WEEK' | translate}}</a> " id="1" #itemtarget1 [ngClass]="{ active: selectedTarget == itemtarget1.id, txt_primay: true }">1
<!-- <a href="JavaScript:void(0);" (click)=" {{'home.WEEK' | translate}}</a>
Difficultyreq('target', '', '', '15 days',''); selectedItem = 2; difficultyRange = '15 days' <!-- <a href="JavaScript:void(0);" (click)="
" id="2" #item2 [ngClass]="{ active: selectedItem == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}}</a> --> Difficultyreq('total', '', '', '15 days',''); selectedTarget = 2; TdifficultyRange = '15 days'
<a href="JavaScript:void(0);" (click)=" " id="2" #itemtarget2 [ngClass]="{ active: selectedTarget == itemtarget2.id, day15_txt: true }">15
Difficultyreq('target', '', '', '30 days',''); selectedItem = 3; difficultyRange = '30 days' {{'home.DAYS' | translate}}</a> -->
" id="3" #item3 [ngClass]="{ active: selectedItem == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}}</a> <a href="JavaScript:void(0);" (click)="
<a href="JavaScript:void(0);" (click)=" Difficultyreq('total', '', '', '30 days',''); selectedTarget = 3; TdifficultyRange = '30 days'
Difficultyreq('target', '', '', '60 days',''); selectedItem = 4; difficultyRange = '60 days' " id="3" #itemtarget3 [ngClass]="{ active: selectedTarget == itemtarget3.id, day30_txt: true }">30
" id="4" #item4 [ngClass]="{ active: selectedItem == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}}</a> {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Difficultyreq('target', '', '', '3 months',''); selectedItem = 5; difficultyRange = '3 months' Difficultyreq('total', '', '', '60 days',''); selectedTarget = 4; TdifficultyRange = '60 days'
" id="5" #item5 [ngClass]="{ active: selectedItem == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a> " id="4" #itemtarget4 [ngClass]="{ active: selectedTarget == itemtarget4.id, day60_txt: true }">60
</div> {{'home.DAYS' | translate}}</a>
<a href="JavaScript:void(0);" (click)="
Difficultyreq('total', '', '', '3 months',''); selectedTarget = 5; TdifficultyRange = '3 months'
" id="5" #itemtarget5 [ngClass]="{ active: selectedTarget == itemtarget5.id, day3m_txt: true }">3
{{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right"> <div class="explore_all text-right">
<a routerLink="/chart/target-difficulty"><span class="text-uppercase">{{'home.EXPLORE_IT' | translate}} <i <a routerLink="/chart/total-difficulty"><span class="text-uppercase">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a> class="fa fa-long-arrow-right"></i></span></a>
</div> </div>
</div> </div>

6
src/app/view/home/graph-list/graph-list.component.ts
View File

@ -533,6 +533,7 @@ export class GraphListComponent implements OnInit {
tickangle: -45, tickangle: -45,
tickformat: tickformat, tickformat: tickformat,
fixedrange: true, fixedrange: true,
domain: [0.2, 0.8]
// showgrid: true // showgrid: true
}, },
yaxis: { yaxis: {
@ -548,7 +549,7 @@ export class GraphListComponent implements OnInit {
// range: range, // range: range,
overlaying: 'y', overlaying: 'y',
side: 'left', side: 'left',
position: 0.25 position: 1.25
}, },
yaxis3: { yaxis3: {
title: 'RandomX', title: 'RandomX',
@ -1138,6 +1139,7 @@ export class GraphListComponent implements OnInit {
tickangle: -45, tickangle: -45,
tickformat: tickformat, tickformat: tickformat,
fixedrange: true, fixedrange: true,
domain: [0.2, 0.8]
// showgrid: true // showgrid: true
}, },
yaxis: { yaxis: {
@ -1153,7 +1155,7 @@ export class GraphListComponent implements OnInit {
// range: range, // range: range,
overlaying: 'y', overlaying: 'y',
side: 'left', side: 'left',
position: 0.25 position: 1.25
}, },
yaxis3: { yaxis3: {
title: 'RandomX', title: 'RandomX',

6
src/assets/css/responsive.css
View File

@ -76,6 +76,9 @@
.theme_switch{padding-top: 8px; padding-bottom: 8px;} .theme_switch{padding-top: 8px; padding-bottom: 8px;}
.theme_switch img{height: 15px;} .theme_switch img{height: 15px;}
.peer_table_data .col-6 {flex: 0 0 100%; max-width: 100%; } .peer_table_data .col-6 {flex: 0 0 100%; max-width: 100%; }
/* .home_mble_hdr .navbar-nav{margin: 15px auto 0; width: 100%;} */
.home_tst_net{font-size: 15px; text-align: center;}
.navbar-nav{justify-content: center;}
} }
@media(max-width: 588px){ @media(max-width: 588px){
/* .view_page_header{text-align: center;} */ /* .view_page_header{text-align: center;} */
@ -85,8 +88,7 @@
} }
@media(max-width: 470px){ @media(max-width: 470px){
.navbar-expand .navbar-collapse.home_mble_hdr{display: block !important;} .navbar-expand .navbar-collapse.home_mble_hdr{display: block !important;}
.home_mble_hdr .navbar-nav{margin: 15px auto 0; width: 63%;}
.home_tst_net{font-size: 15px; width: 85%; margin: 0 auto;}
} }
@media(max-width: 365px){ @media(max-width: 365px){