From 6539344d125579eff921c5e9754fa4b6e7c6ac49 Mon Sep 17 00:00:00 2001 From: Dev-JamesR Date: Sun, 13 Oct 2019 20:59:22 -0700 Subject: [PATCH] #17 Missing Modals Bug Fix / #14 Inactive Buttons Fix --- assets/dashboard/js/app.js | 3 +- assets/templates/uploads.html | 476 ++++++++++++++++++---------------- 2 files changed, 257 insertions(+), 222 deletions(-) diff --git a/assets/dashboard/js/app.js b/assets/dashboard/js/app.js index 68e33ce..79fe9c9 100644 --- a/assets/dashboard/js/app.js +++ b/assets/dashboard/js/app.js @@ -986,7 +986,6 @@ function startUploadProcess() { from: GlobalUserAddress, value: contractCost }; - $('#preparingUploadModal').modal('hide'); console.log("Contract Address: " + GlobalControllerContractAddress + " Value: " + contractCost); if (privateKeyLogin == true) { const tx = { @@ -1006,6 +1005,7 @@ function startUploadProcess() { if (result) { console.log("Result: " + result); $('#minedBlockTrackerModal').modal('show'); + $('#preparingUploadModal').modal('hide'); waitForReceipt(result, function(receipt) { console.log("Transaction Has Been Mined: " + receipt); $('#minedBlockTrackerModal').modal('hide'); @@ -1027,6 +1027,7 @@ function startUploadProcess() { if (!error) { if (result) { $('#minedBlockTrackerModal').modal('show'); + $('#preparingUploadModal').modal('hide'); waitForReceipt(result, function(receipt) { console.log("Transaction Has Been Mined: " + receipt); $('#minedBlockTrackerModal').modal('hide'); diff --git a/assets/templates/uploads.html b/assets/templates/uploads.html index 240859a..e2c2809 100644 --- a/assets/templates/uploads.html +++ b/assets/templates/uploads.html @@ -1,6 +1,7 @@ - + @@ -12,7 +13,8 @@ --> - + @@ -185,14 +187,16 @@ - +
- +
@@ -220,7 +224,8 @@
- +
@@ -265,7 +270,8 @@
- +
@@ -290,7 +296,8 @@ box to upload.

- +
@@ -309,7 +316,8 @@
- +
@@ -331,7 +339,8 @@ - + @@ -375,7 +384,8 @@
- +
@@ -387,7 +397,8 @@
-
- +
+
-