gui: Show pool payments. (#249)

decred · Oct 6, 2020 · b45a0d3 · b45a0d3
1 parent 78b5738
commit b45a0d3
Show file tree

Hide file tree

Showing 13 changed files with 316 additions and 119 deletions.
diff --git a/gui/account.go b/gui/account.go
@@ -14,14 +14,16 @@ import (
 // accountPageData contains all of the necessary information to render the
 // account template.
 type accountPageData struct {
-	HeaderData       headerData
-	MinedWork        []*minedWork
-	ArchivedPayments []*archivedPayment
-	PendingPayments  []*pendingPayment
-	ConnectedClients []*client
-	AccountID        string
-	Address          string
-	BlockExplorerURL string
+	HeaderData            headerData
+	MinedWork             []*minedWork
+	ArchivedPaymentsTotal string
+	ArchivedPayments      []*archivedPayment
+	PendingPaymentsTotal  string
+	PendingPayments       []*pendingPayment
+	ConnectedClients      []*client
+	AccountID             string
+	Address               string
+	BlockExplorerURL      string
 }
 
 // account is the handler for "GET /account". Renders the account template if
@@ -43,6 +45,12 @@ func (ui *GUI) account(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	totalPending := ui.cache.getPendingPaymentsTotal(accountID)
+	totalArchived := ui.cache.getArchivedPaymentsTotal(accountID)
+
+	// We don't need to handle errors on the following cache access because we
+	// are passing hard-coded, good params.
+
 	// Get the 10 most recently mined blocks by this account.
 	_, recentWork, _ := ui.cache.getMinedWorkByAccount(0, 9, accountID)
 
@@ -61,13 +69,15 @@ func (ui *GUI) account(w http.ResponseWriter, r *http.Request) {
 			Designation: ui.cfg.Designation,
 			ShowMenu:    true,
 		},
-		MinedWork:        recentWork,
-		PendingPayments:  pendingPmts,
-		ArchivedPayments: archivedPmts,
-		ConnectedClients: clients,
-		AccountID:        accountID,
-		Address:          address,
-		BlockExplorerURL: ui.cfg.BlockExplorerURL,
+		MinedWork:             recentWork,
+		PendingPaymentsTotal:  totalPending,
+		PendingPayments:       pendingPmts,
+		ArchivedPaymentsTotal: totalArchived,
+		ArchivedPayments:      archivedPmts,
+		ConnectedClients:      clients,
+		AccountID:             accountID,
+		Address:               address,
+		BlockExplorerURL:      ui.cfg.BlockExplorerURL,
 	}
 
 	ui.renderTemplate(w, "account", data)

diff --git a/gui/admin.go b/gui/admin.go
@@ -7,16 +7,21 @@ package gui
 import (
 	"net/http"
 
+	"github.com/decred/dcrpool/pool"
 	"github.com/gorilla/csrf"
 	"github.com/gorilla/sessions"
 )
 
 // adminPageData contains all of the necessary information to render the admin
 // template.
 type adminPageData struct {
-	HeaderData       headerData
-	PoolStatsData    poolStatsData
-	ConnectedClients map[string][]*client
+	HeaderData            headerData
+	PoolStatsData         poolStatsData
+	ConnectedClients      map[string][]*client
+	ArchivedPaymentsTotal string
+	ArchivedPayments      []*archivedPayment
+	PendingPaymentsTotal  string
+	PendingPayments       []*pendingPayment
 }
 
 // adminPage is the handler for "GET /admin". If the current session is
@@ -32,6 +37,18 @@ func (ui *GUI) adminPage(w http.ResponseWriter, r *http.Request) {
 
 	clients := ui.cache.getClients()
 
+	totalPending := ui.cache.getPendingPaymentsTotal(pool.PoolFeesK)
+	totalArchived := ui.cache.getArchivedPaymentsTotal(pool.PoolFeesK)
+
+	// We don't need to handle errors on the following cache access because we
+	// are passing hard-coded, good params.
+
+	// Get the 10 most recent pending payments.
+	_, pendingPmts, _ := ui.cache.getPendingPayments(0, 9, pool.PoolFeesK)
+
+	// Get the 10 most recent archived payments.
+	_, archivedPmts, _ := ui.cache.getArchivedPayments(0, 9, pool.PoolFeesK)
+
 	pageData := adminPageData{
 		HeaderData: headerData{
 			CSRF:        csrf.TemplateField(r),
@@ -47,7 +64,11 @@ func (ui *GUI) adminPage(w http.ResponseWriter, r *http.Request) {
 			PoolFee:           ui.cfg.PoolFee,
 			SoloPool:          ui.cfg.SoloPool,
 		},
-		ConnectedClients: clients,
+		ConnectedClients:      clients,
+		PendingPaymentsTotal:  totalPending,
+		PendingPayments:       pendingPmts,
+		ArchivedPaymentsTotal: totalArchived,
+		ArchivedPayments:      archivedPmts,
 	}
 
 	ui.renderTemplate(w, "admin", pageData)

diff --git a/gui/assets/public/css/dcrpool.css b/gui/assets/public/css/dcrpool.css
@@ -8781,6 +8781,11 @@ table td {
   padding-bottom: 10px;
 }
 
+.block__content h2 {
+  color: #3D5873;
+  font-size: 22px;
+}
+
 .dcr-label {
   background: #D3F0FD 0% 0% no-repeat padding-box;
   border-radius: 3px;

diff --git a/gui/assets/public/js/admin-pagination.js b/gui/assets/public/js/admin-pagination.js
@@ -0,0 +1,39 @@
+$.fn["pagination"].defaults.locator = "data";
+$.fn["pagination"].defaults.totalNumberLocator = function(response) { return response.count; };
+$.fn["pagination"].defaults.nextText = '<div class="pagination-arrow pagination-arrow-right"></div>';
+$.fn["pagination"].defaults.prevText = '<div class="pagination-arrow pagination-arrow-left"></div>';
+$.fn["pagination"].defaults.hideWhenLessThanOnePage = true;
+
+if ($('#pending-payments-page-select').length) {
+    $('#pending-payments-page-select').pagination({
+        dataSource: "/admin/payments/pending",
+        callback: function (data) {
+            var html = '';
+            if (data.length > 0) {
+                $.each(data, function (_, item) {
+                    html += '<tr><td><a href="' +  item.workheighturl + '" rel="noopener noreferrer">' +  item.workheight + '</a></td><td>' +  item.createdon + '</td><td>' +  item.amount + '</td></tr>';
+                });
+            } else {
+                html += '<tr><td colspan="100%"><span class="no-data">No pending payments</span></td></tr>';
+            }
+            $('#pending-payments-table').html(html);
+        }
+    });
+};
+
+if ($('#archived-payments-page-select').length) {
+    $('#archived-payments-page-select').pagination({
+        dataSource: "/admin/payments/archived",
+        callback: function (data) {
+            var html = '';
+            if (data.length > 0) {
+                $.each(data, function (_, item) {
+                    html += '<tr><td><a href="' +  item.workheighturl + '" rel="noopener noreferrer">' +  item.workheight + '</a></td><td><a href="' +  item.paidheighturl + '" rel="noopener noreferrer">' +  item.paidheight + '</a></td><td>' +  item.createdon + '</td><td>' +  item.amount + '</td><td><a href="' +  item.txurl + '" rel="noopener noreferrer">' +  item.txid + '</a></td></tr>';
+                });
+            } else {
+                html += '<tr><td colspan="100%"><span class="no-data">No received payments</span></td></tr>';
+            }
+            $('#archived-payments-table').html(html);
+        }
+    });
+};
diff --git a/gui/assets/templates/account.html b/gui/assets/templates/account.html
@@ -35,84 +35,9 @@ <h1>Account Information</h1>
 
 
 <div class="container">
-
-    {{ if .PendingPayments }}
-    <div class="row">
-        <div class="col-12 p-3">
-            <div class="block__content">
-
-                <h1>Pending Payments</h1>
-
-                <table class="table">
-                    <thead>
-                        <tr>
-                            <th>Work Height</th>
-                            <th>Created On</th>
-                            <th>Amount</th>
-                        </tr>
-                    </thead>
-                    <tbody id="pending-payments-table">
-                        {{ range .PendingPayments }}
-                        <tr>
-                            <td><a href="{{ .WorkHeightURL }}"
-                                    rel="noopener noreferrer">{{ .WorkHeight }}</a></td>
-                            <td>{{ .CreatedOn }}</td>
-                            <td>{{ .Amount }}</td>
-                        </tr>
-                        {{end}}
-                    </tbody>
-                </table>
-
-                <div id="pending-payments-page-select" class="page-select"></div>
 
-            </div>
-        </div>
-    </div>
-    {{end}}
+    {{template "payments" . }}
 
-    <div class="row">
-        <div class="col-12 p-3">
-            <div class="block__content">
-                <h1>Payments Received</h1>
-
-                <table class="table">
-                    <thead>
-                        <tr>
-                            <th>Work Height</th>
-                            <th>Payment Height</th>
-                            <th>Created On</th>
-                            <th>Amount</th>
-                            <th>Tx ID</th>
-                        </tr>
-                    </thead>
-                    <tbody id="archived-payments-table">
-                        {{ range .ArchivedPayments }}
-                        <tr>
-                            <td><a href="{{ .WorkHeightURL }}"
-                                    rel="noopener noreferrer">{{ .WorkHeight }}</a></td>
-                            <td><a href="{{ .PaidHeightURL }}"
-                                    rel="noopener noreferrer">{{ .PaidHeight }}</a></td>
-                            <td>{{ .CreatedOn }}</td>
-                            <td>{{ .Amount }}</td>
-                            <td><a href="{{ .TxURL }}"
-                                    rel="noopener noreferrer">{{ .TxID }}</a>
-                            </td>
-                        </tr>
-                        {{else}}
-                        <tr>
-                            <td colspan="100%"><span class="no-data">No payments received by account</span></td>
-                        </tr>
-                        {{end}}
-                    </tbody>
-                </table>
-
-                <div id="archived-payments-page-select" class="page-select"></div>
-
-            </div>
-        </div>
-
-    </div>
-
     <div class="row">
 
         <div class="col-lg-6 col-12 p-3">

diff --git a/gui/assets/templates/admin.html b/gui/assets/templates/admin.html
@@ -62,9 +62,12 @@ <h1>All Connected Miners</h1>
 
     </div>
 
+    {{template "payments" . }}
+
 </div>
 
 <script src='/assets/js/socket.js'></script>
+<script src='/assets/js/admin-pagination.js'></script>
 
 </body>
 </html>

diff --git a/gui/assets/templates/payments.html b/gui/assets/templates/payments.html
@@ -0,0 +1,93 @@
+{{define "payments"}}
+
+    {{ if .PendingPayments }}
+    <div class="row">
+        <div class="col-12 p-3">
+            <div class="block__content">
+
+                <div class="d-flex flex-wrap">
+                    <h1 class="mr-auto text-nowrap">Pending Payments</h1>
+
+                    <h2 class="row mr-1">
+                        Total:&nbsp;{{ .PendingPaymentsTotal }}
+                    </h2>
+                </div>
+
+                <table class="table">
+                    <thead>
+                        <tr>
+                            <th>Work Height</th>
+                            <th>Created On</th>
+                            <th>Amount</th>
+                        </tr>
+                    </thead>
+                    <tbody id="pending-payments-table">
+                        {{ range .PendingPayments }}
+                        <tr>
+                            <td><a href="{{ .WorkHeightURL }}"
+                                    rel="noopener noreferrer">{{ .WorkHeight }}</a></td>
+                            <td>{{ .CreatedOn }}</td>
+                            <td>{{ .Amount }}</td>
+                        </tr>
+                        {{end}}
+                    </tbody>
+                </table>
+
+                <div id="pending-payments-page-select" class="page-select"></div>
+
+            </div>
+        </div>
+    </div>
+    {{end}}
+
+    <div class="row">
+        <div class="col-12 p-3">
+            <div class="block__content">
+
+                <div class="d-flex flex-wrap">
+                    <h1 class="mr-auto text-nowrap">Payments Received</h1>
+
+                    <h2 class="row mr-1">
+                        Total:&nbsp;{{ .ArchivedPaymentsTotal }}
+                    </h2>
+                </div>
+
+                <table class="table">
+                    <thead>
+                        <tr>
+                            <th>Work Height</th>
+                            <th>Payment Height</th>
+                            <th>Created On</th>
+                            <th>Amount</th>
+                            <th>Tx ID</th>
+                        </tr>
+                    </thead>
+                    <tbody id="archived-payments-table">
+                        {{ range .ArchivedPayments }}
+                        <tr>
+                            <td><a href="{{ .WorkHeightURL }}"
+                                    rel="noopener noreferrer">{{ .WorkHeight }}</a></td>
+                            <td><a href="{{ .PaidHeightURL }}"
+                                    rel="noopener noreferrer">{{ .PaidHeight }}</a></td>
+                            <td>{{ .CreatedOn }}</td>
+                            <td>{{ .Amount }}</td>
+                            <td><a href="{{ .TxURL }}"
+                                    rel="noopener noreferrer">{{ .TxID }}</a>
+                            </td>
+                        </tr>
+                        {{else}}
+                        <tr>
+                            <td colspan="100%"><span class="no-data">No payments received</span></td>
+                        </tr>
+                        {{end}}
+                    </tbody>
+                </table>
+
+                <div id="archived-payments-page-select" class="page-select"></div>
+
+            </div>
+        </div>
+
+    </div>
+
+{{end}}