diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..60647a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +node_modules +build +build_webpack +npm-debug.log +.env +.DS_Store +.truffle-solidity-loader diff --git a/src/js/app.js b/src/js/app.js index 75346aa..3787bbf 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -29,7 +29,7 @@ App = { // Set the provider for our contract. App.contracts.TutorialToken.setProvider(App.web3Provider); - // Use our contract to retieve and mark the adopted pets. + // Get My Balance return App.getBalances(); }); @@ -46,7 +46,7 @@ App = { var amount = parseInt($('#TTTransferAmount').val()); var toAddress = $('#TTTransferAddress').val(); - console.log('Transfer ' + amount + ' TT to ' + toAddress); + console.log('Transferring ' + amount + ' TT to ' + toAddress); var tutorialTokenInstance; @@ -57,12 +57,22 @@ App = { var account = accounts[0]; + // cannot transfer tokens to ownself + if (toAddress.toLowerCase() == account.toLowerCase()) { + alert('Sorry, you cannot transfer tokens to yourself'); + throw new Error('Sorry, you cannot transfer tokens to yourself'); + } + App.contracts.TutorialToken.deployed().then(function(instance) { tutorialTokenInstance = instance; return tutorialTokenInstance.transfer(toAddress, amount, {from: account}); }).then(function(result) { alert('Transfer Successful!'); + // clean up input boxes + $('#TTTransferAmount').val(''); + $('#TTTransferAddress').val(''); + return App.getBalances(); }).catch(function(err) { console.log(err.message); @@ -70,7 +80,7 @@ App = { }); }, - getBalances: function(adopters, account) { + getBalances: function() { console.log('Getting balances...'); var tutorialTokenInstance;