From 5e03be0ad95a62ff32b05bc765bda9d8931458c2 Mon Sep 17 00:00:00 2001 From: Kostas Drakontidis Date: Sat, 17 May 2025 10:43:18 +0300 Subject: [PATCH] Extracted error messages --- app/routes/private_routes.js | 30 +++++++++++++++++++++++------- samples/messages.conf.sample | 6 ++++++ 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 samples/messages.conf.sample diff --git a/app/routes/private_routes.js b/app/routes/private_routes.js index 1175500..6789228 100644 --- a/app/routes/private_routes.js +++ b/app/routes/private_routes.js @@ -5,6 +5,7 @@ const path = require("path"); const fs = require("fs"); const app_conf = require("../config/app.conf.js"); const db_conf = require("../config/db.conf.js"); +const messages = require("../config/messages.conf.js"); const express = require('express'); const router = express.Router(); @@ -20,6 +21,8 @@ function errorPageRenderer(res, emoji, message) { } router.delete("/remove", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + if (req.query["element"]) { try { const remove = db.prepare(`DELETE FROM ${db_conf.table_name} WHERE Name='${req.query["element"]}';`); @@ -38,6 +41,8 @@ router.delete("/remove", async (req, res) => { }); router.post("/upload", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + if (!req.files || !req.files.file) { res.status(422).send(); } else { @@ -60,10 +65,14 @@ router.post("/upload", async (req, res) => { }); router.get("/download", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + res.download(db_conf.path); }); router.post("/add", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + if (req.query["element"] && req.body) { try { let keys = Object.keys(req.body); @@ -95,6 +104,8 @@ router.post("/add", async (req, res) => { }); router.post("/edit", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + if (req.query["element"] && req.body) { try { let keys = Object.keys(req.body); @@ -126,6 +137,8 @@ router.post("/edit", async (req, res) => { }); router.get("/add", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + try { const select_get = db.prepare(`SELECT * FROM ${db_conf.table_name};`); const row = select_get.get(); @@ -172,14 +185,17 @@ router.get("/add", async (req, res) => { table_data: table_data }); } else { - errorPageRenderer(res, "❓", "The database is empty."); + errorPageRenderer(res, "❓", messages.empty_db); } } catch (error) { + errorPageRenderer(res, "🌋💥", messages.internal_server_error); logger.error(error.message); } }); router.get("/edit", async (req, res) => { + logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); + if (req.query["element"]) { try { const select_get = db.prepare(`SELECT * FROM ${db_conf.table_name} WHERE Name='${req.query["element"]}';`); @@ -235,18 +251,18 @@ router.get("/edit", async (req, res) => { table_data: table_data }); } else { - errorPageRenderer(res, "🔍❌", "Not found."); + errorPageRenderer(res, "🔍❌", messages.not_found); } } catch (error) { + errorPageRenderer(res, "🌋💥", messages.internal_server_error); logger.error(error.message); - errorPageRenderer(res, "🌋💥", "Internal server error. Check logs for more information."); } } else { - errorPageRenderer(res, "✋⛔", "Bad request."); + errorPageRenderer(res, "✋⛔", messages.bad_request); } }); -router.get("", async (req, res) => { +router.get("/", async (req, res) => { logger.info(`${req.method}: "${req.url}" => ${req.get("User-Agent")}`); try { @@ -281,10 +297,10 @@ router.get("", async (req, res) => { table_data: table_data }); } else { - errorPageRenderer(res, "❓", "The database is empty."); + errorPageRenderer(res, "❓", messages.empty_db); } } catch (error) { - errorPageRenderer(res, "🌋💥", "Internal server error. Check logs for more information."); + errorPageRenderer(res, "🌋💥", messages.internal_server_error); logger.error(error.message); } }); diff --git a/samples/messages.conf.sample b/samples/messages.conf.sample new file mode 100644 index 0000000..e8b2b43 --- /dev/null +++ b/samples/messages.conf.sample @@ -0,0 +1,6 @@ +module.exports = { + internal_server_error: "Internal server error. Check logs for more information.", + empty_db: "The database is empty.", + bad_request: "Bad request.", + not_found: "Not found." +}; \ No newline at end of file