matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#17 Missing Modals Bug Fix / #14 Inactive Buttons Fix

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-13 20:59:22 -07:00
parent 6fa1b3ec8a
commit 6539344d12
2 changed files with 257 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/dashboard/js/app.js
View File

@@ -986,7 +986,6 @@ function startUploadProcess() {
from: GlobalUserAddress, from: GlobalUserAddress,
value: contractCost value: contractCost
}; };
$('#preparingUploadModal').modal('hide');
console.log("Contract Address: " + GlobalControllerContractAddress + " Value: " + contractCost); console.log("Contract Address: " + GlobalControllerContractAddress + " Value: " + contractCost);
if (privateKeyLogin == true) { if (privateKeyLogin == true) {
const tx = { const tx = {
@@ -1006,6 +1005,7 @@ function startUploadProcess() {
if (result) { if (result) {
console.log("Result: " + result); console.log("Result: " + result);
$('#minedBlockTrackerModal').modal('show'); $('#minedBlockTrackerModal').modal('show');
$('#preparingUploadModal').modal('hide');
waitForReceipt(result, function(receipt) { waitForReceipt(result, function(receipt) {
console.log("Transaction Has Been Mined: " + receipt); console.log("Transaction Has Been Mined: " + receipt);
$('#minedBlockTrackerModal').modal('hide'); $('#minedBlockTrackerModal').modal('hide');
@@ -1027,6 +1027,7 @@ function startUploadProcess() {
if (!error) { if (!error) {
if (result) { if (result) {
$('#minedBlockTrackerModal').modal('show'); $('#minedBlockTrackerModal').modal('show');
$('#preparingUploadModal').modal('hide');
waitForReceipt(result, function(receipt) { waitForReceipt(result, function(receipt) {
console.log("Transaction Has Been Mined: " + receipt); console.log("Transaction Has Been Mined: " + receipt);
$('#minedBlockTrackerModal').modal('hide'); $('#minedBlockTrackerModal').modal('hide');

100
assets/templates/uploads.html
View File

@@ -1,6 +1,7 @@
<head> <head>
<!-- Google Fonts --> <!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet"
type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<!-- Bootstrap Core Css --> <!-- Bootstrap Core Css -->
<link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet">
@@ -12,7 +13,8 @@
<link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />--> <link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />-->
<!-- Custom Css --> <!-- Custom Css -->
<link href="assets/dashboard/css/style.css" rel="stylesheet"> <link href="assets/dashboard/css/style.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css"> <link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes --> <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" /> <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet"> <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet">
@@ -185,14 +187,16 @@
</tr> </tr>
<tr style="border-color:#000;"> <tr style="border-color:#000;">
<td data-th="Private Key"> <td data-th="Private Key">
<input type="text" id="privatekey" name="privatekey" placeholder="Enter Private Key" style="color:Black;"> <input type="text" id="privatekey" name="privatekey" placeholder="Enter Private Key"
style="color:Black;">
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
<div class="modal-footer" style="background-color: #840032;"> <div class="modal-footer" style="background-color: #840032;">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="ethofs-login-button" onclick="ethofsLogin(document.getElementById('privatekey').value);">LOGIN</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="ethofs-login-button"
onclick="ethofsLogin(document.getElementById('privatekey').value);">LOGIN</button>
</div> </div>
</div> </div>
</div> </div>
@@ -220,7 +224,8 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="background-color: #840032;"> <div class="modal-footer" style="background-color: #840032;">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="ethofs-registration-button" onclick="AddNewUser(document.getElementById('username').value);">REGISTER</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="ethofs-registration-button"
onclick="AddNewUser(document.getElementById('username').value);">REGISTER</button>
</div> </div>
</div> </div>
</div> </div>
@@ -265,7 +270,8 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal2">NEXT</button> <button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal"
data-target="#defaultModal2">NEXT</button>
</div> </div>
</div> </div>
</div> </div>
@@ -290,7 +296,8 @@
box to upload. box to upload.
</p> </p>
</center> </center>
<input type="file" id="fileUploadButton" webkitdirectory="true" mozdirectory="true" msdirectory="true" odirectory="true" directory="true" multiple="true"> <input type="file" id="fileUploadButton" webkitdirectory="true" mozdirectory="true" msdirectory="true"
odirectory="true" directory="true" multiple="true">
</div> </div>
<div id="progress-container"> <div id="progress-container">
<div id="progress-bar"></div> <div id="progress-bar"></div>
@@ -309,7 +316,8 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal" data-target="#defaultModal3">NEXT</button> <button type="button" class="btn btn-link waves-effect" data-toggle="modal" data-dismiss="modal"
data-target="#defaultModal3">NEXT</button>
</div> </div>
</div> </div>
</div> </div>
@@ -331,7 +339,8 @@
</tr> </tr>
<tr style="border-color:#000;"> <tr style="border-color:#000;">
<td data-th="Contract Name"> <td data-th="Contract Name">
<input type="text" id="newcontractname" name="newcontractname" placeholder="Enter Contract Name" style="color:white;"> <input type="text" id="newcontractname" name="newcontractname" placeholder="Enter Contract Name"
style="color:white;">
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -375,7 +384,8 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal">CLOSE</button>
<button type="button" class="btn btn-link waves-effect" data-dismiss="modal" id="upload-confirm-button" onclick="startUploadProcess();">CONFIRM</button> <button type="button" class="btn btn-link waves-effect" data-dismiss="modal"
id="upload-confirm-button" onclick="startUploadProcess();">CONFIRM</button>
</div> </div>
</main> </main>
</div> </div>
@@ -387,7 +397,8 @@
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title" id="defaultModalLabel" style="color:white;"> <h4 class="modal-title" id="defaultModalLabel" style="color:white;">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color:#ffffff;" onclick="updateContractTable();"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color:#ffffff;"
onclick="updateContractTable();">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<br> <br>
@@ -399,30 +410,36 @@
<main> <main>
<div class="box node" style="width:100%; background: #000000;"> <div class="box node" style="width:100%; background: #000000;">
<h3 style="padding: 10px;">ethoFS Upload Status: <h3 style="padding: 10px;">ethoFS Upload Status:
<span id="upload-status-message" style="color: #3CB371; text-align: center !important;">In Progress</span> <span id="upload-status-message" style="color: #3CB371; text-align: center !important;">In
Progress</span>
</h3> </h3>
<div> <div>
<h3 style="padding-left:10px;">Message Log:</h3> <h3 style="padding-left:10px;">Message Log:</h3>
<span class="upload-message" style="color: #3CB371; font-size: 24px; padding: 10px"></span> <span class="upload-message" style="color: #3CB371; font-size: 24px; padding: 10px"></span>
</div> </div>
<div class="summary" style="text-align: center !important; padding: 10px; width:100%; background: #000000;"> <div class="summary"
style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
<div id="myBar">0%</div> <div id="myBar">0%</div>
</div> </div>
</div> </div>
</main> </main>
</div> </div>
<div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000"> <div class="modal-footer"
<button type="button" class="btn btn-primary" id="upload-check-button" onclick="finishUploadModal(); event.stopPropagation();">Close</button> style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
<button type="button" class="btn btn-primary" id="upload-check-button"
onclick="finishUploadModal(); event.stopPropagation();">Close</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="analyzeDataModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static"> <div class="modal fade" id="analyzeDataModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title" id="defaultModalLabel" style="color:white;"> <h4 class="modal-title" id="defaultModalLabel" style="color:white;">
<button type="button" class="close" data-dismiss="modal" id="analyze-close-button" aria-label="Close" style="color:#ffffff;"> <button type="button" class="close" data-dismiss="modal" id="analyze-close-button" aria-label="Close"
style="color:#ffffff;">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
<br> <br>
@@ -435,28 +452,34 @@
<main> <main>
<div class="box node" style="width:100%; background: #000000;"> <div class="box node" style="width:100%; background: #000000;">
<h4 style="padding: 20px;">Data Upload Status: <h4 style="padding: 20px;">Data Upload Status:
<span id="analyze-status-message" style="color: #3CB371; font-size: 24px;">Analyzing Upload Data</span> <span id="analyze-status-message" style="color: #3CB371; font-size: 24px;">Analyzing Upload
Data</span>
</h4> </h4>
<div> <div>
<h4 style="padding-left:10px;">Message Log:</h4> <h4 style="padding-left:10px;">Message Log:</h4>
<pre class="analyze-message" style="color: #3CB371; font-size: 24px;"></pre> <pre class="analyze-message" style="color: #3CB371; font-size: 24px;"></pre>
</div> </div>
<div class="summary" style="text-align: center !important; padding: 10px; width:100%; background: #000000;"> <div class="summary"
style="text-align: center !important; padding: 10px; width:100%; background: #000000;">
<div id="myAnalyzeBar">0%</div> <div id="myAnalyzeBar">0%</div>
</div> </div>
</div> </div>
<div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000"> <div class="modal-footer"
<button type="button" class="btn btn-primary" id="upload-check-button" onclick="finishUploadModal(); event.stopPropagation();">Close</button> style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
<button type="button" class="btn btn-primary" id="upload-check-button"
onclick="finishUploadModal(); event.stopPropagation();">Close</button>
</div> </div>
</main> </main>
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- end analyze data modal --> <!-- end analyze data modal -->
<!-- begin mined block checking modal --> <!-- begin mined block checking modal -->
<div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static"> <div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -474,7 +497,8 @@
<main> <main>
<div class="box node" style="width:100%; background: #000000; background-color: #000;"> <div class="box node" style="width:100%; background: #000000; background-color: #000;">
<h3 style="padding: 20px;">Ether-1 Transaction Status: <h3 style="padding: 20px;">Ether-1 Transaction Status:
<span id="mining-status-message" style="color: #3CB371; font-size: 24px; text-align: center !important;">In <span id="mining-status-message"
style="color: #3CB371; font-size: 24px; text-align: center !important;">In
Progress</span> Progress</span>
</h3> </h3>
<div> <div>
@@ -483,7 +507,8 @@
<span class="mining-message" id="mining-message" style="color: #3CB371; font-size: 24px;"></span> <span class="mining-message" id="mining-message" style="color: #3CB371; font-size: 24px;"></span>
</center> </center>
</div> </div>
<div class="summary" style="text-align: center !important; padding: 20px; width:100%; background: #000000;"> <div class="summary"
style="text-align: center !important; padding: 20px; width:100%; background: #000000;">
<h3 style="font-size: 24px;">Current Ether-1 Block Height: <h3 style="font-size: 24px;">Current Ether-1 Block Height:
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
<span id="block-height" style="color: #3CB371; font-size: 24px;">0</span> <span id="block-height" style="color: #3CB371; font-size: 24px;">0</span>
@@ -497,7 +522,8 @@
</div> </div>
<!-- end mined block checking modal --> <!-- end mined block checking modal -->
<!-- begin preparing upload modal --> <!-- begin preparing upload modal -->
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static"> <div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -519,7 +545,8 @@
</h3> </h3>
<div> <div>
<h3 style="padding-left:20px;">Message Log:</h3> <h3 style="padding-left:20px;">Message Log:</h3>
<span class="mining-message" id="preparing-message" style="color: #3CB371;">Preparing Data For Upload</span> <span class="mining-message" id="preparing-message" style="color: #3CB371;">Preparing Data For
Upload</span>
</div> </div>
</div> </div>
</main> </main>
@@ -529,7 +556,8 @@
</div> </div>
<!-- end preparing upload modal --> <!-- end preparing upload modal -->
<!-- begin contract detail modal --> <!-- begin contract detail modal -->
<div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static"> <div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -539,7 +567,8 @@
<center> <center>
<img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo"> <img src="assets/dashboard/images/ethofslogo.png" width="200" alt="Ether-1 ethoFS Logo">
</center> </center>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: white;" onclick="resetContractDetailTableRows();"> <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="color: white;"
onclick="resetContractDetailTableRows();">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
@@ -606,7 +635,8 @@
</tr> </tr>
<tr> <tr>
<td data-th="Contract Duration (Blocks)"> <td data-th="Contract Duration (Blocks)">
<select class="js-select22" name="extend-contract" id="extend-contract" onchange="contractExtensionChange(this);"> <select class="js-select22" name="extend-contract" id="extend-contract"
onchange="contractExtensionChange(this);">
<option value="100000" selected="selected">100000 <option value="100000" selected="selected">100000
- 15 Days - 15 Days
</option> </option>
@@ -645,7 +675,8 @@
</tr> </tr>
</table> </table>
<div class="table-data__tool-right" style="margin-left: 15px;"> <div class="table-data__tool-right" style="margin-left: 15px;">
<button class="btn btn-primary" id="contract-extension-button" type="button" onclick="contractExtensionConfirmation();">Extend Hosting Contract</button> <button class="btn btn-primary" id="contract-extension-button" type="button"
onclick="contractExtensionConfirmation();">Extend Hosting Contract</button>
<br> <br>
<br> <br>
</div> </div>
@@ -653,8 +684,10 @@
</div> </div>
</main> </main>
</div> </div>
<div class="modal-footer" style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000"> <div class="modal-footer"
<button type="button" class="btn btn-primary" data-dismiss="modal" onclick="resetContractDetailTableRows();">Close</button> style="background-color: #840032; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; border-color:#000">
<button type="button" class="btn btn-primary" data-dismiss="modal"
onclick="resetContractDetailTableRows();">Close</button>
</div> </div>
</div> </div>
</div> </div>
@@ -669,7 +702,8 @@
module = undefined; module = undefined;
} }
</script> </script>
<script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js" integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js"
integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script>
<!-- Jquery Core Js --> <!-- Jquery Core Js -->
<script src="assets/dashboard/plugins/jquery/jquery.min.js"></script> <script src="assets/dashboard/plugins/jquery/jquery.min.js"></script>
<!-- Bootstrap Core Js --> <!-- Bootstrap Core Js -->