From 7a7f4c34ba956fb52b8d49c70a805ae6676ee5ce Mon Sep 17 00:00:00 2001
From: "raja.blaze" <rajasingh.blaze@gmail.com>
Date: Fri, 9 Aug 2019 17:53:06 +0530
Subject: [PATCH] Block splitted

---
 server/i18n/de.json                           |  3 +-
 server/i18n/en.json                           |  3 +-
 .../block-detail-list.component.html          | 73 ++++++++++++++-----
 src/assets/css/style.css                      | 10 +--
 4 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/server/i18n/de.json b/server/i18n/de.json
index 87c1b1f..d63a9c1 100644
--- a/server/i18n/de.json
+++ b/server/i18n/de.json
@@ -18,7 +18,8 @@
         "VIEWALL": "Alle Diagramme anzeigen",
         "BLOCKCHAIN_HEIGHT": "Blockchain Höhe",
         "LATEST_BLOCK": "Letzter Block",
-        "LATEST_BLOCK1": "Aktuelle Schwierigkeit",
+        "LATEST_BLOCK1": "Aktuelle Zielschwierigkeit",
+				"LATEST_BLOCK2": "Aktuelle Gesamtschwierigkeit",
         "COIN_IN": "Zirkulierende Versorgung",
         "HEIGHT": "Höhe",
         "HASH": "Hash",
diff --git a/server/i18n/en.json b/server/i18n/en.json
index 1fb1874..4685ce7 100644
--- a/server/i18n/en.json
+++ b/server/i18n/en.json
@@ -18,7 +18,8 @@
         "VIEWALL": "View All Charts",
         "BLOCKCHAIN_HEIGHT": "Blockchain Height",
         "LATEST_BLOCK": "Latest Block",
-        "LATEST_BLOCK1": "Current Difficulty",
+				"LATEST_BLOCK1": "Current Target Difficulty",
+				"LATEST_BLOCK2": "Current Total Difficulty",
         "COIN_IN": "Circulating Supply",
         "HEIGHT": "Height",
         "HASH": "Hash",
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 b9e7118..f34d90d 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
@@ -25,7 +25,7 @@
   </div>
 </div> -->
 <div class="row" *ngIf="latestblockdetail">
-  <div class="col-md-3">
+  <div class="col-md-2">
     <div
       class="text-center detail_div"
     >
@@ -39,7 +39,7 @@
       </p>
     </div>
   </div>
-  <div class="col-md-3">
+  <div class="col-md-2">
     <div
       class="text-center detail_div"
     >
@@ -49,8 +49,8 @@
         [ngClass]="latestblockdetail.blink == true ? 'item-highlight' : ''"
       >
         {{ latestblockdetail.letest_block_num }}
-        <span class="">{{ latestblockdetail.letest_block_duration }}</span>
       </p>
+      <span class="">{{ latestblockdetail.letest_block_duration }}</span>
     </div>
   </div>
   <div class="col-md-3">
@@ -63,28 +63,23 @@
 
         <!-- <p class="difficulty_datas">Cuckaroo : {{latestblockdetail.targetdifficultycuckaroo | number}} / {{latestblockdetail.TotalDifficultyCuckatoo | number}}</p> -->
         <div class="difficulty_datas">
-          <span class="day60_txt">Cuckoo</span>
-          <div>
-            <span>Target:</span><span>{{ latestblockdetail.targetdifficultycuckatoo | number }}, </span>
-            <span>Total :</span><span>{{ latestblockdetail.TotalDifficultyCuckatoo | number }}</span>
-          </div>
+          <span class="day60_txt">Cuckoo : </span>
+            <!-- <span>Target:</span> -->
+            <span>{{ latestblockdetail.targetdifficultycuckatoo | number }}</span>
+            <!-- <span>Total :</span><span>{{ latestblockdetail.TotalDifficultyCuckatoo | number }}</span> -->
 
         </div>
         <div class="difficulty_datas">
-            <span class="day60_txt">ProgPow </span>
-            <div>
-              <span>Target:</span><span class="diff_span" title="{{ latestblockdetail.targetdifficultyprogpow | number }}">{{ latestblockdetail.targetdifficultyprogpow | number }} </span>,
-              <span>Total:</span><span class="diff_span" title="{{ latestblockdetail.TotalDifficultyProgpow | number }}">{{ latestblockdetail.TotalDifficultyProgpow | number }}</span>
-            </div>
-
+            <span class="day60_txt">ProgPow : </span>
+              <!-- <span>Target:</span> -->
+              <span class="diff_span" style="width:85px;" title="{{ latestblockdetail.targetdifficultyprogpow | number }}">{{ latestblockdetail.targetdifficultyprogpow | number }}</span>
+              <!-- <span>Total:</span><span class="diff_span" title="{{ latestblockdetail.TotalDifficultyProgpow | number }}">{{ latestblockdetail.TotalDifficultyProgpow | number }}</span> -->
           </div>
           <div class="difficulty_datas">
-             <span class="day60_txt"> RandomX </span>
-              <div>
-                <span>Target:</span><span>{{ latestblockdetail.targetdifficultyrandomx | number }}, </span>
-                <span>Total:</span><span>{{ latestblockdetail.TotalDifficultyRandomx | number }}</span>
-              </div>
-
+             <span class="day60_txt"> RandomX : </span>
+                <!-- <span>Target:</span> -->
+                <span>{{ latestblockdetail.targetdifficultyrandomx | number }}</span>
+                <!-- <span>Total:</span><span>{{ latestblockdetail.TotalDifficultyRandomx | number }}</span> -->
             </div>
         <!-- <p class="difficulty_datas">
           ProgPow : {{ latestblockdetail.targetdifficultyprogpow | number }} /
@@ -98,6 +93,44 @@
     </div>
   </div>
   <div class="col-md-3">
+    <div class="text-center detail_div" #minhgt>
+      <p class="mb-2 desc">{{ "home.LATEST_BLOCK2" | translate }}</p>
+      <div
+        class=" text-center d-inline-block"
+        [ngClass]="latestblockdetail.blink == true ? 'item-highlight' : ''"
+      >
+
+        <!-- <p class="difficulty_datas">Cuckaroo : {{latestblockdetail.targetdifficultycuckaroo | number}} / {{latestblockdetail.TotalDifficultyCuckatoo | number}}</p> -->
+        <div class="difficulty_datas">
+          <span class="day60_txt">Cuckoo : </span>
+            <!-- <span>Target:</span><span>{{ latestblockdetail.targetdifficultycuckatoo | number }}, </span> -->
+            <!-- <span>Total :</span> -->
+            <span>{{ latestblockdetail.TotalDifficultyCuckatoo | number }}</span>
+        </div>
+        <div class="difficulty_datas">
+            <span class="day60_txt">ProgPow : </span>
+              <!-- <span>Target:</span><span class="diff_span" title="{{ latestblockdetail.targetdifficultyprogpow | number }}">{{ latestblockdetail.targetdifficultyprogpow | number }} </span>, -->
+              <!-- <span>Total:</span> -->
+              <span class="diff_span" style="width:110px;" title="{{ latestblockdetail.TotalDifficultyProgpow | number }}">{{ latestblockdetail.TotalDifficultyProgpow | number }}</span>
+          </div>
+          <div class="difficulty_datas">
+             <span class="day60_txt"> RandomX : </span>
+                <!-- <span>Target:</span><span>{{ latestblockdetail.targetdifficultyrandomx | number }}, </span> -->
+                <!-- <span>Total:</span> -->
+                <span >{{ latestblockdetail.TotalDifficultyRandomx | number }}</span>
+            </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> -->
+      </div>
+    </div>
+  </div>
+  <div class="col-md-2">
     <div
       class="text-center detail_div"
     >
diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index fee25ae..fc27450 100644
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -283,10 +283,10 @@ a:focus {
   padding: 10px 20px;
 }
 .detail_div {
-  background-color: #ecf2ff;
-  border: 1px solid rgb(220, 228, 245);
+  background-color: #fff;
+  border: 1px solid #fff;
   box-shadow: 0 1px 5px rgba(0, 0, 0, 0.1);
-  padding: 20px;
+  padding: 10px ;
   transition: 0.3s linear all;
   min-height: 100%;
   display: flex;
@@ -301,7 +301,7 @@ a:focus {
   text-overflow: ellipsis;
 }
 .detail_div .desc {
-  font-size: 20px;
+  font-size: 18px;
 }
 .detail_div .count span {
   font-size: 15px;
@@ -656,7 +656,7 @@ body.dark_theme {
 .diff_margin{margin-bottom: -10px !important; margin-top: -10px !important;}
 @keyframes yellowfade {
   from {
-    background: yellow;
+    background: white;
   }
   to {
     background: transparent;