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

Compare commits

merge into: deadvey/blogger-nodejs:master
Branches Tags
deadvey/blogger-nodejs:master deadvey/blogger-nodejs:dev
..
pull from: deadvey/blogger-nodejs:dev
Branches Tags
deadvey/blogger-nodejs:master deadvey/blogger-nodejs:dev

3 Commits
master .. dev

Author SHA1 Message Date
deadvey ad4efffed5 Database reading changes should work, gotta implement same for writing and finish up testing then merge back into master 2026-03-07 17:56:53 +00:00
deadvey 30cec0f7f0 Sydication updates 2026-03-06 21:26:00 +00:00
deadvey 9f5fd261c3 Changing how data is requested in DEV branch 2026-03-05 13:53:10 +00:00
37 changed files with 809 additions and 946 deletions
Expand all files Collapse all files
README.md
+7 -1
View File
@@ -29,14 +29,20 @@ Read the [configuation guide](docs/CONFIG.md) for configuration help (in config.
* Search functionality * Search functionality
* Page indexes * Page indexes
# Bugs:
* probably scales like shit
* probably insecure as hell
# Planned features/todo list: # Planned features/todo list:
* federation * federation (looks tricky)
* inline comments and docs
* clean up code a bit * clean up code a bit
* /postID and /userID pages * /postID and /userID pages
* Make EJS modification more user friendly (half done) * Make EJS modification more user friendly (half done)
* API for returning posts, users, comments, tags other?... * API for returning posts, users, comments, tags other?...
* Moderation tools including a keyword blacklist * Moderation tools including a keyword blacklist
* Request account function? Not sure how this should be implemented. * Request account function? Not sure how this should be implemented.
* optional SQL
* initialisation has prompts for setup process. * initialisation has prompts for setup process.
# Docs: # Docs:
example-config.json
+4 -5
View File
@@ -3,7 +3,6 @@
"seperator": "<hr/>", "seperator": "<hr/>",
"site_name": "My Blog", "site_name": "My Blog",
"site_url": "https://example.com", "site_url": "https://example.com",
"site_path": "/",
"locale": "en-US", "locale": "en-US",
"port": 8080, "port": 8080,
"data_storage": "json", "data_storage": "json",
@@ -14,10 +13,10 @@
"enable_hitcount": true, "enable_hitcount": true,
"charset": "UTF-8", "charset": "UTF-8",
"root_path": "../webroot/", "root_path": "../webroot/",
"edit_account_base_url": "edit_account", "edit_account_base_url": "/edit_account",
"new_post_url": "post", "new_post_url": "/post",
"signup_url": "signup", "signup_url": "/signup",
"edit_post_base_url": "edit", "edit_post_base_url": "/edit",
"default_commenter_username": "Anon", "default_commenter_username": "Anon",
"rss": true, "rss": true,
"atom": true, "atom": true,
package.json
-2
View File
@@ -9,9 +9,7 @@
"ejs": "^3.1.10", "ejs": "^3.1.10",
"express": "^5.2.1", "express": "^5.2.1",
"express-router": "^0.0.1", "express-router": "^0.0.1",
"highlight.js": "^11.11.1",
"markdown-it": "^14.1.0", "markdown-it": "^14.1.0",
"markdown-it-named-code-blocks": "^1.1.0",
"mssql": "^12.2.0", "mssql": "^12.2.0",
"package.json": "^2.0.1" "package.json": "^2.0.1"
} }
src/data.js
+7 -37
View File
@@ -90,16 +90,14 @@ export function getdata(table_name, key=-1, value=-1) {
} }
else else
{ {
console.log("No object of this ID exists for the selected table", table_name) console.log("No object of this ID exists for the selected table")
return 1 return 1
} }
} }
let return_value = func.find_key_value_pair(result, key, value) let return_list = func.find_key_value_pair(result,key,value)
return return_value return return_list
} }
let return_value = result.slice(- config['data_request_limit']) return result
return return_value
break;
case 'hitcount': case 'hitcount':
result = func.require_module('../data/data.json') // This file is actually called data.json result = func.require_module('../data/data.json') // This file is actually called data.json
return result["hitcount"] return result["hitcount"]
@@ -110,37 +108,9 @@ export function getdata(table_name, key=-1, value=-1) {
break; break;
} }
break; break;
// NOT YET WORKING! default:
case 'mysql': console.log("Error, invalid database management system")
const mysql = require('mysql'); return 1
let con = mysql.createConnection({
host: config.database.host,
user: config.database.user,
password: config.database.password,
database: config.database.database,
});
con.connect(function(err) {
if (err) throw err;
if (data == "posts" || data == 'users' || data == 'comments') {
con.query(`SELECT * FROM ${data}`, function (err, result, fields) {
if (err) throw err;
result = Object.values(JSON.parse(JSON.stringify(result)))
console.log(result)
return result;
});
}
else if (data == 'hitcount') {
con.query(`SELECT paramValue FROM params WHERE paramName = '${data}'`, function (err, result, fields) {
if (err) throw err;
result = Object.values(JSON.parse(JSON.stringify(result)))
console.log(result)
return result;
});
}
});
} }
} }
src/functions.js
+4 -50
View File
@@ -57,8 +57,9 @@ export function unix_time_to_atom_date(unix_time)
// eg "<a href="/tag/string1">string1</a>, <a href="/tag/string2">string2</a>, <a href="/tag/string3">string3</a>" // eg "<a href="/tag/string1">string1</a>, <a href="/tag/string2">string2</a>, <a href="/tag/string3">string3</a>"
// this is so you can have a list of tags that each point to their individual tag page // this is so you can have a list of tags that each point to their individual tag page
// returns: string // returns: string
export function render_tags(tags) export function render_tags(tags_string)
{ {
let tags = tags_string.split(',')
tags = tags.filter((item, index) => tags.indexOf(item) === index) // Remove duplicate tags tags = tags.filter((item, index) => tags.indexOf(item) === index) // Remove duplicate tags
let string = "" // Initialises the string let string = "" // Initialises the string
if (tags.length == 1 && tags[0] == "") if (tags.length == 1 && tags[0] == "")
@@ -69,29 +70,11 @@ export function render_tags(tags)
{ {
for (let tag_index = 0; tag_index < tags.length; tag_index++) for (let tag_index = 0; tag_index < tags.length; tag_index++)
{ // Loop over each tag { // Loop over each tag
string += `<a href="${config.site_path}/tag/${tags[tag_index].trim()}">#${tags[tag_index].trim()}</a> ` // Adds the tag to the string as a HTML href string += `<a href="/tag/${tags[tag_index].trim()}">#${tags[tag_index].trim()}</a> ` // Adds the tag to the string as a HTML href
} }
} }
return string return string
} }
// The users are stored as a list of objects [ user_object, user_object, user_object ]
// So you cannot easily find the userID (position in list) from the username
// This function returns the username for a given userID by looping over every user
// if the user is present, it returns the index of the user (integer)
// if the user is not present it returns -1
export function get_userID(username)
{
const users = require_module("../data/users.json")
for (let i = 0; i < users.length; i++)
{ // Loop over every user
if (users[i]['username'] == username)
{
return i // If the username matches then return the index of that user
}
}
return -1 // If user is not present, return -1
}
// This escapes some potentially dangerous HTML characters with their HTML entities // This escapes some potentially dangerous HTML characters with their HTML entities
// https://www.freeformatter.com/html-entities.html // https://www.freeformatter.com/html-entities.html
// accepts a string // accepts a string
@@ -127,8 +110,6 @@ export function render_comment(comment_content)
export function render_md(content) export function render_md(content)
{ {
const markdownit = require("markdown-it") const markdownit = require("markdown-it")
const hljs = require("highlight.js");
const namedCodeBlocks = require("markdown-it-named-code-blocks");
const md = markdownit const md = markdownit
({ // this is just defining some options for markdown-it, should I add this to config.json? ({ // this is just defining some options for markdown-it, should I add this to config.json?
html: false, html: false,
@@ -137,46 +118,19 @@ export function render_md(content)
linkify: false, linkify: false,
typographer: true, typographer: true,
quotes: locale.quotes, quotes: locale.quotes,
highlight: function (content, lang) {
if (lang && hljs.getLanguage(lang)) {
return (
'<pre class="hljs"><code>' +
hljs.highlight(content, { language: lang, ignoreIllegals: true }).value +
"</code></pre>"
);
}
return (
'<pre class="hljs"><code>' + md.utils.escapeHtml(content) + "</code></pre>"
);
}
}) })
.use(namedCodeBlocks)
.disable('image'); .disable('image');
return md.render(content) return md.render(content)
}; };
/*
export function find_key_value_pair(data_array, key, value) {
for (let i = 0; i < data_array.length; i++) {
if (data_array[i][key] == value) {
return i
}
}
return -1
};
*/
// Returns a list of matches // Returns a list of matches
export function find_key_value_pair(data_array, key, value) { export function find_key_value_pair(data_array, key, value) {
let return_list = [] let return_list = []
for (let i = 0; i < data_array.length; i++) { for (let i = 0; i < data_array.length; i++) {
let element = data_array[i][key] let element = data_array[i][key]
if (element == value if (element == value || (key == 'tags' && element.includes(value))) {
|| (Array.isArray(element) && element.includes(value))) {
return_list.push(data_array[i]) return_list.push(data_array[i])
} }
} }
return return_list return return_list
}; };
src/routes/form_actions.js
+13 -14
View File
@@ -14,7 +14,7 @@ const crypto = require('crypto')
const router = express.Router(); const router = express.Router();
////////////////////// Form actions ///////////////////////// ////////////////////// Form actions /////////////////////////
router.post(`${config.site_path}/submit_comment`, (req,res) => { router.post("/submit_comment", (req,res) => {
const unix_timestamp = getUnixTime(new Date()) const unix_timestamp = getUnixTime(new Date())
const postID = parseInt(req.body.post_index) const postID = parseInt(req.body.post_index)
const content = func.escape_input(req.body.content) const content = func.escape_input(req.body.content)
@@ -38,10 +38,10 @@ router.post(`${config.site_path}/submit_comment`, (req,res) => {
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8'); fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
} }
res.redirect(301,`${config.site_path}/post/${req.body.post_index}`) res.redirect(301,`/post/${req.body.post_index}`)
}); // /submit_comment }); // /submit_comment
router.post(`${config.site_path}/submit_post`, (req,res) => { router.post("/submit_post", (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex'); const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const username = func.escape_input(req.body.username) const username = func.escape_input(req.body.username)
const title = func.escape_input(req.body.title) const title = func.escape_input(req.body.title)
@@ -71,7 +71,7 @@ router.post(`${config.site_path}/submit_post`, (req,res) => {
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8'); fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
comments.push({'id': id, 'comments': []}) comments.push({'id': id, 'comments': []})
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`) fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`)
res.redirect(302, `${config.sitr_path}/post/${id}`); res.redirect(302, "/");
} }
else { else {
res.render("partials/message", { res.render("partials/message", {
@@ -81,7 +81,7 @@ router.post(`${config.site_path}/submit_post`, (req,res) => {
} }
}); // /submit_post }); // /submit_post
router.post(`${config.site_path}/submit_signup`, (req,res) => { router.post("/submit_signup", (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex'); const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const username = func.escape_input(req.body.username) const username = func.escape_input(req.body.username)
const prettyname = func.escape_input(req.body.prettyname) const prettyname = func.escape_input(req.body.prettyname)
@@ -100,7 +100,7 @@ router.post(`${config.site_path}/submit_signup`, (req,res) => {
"description": description, "description": description,
}) })
fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8'); fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8');
res.redirect(301, `${config.site_path}/user/${username}`) res.redirect(301, `/user/${username}`)
} }
// if the user does exist then // if the user does exist then
else { else {
@@ -118,12 +118,12 @@ router.post(`${config.site_path}/submit_signup`, (req,res) => {
} }
// If allow_signup is undefined or not a boolean, error // If allow_signup is undefined or not a boolean, error
else { else {
res.redirect(301,config.site_path) res.redirect(301,"/")
console.log("Error, invalid value for allow_signup (bool)") console.log("Error, invalid value for allow_signup (bool)")
} }
}); // /submit_signup }); // /submit_signup
router.post(`${config.site_path}/submit_edit_user`, (req,res) => { router.post("/submit_edit_user", (req,res) => {
// Get the form info // Get the form info
const password = crypto.createHash("sha512").update(req.body.password).digest("hex"); const password = crypto.createHash("sha512").update(req.body.password).digest("hex");
const userID = func.escape_input(req.body.userID) const userID = func.escape_input(req.body.userID)
@@ -152,7 +152,7 @@ router.post(`${config.site_path}/submit_edit_user`, (req,res) => {
fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8'); fs.writeFileSync(`../data/users.json`, `${JSON.stringify(users)}`, 'utf-8');
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8'); fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8'); fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
res.redirect(301,`${config.site_path}/user/${users[userID]["username"]}`) res.redirect(301,`/user/${users[userID]["username"]}`)
} }
else { // password does not match else { // password does not match
res.render("partials/message", { res.render("partials/message", {
@@ -170,7 +170,7 @@ router.post(`${config.site_path}/submit_edit_user`, (req,res) => {
} }
}); // /submit_delete_account }); // /submit_delete_account
router.post(`${config.site_path}/submit_edit_post`, (req,res) => { router.post("/submit_edit_post", (req,res) => {
const password = crypto.createHash('sha512').update(req.body.password).digest('hex'); const password = crypto.createHash('sha512').update(req.body.password).digest('hex');
const postID = req.body.postID const postID = req.body.postID
const userID = req.body.userID const userID = req.body.userID
@@ -194,7 +194,7 @@ router.post(`${config.site_path}/submit_edit_post`, (req,res) => {
fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8'); fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`, 'utf-8');
} }
fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8'); fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
res.redirect(302, config.site_path); res.redirect(302, "/");
} }
else { else {
res.render("partials/message", { res.render("partials/message", {
@@ -204,7 +204,7 @@ router.post(`${config.site_path}/submit_edit_post`, (req,res) => {
} }
}); // /submit_edit }); // /submit_edit
router.get(`${config.site_path}/search`, (req, res) => { router.get('/search', (req, res) => {
const search_term = func.escape_input(req.query.q); // 'q' is the parameter name const search_term = func.escape_input(req.query.q); // 'q' is the parameter name
let search_type = req.query.type; // eg 'post', 'user' let search_type = req.query.type; // eg 'post', 'user'
if (typeof search_type == 'string') { // Make the search_term an array if (typeof search_type == 'string') { // Make the search_term an array
@@ -216,8 +216,7 @@ router.get(`${config.site_path}/search`, (req, res) => {
console.log('searching for: ', search_term); console.log('searching for: ', search_term);
const search_results = data.searchdata(search_term, search_type); // data.searchdata returns an array of search results const search_results = data.searchdata(search_term, search_type); // data.searchdata returns an array of search results
res.render('pages/search', res.render('pages/search', {
{
config, config,
locale, locale,
search_results, search_results,
src/routes/forms.js
+10 -19
View File
@@ -5,16 +5,13 @@ const func = require('../functions')
const router = express.Router(); const router = express.Router();
///////////////////// Form pages //////////////////////////// ///////////////////// Form pages ////////////////////////////
// new post router.get(config.new_post_url, (req,res) => {
router.get(`${config.site_path}/${config.new_post_url}`, (req,res) => {
res.render("forms/new_post", { res.render("forms/new_post", {
config, config,
locale, locale,
}); });
}); // /post }); // /post
router.get(config.signup_url, (req,res) => {
// signup
router.get(`${config.site_path}/${config.signup_url}`, (req,res) => {
// if the server does allow signup // if the server does allow signup
if (config.allow_signup == true) { if (config.allow_signup == true) {
// Send the page for signing up to the server // Send the page for signing up to the server
@@ -32,30 +29,24 @@ router.get(`${config.site_path}/${config.signup_url}`, (req,res) => {
} }
// If allow_signup is undefined or not a boolean, error // If allow_signup is undefined or not a boolean, error
else { else {
res.redirect(301,config.site_path) res.redirect(301,"/")
console.log("Error, invalid value for allow_signup (bool)") console.log("Error, invalid value for allow_signup (bool)")
} }
}); // /signup }); // /signup
router.get(`${config.edit_account_base_url}/:user_id`, (req,res) => {
// edit account
router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => {
const userID = parseInt(req.params.user_id); const userID = parseInt(req.params.user_id);
res.render("forms/edit_account", res.render("forms/edit_account", {
{
config, config,
locale, locale,
user: data.getdata('users', 'id', userID)[0], user: data.getdata('users', 'id', userID),
userID userID
}); });
}); // /delete_account }); // /delete_account
router.get(`${config.edit_post_base_url}/:post_id`, (req,res) => {
// edit post
router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => {
const postID = req.params.post_id const postID = req.params.post_id
const post = data.getdata('posts','id', postID)[0] const post = data.getdata('posts','id', postID)
const user = data.getdata('users', 'id', post.userID)[0] const user = data.getdata('users', 'id', post.userID)
res.render("forms/edit_post", res.render("forms/edit_post", {
{
config, config,
locale, locale,
post, post,
src/routes/indexes.js
+4 -4
View File
@@ -6,7 +6,7 @@ const func = require('../functions')
const router = express.Router(); const router = express.Router();
///////////////////// Page index's /////////////////////// ///////////////////// Page index's ///////////////////////
router.get(`${config.site_path}/index/pages`, (req,res) => { router.get("/index/pages", (req,res) => {
res.render("indexes/all_pages", { res.render("indexes/all_pages", {
config, config,
posts: data.getdata('posts'), posts: data.getdata('posts'),
@@ -14,19 +14,19 @@ router.get(`${config.site_path}/index/pages`, (req,res) => {
comments: data.getdata('comments'), comments: data.getdata('comments'),
}); });
}); // /index/pages }); // /index/pages
router.get(`${config.site_path}/index/posts`, (req,res) => { router.get("/index/posts", (req,res) => {
res.render("indexes/posts", { res.render("indexes/posts", {
config, config,
posts: data.getdata('posts'), posts: data.getdata('posts'),
}); });
}); // /index/posts }); // /index/posts
router.get(`${config.site_path}/index/users`, (req,res) => { router.get("/index/users", (req,res) => {
res.render("indexes/users", { res.render("indexes/users", {
config, config,
users: data.getdata('users'), users: data.getdata('users'),
}); });
}); // /index/users }); // /index/users
router.get(`${config.site_path}/index/comments`, (req,res) => { router.get("/index/comments", (req,res) => {
res.render("indexes/comments", { res.render("indexes/comments", {
config, config,
comments: data.getdata('comments'), comments: data.getdata('comments'),
src/routes/standard_pages.js
+23 -25
View File
@@ -9,7 +9,8 @@ const router = express.Router();
///////////////////// Standard Pages ////////////////////// ///////////////////// Standard Pages //////////////////////
// Timeline // Timeline
router.get(config.site_path, (req,res) => { router.get("/", (req,res) => {
let posts = data.getdata('posts')
// Increment the hitcount // Increment the hitcount
if (config.enable_hitcount) { if (config.enable_hitcount) {
data.increment_hitcount() data.increment_hitcount()
@@ -19,7 +20,7 @@ router.get(config.site_path, (req,res) => {
{ {
config, config,
locale, locale,
posts: data.getdata("posts"), posts,
users: data.getdata("users"), users: data.getdata("users"),
comments: data.getdata("comments"), comments: data.getdata("comments"),
hitcount: data.getdata("hitcount"), hitcount: data.getdata("hitcount"),
@@ -31,26 +32,23 @@ router.get(config.site_path, (req,res) => {
}); // / }); // /
// Users // Users
router.get(`${config.site_path}/user/:username`, (req, res) => { router.get("/user/:username", (req, res) => {
const userID = func.get_userID(req.params.username) let user = data.getdata('users', 'username', req.params.username)
let posts = data.getdata('posts', 'userID', userID); if (user.length > 0) {
let user = data.getdata('users', 'id', userID)[0];
if (userID != -1) {
res.render("pages/user", res.render("pages/user",
{ {
config, config,
locale, locale,
posts, posts: data.getdata('posts','userID',user[0].id),
user, user: user[0],
userID: userID, comments: data.getdata('comments'),
comments: data.getdata('comments', 'postID'),
fromUnixTime, fromUnixTime,
format, format,
getUnixTime, getUnixTime,
func, func,
}) })
} }
else if (userID == -1) { else {
res.render("partials/message", res.render("partials/message",
{ {
message: locale.user_doesnt_exist, message: locale.user_doesnt_exist,
@@ -60,16 +58,16 @@ router.get(`${config.site_path}/user/:username`, (req, res) => {
}); // /user/:username }); // /user/:username
// Posts // Posts
router.get(`${config.site_path}/post/:post_index`, (req, res) => { router.get("/post/:post_index", (req, res) => {
const postID = parseInt(req.params.post_index) const postID = parseInt(req.params.post_index)
let post = data.getdata('posts','id', postID)[0] let post = data.getdata('posts','id', postID)[0]
if (post == 1) { // data.getdata returns error code 1 if nothing is available if (post.length == 0) { // data.getdata returns error code 1 if nothing is available
res.render("partials/message", { res.render("partials/message", {
message: locale.post_doesnt_exist, message: locale.post_doesnt_exist,
config, config,
}) })
} }
else if (typeof post["deleted"] == "undefined" || post["deleted"] == false) { else {
if (config.enable_hitcount) { if (config.enable_hitcount) {
data.increment_hitcount(postID) data.increment_hitcount(postID)
} }
@@ -87,24 +85,24 @@ router.get(`${config.site_path}/post/:post_index`, (req, res) => {
func, func,
}) })
} }
else {
console.log("Error loading page")
res.redirect(301,config.site_path)
}
}); // /post/:post_index }); // /post/:post_index
// Tags // Tags
router.get(`${config.site_path}/tag/:tag`, (req,res) => { router.get("/tag/:tag", (req,res) => {
const tag = req.params.tag const tag = req.params.tag
const posts = data.getdata('posts','tags',tag);
console.log(posts)
const users = data.getdata('users')
const comments = data.getdata('comments')
res.render("pages/tag", res.render("pages/tag",
{ {
config, config,
locale, locale,
tag, tag,
posts: data.getdata('posts'), posts,
users: data.getdata('users'), users,
comments: data.getdata('comments'), comments,
fromUnixTime, fromUnixTime,
format, format,
getUnixTime, getUnixTime,
@@ -114,11 +112,11 @@ router.get(`${config.site_path}/tag/:tag`, (req,res) => {
// Comments // Comments
router.get(`${config.site_path}/comment/:postID-:commentID`, (req,res) => { router.get("/comment/:postID-:commentID", (req,res) => {
const commentID = parseInt(req.params.commentID); const commentID = parseInt(req.params.commentID);
const postID = parseInt(req.params.postID); const postID = parseInt(req.params.postID);
let posts_comments = data.getdata('comments', 'id', postID)[0]["comments"] let posts_comments = data.getdata('comments', 'id', postID)["comments"]
let comment = 1 let comment = 1
// For loop to find the comment with matching ID // For loop to find the comment with matching ID
posts_comments.forEach((current_comment, index) => { posts_comments.forEach((current_comment, index) => {
src/routes/syndication.js
+14 -11
View File
@@ -9,7 +9,7 @@ const router = express.Router();
////////////////////// SYNDICATION //////////////////////// ////////////////////// SYNDICATION ////////////////////////
// global RSS protocol gets // global RSS protocol gets
router.get(`${config.site_path}/rss`, (req,res) => { router.get("/rss", (req,res) => {
if (config.rss == false) { if (config.rss == false) {
res.render("partials/message", { res.render("partials/message", {
message: locale.rss_disabled, message: locale.rss_disabled,
@@ -19,18 +19,17 @@ router.get(`${config.site_path}/rss`, (req,res) => {
else { else {
res.setHeader('content-type', 'application/rss+xml'); res.setHeader('content-type', 'application/rss+xml');
res.render("syndication/rss", { res.render("syndication/rss", {
users: data.getdata('users'),
config, config,
posts: data.getdata('posts'), posts: data.getdata('posts'),
users: data.getdata('users'),
func, func,
}) })
}; };
}); });
// user RSS protocol gets // user RSS protocol gets
// TODO specific title field and descriptions?? router.get("/user/:username/rss", (req,res) => {
router.get(`${config.site_path}/user/:username/rss`, (req,res) => {
const username = req.params.username; const username = req.params.username;
const user = data.getdata('users','username',username)[0]; // Get the user data const user = data.getdata('users', 'username', username);
if (config.rss == false) { if (config.rss == false) {
res.render("partials/message", { res.render("partials/message", {
message: locale.rss_disabled, message: locale.rss_disabled,
@@ -40,15 +39,15 @@ router.get(`${config.site_path}/user/:username/rss`, (req,res) => {
else { else {
res.setHeader('content-type', 'application/rss+xml'); res.setHeader('content-type', 'application/rss+xml');
res.render("syndication/rss", { res.render("syndication/rss", {
users: [user],
config, config,
posts: data.getdata('posts','id',user['id']), posts: data.getdata('posts'),
users: user,
func, func,
}) })
}; };
}); });
// global ATOM protocol gets // global ATOM protocol gets
router.get(`${config.site_path}/atom`, (req,res) => { router.get("/atom", (req,res) => {
if (config.atom == false) { if (config.atom == false) {
res.render("partials/message", { res.render("partials/message", {
message: locale.atom_disabled, message: locale.atom_disabled,
@@ -57,17 +56,19 @@ router.get(`${config.site_path}/atom`, (req,res) => {
} }
else { else {
res.setHeader('content-type', 'application/rss+xml'); res.setHeader('content-type', 'application/rss+xml');
res.render("syndication/atom", { res.render("syndication/global_atom", {
config, config,
posts: data.getdata('posts'), posts: data.getdata('posts'),
users: data.getdata('users'),
func, func,
getUnixTime, getUnixTime,
}) })
}; };
}); });
// user ATOM protocol gets // user ATOM protocol gets
router.get(`${config.site_path}/user/:username/atom`, (req,res) => { router.get("/user/:username/atom", (req,res) => {
const username = req.params.username; const username = req.params.username;
const userID = func.get_userID(username);
if (config.atom == false) { if (config.atom == false) {
res.render("partials/message", { res.render("partials/message", {
message: locale.atom_disabled, message: locale.atom_disabled,
@@ -76,10 +77,12 @@ router.get(`${config.site_path}/user/:username/atom`, (req,res) => {
} }
else { else {
res.setHeader('content-type', 'application/rss+xml'); res.setHeader('content-type', 'application/rss+xml');
res.render("syndication/atom", { res.render("syndication/user_atom", {
config, config,
posts: data.getdata('posts'), posts: data.getdata('posts'),
users: data.getdata('users'),
func, func,
userID,
getUnixTime, getUnixTime,
}) })
}; };
src/server.js
+4 -6
View File
@@ -26,7 +26,7 @@ catch (error) {
const app = express(); const app = express();
app.use(express.urlencoded({ extended: true })); app.use(express.urlencoded({ extended: true }));
app.use(express.json()); app.use(express.json());
app.use(config.site_path, express.static(config.root_path)); app.use(express.static(config.root_path));
// set the view engine to ejs // set the view engine to ejs
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
app.set('views', '../views') app.set('views', '../views')
@@ -50,9 +50,6 @@ function perform_checks()
exit_flag = false exit_flag = false
required_values = ['site_admin','seperator','site_name','site_url','locale','port','cache_data','allow_signup','site_description','request_data_limit','enable_hitcount','charset','root_path','edit_account_base_url','new_post_url','signup_url','default_commenter_username','rss','atom','date_format','time_zone','css'] required_values = ['site_admin','seperator','site_name','site_url','locale','port','cache_data','allow_signup','site_description','request_data_limit','enable_hitcount','charset','root_path','edit_account_base_url','new_post_url','signup_url','default_commenter_username','rss','atom','date_format','time_zone','css']
// Perform some standard checks: // Perform some standard checks:
if (config.site_path.slice(-1) == "/") { // cut off a trailing /
config.site_path = config.site_path.substring(0,config.site_path.length-1);
}
// data_storage // data_storage
switch (config.data_storage) switch (config.data_storage)
@@ -85,7 +82,8 @@ function perform_checks()
} }
perform_checks() perform_checks()
app.listen(config.port, () => { app.listen(config.port, () => {
console.log(`Server is running at http://localhost:${config.port}${config.site_path} webroot: ${config.root_path}`); console.log(`Server is running at http://localhost:${config.port} webroot: ${config.root_path}`);
console.log("Running in: ", __dirname) console.log("Running in: ", __dirname)
}) });
views/forms/edit_account.ejs
+2 -7
View File
@@ -1,14 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.language %>"> <html lang="<%= config.language %>
<head> <head>
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main"> <form action="/submit_edit_user" method="POST">
<header id="site-header">
<%- include("../headers/site_wide") %>
</header>
<form action="<%= config.site_path %>/submit_edit_user" method="POST">
<input name="userID" type="hidden" value="<%= userID %>"> <input name="userID" type="hidden" value="<%= userID %>">
<label><%= locale.password %>:</label><br/> <label><%= locale.password %>:</label><br/>
<input type="password" required id="password" name="password"><br/><br/> <input type="password" required id="password" name="password"><br/><br/>
@@ -22,6 +18,5 @@
<label><%- locale.delete_account_confirmation %>: </label><input type="checkbox" name="agreement"><br/> <label><%- locale.delete_account_confirmation %>: </label><input type="checkbox" name="agreement"><br/>
<input type="submit" value="Submit"><br/> <input type="submit" value="Submit"><br/>
</form> </form>
</div>
</body> </body>
</html> </html>
views/forms/edit_post.ejs
+1 -6
View File
@@ -4,11 +4,7 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main"> <form action="/submit_edit_post" method="POST" onsubmit="sha512password()">
<header id="site-header">
<%- include("../headers/site_wide") %>
</header>
<form action="<%= config.site_path %>/submit_edit_post" method="POST" onsubmit="sha512password()">
<input name="userID" type="hidden" value="<%= post['userID'] %>"> <input name="userID" type="hidden" value="<%= post['userID'] %>">
<input name="postID" type="hidden" value="<%= postID %>"> <input name="postID" type="hidden" value="<%= postID %>">
@@ -27,6 +23,5 @@
<label>Delete forever (no undo): </label><input name="delete" type="checkbox"><br/> <label>Delete forever (no undo): </label><input name="delete" type="checkbox"><br/>
<input type="submit" value="Submit"><br/> <input type="submit" value="Submit"><br/>
</form> </form>
</div>
</body> </body>
</html> </html>
views/forms/new_post.ejs
+2 -8
View File
@@ -4,11 +4,7 @@
<%- include('../partials/head.ejs') %> <%- include('../partials/head.ejs') %>
</head> </head>
<body> <body>
<div id="main"> <form action="/submit_post" method="POST">
<header id="site-header">
<%- include("../headers/site_wide") %>
</header>
<form action="<%= config.site_path %>/submit_post" method="POST">
<label><%= locale.username %>:</label><br/> <label><%= locale.username %>:</label><br/>
<input required name="username"><br/><br/> <input required name="username"><br/><br/>
@@ -25,7 +21,5 @@
<input name="tags"><br/><br/> <input name="tags"><br/><br/>
<input type="submit" value="Submit"><br/> <input type="submit" value="Submit"><br/>
</form>
</div>
</body> </body>
</html> </form></html>
views/forms/signup.ejs
+1 -6
View File
@@ -4,11 +4,7 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main"> <form action="/submit_signup" method="POST">
<header id="site-header">
<%- include("../headers/site_wide") %>
</header>
<form action="<%= config.site_path %>/submit_signup" method="POST">
<label><%= locale.username %></label><br/> <label><%= locale.username %></label><br/>
<input required name="username"><br/><br/> <input required name="username"><br/><br/>
@@ -24,6 +20,5 @@
<label><%- locale.signup_agreement %>: </label><input type="checkbox" name="agreement" required><br/> <label><%- locale.signup_agreement %>: </label><input type="checkbox" name="agreement" required><br/>
<input type="submit" value="Submit"><br/> <input type="submit" value="Submit"><br/>
</form> </form>
</div>
</body> </body>
</html> </html>
views/headers/site_wide.ejs
+9 -10
View File
@@ -1,29 +1,28 @@
<a id='home-page-link' href="<%= config.site_path %>/"><%= locale.home_page %></a> <a id='home-page-link' href="/"><%= locale.home_page %></a>
/ /
<% if (config.rss == true) { %> <% if (config.rss == true) { %>
<a id='rss-link' href="<%= config.site_path %>/rss"> <a id='rss-link' href="/rss">
<img class='icon' src='<%= config.site_path %>/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'> <img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'>
</a> </a>
<% } %> <% } %>
|
<% if (config.atom == true) { %> <% if (config.atom == true) { %>
<a id='atom-link' href="<%= config.site_path %>/atom"> <a id='atom-link' href="/atom">
<img class='icon' src='<%= config.site_path %>/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'> <img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
</a> </a>
<% } %> <% } %>
/ /
<a id='new-post-link' href="<%= config.site_path %>/<%= config.new_post_url %>"><%= locale.new_post %></a> <a id='new-post-link' href="<%= config.new_post_url %>"><%= locale.new_post %></a>
/ /
<% if (config.allow_signup == true) { %> <% if (config.allow_signup == true) { %>
<a id='signup-link' href="<%= config.site_path %>/<%= config.signup_url %>"><%= locale.sign_up %></a> <a id='signup-link' href="<%= config.signup_url %>"><%= locale.sign_up %></a>
<% } %> <% } %>
/ /
<form id='search-form' method="GET" action="<%= config.site_path %>/search" style="display: inline"> <form id='search-form' method="GET" action="/search" style="display: inline">
<input type="text" placeholder="🔍" name="q"><input type="submit" value="Search"> <input type="text" placeholder="🔍" name="q"><input type="submit" value="Search">
</form> </form>
<br/> <br/>
<div id='site-name'> <div id='site-name'>
<h1><a id='home-page-link' href="<%= config.site_path %>/"><%= config.site_name %></a></h1> <h1><a id='home-page-link' href="/"><%= config.site_name %></a></h1>
</div> </div>
<div id='site-description'> <div id='site-description'>
<h2><%- config.site_description %></h2> <h2><%- config.site_description %></h2>
views/headers/user.ejs
+6 -6
View File
@@ -4,14 +4,14 @@
</h1> </h1>
</div> </div>
<p><%- func.render_md(user.description) %></p> <p><%- func.render_md(user.description) %></p>
<a if='edit-account-link' href="<%= config.site_path %>/<%= config.edit_account_base_url %>/<%= userID %>"> <a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= user.id %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'>
</a> </a>
| |
<a id='rss-link' href="<%= config.site_path %>/user/<%= user.username %>/rss"> <a id='rss-link' href="/user/<%= user.username %>/rss">
<img class='icon' src='<%= config.site_path %>/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'> <img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'>
</a> </a>
<a id='atom-link' href="<%= config.site_path %>/user/<%= user.username %>/atom"> <a id='atom-link' href="/user/<%= user.username %>/atom">
<img class='icon' src='<%= config.site_path %>/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'> <img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
</a> </a>
<%- config.seperator %> <%- config.seperator %>
views/indexes/all_pages.ejs
+11 -13
View File
@@ -4,46 +4,44 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main">
Misc:<br/> Misc:<br/>
<a href="<%= config.site_path %>/">Home Page</a><br/> <a href="/">Home Page</a><br/>
<a href="<%= config.site_path %><%= config.new_post_url %>">New Post Form</a><br/> <a href="<%= config.new_post_url %>">New Post Form</a><br/>
<a href="<%= config.site_path %><%= config.signup_url %>">Signup Form</a><br/> <a href="<%= config.signup_url %>">Signup Form</a><br/>
Indexes:<br/> Indexes:<br/>
<a href="<%= config.site_path %>/index/posts">Posts Index</a><br/> <a href="/index/posts">Posts Index</a><br/>
<a href="<%= config.site_path %>/index/users">Users Index</a><br/> <a href="/index/users">Users Index</a><br/>
<a href="<%= config.site_path %>/index/comments">Comments Index</a><br/> <a href="/index/comments">Comments Index</a><br/>
Posts:<br/> Posts:<br/>
<% for (let postID = 0; postID < posts.length; postID++) { %> <% for (let postID = 0; postID < posts.length; postID++) { %>
<% if (posts[postID]["deleted"] != true) { %> <% if (posts[postID]["deleted"] != true) { %>
<a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/> <a href="/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
Comments:<br/> Comments:<br/>
<% for (let postID = 0; postID < comments.length; postID++) { %> <% for (let postID = 0; postID < comments.length; postID++) { %>
<% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %> <% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
<a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/> <a href="/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
Users:<br/> Users:<br/>
<% for (let userID = 0; userID < users.length; userID++) { %> <% for (let userID = 0; userID < users.length; userID++) { %>
<% if (users[userID]["deleted"] != true) { %> <% if (users[userID]["deleted"] != true) { %>
<a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/> <a href="/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
Edit Posts:<br/> Edit Posts:<br/>
<% for (let postID = 0; postID < posts.length; postID++) { %> <% for (let postID = 0; postID < posts.length; postID++) { %>
<% if (posts[postID]["deleted"] != true) { %> <% if (posts[postID]["deleted"] != true) { %>
<a href="<%= config.site_path %><%= config.edit_post_base_url %>/<%= postID %>">Edit <%= posts[postID]["title"] %></a><br/> <a href="<%= config.edit_post_base_url %>/<%= postID %>">Edit <%= posts[postID]["title"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
Edit Users:<br/> Edit Users:<br/>
<% for (let userID = 0; userID < users.length; userID++) { %> <% for (let userID = 0; userID < users.length; userID++) { %>
<% if (users[userID]["deleted"] != true) { %> <% if (users[userID]["deleted"] != true) { %>
<a href="<%= config.site_path %><%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/> <a href="<%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
<!-- TODO add tags --> <!-- TODO add tags -->
</div>
</body> </body>
</html> </html>
views/indexes/comments.ejs
+1 -3
View File
@@ -4,12 +4,10 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main">
<% for (let postID = 0; postID < comments.length; postID++) { %> <% for (let postID = 0; postID < comments.length; postID++) { %>
<% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %> <% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
<a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/> <a href="/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</div>
</body> </body>
</html> </html>
views/indexes/posts.ejs
+1 -3
View File
@@ -4,12 +4,10 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main">
<% for (let postID = 0; postID < posts.length; postID++) { %> <% for (let postID = 0; postID < posts.length; postID++) { %>
<% if (posts[postID]["deleted"] != true) { %> <% if (posts[postID]["deleted"] != true) { %>
<a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/> <a href="/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</div>
</body> </body>
</html> </html>
views/indexes/users.ejs
+1 -3
View File
@@ -4,12 +4,10 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main">
<% for (let userID = 0; userID < users.length; userID++) { %> <% for (let userID = 0; userID < users.length; userID++) { %>
<% if (users[userID]["deleted"] != true) { %> <% if (users[userID]["deleted"] != true) { %>
<a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/> <a href="/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</div>
</body> </body>
</html> </html>
views/pages/comment.ejs
+1 -3
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<header id="site-header"> <header id="site-header">
<%- include("../headers/site_wide") %> <%- include("../headers/site_wide") %>
</header> </header>
@@ -19,10 +18,9 @@
<input type="hidden" name="post_index" value="<%= postID %>"> <input type="hidden" name="post_index" value="<%= postID %>">
<label><%= locale.username %>:</label><br/><input name="name"><br/><br/> <label><%= locale.username %>:</label><br/><input name="name"><br/><br/>
<label><%= locale.comment %>:</label><br/><textarea name="content">>> <%- postID %>-<%- commentID %> <label><%= locale.comment %>:</label><br/><textarea name="content">>> <%- postID %>-<%- commentID %>
</textarea><br/> </textarea><br/>
<button type="submit"><%= locale.submit %></button> <button type="submit"><%= locale.submit %></button>
</form> </form>
</div> </div>
</div>
</body> </body>
</html> </html>
views/pages/post.ejs
-2
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<header id="site-header"> <header id="site-header">
<%- include("../headers/site_wide") %> <%- include("../headers/site_wide") %>
</header> </header>
@@ -14,6 +13,5 @@
<footer id='footer'> <footer id='footer'>
<%- include('../partials/footer'); %> <%- include('../partials/footer'); %>
</footer> </footer>
</div>
</body> </body>
</html> </html>
views/pages/search.ejs
-2
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<div id='site-header'> <div id='site-header'>
<%- include('../headers/site_wide'); %> <%- include('../headers/site_wide'); %>
</div> </div>
@@ -34,6 +33,5 @@
<a href="/user/<%- result.username %>"><%- result.prettyname %></a><br/> <a href="/user/<%- result.username %>"><%- result.prettyname %></a><br/>
<% }); %> <% }); %>
</div> </div>
</div>
</body> </body>
</html> </html>
views/pages/tag.ejs
-8
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<header id="site-header"> <header id="site-header">
<%- include('../headers/site_wide'); %> <%- include('../headers/site_wide'); %>
</header> </header>
@@ -13,18 +12,11 @@
</header> </header>
<div id="posts"> <div id="posts">
<% for (let index = posts.length - 1; index >= 0; index--) { %> <% for (let index = posts.length - 1; index >= 0; index--) { %>
<% if ( posts[index].deleted != true) { %>
<% posts[index].tags.forEach((current_tag, tag_index) => { %>
<% if (current_tag.toLowerCase() == tag.toLowerCase()) { %>
<%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %> <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
<% } %> <% } %>
<% }) %>
<% } %>
<% } %>
</div> </div>
<footer id='footer'> <footer id='footer'>
<%- include('../partials/footer'); %> <%- include('../partials/footer'); %>
</footer> </footer>
</div>
</body> </body>
</html> </html>
views/pages/timeline.ejs
+1 -2
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<header id="site-header"> <header id="site-header">
<%- include("../headers/site_wide") %> <%- include("../headers/site_wide") %>
</header> </header>
@@ -14,6 +13,7 @@
<div id="posts"> <div id="posts">
<% for (let index = posts.length - 1; index >= 0; index--) { %> <% for (let index = posts.length - 1; index >= 0; index--) { %>
<% if (posts[index]["deleted"] != true) { %> <% if (posts[index]["deleted"] != true) { %>
<%- console.log(posts[index]) %>
<%- include('../posts/timeline', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %> <%- include('../posts/timeline', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
<% } %> <% } %>
<% } %> <% } %>
@@ -21,6 +21,5 @@
<footer id='footer'> <footer id='footer'>
<%- include('../partials/footer'); %> <%- include('../partials/footer'); %>
</footer> </footer>
</div>
</body> </body>
</html> </html>
views/pages/user.ejs
-4
View File
@@ -4,7 +4,6 @@
<%- include('../partials/head'); %> <%- include('../partials/head'); %>
</head> </head>
<body> <body>
<div id="main">
<header id="site-header"> <header id="site-header">
<%- include("../headers/site_wide") %> <%- include("../headers/site_wide") %>
</header> </header>
@@ -13,14 +12,11 @@
</header> </header>
<div id="posts"> <div id="posts">
<% for (let index = posts.length - 1; index >= 0; index--) { %> <% for (let index = posts.length - 1; index >= 0; index--) { %>
<% if (posts[index].userID == userID) { %>
<%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %> <%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
<% } %> <% } %>
<% } %>
</div> </div>
<footer id='footer'> <footer id='footer'>
<%- include('../partials/footer'); %> <%- include('../partials/footer'); %>
</footer> </footer>
</div>
</body> </body>
</html> </html>
views/partials/comment.ejs
+1 -1
View File
@@ -5,7 +5,7 @@
<%= func.unix_time_to_date_format(comment.pubdate) %> <%= func.unix_time_to_date_format(comment.pubdate) %>
</span> </span>
<span id='comment-id' style='display: inline'> <span id='comment-id' style='display: inline'>
<a href='<%= config.site_path %>/comment/<%= postID %>-<%= comment.id %>'>No. <%= postID %>-<%= comment.id %></a>:<br/> <a href='/comment/<%= postID %>-<%= comment.id %>'>No. <%= postID %>-<%= comment.id %></a>:<br/>
</span> </span>
<span id='comment-content'> <span id='comment-content'>
<%- func.render_comment(comment.content) %> <%- func.render_comment(comment.content) %>
views/partials/footer.ejs
+1 -1
View File
@@ -1,4 +1,4 @@
<a id='site-index-link' href="<%= config.site_path %>/index/pages"><%= locale.site_index %></a><br/> <a id='site-index-link' href="/index/pages"><%= locale.site_index %></a><br/>
<%= locale.site_ran_by %> <%= config.site_admin %><br/> <%= locale.site_ran_by %> <%= config.site_admin %><br/>
<%- locale.attribution %><br/> <%- locale.attribution %><br/>
<%= locale.AI_consent %> <!-- remove consent for AI scrapers --> <%= locale.AI_consent %> <!-- remove consent for AI scrapers -->
views/partials/head.ejs
+2 -3
View File
@@ -1,10 +1,9 @@
<meta charset="<%- config.charset %>"> <meta charset="<%- config.charset %>">
<meta name='robots' content='noindex'>
<title><%= config.site_name %></title> <title><%= config.site_name %></title>
<style> <style>
</style> </style>
<link rel="stylesheet" href="<%= config.site_path %>/default.css"> <link rel="stylesheet" href="/default.css">
<link rel="stylesheet" href="<%= config.site_path %>/custom.css"> <link rel="stylesheet" href="/custom.css">
views/posts/post.ejs
+5 -5
View File
@@ -1,6 +1,6 @@
<div id="post-header"> <div id="post-header">
<h2> <h2>
<a href='<%= config.site_path %>/post/<%= post['id'] %>'><%= post.title %></a> <a href='/post/<%= post['id'] %>'><%= post.title %></a>
</h2> </h2>
</div> </div>
@@ -15,7 +15,7 @@
</div> </div>
<div id="post-details"> <div id="post-details">
<span id="post-author"> <span id="post-author">
<i><%= locale.written_by %> <a href="<%= config.site_path %>/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><%= locale.written_by %> <a href="/user/<%= user.username %>"><%= user.prettyname %></a></i>
</span> </span>
- -
<span id="post-pubdate"> <span id="post-pubdate">
@@ -25,8 +25,8 @@
<i><%= locale.last_modified %>: <%= func.unix_time_to_date_format(post.pubdate) %></i><br/> <i><%= locale.last_modified %>: <%= func.unix_time_to_date_format(post.pubdate) %></i><br/>
</div> </div>
<div id="post-edit"> <div id="post-edit">
<a href="<%= config.site_path %>/<%= config.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
</a><br/> </a><br/>
</div> </div>
<% if (config.enable_hitcount == true) { %> <% if (config.enable_hitcount == true) { %>
@@ -40,7 +40,7 @@
<div id="post-commentform"> <div id="post-commentform">
<!-- Comment form --> <!-- Comment form -->
<form method="POST" action="<%= config.site_path %>/submit_comment"> <form method="POST" action="/submit_comment">
<input type="hidden" name="post_index" value="<%= post["id"] %>"> <input type="hidden" name="post_index" value="<%= post["id"] %>">
<label><%= locale.username %>:</label><br/><input name="name"><br/><br/> <label><%= locale.username %>:</label><br/><input name="name"><br/><br/>
<label><%= locale.comment %>:</label><br/><textarea name="content"></textarea><br/> <label><%= locale.comment %>:</label><br/><textarea name="content"></textarea><br/>
views/posts/tag.ejs
+3 -3
View File
@@ -1,6 +1,6 @@
<div id="post-header"> <div id="post-header">
<h2> <h2>
<a href='<%= config.site_path %>/post/<%= post['id'] %>'><%= post.title %></a> <a href='/post/<%= post['id'] %>'><%= post.title %></a>
</h2> </h2>
</div> </div>
@@ -15,7 +15,7 @@
</div> </div>
<div id="post-details"> <div id="post-details">
<span id="post-author"> <span id="post-author">
<i><a href="<%= config.site_path %>/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="/user/<%= user.username %>"><%= user.prettyname %></a></i>
</span> </span>
- -
<span id="post-pubdate"> <span id="post-pubdate">
@@ -24,7 +24,7 @@
<br/> <br/>
<div id="post-edit"> <div id="post-edit">
<a href="<%= config.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
</a><br/> </a><br/>
</div> </div>
</div> </div>
views/posts/timeline.ejs
+6 -6
View File
@@ -1,6 +1,6 @@
<div id="post-header"> <div id="post-header">
<h2> <h2>
<a href='<%= config.site_path %>/post/<%= post['id'] %>'><%= post.title %></a> <a href='/post/<%= post['id'] %>'><%= post.title %></a>
</h2> </h2>
</div> </div>
@@ -15,11 +15,11 @@
</div> </div>
<div id="post-details"> <div id="post-details">
<span id="post-author"> <span id="post-author">
<i><a href="<%= config.site_path %>/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="/user/<%= user.username %>"><%= user.prettyname %></a></i>
</span> </span>
- -
<a if='edit-account-link' href="<%= config.site_path %>/<%= config.edit_account_base_url %>/<%= user.id %>"> <a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= user.id %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'>
</a> </a>
- -
<span id="post-pubdate"> <span id="post-pubdate">
@@ -27,8 +27,8 @@
</span> </span>
<br/> <br/>
<div id="post-edit"> <div id="post-edit">
<a href="<%= config.site_path %>/<%= config.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
</a><br/> </a><br/>
</div> </div>
</div> </div>
views/posts/user.ejs
+4 -4
View File
@@ -1,6 +1,6 @@
<div id="post-header"> <div id="post-header">
<h2> <h2>
<a href='<%= config.site_path %>/post/<%= post['id'] %>'><%= post.title %></a> <a href='/post/<%= post['id'] %>'><%= post.title %></a>
</h2> </h2>
</div> </div>
@@ -15,7 +15,7 @@
</div> </div>
<div id="post-details"> <div id="post-details">
<span id="post-author"> <span id="post-author">
<i><a href="<%= config.site_path %>/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="/user/<%= user.username %>"><%= user.prettyname %></a></i>
</span> </span>
- -
<span id="post-pubdate"> <span id="post-pubdate">
@@ -23,8 +23,8 @@
</span> </span>
<br/> <br/>
<div id="post-edit"> <div id="post-edit">
<a href="<%= config.site_path %>/<%= config.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='<%= config.site_path %>/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
</a><br/> </a><br/>
</div> </div>
</div> </div>
views/syndication/atom.ejs
+4 -3
View File
@@ -12,9 +12,10 @@
<link><%= config.site_url %>/post/<%= postID %></link> <link><%= config.site_url %>/post/<%= postID %></link>
<summary><![CDATA[<%- (posts[postID]["content"]) %>]]></summary> <summary><![CDATA[<%- (posts[postID]["content"]) %>]]></summary>
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid> <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%# func.unix_time_to_date_format(posts[postID]['pubdate'],"yyyy-MM-dd'T'HH:mm:ss'Z'") %></pubDate> <pubDate><%- func.unix_time_to_date_format(posts[postID]['pubdate'],"yyyy-MM-dd'T'HH:mm:ss'Z'") %></pubDate>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %> <% tags = posts[postID]['tags'].split(',') %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category> <% for (let tag_index = 0; tag_index < tags.length; tag_index++) { %>
<category><![CDATA[<%= tags[tag_index] %>]]></category>
<% } %> <% } %>
</entry> </entry>
<% } %> <% } %>
views/syndication/rss.ejs
+3 -3
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="<%= config.charset %>" ?>
<rss version="2.0"> <rss version="2.0">
<channel> <channel>
<title><%= config.site_name %></title> <title><%= config.site_name %></title>
@@ -13,8 +12,9 @@
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid> <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%= func.unix_time_to_date_format(posts[postID]['pubdate'],'EEE, dd MMM yyyy HH:mm:ss') %></pubDate> <pubDate><%= func.unix_time_to_date_format(posts[postID]['pubdate'],'EEE, dd MMM yyyy HH:mm:ss') %></pubDate>
<author><%= users[posts[postID]['userID']]['prettyname'] %></author> <author><%= users[posts[postID]['userID']]['prettyname'] %></author>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %> <% tags = posts[postID]['tags'].split(',') %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category> <% for (let tag_index = 0; tag_index < tags.length; tag_index++) { %>
<category><![CDATA[<%= tags[tag_index] %>]]></category>
<% } %> <% } %>
</item> </item>
<% } %> <% } %>
webroot/default.css
+2 -6
View File
@@ -30,6 +30,7 @@ a {
border: none; border: none;
border-radius: 0px; border-radius: 0px;
font-size: 14px; font-size: 14px;
}
} }
a:hover { a:hover {
text-decoration: underline; text-decoration: underline;
@@ -55,9 +56,7 @@ a:hover {
.comment:nth-child(even) { .comment:nth-child(even) {
background: #1E1E1E; background: #1E1E1E;
} }
.named-fence-filename {
border: 1px white solid;
}
} }
@media (prefers-color-scheme: light) { @media (prefers-color-scheme: light) {
@@ -71,7 +70,4 @@ a:hover {
.comment:nth-child(even) { .comment:nth-child(even) {
background: #EEEEEE; background: #EEEEEE;
} }
.named-fence-filename {
border: 1px black solid;
}
} }