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

Clean-up

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-20 21:15:20 -07:00
parent 38b3621d38
commit 716ccbdcf5
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/templates/uploads.html
View File

@@ -9,7 +9,8 @@
<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 -->
<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">
<link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
<script src="https://medium-widget.pixelpoint.io/widget.js"></script>
</head>
@@ -504,7 +505,8 @@
<!-- end analyze data 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" style="background-color: #840032">
<div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -545,7 +547,8 @@
<!-- end mined block checking modal -->
<!-- begin preparing upload modal -->
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -577,7 +580,8 @@
<!-- end preparing upload modal -->
<!-- begin contract detail modal -->
<div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" style="padding-top:0px;background-color: #840032">
<div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog"
style="padding-top:0px;background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">

16
renderer/uploads.js
View File

@@ -1501,15 +1501,15 @@ $(document).on("render_uploads", function () {
} else {
loginPassword = document.getElementById('walletpassword').value;
loginAddress = $("#sendFromAddress").find("option:selected").val().trim();
var accountsPath = getKeyStoreLocation();
var keyObject = keythereum.importFromFile(loginAddress, accountsPath);
var privateKey = keythereum.recover(loginPassword, keyObject);
var key = privateKey.toString('hex');
GlobalPrivateKey = key;
console.log("Global Private Key: " + GlobalPrivateKey);
EthoUploads.ethofsLogin(GlobalPrivateKey);
var accountsPath = getKeyStoreLocation();
var keyObject = keythereum.importFromFile(loginAddress, accountsPath);
var privateKey = keythereum.recover(loginPassword, keyObject);
var key = privateKey.toString('hex');
GlobalPrivateKey = key;
console.log("Global Private Key: " + GlobalPrivateKey);
EthoUploads.ethofsLogin(GlobalPrivateKey);
}
});
$(document).on("click", "#main-upload-button", function (event) {