aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2015-11-24 10:07:57 -0800
committerAdam Soltys <[email protected]>2015-11-27 22:02:48 -0800
commit9d4926c942928333ce9436649fe47abd3399003a (patch)
tree947c1469316c53627b681ebcee62b44c0bbb5568
parent7db9ced7b02fac057c97460069ba800b6db2e391 (diff)
downloadcoinos-server-9d4926c942928333ce9436649fe47abd3399003a.tar.gz
coinos-server-9d4926c942928333ce9436649fe47abd3399003a.zip
Error handling
-rw-r--r--public/js/wallet.coffee5
-rw-r--r--routes/users.js4
-rw-r--r--src/routes/users.coffee3
-rw-r--r--views/users/wallet.html4
4 files changed, 11 insertions, 5 deletions
diff --git a/public/js/wallet.coffee b/public/js/wallet.coffee
index dda576e7..aec62911 100644
--- a/public/js/wallet.coffee
+++ b/public/js/wallet.coffee
@@ -145,10 +145,13 @@ getAddresses = ->
calculateBalance = ->
balances = JSON.parse(localStorage.getItem(g.user.username)).balances
- balance = balances.reduce (t,s) -> t + s
+
+ balance = balances.length ? balances.reduce (t,s) -> t + s : 0
+
g.balance = (balance * multiplier() / 100000000).toFixed(precision())
fiat = (g.balance * g.exchange / multiplier()).toFixed(2)
$('#balance').html(g.balance)
+ $('#balance').parent().fadeIn()
$('#fiat').html("#{fiat} #{g.user.currency}")
$('#amount').val(g.balance)
diff --git a/routes/users.js b/routes/users.js
index 4ef67d2c..70d9231c 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -59,7 +59,9 @@
path = "public/assets/img/logos/" + obj.username + "." + ext;
fs.lstat(path, function(err, stats) {
if ((ext === 'jpg' || ext === 'png' || ext === 'gif') && (err || !stats.isFile())) {
- return request("" + obj.logo).pipe(fs.createWriteStream(path));
+ try {
+ return request("" + obj.logo).pipe(fs.createWriteStream(path));
+ } catch (_error) {}
}
});
}
diff --git a/src/routes/users.coffee b/src/routes/users.coffee
index 5daae180..cc5a9be6 100644
--- a/src/routes/users.coffee
+++ b/src/routes/users.coffee
@@ -40,7 +40,8 @@ module.exports = (sessions) ->
path = "public/assets/img/logos/#{obj.username}.#{ext}"
fs.lstat(path, (err, stats) ->
if ext in ['jpg', 'png', 'gif'] and (err or not stats.isFile())
- request("#{obj.logo}").pipe(fs.createWriteStream(path))
+ try
+ request("#{obj.logo}").pipe(fs.createWriteStream(path))
)
res.render('users/show', options)
diff --git a/views/users/wallet.html b/views/users/wallet.html
index 1999fe8b..7b5b7d43 100644
--- a/views/users/wallet.html
+++ b/views/users/wallet.html
@@ -7,10 +7,10 @@
<input type="hidden" id="username" name="username" value="{{user}}" />
<input type="hidden" id="email" name="email" />
-<div class="form-group">
+<div class="form-group" style="display: none">
<label>Balance:</label>
<b id="balance" class="lead">0</b> <b id="unit" class="lead"></b>
- <b class="lead">(<b id="fiat" class="lead">0</b>)</b>
+ <b class="lead">(<b id="fiat" class="lead">0 CAD</b>)</b>
</div>
<div>