From adc0d4181cee262c3345ffeb4bb943d2d2378592 Mon Sep 17 00:00:00 2001 From: Bernard Peh Date: Wed, 16 Aug 2017 15:39:32 +1000 Subject: [PATCH 1/3] minor typo fix and added little checks --- .gitignore | 7 +++++++ src/js/app.js | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 .gitignore 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..68660de 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('Transfering ' + amount + ' TT to ' + toAddress); var tutorialTokenInstance; @@ -57,12 +57,22 @@ App = { var account = accounts[0]; + // user cannot transfer tokens to himself + if (toAddress.toLowerCase() == account.toLowerCase()) { + alert('Sorry, you cannot transfer token to yourself'); + throw new Error('cannot transfer token 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; @@ -102,4 +112,4 @@ $(function() { $(window).load(function() { App.init(); }); -}); +}); \ No newline at end of file From 51607bd6f612a0b0cf5d5965175a2b557b471ea0 Mon Sep 17 00:00:00 2001 From: Bernard Peh Date: Fri, 18 Aug 2017 17:22:48 +1000 Subject: [PATCH 2/3] minor typo fix --- src/js/app.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 68660de..ee6ea22 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -46,7 +46,7 @@ App = { var amount = parseInt($('#TTTransferAmount').val()); var toAddress = $('#TTTransferAddress').val(); - console.log('Transfering ' + amount + ' TT to ' + toAddress); + console.log('Transferring ' + amount + ' TT to ' + toAddress); var tutorialTokenInstance; @@ -57,10 +57,10 @@ App = { var account = accounts[0]; - // user cannot transfer tokens to himself + // cannot transfer tokens to ownself if (toAddress.toLowerCase() == account.toLowerCase()) { - alert('Sorry, you cannot transfer token to yourself'); - throw new Error('cannot transfer token to yourself'); + alert('Sorry, you cannot transfer tokens nto yourself'); + throw new Error('Sorry, you cannot transfer tokens to yourself'); } App.contracts.TutorialToken.deployed().then(function(instance) { @@ -112,4 +112,4 @@ $(function() { $(window).load(function() { App.init(); }); -}); \ No newline at end of file +}); From 78ea24ded91d8c05ea34891f9d62b7f141b45c77 Mon Sep 17 00:00:00 2001 From: bernard peh Date: Sat, 19 Aug 2017 08:49:46 +1000 Subject: [PATCH 3/3] another minor typo fix --- src/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/app.js b/src/js/app.js index ee6ea22..3787bbf 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -59,7 +59,7 @@ App = { // cannot transfer tokens to ownself if (toAddress.toLowerCase() == account.toLowerCase()) { - alert('Sorry, you cannot transfer tokens nto yourself'); + alert('Sorry, you cannot transfer tokens to yourself'); throw new Error('Sorry, you cannot transfer tokens to yourself'); }