expand/ccashfrontend
1
0
Fork 0
mirror of https://github.com/Expand-sys/ccashfrontend synced 2025-12-18 15:42:14 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

getting rid of garbage

Browse source
This commit is contained in:
Expand-sys 2021-06-11 09:36:21 +10:00
parent c3fd11bced
commit 2610c74cd4
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
index.js
View file

@ -215,10 +215,7 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
if (graphlog != null) { if (graphlog != null) {
graphlog = graphlog.reverse(); graphlog = graphlog.reverse();
} }
<<<<<<< HEAD
=======
console.log(graphlog); console.log(graphlog);
>>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817
let graphdata = ""; let graphdata = "";
let currentbal = balance.value; let currentbal = balance.value;
if (graphlog != null) { if (graphlog != null) {
@ -239,19 +236,13 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
} else { } else {
graphlog = undefined; graphlog = undefined;
} }
<<<<<<< HEAD
if (graphdata != "") { if (graphdata != "") {
graphdata = graphdata =
", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata; ", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata;
graphdata = '["transaction", "balance"]' + graphdata; graphdata = '["transaction", "balance"]' + graphdata;
} }
console.log(balance); console.log(balance);
console.log(JSON.stringify(graphdata)); console.log(JSON.stringify(graphdata));
=======
>>>>>>> 0632ce5d3013197f52c2a2ffa69b5bd940da7817
if (logsent == 1 || logsent == -1 || logsent == null) { if (logsent == 1 || logsent == -1 || logsent == null) {
logsent = undefined; logsent = undefined;
} else { } else {