mirror of
https://github.com/Expand-sys/ccashfrontend
synced 2026-03-22 12:37:13 +11:00
basically done
This commit is contained in:
Expand-sys
parent
76b36d5740
commit
df951c9136
4 changed files with 55 additions and 45 deletions
39
index.js
39
index.js
|
|
@ -172,10 +172,7 @@ app.get("/", async function (req, res) {
|
|||
}
|
||||
});
|
||||
app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
||||
let successes = [];
|
||||
if (req.session.sucess == true) {
|
||||
successes.push({ msg: "Transfer successful" });
|
||||
}
|
||||
let successes = req.session.successes;
|
||||
let errors = req.session.errors;
|
||||
req.session.errors = [];
|
||||
let admin;
|
||||
|
|
@ -190,7 +187,6 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
|||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
console.log(balance);
|
||||
let logsent;
|
||||
console.log("start " + Date.now());
|
||||
try {
|
||||
|
|
@ -224,9 +220,6 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
|||
", [" + parseInt(graphlog.length) + "," + balance + "]" + graphdata;
|
||||
graphdata = '["transaction", "balance"]' + graphdata;
|
||||
}
|
||||
|
||||
console.log(balance);
|
||||
console.log(JSON.stringify(graphdata));
|
||||
if (logsent == null) {
|
||||
logsent = undefined;
|
||||
} else {
|
||||
|
|
@ -272,21 +265,27 @@ app.get("/BankF", ensureAuthenticated, async function (req, res) {
|
|||
});
|
||||
|
||||
app.post("/sendfunds", async function (req, res) {
|
||||
let balance = 0;
|
||||
try {
|
||||
balance = await client.balance(req.session.user);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
let { amount, name, senderpass } = req.body;
|
||||
let a_name = req.session.user;
|
||||
let successes = [];
|
||||
req.session.errors = [];
|
||||
let result = {};
|
||||
result = await client.sendFunds(a_name, senderpass, name, parseInt(amount));
|
||||
|
||||
req.session.successes = [];
|
||||
let a_name = req.session.user;
|
||||
let result;
|
||||
try {
|
||||
result = await got.post(
|
||||
`${process.env.BANKAPIURL}/${a_name}/send/${name}?amount=${amount}`,
|
||||
{
|
||||
headers: {
|
||||
Password: senderpass,
|
||||
},
|
||||
}
|
||||
);
|
||||
//client.sendFunds(a_name, senderpass, name, amount);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
console.log(result);
|
||||
if (result == true || result) {
|
||||
req.session.success = true;
|
||||
req.session.successes.push({ msg: "Transfer successful" });
|
||||
//post details
|
||||
res.redirect("/BankF");
|
||||
} else {
|
||||
|
|
|
|||
14
package-lock.json
generated
14
package-lock.json
generated
|
|
@ -8,7 +8,7 @@
|
|||
"version": "1.0.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"ccash-client-js": "^1.6.0",
|
||||
"ccash-client-js": "^1.6.2",
|
||||
"connect-flash": "^0.1.1",
|
||||
"dotenv": "^8.2.0",
|
||||
"express": "^4.17.1",
|
||||
|
|
@ -275,9 +275,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/ccash-client-js": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/ccash-client-js/-/ccash-client-js-1.6.0.tgz",
|
||||
"integrity": "sha512-uNLrecsFLS4S3EIzeShnOrcIPYub36K1vG/dq13EL8V76UWeaWB3iWZEO8l2h6VQTXrfSa9PmM/+rAb3BQcahQ==",
|
||||
"version": "1.6.2",
|
||||
"resolved": "https://registry.npmjs.org/ccash-client-js/-/ccash-client-js-1.6.2.tgz",
|
||||
"integrity": "sha512-1U+QPvlIoFMsYD/Jz+2GncjdTB9pH+uiqKozdbE5wUNPWpBSfjYA6hc0iJAxypfsNR8mI2o5G0yIDdsoGhd5Cw==",
|
||||
"dependencies": {
|
||||
"axios": "^0.21.1",
|
||||
"class-transformer": "^0.4.0"
|
||||
|
|
@ -1883,9 +1883,9 @@
|
|||
}
|
||||
},
|
||||
"ccash-client-js": {
|
||||
"version": "1.6.0",
|
||||
"resolved": "https://registry.npmjs.org/ccash-client-js/-/ccash-client-js-1.6.0.tgz",
|
||||
"integrity": "sha512-uNLrecsFLS4S3EIzeShnOrcIPYub36K1vG/dq13EL8V76UWeaWB3iWZEO8l2h6VQTXrfSa9PmM/+rAb3BQcahQ==",
|
||||
"version": "1.6.2",
|
||||
"resolved": "https://registry.npmjs.org/ccash-client-js/-/ccash-client-js-1.6.2.tgz",
|
||||
"integrity": "sha512-1U+QPvlIoFMsYD/Jz+2GncjdTB9pH+uiqKozdbE5wUNPWpBSfjYA6hc0iJAxypfsNR8mI2o5G0yIDdsoGhd5Cw==",
|
||||
"requires": {
|
||||
"axios": "^0.21.1",
|
||||
"class-transformer": "^0.4.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"ccash-client-js": "^1.6.0",
|
||||
"ccash-client-js": "^1.6.2",
|
||||
"connect-flash": "^0.1.1",
|
||||
"dotenv": "^8.2.0",
|
||||
"express": "^4.17.1",
|
||||
|
|
|
|||
|
|
@ -40,8 +40,9 @@ function mongo() {
|
|||
|
||||
router.get("/", checkAdmin, function (req, res) {
|
||||
let successes = req.session.successes;
|
||||
req.session.successes = [];
|
||||
let errors = req.session.errors;
|
||||
|
||||
req.session.errors = [];
|
||||
res.render("adminsettings", {
|
||||
user: req.session.user,
|
||||
admin: req.session.admin,
|
||||
|
|
@ -54,7 +55,12 @@ router.get("/", checkAdmin, function (req, res) {
|
|||
|
||||
router.post("/user", checkAdmin, async function (req, res) {
|
||||
let { name, init_pass, init_bal, password2 } = req.body;
|
||||
let contains = await client.contains(name);
|
||||
let contains;
|
||||
try {
|
||||
contains = await client.contains(name);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
req.session.errors = [];
|
||||
req.session.successes = [];
|
||||
if (contains == true) {
|
||||
|
|
@ -90,7 +96,7 @@ router.post("/user", checkAdmin, async function (req, res) {
|
|||
console.log(err);
|
||||
}
|
||||
if (post) {
|
||||
successes.push({ msg: "Account Creation Successful" });
|
||||
req.session.successes.push({ msg: "Account Creation Successful" });
|
||||
}
|
||||
}
|
||||
res.redirect("/admin");
|
||||
|
|
@ -107,12 +113,11 @@ router.post("/baluser", checkAdmin, async function (req, res) {
|
|||
console.log(err);
|
||||
}
|
||||
balance = parseInt(balance);
|
||||
console.log(balance);
|
||||
if (balance < 0) {
|
||||
req.session.errors.push({ msg: "User not found" });
|
||||
} else {
|
||||
req.session.successes.push({
|
||||
msg: "User: " + name + " has " + balance.value + " monies",
|
||||
msg: "User: " + name + " has " + balance + " monies",
|
||||
});
|
||||
}
|
||||
res.redirect("/admin");
|
||||
|
|
@ -136,22 +141,28 @@ router.post("/bal", checkAdmin, async function (req, res) {
|
|||
router.post("/userdelete", checkAdmin, async function (req, res) {
|
||||
let { name, attempt } = req.body;
|
||||
console.log(name);
|
||||
let contains = await client.contains(name);
|
||||
let deleteUser;
|
||||
let successes = [];
|
||||
let errors = [];
|
||||
let contains;
|
||||
try {
|
||||
contains = await client.contains(name);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
if (attempt != req.session.adminp) {
|
||||
req.session.errors.push({ msg: "Wrong Admin Password" });
|
||||
}
|
||||
console.log(contains);
|
||||
if (contains == true) {
|
||||
deleteUser = client.adminDeleteUser(name, attempt);
|
||||
req.session.successes.push({ msg: "User Deletion Successful" });
|
||||
res.redirect("/admin");
|
||||
} else {
|
||||
req.session.errors.push({ msg: "User Deletion Failed, User Not Found" });
|
||||
console.log(contains);
|
||||
if (contains == 1) {
|
||||
let deleteUser = client.adminDeleteUser(name, attempt);
|
||||
req.session.successes.push({ msg: "User Deletion Successful" });
|
||||
res.redirect("/admin");
|
||||
} else {
|
||||
req.session.errors.push({ msg: "User Deletion Failed, User Not Found" });
|
||||
res.redirect("/admin");
|
||||
}
|
||||
}
|
||||
res.redirect("/admin");
|
||||
});
|
||||
|
||||
router.post("/destroyallsessions", checkAdmin, async function (req, res) {
|
||||
let { attempt } = req.body;
|
||||
let adminTest;
|
||||
|
|
@ -164,8 +175,8 @@ router.post("/destroyallsessions", checkAdmin, async function (req, res) {
|
|||
if (adminTest) {
|
||||
req.sessionStore.clear(function (err) {
|
||||
console.log(err);
|
||||
res.redirect("/");
|
||||
});
|
||||
res.redirect("/");
|
||||
} else {
|
||||
req.session.errors.push({ msg: "failed admin password check" });
|
||||
res.redirect("/admin");
|
||||
|
|
|
|||
Loading…
Reference in a new issue