deadvey/blogger-nodejs
1
1
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ugghhhh new site_path config option

Browse Source
This commit is contained in:
deadvey
2026-05-30 20:05:01 +01:00
parent 6e7d2109c8
commit f11b94527d
23 changed files with 91 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/form_actions.js
+12 -12
View File
@@ -14,7 +14,7 @@ const crypto = require('crypto')
const router = express.Router();
////////////////////// Form actions /////////////////////////
router.post("/submit_comment", (req,res) => {
router.post(`${config.site_path}/submit_comment`, (req,res) => {
const unix_timestamp = getUnixTime(new Date())
const postID = parseInt(req.body.post_index)
const content = func.escape_input(req.body.content)
@@ -38,10 +38,10 @@ router.post("/submit_comment", (req,res) => {
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
}
res.redirect(301,`/post/${req.body.post_index}`)
res.redirect(301,`${config.site_path}/post/${req.body.post_index}`)
}); // /submit_comment
router.post("/submit_post", (req,res) => {
router.post(`${config.site_path}/submit_post`, (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const username = func.escape_input(req.body.username)
const title = func.escape_input(req.body.title)
@@ -71,7 +71,7 @@ router.post("/submit_post", (req,res) => {
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
comments.push({'id': id, 'comments': []})
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`)
res.redirect(302, "/");
res.redirect(302, config.site_path);
}
else {
res.render("partials/message", {
@@ -81,7 +81,7 @@ router.post("/submit_post", (req,res) => {
}
}); // /submit_post
router.post("/submit_signup", (req,res) => {
router.post(`${config.site_path}/submit_signup`, (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const username = func.escape_input(req.body.username)
const prettyname = func.escape_input(req.body.prettyname)
@@ -100,7 +100,7 @@ router.post("/submit_signup", (req,res) => {
"description": description,
})
fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8');
res.redirect(301, `/user/${username}`)
res.redirect(301, `${config.site_path}/user/${username}`)
}
// if the user does exist then
else {
@@ -118,12 +118,12 @@ router.post("/submit_signup", (req,res) => {
}
// If allow_signup is undefined or not a boolean, error
else {
res.redirect(301,"/")
res.redirect(301,config.site_path)
console.log("Error, invalid value for allow_signup (bool)")
}
}); // /submit_signup
router.post("/submit_edit_user", (req,res) => {
router.post(`${config.site_path}/submit_edit_user`, (req,res) => {
// Get the form info
const password = crypto.createHash("sha512").update(req.body.password).digest("hex");
const userID = func.escape_input(req.body.userID)
@@ -152,7 +152,7 @@ router.post("/submit_edit_user", (req,res) => {
fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8');
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
res.redirect(301,`/user/${users[userID]["username"]}`)
res.redirect(301,`${config.site_path}/user/${users[userID]["username"]}`)
}
else { // password does not match
res.render("partials/message", {
@@ -170,7 +170,7 @@ router.post("/submit_edit_user", (req,res) => {
}
}); // /submit_delete_account
router.post("/submit_edit_post", (req,res) => {
router.post(`${config.site_path}/submit_edit_post`, (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const postID = req.body.postID
const userID = req.body.userID
@@ -194,7 +194,7 @@ router.post("/submit_edit_post", (req,res) => {
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
}
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
res.redirect(302, "/");
res.redirect(302, config.site_path);
}
else {
res.render("partials/message", {
@@ -204,7 +204,7 @@ router.post("/submit_edit_post", (req,res) => {
}
}); // /submit_edit
router.get('/search', (req, res) => {
router.get(`${config.site_path}/search`, (req, res) => {
const search_term = func.escape_input(req.query.q); // 'q' is the parameter name
let search_type = req.query.type; // eg 'post', 'user'
if (typeof search_type == 'string') { // Make the search_term an array
src/routes/forms.js
+4 -4
View File
@@ -5,13 +5,13 @@ const func = require('../functions')
const router = express.Router();
///////////////////// Form pages ////////////////////////////
router.get(config.new_post_url, (req,res) => {
router.get(`${config.site_path}/${config.new_post_url}`, (req,res) => {
res.render("forms/new_post", {
config,
locale,
});
}); // /post
router.get(config.signup_url, (req,res) => {
router.get(`${config.site_path}/${config.signup_url}`, (req,res) => {
// if the server does allow signup
if (config.allow_signup == true) {
// Send the page for signing up to the server
@@ -33,7 +33,7 @@ router.get(config.signup_url, (req,res) => {
console.log("Error, invalid value for allow_signup (bool)")
}
}); // /signup
router.get(`${config.edit_account_base_url}/:user_id`, (req,res) => {
router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => {
const userID = parseInt(req.params.user_id);
res.render("forms/edit_account", {
config,
@@ -42,7 +42,7 @@ router.get(`${config.edit_account_base_url}/:user_id`, (req,res) => {
userID
});
}); // /delete_account
router.get(`${config.edit_post_base_url}/:post_id`, (req,res) => {
router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => {
const postID = req.params.post_id
const post = data.getdata('posts','id', postID)
const user = data.getdata('users', 'id', post.userID)
src/routes/indexes.js
+4 -4
View File
@@ -6,7 +6,7 @@ const func = require('../functions')
const router = express.Router();
///////////////////// Page index's ///////////////////////
router.get("/index/pages", (req,res) => {
router.get(`${config.site_path}/index/pages`, (req,res) => {
res.render("indexes/all_pages", {
config,
posts: data.getdata('posts'),
@@ -14,19 +14,19 @@ router.get("/index/pages", (req,res) => {
comments: data.getdata('comments'),
});
}); // /index/pages
router.get("/index/posts", (req,res) => {
router.get(`${config.site_path}/index/posts`, (req,res) => {
res.render("indexes/posts", {
config,
posts: data.getdata('posts'),
});
}); // /index/posts
router.get("/index/users", (req,res) => {
router.get(`${config.site_path}/index/users`, (req,res) => {
res.render("indexes/users", {
config,
users: data.getdata('users'),
});
}); // /index/users
router.get("/index/comments", (req,res) => {
router.get(`${config.site_path}/index/comments`, (req,res) => {
res.render("indexes/comments", {
config,
comments: data.getdata('comments'),
src/routes/standard_pages.js
+5 -5
View File
@@ -9,7 +9,7 @@ const router = express.Router();
///////////////////// Standard Pages //////////////////////
// Timeline
router.get("/", (req,res) => {
router.get(config.site_path, (req,res) => {
// Increment the hitcount
if (config.enable_hitcount) {
data.increment_hitcount()
@@ -31,7 +31,7 @@ router.get("/", (req,res) => {
}); // /
// Users
router.get("/user/:username", (req, res) => {
router.get(`${config.site_path}/user/:username`, (req, res) => {
const userID = func.get_userID(req.params.username)
let user = data.getdata('users', 'id', userID)
if (userID != -1) {
@@ -59,7 +59,7 @@ router.get("/user/:username", (req, res) => {
}); // /user/:username
// Posts
router.get("/post/:post_index", (req, res) => {
router.get(`${config.site_path}/post/:post_index`, (req, res) => {
const postID = parseInt(req.params.post_index)
let post = data.getdata('posts','id', postID)
if (post == 1) { // data.getdata returns error code 1 if nothing is available
@@ -94,7 +94,7 @@ router.get("/post/:post_index", (req, res) => {
// Tags
router.get("/tag/:tag", (req,res) => {
router.get(`${config.site_path}/tag/:tag`, (req,res) => {
const tag = req.params.tag
res.render("pages/tag",
{
@@ -113,7 +113,7 @@ router.get("/tag/:tag", (req,res) => {
// Comments
router.get("/comment/:postID-:commentID", (req,res) => {
router.get(`${config.site_path}/comment/:postID-:commentID`, (req,res) => {
const commentID = parseInt(req.params.commentID);
const postID = parseInt(req.params.postID);
src/routes/syndication.js
+4 -4
View File
@@ -9,7 +9,7 @@ const router = express.Router();
////////////////////// SYNDICATION ////////////////////////
// global RSS protocol gets
router.get("/rss", (req,res) => {
router.get(`${config.site_path}/rss`, (req,res) => {
if (config.rss == false) {
res.render("partials/message", {
message: locale.rss_disabled,
@@ -26,7 +26,7 @@ router.get("/rss", (req,res) => {
};
});
// user RSS protocol gets
router.get("/user/:username/rss", (req,res) => {
router.get(`${config.site_path}/user/:username/rss`, (req,res) => {
const username = req.params.username;
const userID = func.get_userID(username);
if (config.rss == false) {
@@ -46,7 +46,7 @@ router.get("/user/:username/rss", (req,res) => {
};
});
// global ATOM protocol gets
router.get("/atom", (req,res) => {
router.get(`${config.site_path}/atom`, (req,res) => {
if (config.atom == false) {
res.render("partials/message", {
message: locale.atom_disabled,
@@ -64,7 +64,7 @@ router.get("/atom", (req,res) => {
};
});
// user ATOM protocol gets
router.get("/user/:username/atom", (req,res) => {
router.get(`${config.site_path}/user/:username/atom`, (req,res) => {
const username = req.params.username;
const userID = func.get_userID(username);
if (config.atom == false) {