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

src/app/view/home/block-detail-list/block-detail-list.component.html

@@ -60,19 +60,40 @@
         title="Target / Total Block Difficulty"
         [ngClass]="latestblockdetail.blink == true ? 'item-highlight' : ''"
       >
+
         <!-- <p class="difficulty_datas">Cuckaroo : {{latestblockdetail.targetdifficultycuckaroo | number}} / {{latestblockdetail.TotalDifficultyCuckatoo | number}}</p> -->
-        <p class="difficulty_datas">
+        <div class="difficulty_datas">
-          Cuckoo : {{ latestblockdetail.targetdifficultycuckatoo | number }} /
+          <span class="day60_txt">Cuckoo</span> 
-          {{ latestblockdetail.TotalDifficultyCuckatoo | number }}
+          <div>
-        </p>
+            <span>Target Difficulty:</span><span>{{ latestblockdetail.targetdifficultycuckatoo | number }}</span><br>
-        <p class="difficulty_datas">
+            <span>Total Difficulty</span><span>{{ latestblockdetail.TotalDifficultyCuckatoo | number }}</span>
+          </div>
+          
+        </div>
+        <div class="difficulty_datas">
+            <span class="day60_txt">ProgPow </span> 
+            <div>
+              <span>Target Difficulty:</span><span>{{ latestblockdetail.targetdifficultyprogpow | number }}</span><br>
+              <span>Total Difficulty</span><span>{{ latestblockdetail.TotalDifficultyProgpow | number }}</span>
+            </div>
+            
+          </div>
+          <div class="difficulty_datas">
+             <span class="day60_txt"> RandomX </span>
+              <div>
+                <span>Target Difficulty:</span><span>{{ latestblockdetail.targetdifficultyrandomx | number }}</span><br>
+                <span>Total Difficulty</span><span>{{ latestblockdetail.TotalDifficultyRandomx | number }}</span>
+              </div>
+              
+            </div>
+        <!-- <p class="difficulty_datas">
           ProgPow : {{ latestblockdetail.targetdifficultyprogpow | number }} /
           {{ latestblockdetail.TotalDifficultyProgpow | number }}
         </p>
         <p class="difficulty_datas">
           RandomX : {{ latestblockdetail.targetdifficultyrandomx | number }} /
           {{ latestblockdetail.TotalDifficultyRandomx | number }}
-        </p>
+        </p> -->
       </div>
     </div>
   </div>

src/app/view/home/graph-list/graph-list.component.ts

@@ -776,7 +776,7 @@ export class GraphListComponent implements OnInit {
           rangemode: 'nonnegative',
           fixedrange: true,
           showgrid: true,
-          tickformat :".0f",
+          //tickformat :".0f",
           tickprefix: '                '
         },
         margin: {

src/app/view/home/home-worksapce.component.ts

@@ -2,6 +2,8 @@ import { Component, OnInit, Inject, AfterViewInit } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { Utils } from 'src/app/shared/utils';
 import { Router } from '@angular/router';
+import { Title } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'epic-explorer-home-worksapce',
@@ -46,7 +48,7 @@ export class HomeWorksapceComponent extends Utils
   implements OnInit, AfterViewInit {
   viewchartvar: boolean;
   constructor(@Inject(DOCUMENT) public document: Document,
-  private router: Router) {
+  private router: Router,private route: ActivatedRoute,private titleService: Title) {
     super(document);
     if (this.router.url == '/all') {
       this.viewchartvar = false;
@@ -55,7 +57,10 @@ export class HomeWorksapceComponent extends Utils
     }
   }
 
-  ngOnInit() {}
+  ngOnInit() {
+    this.titleService.setTitle(
+      this.route.snapshot.data.title,
+    );}
 
   viewchartenable() {
     this.viewchartvar = false;

src/app/view/view-routing.module.ts

@@ -7,6 +7,9 @@ const viewRoutes: Routes = [
   {
     path: '',
     loadChildren: './home/home.module#HomeModule',
+    data: {
+      title: 'Epic Explorer - Home',
+    },
   },
   {
     path: 'all',
@@ -21,6 +24,9 @@ const siteRoutes: Routes = [
   {
     path: 'blockdetail/:hash',
     loadChildren: './block-view/block-view.module#BlockViewModule',
+    data: {
+        title: 'Epic Explorer - Block',
+      },
   },
   {
     path: 'chart',

src/assets/css/style.css

@@ -288,6 +288,9 @@ a:focus {
   padding: 20px;
   transition: 0.3s linear all;
   min-height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
 }
 .detail_div .count {
   font-size: 25px;