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

Merge branch 'dev' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8 into dev

Browse Source
This commit is contained in:
root 2019-09-06 13:25:36 +02:00
commit 1019ebb535
11 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -441,7 +441,7 @@ export class GraphListComponent implements OnInit {
// mode: 'lines+markers', // mode: 'lines+markers',
type: 'scatter', type: 'scatter',
name: 'Cuckoo', name: 'Cuckoo',
// line: { color: '#ac3333' }, line: { color: '#bf9b30' },
//hovertemplate: '%{text}<br> Cuckoo : %{y:,}', //hovertemplate: '%{text}<br> Cuckoo : %{y:,}',
hovertemplate: 'Cuckoo : %{y:,}', hovertemplate: 'Cuckoo : %{y:,}',
hoverlabel: {namelength : 0} hoverlabel: {namelength : 0}
@ -455,7 +455,7 @@ export class GraphListComponent implements OnInit {
type: 'scatter', type: 'scatter',
name: 'Progpow', name: 'Progpow',
yaxis: 'y2', yaxis: 'y2',
// line: { color: '#ac3333' }, line: { color: '#e2e2e2' },
hovertemplate: 'Progpow : %{y:,}', hovertemplate: 'Progpow : %{y:,}',
hoverlabel: {namelength : 0} hoverlabel: {namelength : 0}
}, },
@ -467,7 +467,7 @@ export class GraphListComponent implements OnInit {
type: 'scatter', type: 'scatter',
name: 'RandomX', name: 'RandomX',
yaxis: 'y3', yaxis: 'y3',
// line: { color: '#ac3333' }, line: { color: '#222223' },
hovertemplate: 'RandomX : %{y:,}', hovertemplate: 'RandomX : %{y:,}',
hoverlabel: {namelength : 0} hoverlabel: {namelength : 0}
}, },
@ -484,7 +484,7 @@ export class GraphListComponent implements OnInit {
mode: 'lines+markers', mode: 'lines+markers',
type: 'scatter', type: 'scatter',
name: '', name: '',
line: { color: '#ac3333' }, line: { color: '#222223' },
hovertemplate: '%{text}<br> Difficulty : %{y:,}', hovertemplate: '%{text}<br> Difficulty : %{y:,}',
}]; }];
break; break;
@ -676,7 +676,7 @@ export class GraphListComponent implements OnInit {
hovertemplate: '%{x}<br> Cuckoo : %{text:,}', hovertemplate: '%{x}<br> Cuckoo : %{text:,}',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
marker: { marker: {
color: '#77817C', color: '#bf9b30',
}, },
}, },
// { // {
@ -699,7 +699,7 @@ export class GraphListComponent implements OnInit {
hovertemplate: '%{x}<br> ProgPow : %{text:,}', hovertemplate: '%{x}<br> ProgPow : %{text:,}',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
marker: { marker: {
color: '#825f5f', color: '#222223',
}, },
}, },
{ {
@ -711,7 +711,7 @@ export class GraphListComponent implements OnInit {
hovertemplate: '%{x}<br> RandomX : %{text:,}', hovertemplate: '%{x}<br> RandomX : %{text:,}',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
marker: { marker: {
color: '#a9df5f', color: '#e2e2e2',
}, },
} }
@ -764,7 +764,7 @@ export class GraphListComponent implements OnInit {
], ],
layout: { layout: {
hovermode: 'closest', hovermode: 'closest',
//width: 350, width: 350,
height: 250, height: 250,
autosize: false, autosize: false,
showlegend: false, showlegend: false,
@ -803,7 +803,7 @@ export class GraphListComponent implements OnInit {
hovertemplate: 'Block #%{x}<br> Interval : %{text:,}s', hovertemplate: 'Block #%{x}<br> Interval : %{text:,}s',
type: 'bar', type: 'bar',
marker: { marker: {
color: Blockval, color: '#bf9b30',
colorscale: 'Viridis', colorscale: 'Viridis',
}, },
}, },
@ -857,7 +857,7 @@ export class GraphListComponent implements OnInit {
hovertemplate: '%{x}<br> Block : %{text:,}', hovertemplate: '%{x}<br> Block : %{text:,}',
type: 'bar', type: 'bar',
marker: { marker: {
color: Blockval, color: "#bf9b30",
colorscale: 'Viridis', colorscale: 'Viridis',
}, },
}, },
@ -901,6 +901,9 @@ export class GraphListComponent implements OnInit {
name: '', name: '',
hovertemplate: '%{x}<br> Fee : %{text:,}', hovertemplate: '%{x}<br> Fee : %{text:,}',
type: 'lines', type: 'lines',
line: {
color: '#bf9b30',
},
}, },
], ],
layout: { layout: {
@ -937,13 +940,13 @@ export class GraphListComponent implements OnInit {
{ {
x: gDate, x: gDate,
y: gaddedreward, y: gaddedreward,
// type: 'scatter', // type: 'line',
// mode: 'lines', //mode: 'lines',
fill: 'tozeroy', //fill: 'tozeroy',
type: 'line', type: 'line',
name: '', name: '',
line: { line: {
color: '#17BECF', color: '#bf9b30',
width: 3, width: 3,
}, },
text: gReward, text: gReward,
@ -996,7 +999,7 @@ export class GraphListComponent implements OnInit {
fill: 'tozeroy', fill: 'tozeroy',
type: 'line', type: 'line',
line: { line: {
color: 'rgb(100, 0, 160)', color: '#bf9b30',
}, },
}, },
], ],
@ -1042,7 +1045,7 @@ export class GraphListComponent implements OnInit {
fill: 'tozeroy', fill: 'tozeroy',
type: 'line', type: 'line',
line: { line: {
color: '#f5ca19', color: '#bf9b30',
}, },
}, },
// { // {
@ -1067,7 +1070,7 @@ export class GraphListComponent implements OnInit {
type: 'line', type: 'line',
name: 'RandomX', name: 'RandomX',
line: { line: {
color: '#1ad5e9', color: '#e2e2e2',
}, },
}, },
{ {
@ -1080,7 +1083,7 @@ export class GraphListComponent implements OnInit {
type: 'line', type: 'line',
name: 'ProgPow', name: 'ProgPow',
line: { line: {
color: '#f74f4f', color: '#222223',
}, },
}, },
], ],
@ -1127,6 +1130,7 @@ export class GraphListComponent implements OnInit {
text: hovertext, text: hovertext,
hovertemplate: hovertext + ': %{z:,} ', hovertemplate: hovertext + ': %{z:,} ',
colorscale: 'Rainbow', colorscale: 'Rainbow',
//colors : colorRamp(c("red", "green")),
type: 'heatmap', type: 'heatmap',
visible: true, visible: true,
colorbar: { thickness: 3 }, colorbar: { thickness: 3 },
@ -1188,7 +1192,7 @@ export class GraphListComponent implements OnInit {
text: Ttotalinput, text: Ttotalinput,
hovertemplate: 'Total Input : %{text:,} ', hovertemplate: 'Total Input : %{text:,} ',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
line: { color: '#6ebe58' }, line: { color: '#bf9b30' },
}, },
{ {
type: 'scatter', type: 'scatter',
@ -1199,7 +1203,7 @@ export class GraphListComponent implements OnInit {
text: Ttotalkernal, text: Ttotalkernal,
hovertemplate: 'Total Kernel : %{text:,} ', hovertemplate: 'Total Kernel : %{text:,} ',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
line: { color: '#f57979' }, line: { color: '#e2e2e2' },
}, },
{ {
type: 'scatter', type: 'scatter',
@ -1210,7 +1214,7 @@ export class GraphListComponent implements OnInit {
text: Ttotaloutput, text: Ttotaloutput,
hovertemplate: 'Total Output : %{text:,} ', hovertemplate: 'Total Output : %{text:,} ',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
line: { color: '#f7d340' }, line: { color: '#222223' },
}, },
], ],
layout: { layout: {

10
src/assets/css/style.css
View File

@ -268,9 +268,10 @@ a:focus {
} }
.day_filter a.active { .day_filter a.active {
border: 1px solid #BF9B30; border: 1px solid #BF9B30;
background: #BF9B30; /* background: #BF9B30; */
padding: 0 5px; padding: 0 5px;
color: #f3f4f2 /* color: #f3f4f2 */
color: #BF9B30
} }
.difficulty_filter.day_filter a.active{border-color: #0056b3; color: #0056b3;} .difficulty_filter.day_filter a.active{border-color: #0056b3; color: #0056b3;}
.explore_all { .explore_all {
@ -600,9 +601,10 @@ body.dark_theme {
color: #c0d2ff; color: #c0d2ff;
} }
.dark_theme .day_filter a.active { .dark_theme .day_filter a.active {
background-color: #BF9B30; /* background-color: #BF9B30; */
border-color: #BF9B30; border-color: #BF9B30;
color: #f3f4f2; /* color: #f3f4f2; */
color: #BF9B30;
} }
.dark_theme .chart_heading { .dark_theme .chart_heading {
color: #f3f4f2; color: #f3f4f2;

BIN
src/assets/img/body_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 609 KiB

BIN
src/assets/img/body_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
src/assets/img/dark_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 76 KiB

BIN
src/assets/img/dark_bg1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 598 KiB

BIN
src/assets/img/favicon1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
src/assets/img/ftrlogo_dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 174 KiB

BIN
src/assets/img/ftrlogo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 KiB

After

Width:  |  Height:  |  Size: 173 KiB

BIN
src/assets/img/logo_dark.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
src/assets/img/logo_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 53 KiB