From dec8ae2930afc877f4a7a10f47b6447a46c2e65f Mon Sep 17 00:00:00 2001
From: Miguel Medeiros <miguel@miguelmedeiros.com.br>
Date: Sun, 6 Jun 2021 17:07:04 -0300
Subject: [PATCH] Dashboard layout reviewed. (#550)

* Fix mempool-info-data item margin-bottom.

* Remove unecessary bootstrap classes.

* Fix lint errors.

* Fix and remove css classes.

* Add css class to Terms of Service.
---
 .../app/dashboard/dashboard.component.html    | 56 +++++++++----------
 .../app/dashboard/dashboard.component.scss    | 37 ++++++++++--
 .../src/app/dashboard/dashboard.component.ts  |  4 +-
 3 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html
index f230767c1..ba2a4028b 100644
--- a/frontend/src/app/dashboard/dashboard.component.html
+++ b/frontend/src/app/dashboard/dashboard.component.html
@@ -1,64 +1,64 @@
 
-<div class="container-xl mt-2 dashboard-container">
+<div class="container-xl dashboard-container">
 
   <div class="row row-cols-1 row-cols-md-2" *ngIf="{ value: (mempoolInfoData$ | async) } as mempoolInfoData">
     <ng-template [ngIf]="collapseLevel === 'three'" [ngIfElse]="expanded">
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <app-fees-box class="d-block"></app-fees-box>
           </div>
         </div>
       </div>
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <ng-container *ngTemplateOutlet="mempoolTable; context: { $implicit: mempoolInfoData }"></ng-container>
           </div>
         </div>
       </div>
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <ng-container *ngTemplateOutlet="txPerSecond; context: { $implicit: mempoolInfoData }"></ng-container>
           </div>
         </div>
       </div>
-      <div class="col mb-4" *ngIf="(network$ | async) !== 'liquid'; else emptyBlock">
+      <div class="col" *ngIf="(network$ | async) !== 'liquid'; else emptyBlock">
         <ng-container *ngTemplateOutlet="difficultyEpoch"></ng-container>
       </div>
     </ng-template>
     <ng-template #expanded>
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <app-fees-box class="d-block"></app-fees-box>
           </div>
         </div>
       </div>
-      <div class="col mb-4" *ngIf="(network$ | async) !== 'liquid'; else emptyBlock">
+      <div class="col" *ngIf="(network$ | async) !== 'liquid'; else emptyBlock">
         <ng-container *ngTemplateOutlet="difficultyEpoch"></ng-container>
       </div>
-      <div class="col mb-4">
-        <div class="card text-center graph-card">
+      <div class="col">
+        <div class="card graph-card">
           <div class="card-body pl-0">
             <div style="padding-left: 1.25rem;">
               <ng-container *ngTemplateOutlet="mempoolTable; context: { $implicit: mempoolInfoData }"></ng-container>
               <hr>
             </div>
-            <div style="height: 250px;" *ngIf="(mempoolStats$ | async) as mempoolStats">
+            <div class="mempool-graph" *ngIf="(mempoolStats$ | async) as mempoolStats">
               <app-mempool-graph [data]="mempoolStats.mempool" [showLegend]="false" [offsetX]="20" [small]="true"></app-mempool-graph>
             </div>
           </div>
         </div>
       </div>
-      <div class="col mb-4">
-        <div class="card text-center graph-card">
+      <div class="col">
+        <div class="card graph-card">
           <div class="card-body">
             <ng-container *ngTemplateOutlet="txPerSecond; context: { $implicit: mempoolInfoData }"></ng-container>
             <br>
             <hr>
-            <div style="height: 250px;" *ngIf="(mempoolStats$ | async) as mempoolStats">
+            <div class="mempool-graph" *ngIf="(mempoolStats$ | async) as mempoolStats">
               <app-chartist
                   [data]="mempoolStats.weightPerSecond"
                   [type]="'Line'"
@@ -69,8 +69,8 @@
         </div>
       </div>
       <ng-template [ngIf]="collapseLevel === 'one'">
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <h5 class="card-title" i18n="dashboard.latest-blocks">Latest blocks</h5>
             <table class="table lastest-blocks-table">
@@ -94,12 +94,12 @@
                 </tr>
               </tbody>
             </table>
-            <div class="text-center"><a href="" [routerLink]="['/blocks' | relativeUrl]" i18n="dashboard.view-all">View all &raquo;</a></div>
+            <div class=""><a href="" [routerLink]="['/blocks' | relativeUrl]" i18n="dashboard.view-all">View all &raquo;</a></div>
           </div>
         </div>
       </div>
-      <div class="col mb-4">
-        <div class="card text-center">
+      <div class="col">
+        <div class="card">
           <div class="card-body">
             <h5 class="card-title" i18n="dashboard.latest-transactions">Latest transactions</h5>
             <table class="table latest-transactions">
@@ -118,7 +118,7 @@
                 </tr>
               </tbody>
             </table>
-            <div class="text-center">&nbsp;</div>
+            <div class="">&nbsp;</div>
           </div>
         </div>
       </div>
@@ -135,7 +135,7 @@
 
   <app-language-selector></app-language-selector>
 
-  <div class="text-small text-center mt-3">
+  <div class="terms-of-service">
     <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
   </div>
 
@@ -150,7 +150,7 @@
 </ng-template>
 
 <ng-template #emptyBlock>
-  <div class="col mb-4">
+  <div class="col">
 
   </div>
 </ng-template>
@@ -189,8 +189,8 @@
       &nbsp;<span class="badge badge-pill badge-warning"><ng-container i18n="dashboard.backend-is-synchronizing">Backend is synchronizing</ng-container> ({{ mempoolLoadingStatus$ | async }}%)</span>
     </span>
     <ng-template #inSync>
-      <div class="progress" style="max-width: 250px;">
-        <div class="progress-bar {{ mempoolInfoData.value.progressClass }}" style="padding: 4px;" role="progressbar" [ngStyle]="{'width': mempoolInfoData.value.progressWidth}">&nbsp;</div>
+      <div class="progress inc-tx-progress-bar">
+        <div class="progress-bar {{ mempoolInfoData.value.progressClass }}" role="progressbar" [ngStyle]="{'width': mempoolInfoData.value.progressWidth}">&nbsp;</div>
         <div class="progress-text">{{ mempoolInfoData.value.vBytesPerSecond | ceil | number }} <ng-container i18n="shared.vbytes-per-second|vB/s">vB/s</ng-container></div>
       </div>
     </ng-template>
@@ -198,7 +198,7 @@
 </ng-template>
 
 <ng-template #difficultyEpoch>
-  <div class="card text-center">
+  <div class="card">
     <div class="card-body more-padding">
       <h5 class="card-title" i18n="dashboard.difficulty-adjustment">Difficulty adjustment</h5>
       <div class="progress" *ngIf="(difficultyEpoch$ | async) as epochData; else loading">
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss
index c1b9012ca..394040cf5 100644
--- a/frontend/src/app/dashboard/dashboard.component.scss
+++ b/frontend/src/app/dashboard/dashboard.component.scss
@@ -1,8 +1,13 @@
 .dashboard-container {
   padding-bottom: 60px;
+  text-align: center;
+  margin-top: 0.5rem;
   @media (min-width: 992px) {
     padding-bottom: 0px;
   }
+  .col {
+    margin-bottom: 1.5rem;
+  }
 }
 
 .card {
@@ -57,11 +62,14 @@
     margin-bottom: 10px;
   } 
   .item {
-    width: 124px;
-    margin: 0px auto 0px;
+    width: 50%;
+    margin: 0px auto 20px;
     display: inline-block;
-    @media (min-width: 400px) {
-      width: 50%;
+    @media (min-width: 485px) {
+      margin: 0px auto 10px;
+    }
+    @media (min-width: 785px) {
+      margin: 0px auto 0px;
     }
     &:last-child {
       margin: 0px auto 0px;
@@ -92,6 +100,12 @@
         font-size: 12px;
       }
     }
+    .progress {
+      width: 90%;
+      @media (min-width: 768px) {
+        width: 100%;
+      }
+    }
   }
   .bar {
     width: 93%;
@@ -184,4 +198,19 @@
       display: table-cell;
     }
   }
+}
+
+.mempool-graph {
+  height: 250px;
+}
+
+.inc-tx-progress-bar {
+  max-width: 250px;
+  .progress-bar {
+    padding: 4px;
+  }
+}
+
+.terms-of-service {
+  margin-top: 1rem;
 }
\ No newline at end of file
diff --git a/frontend/src/app/dashboard/dashboard.component.ts b/frontend/src/app/dashboard/dashboard.component.ts
index 07a71bd1c..8000ba912 100644
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -90,7 +90,7 @@ export class DashboardComponent implements OnInit {
           progressClass = 'bg-warning';
         }
 
-        const mempoolSizePercentage = (mempoolInfo.usage / mempoolInfo.maxmempool * 100)
+        const mempoolSizePercentage = (mempoolInfo.usage / mempoolInfo.maxmempool * 100);
         let mempoolSizeProgress = 'bg-danger';
         if (mempoolSizePercentage <= 50) {
           mempoolSizeProgress = 'bg-success';
@@ -118,7 +118,7 @@ export class DashboardComponent implements OnInit {
         const diff = now - DATime;
         const blocksInEpoch = block.height % 2016;
         const estimatedBlocks = Math.round(diff / 60 / 10);
-        const difficultyChange = (600 / (diff / blocksInEpoch ) -1) * 100;
+        const difficultyChange = (600 / (diff / blocksInEpoch ) - 1) * 100;
 
         let base = 0;
         let green = 0;