diff --git a/src/app/shared/components/footer/footer.component.html b/src/app/shared/components/footer/footer.component.html index 10c7c03..f895645 100644 --- a/src/app/shared/components/footer/footer.component.html +++ b/src/app/shared/components/footer/footer.component.html @@ -4,7 +4,9 @@
-
+
+
+
@@ -14,6 +16,10 @@
+
+ + +

Home | Epic Cash | API | diff --git a/src/app/view/home/block-detail-list/block-detail-list.component.html b/src/app/view/home/block-detail-list/block-detail-list.component.html index 165cacf..3196a76 100644 --- a/src/app/view/home/block-detail-list/block-detail-list.component.html +++ b/src/app/view/home/block-detail-list/block-detail-list.component.html @@ -128,12 +128,12 @@

-
+
-
+

{{ "home.CURRENT_TARGET_DIFF" | translate }}

@@ -167,7 +167,7 @@
-
+

{{ "home.HASHRATE" | translate }}

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 30c020f..5931c49 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -1,61 +1,41 @@
-
+
-
-

{{'home.TARGET_DIFFICULTY' | translate}}

- -
- - - - +

{{'home.TRANSACTIONS_VS_DATE' | translate}}

+ {{ + this.tg_last | number + }} +
+ + +
+ 1 {{'home.WEEK' | translate}} 1 {{'day' | translate}} + Transactionlinechartreq('', '', '15 days'); selectedItem8 = 2 + " id="2" #item2 [ngClass]="{ active: selectedItem8 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}} 1 {{'home.WEEK' | translate}} - + Transactionlinechartreq('', '', '30 days'); selectedItem8 = 3 + " id="3" #item3 [ngClass]="{ active: selectedItem8 == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}} 30 {{'home.DAYS' | translate}} + Transactionlinechartreq('', '', '60 days'); selectedItem8 = 4 + " id="4" #item4 [ngClass]="{ active: selectedItem8 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}} 60 {{'home.DAYS' | translate}} + Transactionlinechartreq('', '', '3 months'); selectedItem8 = 5 + " id="5" #item5 [ngClass]="{ active: selectedItem8 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}} + 3 {{'home.MONTHS' | translate}} - - {{'home.All' | translate}} + Transactionlinechartreq('', '', 'all'); selectedItem8 = 8; + " id="8" #item8 [ngClass]="{ active: selectedItem8 == item8.id, day3m_txt: true }">{{'home.All' | translate}}
- {{'home.EXPLORE_IT' | translate}} + {{'home.EXPLORE_IT' | translate}}
@@ -138,7 +118,7 @@

{{'home.SUPPLY_GROWTH' | translate}}

- {{ + {{ this.gg_last | number }} Epic per block
@@ -344,7 +324,7 @@
-
+

{{'home.TOTAL_DIFFICULTY' | translate}}

@@ -388,43 +368,63 @@
-
-
+
+
-

{{'home.TRANSACTIONS_VS_DATE' | translate}}

- {{ - this.tg_last | number - }} -
- - -
- 1 {{'home.WEEK' | translate}} 15 {{'home.DAYS' | translate}} + Difficultyreq('target', '', '', '1 day',''); selectedItem = 6; difficultyRange = '1 day' + " id="6" #item6 [ngClass]="{ active: selectedItem == item6.id, txt_primary: true }">1 {{'day' | translate}} 30 {{'home.DAYS' | translate}} + Difficultyreq('target', '', '', '1 week',''); selectedItem = 1; difficultyRange = '1 week' + " id="1" #item1 [ngClass]="{ active: selectedItem == item1.id, txt_primary: true }">1 {{'home.WEEK' | translate}} + 60 {{'home.DAYS' | translate}} + Difficultyreq('target', '', '', '30 days',''); selectedItem = 3; difficultyRange = '30 days' + " id="3" #item3 [ngClass]="{ active: selectedItem == item3.id, day30_txt: true }">30 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} - + Difficultyreq('target', '', '', '60 days',''); selectedItem = 4; difficultyRange = '60 days' + " id="4" #item4 [ngClass]="{ active: selectedItem == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}} {{'home.All' | translate}} + Difficultyreq('target', '', '', '3 months',''); selectedItem = 5; difficultyRange = '3 months' + " id="5" #item5 [ngClass]="{ active: selectedItem == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}} + + {{'home.All' | translate}}
- {{'home.EXPLORE_IT' | translate}} + {{'home.EXPLORE_IT' | translate}}
\ No newline at end of file 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 7f20f21..37453a6 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -765,14 +765,16 @@ export class GraphListComponent implements OnInit { difficultyChartFunc(DifficultychartDate, data, Type, range1, range2, range3, tickformat) { let dtickval; - if (tickformat == "%H-%M") + if (tickformat == "%H-%M"){ dtickval = '' - else if (DifficultychartDate.length < 21712) + }else if (DifficultychartDate.length < 21712){ dtickval = 2 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 100571) + }else if (DifficultychartDate.length < 100571){ dtickval = 6 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 5 * 30 * 24 * 60 * 60 * 1000 + } let window_width = window.screen.width; let position = 0.00; @@ -782,7 +784,7 @@ export class GraphListComponent implements OnInit { let cuckoo_position = null; let right_margin = 10; if (window_width > 700) { - position = 0.10; + position = 0.11; angle = 0; domain_start = 0.18; left_margin = 5; @@ -887,16 +889,19 @@ export class GraphListComponent implements OnInit { stackchartFunc(sDate, Cuckoo, ProgPow, RandomX) { let dtickval; - if (sDate.length < 10) + let tickformat = '%m-%d'; + if (sDate.length < 10){ dtickval = 2 * 24 * 60 * 60 * 1000 - else if (sDate.length < 20) + } else if (sDate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (sDate.length < 40) + } else if (sDate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (sDate.length < 70) + } else if (sDate.length < 70) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + } else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.stackGraphData = { data: [ @@ -975,7 +980,7 @@ export class GraphListComponent implements OnInit { showgrid: true, zeroline: false, tickangle: -45, - tickformat: '%m-%d', + tickformat: tickformat, rangemode: 'nonnegative', fixedrange: true, tick0: sDate[0], @@ -1110,20 +1115,22 @@ export class GraphListComponent implements OnInit { totalBlocksFunc(DifficultychartDate, Blockval) { - + let tickformat = '%m-%d'; let dtickval; - if (DifficultychartDate.length < 5) + if (DifficultychartDate.length < 5) { dtickval = 1 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 10) + }else if (DifficultychartDate.length < 10) { dtickval = 2 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 20) + }else if (DifficultychartDate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 40) + }else if (DifficultychartDate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 70) + }else if (DifficultychartDate.length < 70) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.barGraphData = { @@ -1150,7 +1157,7 @@ export class GraphListComponent implements OnInit { showlegend: false, xaxis: { tickangle: -45, - tickformat: '%m-%d', + tickformat: tickformat, showgrid: true, fixedrange: true, rangemode: 'nonnegative', @@ -1180,19 +1187,20 @@ export class GraphListComponent implements OnInit { transcationfeeFunc(TfDate, TfFee) { - + let tickformat = '%m-%d'; let dtickval; - if (TfDate.length < 10) - dtickval = 2 * 24 * 60 * 60 * 1000 - else if (TfDate.length < 20) - dtickval = 4 * 24 * 60 * 60 * 1000 - else if (TfDate.length < 40) - dtickval = 6 * 24 * 60 * 60 * 1000 - else if (TfDate.length < 70) - dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 - + if (TfDate.length < 10) { + dtickval = 2 * 24 * 60 * 60 * 1000; + }else if (TfDate.length < 20) { + dtickval = 4 * 24 * 60 * 60 * 1000; + }else if (TfDate.length < 40) { + dtickval = 6 * 24 * 60 * 60 * 1000; + }else if (TfDate.length < 70) { + dtickval = 8 * 24 * 60 * 60 * 1000; + }else { + tickformat = "%b %Y"; + dtickval = 5 * 30 * 24 * 60 * 60 * 1000; + } this.transcationGraphData = { data: [ @@ -1216,7 +1224,7 @@ export class GraphListComponent implements OnInit { autosize: true, xaxis: { tickangle: -45, - tickformat: '%m-%d', + tickformat: tickformat, rangemode: 'nonnegative', fixedrange: true, showgrid: true, @@ -1256,17 +1264,20 @@ export class GraphListComponent implements OnInit { growthFunc(gDate, gReward, gaddedreward, range) { + let tickformat = '%m-%d'; let dtickval; - if (gDate.length < 10) + if (gDate.length < 10) { dtickval = 2 * 24 * 60 * 60 * 1000 - else if (gDate.length < 20) + }else if (gDate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (gDate.length < 40) + }else if (gDate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (gDate.length < 70) + }else if (gDate.length < 70) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.growthGraphData = { data: [ @@ -1295,8 +1306,8 @@ export class GraphListComponent implements OnInit { autosize: true, xaxis: { linecolor: 'rgb(204,204,204)', - linewidth: 2, - tickformat: '%m-%d', + linewidth: 1, + tickformat: tickformat, tickangle: -45, rangemode: 'nonnegative', fixedrange: true, @@ -1330,17 +1341,20 @@ export class GraphListComponent implements OnInit { } blockspersecFunc(bDate, bPeriod) { + let tickformat = '%m-%d'; let dtickval; - if (bDate.length < 10) + if (bDate.length < 10) { dtickval = 2 * 24 * 60 * 60 * 1000 - else if (bDate.length < 20) + }else if (bDate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (bDate.length < 40) + }else if (bDate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (bDate.length < 70) + }else if (bDate.length < 70) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.areaGraphData = { data: [ { @@ -1364,7 +1378,7 @@ export class GraphListComponent implements OnInit { height: 250, autosize: true, xaxis: { - tickformat: '%m-%d', + tickformat: tickformat, tickangle: -45, rangemode: 'nonnegative', fixedrange: true, @@ -1395,17 +1409,20 @@ export class GraphListComponent implements OnInit { blockminedFunc(mDate, ProgPow, Cuckoo, RandomX, ProgPowper, Cuckooper, RandomXper) { + let tickformat = '%m-%d'; let dtickval; - if (mDate.length < 10) + if (mDate.length < 10) { dtickval = 2 * 24 * 60 * 60 * 1000 - else if (mDate.length < 20) + }else if (mDate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (mDate.length < 40) + }else if (mDate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (mDate.length < 70) + }else if (mDate.length < 70) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.doubleareaGraphData = { data: [ @@ -1483,7 +1500,7 @@ export class GraphListComponent implements OnInit { }, xaxis: { - tickformat: '%m-%d', + tickformat: tickformat, tickangle: -45, rangemode: 'nonnegative', fixedrange: true, @@ -1592,17 +1609,20 @@ export class GraphListComponent implements OnInit { } transactionlinechartFunc(Tdate, Ttotalinput, Ttotalkernal, Ttotaloutput) { + let tickformat = '%m-%d'; let dtickval; - if (Tdate.length < 10) + if (Tdate.length < 10) { dtickval = 2 * 24 * 60 * 60 * 1000 - else if (Tdate.length < 20) + } else if (Tdate.length < 20) { dtickval = 4 * 24 * 60 * 60 * 1000 - else if (Tdate.length < 40) + }else if (Tdate.length < 40) { dtickval = 6 * 24 * 60 * 60 * 1000 - else if (Tdate.length < 100) + }else if (Tdate.length < 100) { dtickval = 8 * 24 * 60 * 60 * 1000 - else - dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000; + } this.feeGraphData = { data: [ @@ -1656,7 +1676,7 @@ export class GraphListComponent implements OnInit { xaxis: { showgrid: true, zeroline: false, - tickformat: '%m-%d', + tickformat: tickformat, rangemode: 'nonnegative', fixedrange: true, tickangle: -45, @@ -1754,14 +1774,16 @@ export class GraphListComponent implements OnInit { totaldifficultyChartFunc(DifficultychartDate, data, type, range1, range2, range3, tickformat) { let dtickval; - if (tickformat == "%H-%M") + if (tickformat == "%H-%M") { dtickval = '' - else if (DifficultychartDate.length < 22712) + }else if (DifficultychartDate.length < 22712){ dtickval = 2 * 24 * 60 * 60 * 1000 - else if (DifficultychartDate.length < 100000) + }else if (DifficultychartDate.length < 100000){ dtickval = 6 * 24 * 60 * 60 * 1000 - else - dtickval = 3 * 30 * 24 * 60 * 60 * 1000 + }else { + tickformat = "%b %Y"; + dtickval = 4 * 30 * 24 * 60 * 60 * 1000 + } let window_width = window.screen.width; let position = 0.00; @@ -1771,7 +1793,7 @@ export class GraphListComponent implements OnInit { let tick_size = 11; let right_margin = 10; if (window_width > 700) { - position = 0.10; + position = 0.11; angle = 0; domain_start = 0.18; left_margin = 5; diff --git a/src/assets/css/responsive.css b/src/assets/css/responsive.css index 40be9c2..268b142 100644 --- a/src/assets/css/responsive.css +++ b/src/assets/css/responsive.css @@ -160,6 +160,19 @@ p.block_value_v2 {font-size: 18px;height: 25px;} /* .view_page_header{text-align: center;} */ .view_page_header .navbar-brand{display: block; margin: 0 auto;} .view_page_header .ml-auto{margin: 0 !important; display: inherit;} +.blockchain_firstrow .subloader { + margin: 0 auto; +} +.text-mobile-center { + text-align: center; +} +.ednalogoMobile { + margin: 0 auto!important; + margin-bottom: 18px!important; +} +.footer_div .logo_img { + margin-bottom: 15px +} } @media(max-width: 470px){ .navbar-expand .navbar-collapse.home_mble_hdr{display: block !important;} diff --git a/src/assets/img/edna-dark.png b/src/assets/img/edna-dark.png new file mode 100644 index 0000000..ee2d61a Binary files /dev/null and b/src/assets/img/edna-dark.png differ diff --git a/src/assets/img/edna-light.png b/src/assets/img/edna-light.png new file mode 100644 index 0000000..8024447 Binary files /dev/null and b/src/assets/img/edna-light.png differ diff --git a/src/styles.css b/src/styles.css index 1ae7b42..f62352a 100644 --- a/src/styles.css +++ b/src/styles.css @@ -296,7 +296,12 @@ button.search_btn { color: #BF9B30; border-top: 1px solid #BF9B30; } - +.blockdetailicon { + filter: invert(55%) sepia(84%) saturate(326%) hue-rotate(7deg) brightness(94%) contrast(99%); +} +.imagegoldcolor { + filter: invert(55%) sepia(84%) saturate(326%) hue-rotate(7deg) brightness(94%) contrast(99%); +} .explore_all a { color: #BF9B30; }