mirror of
https://github.com/Expand-sys/ccashfrontend
synced 2025-12-17 07:12:12 +11:00
fuck you git
This commit is contained in:
parent
400b5a3d94
commit
404e1d9c3f
1 changed files with 0 additions and 15 deletions
15
index.js
15
index.js
|
|
@ -210,19 +210,8 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
||||||
logsent = logsent.body.value;
|
logsent = logsent.body.value;
|
||||||
let logrec = logsent;
|
let logrec = logsent;
|
||||||
let graphlog = logsent;
|
let graphlog = logsent;
|
||||||
<<<<<<< HEAD
|
|
||||||
graphlog = graphlog.reverse();
|
graphlog = graphlog.reverse();
|
||||||
let graphdata = "";
|
let graphdata = "";
|
||||||
=======
|
|
||||||
try {
|
|
||||||
graphlog = graphlog.reverse();
|
|
||||||
} catch (e) {
|
|
||||||
console.log(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(graphlog);
|
|
||||||
let graphdata = '["transaction", "balance"]';
|
|
||||||
>>>>>>> 46b738e61c02b533989bdb6c9cae1f9d6a9bb4a6
|
|
||||||
let currentbal = balance.value;
|
let currentbal = balance.value;
|
||||||
if (graphlog) {
|
if (graphlog) {
|
||||||
for (i = graphlog.length - 1; i > -1; i--) {
|
for (i = graphlog.length - 1; i > -1; i--) {
|
||||||
|
|
@ -237,15 +226,11 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
||||||
} else {
|
} else {
|
||||||
graphlog = undefined;
|
graphlog = undefined;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
graphdata =
|
graphdata =
|
||||||
", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata;
|
", [" + parseInt(graphlog.length) + "," + balance.value + "]" + graphdata;
|
||||||
console.log(balance);
|
console.log(balance);
|
||||||
graphdata = '["transaction", "balance"]' + graphdata;
|
graphdata = '["transaction", "balance"]' + graphdata;
|
||||||
console.log(JSON.stringify(graphdata));
|
console.log(JSON.stringify(graphdata));
|
||||||
=======
|
|
||||||
|
|
||||||
>>>>>>> 46b738e61c02b533989bdb6c9cae1f9d6a9bb4a6
|
|
||||||
if (logsent == 1 || logsent == -1 || logsent == null) {
|
if (logsent == 1 || logsent == -1 || logsent == null) {
|
||||||
logsent = undefined;
|
logsent = undefined;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue