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
+53 -99
View File
@@ -9,15 +9,15 @@ const locale = require(`../locales/${config.locale}.json`)
// https://stackoverflow.com/a/16060619 // https://stackoverflow.com/a/16060619
export function require_module(module) export function require_module(module)
{ {
if (config.cache_data == false) if (config.cache_data == false)
{ {
delete require.cache[require.resolve(module)]; delete require.cache[require.resolve(module)];
return require(module); return require(module);
} }
else else
{ {
return require(module); return require(module);
} }
} }
// The configuration defines a date format using the date-fns (a datetime library) syntax // The configuration defines a date format using the date-fns (a datetime library) syntax
@@ -27,7 +27,7 @@ export function require_module(module)
// returns the formatted date (string) // returns the formatted date (string)
export function unix_time_to_date_format(unix_time) export function unix_time_to_date_format(unix_time)
{ {
const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library
let date = fromUnixTime(unix_time) let date = fromUnixTime(unix_time)
let formatted_date = format(date, config.date_format) let formatted_date = format(date, config.date_format)
return formatted_date return formatted_date
@@ -39,7 +39,7 @@ export function unix_time_to_date_format(unix_time)
// returns the formatted date (string) // returns the formatted date (string)
export function unix_time_to_rss_date(unix_time) export function unix_time_to_rss_date(unix_time)
{ {
const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library
let date = fromUnixTime(unix_time) let date = fromUnixTime(unix_time)
let formatted_date = format(date, "EEE, dd MMM yyyy HH:mm:ss") let formatted_date = format(date, "EEE, dd MMM yyyy HH:mm:ss")
return `${formatted_date} ${config.time_zone}` return `${formatted_date} ${config.time_zone}`
@@ -47,7 +47,7 @@ export function unix_time_to_rss_date(unix_time)
// And again with atom's date format // And again with atom's date format
export function unix_time_to_atom_date(unix_time) export function unix_time_to_atom_date(unix_time)
{ {
const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library
let date = fromUnixTime(unix_time) let date = fromUnixTime(unix_time)
let formatted_date = format(date, "yyyy-MM-dd'T'HH:mm:ss'Z'") let formatted_date = format(date, "yyyy-MM-dd'T'HH:mm:ss'Z'")
return `${formatted_date}` return `${formatted_date}`
@@ -57,126 +57,80 @@ 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] == "")
{ {
string = ''; // If there are no tags, output nothing string = ''; // If there are no tags, output nothing
} }
else else
{ {
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
// returns a string with some character replaced by their entities // returns a string with some character replaced by their entities
export function escape_input(input) export function escape_input(input)
{ {
let output = input let output = input
.replaceAll("&", "&amp;") // This must be first .replaceAll("&", "&amp;") // This must be first
.replaceAll("<", "&lt;") .replaceAll("<", "&lt;")
.replaceAll(">", "&gt;") .replaceAll(">", "&gt;")
.replaceAll("\\", "&#92;") .replaceAll("\\", "&#92;")
.replaceAll('"', "&#34;") .replaceAll('"', "&#34;")
.replaceAll("'", "&#39;") .replaceAll("'", "&#39;")
.replaceAll("/", "&#47;") .replaceAll("/", "&#47;")
.replaceAll("%", "&#37;") .replaceAll("%", "&#37;")
return output return output
} }
// Render comment content by replacing the >> int with a url link to that comment // Render comment content by replacing the >> int with a url link to that comment
// Syntax: ">> postID-commentID" // Syntax: ">> postID-commentID"
export function render_comment(comment_content) export function render_comment(comment_content)
{ {
return comment_content return comment_content
.replaceAll(/>> ([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>> $1-$2</a>") .replaceAll(/>> ([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>> $1-$2</a>")
.replaceAll(/>>([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>>$1-$2</a>") .replaceAll(/>>([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>>$1-$2</a>")
.replaceAll(/&gt;&gt; ([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>> $1-$2</a>") .replaceAll(/&gt;&gt; ([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>> $1-$2</a>")
.replaceAll(/&gt;&gt;([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>>$1-$2</a>") .replaceAll(/&gt;&gt;([0-9]*)-([0-9]*)/g, "<a href='/comment/$1-$2'>>>$1-$2</a>")
.replaceAll("\n", "<br/>") .replaceAll("\n", "<br/>")
}; };
// Renders a string into markdown using markdown-it library // Renders a string into markdown using markdown-it library
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 md = markdownit
const namedCodeBlocks = require("markdown-it-named-code-blocks"); ({ // this is just defining some options for markdown-it, should I add this to config.json?
const md = markdownit html: false,
({ // this is just defining some options for markdown-it, should I add this to config.json? xhtmlOut: false,
html: false, breaks: true,
xhtmlOut: false, linkify: false,
breaks: true, typographer: true,
linkify: false, quotes: locale.quotes,
typographer: true, })
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
+169 -170
View File
@@ -14,197 +14,197 @@ 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)
let name = func.escape_input(req.body.name) let name = func.escape_input(req.body.name)
// Give the user the default username if they left that bit blank // Give the user the default username if they left that bit blank
if (name == "" || typeof name == 'undefined') { if (name == "" || typeof name == 'undefined') {
name = config.default_commenter_username name = config.default_commenter_username
} }
// Check there is actually content in the comment // Check there is actually content in the comment
if (content != '' && typeof content != 'undefined') { if (content != '' && typeof content != 'undefined') {
let comments = data.getdata('comments') let comments = data.getdata('comments')
new_comment = { new_comment = {
"name": name, "name": name,
"content": content, "content": content,
"id": comments[postID]['comments'].length, "id": comments[postID]['comments'].length,
"pubdate": unix_timestamp, "pubdate": unix_timestamp,
}; };
comments[postID]['comments'].push(new_comment); comments[postID]['comments'].push(new_comment);
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)
const content = req.body.content const content = req.body.content
const tags = func.escape_input(req.body.tags).split(',').map(str => str.trim()); const tags = func.escape_input(req.body.tags).split(',').map(str => str.trim());
const unix_timestamp = getUnixTime(new Date()) const unix_timestamp = getUnixTime(new Date())
if (func.get_userID(username) == -1) { if (func.get_userID(username) == -1) {
res.render("partials/message", { res.render("partials/message", {
message: locale.user_doesnt_exit, message: locale.user_doesnt_exit,
config, config,
}) })
} }
else if (users[func.get_userID(username)]['hash'] == password) { // Password matches else if (users[func.get_userID(username)]['hash'] == password) { // Password matches
console.log(username, "is submitting a post titled:", title); console.log(username, "is submitting a post titled:", title);
id = posts.length id = posts.length
posts.push({ posts.push({
"id": id, "id": id,
"userID": func.get_userID(username), "userID": func.get_userID(username),
"title": title, "title": title,
"content": content, "content": content,
"pubdate": unix_timestamp, "pubdate": unix_timestamp,
"editdate": unix_timestamp, "editdate": unix_timestamp,
"tags": tags, "tags": tags,
}) })
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", {
message: locale.incorrect_password, message: locale.incorrect_password,
config, config,
}) })
} }
}); // /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)
const description = req.body.description const description = req.body.description
// Check that signups are allowed // Check that signups are allowed
if (config.allow_signup == true) { if (config.allow_signup == true) {
// func.get_userID will return -1 if the user does not exist // func.get_userID will return -1 if the user does not exist
// so this checks that the user does not exist // so this checks that the user does not exist
if (func.get_userID(username) == -1) { if (func.get_userID(username) == -1) {
users.push({ users.push({
"id": users.length, "id": users.length,
"username": username, "username": username,
"prettyname": prettyname, "prettyname": prettyname,
"hash": password, "hash": password,
"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 {
res.render("partials/message", { res.render("partials/message", {
message: locale.user_exists, message: locale.user_exists,
config, config,
}) })
} }
} }
else if (config.allow_signup == false) { else if (config.allow_signup == false) {
res.render("partials/message", { res.render("partials/message", {
message: locale.signups_unavailable, message: locale.signups_unavailable,
config, config,
}) })
} }
// 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)
const description = req.body.description const description = req.body.description
const prettyname = func.escape_input(req.body.prettyname) const prettyname = func.escape_input(req.body.prettyname)
const delete_bool = req.body.delete const delete_bool = req.body.delete
if (userID >= 0) { // The user exists if (userID >= 0) { // The user exists
if (password == users[userID]['hash']) { // password matches if (password == users[userID]['hash']) { // password matches
console.log(userID, " (userID) is modifying their account") console.log(userID, " (userID) is modifying their account")
users[userID]["prettyname"] = prettyname; users[userID]["prettyname"] = prettyname;
users[userID]["description"] = description; users[userID]["description"] = description;
if (delete_bool == true) { if (delete_bool == true) {
// Delete the user // Delete the user
users[userID] = {"id": userID,"deleted": true} users[userID] = {"id": userID,"deleted": true}
// Delete all their posts // Delete all their posts
for (let postid = 0; postid < posts.length; postid++) { // loop over all posts for (let postid = 0; postid < posts.length; postid++) { // loop over all posts
if (posts[postid]['userID'] == userID) { // if userID matches if (posts[postid]['userID'] == userID) { // if userID matches
posts[postid] = {"id": postid, "deleted": true} // delete the post posts[postid] = {"id": postid, "deleted": true} // delete the post
comments[postid] = [] // the comments for this post should also be deleted comments[postid] = [] // the comments for this post should also be deleted
} }
}; };
} }
// Write these changes // Write these changes
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", {
message: locale.incorrect_password, message: locale.incorrect_password,
config config
} }
) )
}; };
} }
else { else {
res.render("partials/message", { res.render("partials/message", {
message: locale.user_doesnt_exist, message: locale.user_doesnt_exist,
config, config,
}) })
} }
}); // /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
const title = func.escape_input(req.body.title) const title = func.escape_input(req.body.title)
const content = req.body.content const content = req.body.content
const tags = func.escape_input(req.body.tags).split(",").map(str => str.trim()); const tags = func.escape_input(req.body.tags).split(",").map(str => str.trim());
const delete_bool = req.body.delete const delete_bool = req.body.delete
const unix_timestamp = getUnixTime(new Date()) const unix_timestamp = getUnixTime(new Date())
console.log(users[userID]['prettyname'], "is editting the post titled:", title); console.log(users[userID]['prettyname'], "is editting the post titled:", title);
if (users[userID]['hash'] == password) { // password matches if (users[userID]['hash'] == password) { // password matches
let post = posts[postID] let post = posts[postID]
post['title'] = title post['title'] = title
post['content'] = content post['content'] = content
post['tags'] = tags post['tags'] = tags
post['editdate'] = unix_timestamp post['editdate'] = unix_timestamp
if (typeof delete_bool != "undefined") { if (typeof delete_bool != "undefined") {
console.log("Deleting post!") console.log("Deleting post!")
posts[postID] = {"id": post["id"], "deleted": true} posts[postID] = {"id": post["id"], "deleted": true}
comments[postID] = []; comments[postID] = [];
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", {
message: locale.incorrect_password, message: locale.incorrect_password,
config, config,
}) })
} }
}); // /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
+45 -54
View File
@@ -5,63 +5,54 @@ 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 // if the server does allow signup
router.get(`${config.site_path}/${config.signup_url}`, (req,res) => { if (config.allow_signup == true) {
// if the server does allow signup // Send the page for signing up to the server
if (config.allow_signup == true) { res.render("forms/signup", {
// Send the page for signing up to the server config,
res.render("forms/signup", { locale,
config, });
locale, }
}); // if the server does not allow signup
} else if (config.allow_signup == false) {
// if the server does not allow signup res.render("partials/message", {
else if (config.allow_signup == false) { message: locale.signups_unavailable,
res.render("partials/message", { config,
message: locale.signups_unavailable, })
config, }
}) // If allow_signup is undefined or not a boolean, error
} else {
// If allow_signup is undefined or not a boolean, error res.redirect(301,"/")
else { console.log("Error, invalid value for allow_signup (bool)")
res.redirect(301,config.site_path) }
console.log("Error, invalid value for allow_signup (bool)")
}
}); // /signup }); // /signup
router.get(`${config.edit_account_base_url}/:user_id`, (req,res) => {
// edit account const userID = parseInt(req.params.user_id);
router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => { res.render("forms/edit_account", {
const userID = parseInt(req.params.user_id); config,
res.render("forms/edit_account", locale,
{ user: data.getdata('users', 'id', userID),
config, userID
locale, });
user: data.getdata('users', 'id', userID)[0],
userID
});
}); // /delete_account }); // /delete_account
router.get(`${config.edit_post_base_url}/:post_id`, (req,res) => {
// edit post const postID = req.params.post_id
router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => { const post = data.getdata('posts','id', postID)
const postID = req.params.post_id const user = data.getdata('users', 'id', post.userID)
const post = data.getdata('posts','id', postID)[0] res.render("forms/edit_post", {
const user = data.getdata('users', 'id', post.userID)[0] config,
res.render("forms/edit_post", locale,
{ post,
config, postID,
locale, user,
post, });
postID,
user,
});
}); // /edit/:post_id }); // /edit/:post_id
module.exports = router; module.exports = router;
src/routes/indexes.js
+22 -22
View File
@@ -6,31 +6,31 @@ 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'),
users: data.getdata('users'), users: data.getdata('users'),
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'),
}); });
}); // /index/comments }); // /index/comments
src/routes/standard_pages.js
+76 -78
View File
@@ -9,17 +9,18 @@ const router = express.Router();
///////////////////// Standard Pages ////////////////////// ///////////////////// Standard Pages //////////////////////
// Timeline // Timeline
router.get(config.site_path, (req,res) => { router.get("/", (req,res) => {
// Increment the hitcount let posts = data.getdata('posts')
if (config.enable_hitcount) { // Increment the hitcount
data.increment_hitcount() if (config.enable_hitcount) {
} data.increment_hitcount()
}
res.render("pages/timeline", res.render("pages/timeline",
{ {
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,49 +32,46 @@ 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]; res.render("pages/user",
if (userID != -1) {
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,
config, config,
}) })
} }
}); // /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)
} }
res.render("pages/post", res.render("pages/post",
{ {
config, config,
locale, locale,
@@ -86,25 +84,25 @@ router.get(`${config.site_path}/post/:post_index`, (req, res) => {
getUnixTime, getUnixTime,
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
res.render("pages/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",
{ {
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,39 +112,39 @@ 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) => {
if (current_comment.id == commentID) { if (current_comment.id == commentID) {
comment = posts_comments[index] comment = posts_comments[index]
} }
}) })
// If comment doesn't exist, show error // If comment doesn't exist, show error
if (comment == 1 || posts_comments == 1) { // Comment of this ID was not found if (comment == 1 || posts_comments == 1) { // Comment of this ID was not found
res.render("partials/message", { res.render("partials/message", {
config, config,
message: locale.comment_doesnt_exist, message: locale.comment_doesnt_exist,
}) })
} }
else { else {
res.render("pages/comment", res.render("pages/comment",
{ {
config, config,
locale, locale,
comment, comment,
postID, postID,
commentID, commentID,
fromUnixTime, fromUnixTime,
format, format,
getUnixTime, getUnixTime,
func, func,
}) })
} }
}); });
module.exports = router; module.exports = router;
src/routes/syndication.js
+70 -67
View File
@@ -9,80 +9,83 @@ 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,
config, config,
}) })
} }
else { else {
res.setHeader('content-type', 'application/rss+xml'); res.setHeader('content-type', 'application/rss+xml');
res.render("syndication/rss", { res.render("syndication/rss", {
config,
posts: data.getdata('posts'),
users: data.getdata('users'), users: data.getdata('users'),
config, func,
posts: data.getdata('posts'), })
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);
const user = data.getdata('users','username',username)[0]; // Get the user data if (config.rss == false) {
if (config.rss == false) { res.render("partials/message", {
res.render("partials/message", { message: locale.rss_disabled,
message: locale.rss_disabled, config: config,
config: config, })
}) }
} else {
else { res.setHeader('content-type', 'application/rss+xml');
res.setHeader('content-type', 'application/rss+xml'); res.render("syndication/rss", {
res.render("syndication/rss", { config,
users: [user], posts: data.getdata('posts'),
config, users: user,
posts: data.getdata('posts','id',user['id']), 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,
config: config, config: config,
}) })
} }
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'),
func, users: data.getdata('users'),
getUnixTime, func,
}) 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;
if (config.atom == false) { const userID = func.get_userID(username);
res.render("partials/message", { if (config.atom == false) {
message: locale.atom_disabled, res.render("partials/message", {
config: config, message: locale.atom_disabled,
}) config: config,
} })
else { }
res.setHeader('content-type', 'application/rss+xml'); else {
res.render("syndication/atom", { res.setHeader('content-type', 'application/rss+xml');
config, res.render("syndication/user_atom", {
posts: data.getdata('posts'), config,
func, posts: data.getdata('posts'),
getUnixTime, users: data.getdata('users'),
}) func,
}; userID,
getUnixTime,
})
};
}); });
module.exports = router; module.exports = router;
src/server.js
+40 -42
View File
@@ -15,18 +15,18 @@ config = require('../config.json');
// Import the locale // Import the locale
try { try {
locale = require(`../locales/${config.locale}.json`); locale = require(`../locales/${config.locale}.json`);
} }
catch (error) { catch (error) {
console.log("This locale doesn't exist, if you want to create it then you can create a PR") console.log("This locale doesn't exist, if you want to create it then you can create a PR")
console.log("Locale selected: ", config.locale) console.log("Locale selected: ", config.locale)
} }
// Define stuff to do with express (nodejs webserver) // Define stuff to do with express (nodejs webserver)
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')
@@ -46,46 +46,44 @@ app.use('/', form_actions_routes);
function perform_checks() function perform_checks()
{ {
console.log("Performing startup checks...") console.log("Performing startup 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)
{ {
case 'mysql': case 'mysql':
case 'json': case 'json':
break break
default: default:
console.log("[ ERROR ] invalid value in `data_storage`\nPlease modify config.json. Value should be 'mysql' or 'json'.") console.log("[ ERROR ] invalid value in `data_storage`\nPlease modify config.json. Value should be 'mysql' or 'json'.")
exit_flag = true exit_flag = true
} }
// auto_generated // auto_generated
if (config.auto_generated) if (config.auto_generated)
{ {
console.log("[ ERROR ] `autogenerated` option set to true\nplease edit the config.json file to include your relevant information, then set to false or remove the autogenerated option.") console.log("[ ERROR ] `autogenerated` option set to true\nplease edit the config.json file to include your relevant information, then set to false or remove the autogenerated option.")
exit_flag = true exit_flag = true
} }
// Check required values are present // Check required values are present
required_values.forEach((value) => { // Use a loop to check each required value is present required_values.forEach((value) => { // Use a loop to check each required value is present
if (typeof config[value] == 'undefined') { if (typeof config[value] == 'undefined') {
exit_flag = true exit_flag = true
console.log(`[ ERROR ] \`${value}\` is undefined\nPlease set it to something, read the documentation for help.`) console.log(`[ ERROR ] \`${value}\` is undefined\nPlease set it to something, read the documentation for help.`)
} }
}); });
if (exit_flag) if (exit_flag)
{ {
console.log("Exiting due to errors.") console.log("Exiting due to errors.")
process.exit(1) process.exit(1)
} }
} }
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
+17 -22
View File
@@ -1,27 +1,22 @@
<!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"> <input name="userID" type="hidden" value="<%= userID %>">
<%- include("../headers/site_wide") %> <label><%= locale.password %>:</label><br/>
</header> <input type="password" required id="password" name="password"><br/><br/>
<form action="<%= config.site_path %>/submit_edit_user" method="POST">
<input name="userID" type="hidden" value="<%= userID %>">
<label><%= locale.password %>:</label><br/>
<input type="password" required id="password" name="password"><br/><br/>
<label><%= locale.prettyname %>:</label><br/> <label><%= locale.prettyname %>:</label><br/>
<input name="prettyname" value="<%= user.prettyname %>"><br/><br/> <input name="prettyname" value="<%= user.prettyname %>"><br/><br/>
<label><%= locale.description %>:</label><br/> <label><%= locale.description %>:</label><br/>
<textarea name="description"><%= user.description %></textarea><br/><br/> <textarea name="description"><%= user.description %></textarea><br/><br/>
<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
+19 -24
View File
@@ -1,32 +1,27 @@
<!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_post" method="POST" onsubmit="sha512password()">
<header id="site-header"> <input name="userID" type="hidden" value="<%= post['userID'] %>">
<%- include("../headers/site_wide") %> <input name="postID" type="hidden" value="<%= postID %>">
</header>
<form action="<%= config.site_path %>/submit_edit_post" method="POST" onsubmit="sha512password()">
<input name="userID" type="hidden" value="<%= post['userID'] %>">
<input name="postID" type="hidden" value="<%= postID %>">
<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/>
<label><%= locale.title %>:</label><br/> <label><%= locale.title %>:</label><br/>
<input value="<%=post['title'] %>" required name="title"><br/><br/> <input value="<%=post['title'] %>" required name="title"><br/><br/>
<label><%= locale.post_content %>:</label><br/> <label><%= locale.post_content %>:</label><br/>
<textarea required name="content"><%= post['content'] %></textarea><br/><br/> <textarea required name="content"><%= post['content'] %></textarea><br/><br/>
<label><%= locale.tags %>:</label><br/> <label><%= locale.tags %>:</label><br/>
<input value="<%= post['tags'] %>" name="tags"><br/><br/> <input value="<%= post['tags'] %>" name="tags"><br/><br/>
<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
+14 -20
View File
@@ -4,28 +4,22 @@
<%- 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"> <label><%= locale.username %>:</label><br/>
<%- include("../headers/site_wide") %> <input required name="username"><br/><br/>
</header>
<form action="<%= config.site_path %>/submit_post" method="POST">
<label><%= locale.username %>:</label><br/>
<input required name="username"><br/><br/>
<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/>
<label><%= locale.title %>:</label><br/> <label><%= locale.title %>:</label><br/>
<input required name="title"><br/><br/> <input required name="title"><br/><br/>
<label><%= locale.post_content %>:</label><br/> <label><%= locale.post_content %>:</label><br/>
<textarea required name="content"></textarea><br/><br/> <textarea required name="content"></textarea><br/><br/>
<label><%= locale.tags %>:</label><br/> <label><%= locale.tags %>:</label><br/>
<input name="tags"><br/><br/> <input name="tags"><br/><br/>
<input type="submit" value="Submit"><br/> <input type="submit" value="Submit"><br/>
</form> </body>
</div> </form></html>
</body>
</html>
views/forms/signup.ejs
+17 -22
View File
@@ -1,29 +1,24 @@
<!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_signup" method="POST">
<header id="site-header"> <label><%= locale.username %></label><br/>
<%- include("../headers/site_wide") %> <input required name="username"><br/><br/>
</header>
<form action="<%= config.site_path %>/submit_signup" method="POST">
<label><%= locale.username %></label><br/>
<input required name="username"><br/><br/>
<label><%= locale.prettyname %></label><br/> <label><%= locale.prettyname %></label><br/>
<input required name="prettyname"><br/><br/> <input required name="prettyname"><br/><br/>
<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/>
<label><%= locale.description %></label><br/> <label><%= locale.description %></label><br/>
<textarea id="description" name="description"></textarea><br/><br/> <textarea id="description" name="description"></textarea><br/><br/>
<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
+44 -46
View File
@@ -1,49 +1,47 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.charset %>"> <html lang="<%= config.charset %>">
<head> <head>
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<div id="main"> Misc:<br/>
Misc:<br/> <a href="/">Home Page</a><br/>
<a href="<%= config.site_path %>/">Home Page</a><br/> <a href="<%= config.new_post_url %>">New Post Form</a><br/>
<a href="<%= config.site_path %><%= config.new_post_url %>">New Post Form</a><br/> <a href="<%= config.signup_url %>">Signup Form</a><br/>
<a href="<%= config.site_path %><%= config.signup_url %>">Signup Form</a><br/> Indexes:<br/>
Indexes:<br/> <a href="/index/posts">Posts Index</a><br/>
<a href="<%= config.site_path %>/index/posts">Posts Index</a><br/> <a href="/index/users">Users Index</a><br/>
<a href="<%= config.site_path %>/index/users">Users Index</a><br/> <a href="/index/comments">Comments Index</a><br/>
<a href="<%= config.site_path %>/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="/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
<a href="<%= config.site_path %>/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="/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
<a href="<%= config.site_path %>/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="/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
<a href="<%= config.site_path %>/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.edit_post_base_url %>/<%= postID %>">Edit <%= posts[postID]["title"] %></a><br/>
<a href="<%= config.site_path %><%= 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.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/>
<a href="<%= config.site_path %><%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/> <% }; %>
<% }; %> <% }; %>
<% }; %> <!-- TODO add tags -->
<!-- TODO add tags --> </body>
</div>
</body>
</html> </html>
views/indexes/comments.ejs
+10 -12
View File
@@ -1,15 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.charset %>"> <html lang="<%= config.charset %>">
<head> <head>
<%- 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="/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
<a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/> <% }; %>
<% }; %> <% }; %>
<% }; %> </body>
</div>
</body>
</html> </html>
views/indexes/posts.ejs
+10 -12
View File
@@ -1,15 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.charset %>"> <html lang="<%= config.charset %>">
<head> <head>
<%- 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="/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
<a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/> <% }; %>
<% }; %> <% }; %>
<% }; %> </body>
</div>
</body>
</html> </html>
views/indexes/users.ejs
+10 -12
View File
@@ -1,15 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.charset %>"> <html lang="<%= config.charset %>">
<head> <head>
<%- 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="/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
<a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/> <% }; %>
<% }; %> <% }; %>
<% }; %> </body>
</div>
</body>
</html> </html>
views/pages/comment.ejs
+23 -25
View File
@@ -1,28 +1,26 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%- 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> <div id="comment">
<div id="comment"> <%- include("../partials/comment"); %>
<%- include("../partials/comment"); %> </div>
</div> <%- config.seperator %>
<%- config.seperator %> <b><%= locale.reply %>:</b>
<b><%= locale.reply %>:</b> <div id="post-commentform">
<div id="post-commentform"> <!-- Comment form -->
<!-- Comment form --> <form method="POST" action="/submit_comment">
<form method="POST" action="/submit_comment"> <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> </body>
</div>
</body>
</html> </html>
views/pages/post.ejs
+14 -16
View File
@@ -1,19 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%- 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> <div id="posts">
<div id="posts"> <%- include('../posts/post'); %>
<%- include('../posts/post'); %> </div>
</div> <footer id='footer'>
<footer id='footer'> <%- include('../partials/footer'); %>
<%- include('../partials/footer'); %> </footer>
</footer> </body>
</div>
</body>
</html> </html>
views/pages/search.ejs
+23 -25
View File
@@ -4,36 +4,34 @@
<%- 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>
<div id='advanced-search'> <div id='advanced-search'>
<form method="GET" action="/search"> <form method="GET" action="/search">
<label>Search Term:</label> <label>Search Term:</label>
<input type='text' placeholder='🔍' name='q' value='<%- search_term %>'><br/> <input type='text' placeholder='🔍' name='q' value='<%- search_term %>'><br/>
<label>Search for:</label><br/> <label>Search for:</label><br/>
<label>Post:</label> <label>Post:</label>
<input type="checkbox" name="type" value="post" <% if (search_type.includes('post')) {%>checked<% } %>><br/> <input type="checkbox" name="type" value="post" <% if (search_type.includes('post')) {%>checked<% } %>><br/>
<label>User:</label> <label>User:</label>
<input type="checkbox" name="type" value="user" <% if (search_type.includes('user')) {%>checked<% } %>><br/> <input type="checkbox" name="type" value="user" <% if (search_type.includes('user')) {%>checked<% } %>><br/>
<input type="submit" value="Submit"> <input type="submit" value="Submit">
</form> </form>
</div> </div>
<%- config.seperator %> <%- config.seperator %>
<div id='results'> <div id='results'>
<% search_results.posts.forEach((result, index) => { %> <% search_results.posts.forEach((result, index) => { %>
<a href="/post/<%- result.id %>"><%- result.title %></a><br/> <a href="/post/<%- result.id %>"><%- result.title %></a><br/>
<% }); %> <% }); %>
<% search_results.users.forEach((result, index) => { %> <% search_results.users.forEach((result, index) => { %>
<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
+19 -27
View File
@@ -1,30 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%- 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> <header id='page-header'>
<header id='page-header'> <%- include('../headers/tag'); %>
<%- include('../headers/tag'); %> </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--) { %> <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
<% if ( posts[index].deleted != true) { %> <% } %>
<% posts[index].tags.forEach((current_tag, tag_index) => { %> </div>
<% if (current_tag.toLowerCase() == tag.toLowerCase()) { %> <footer id='footer'>
<%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %> <%- include('../partials/footer'); %>
<% } %> </footer>
<% }) %> </body>
<% } %>
<% } %>
</div>
<footer id='footer'>
<%- include('../partials/footer'); %>
</footer>
</div>
</body>
</html> </html>
views/pages/timeline.ejs
+22 -23
View File
@@ -1,26 +1,25 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%- 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> <header id='page-header'>
<header id='page-header'> <%- include('../headers/timeline'); %>
<%- include('../headers/timeline'); %> </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) { %>
<% 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]}); %>
<% } %> <% } %>
<% } %> <% } %>
</div> </div>
<footer id='footer'> <footer id='footer'>
<%- include('../partials/footer'); %> <%- include('../partials/footer'); %>
</footer> </footer>
</div> </body>
</body>
</html> </html>
views/pages/user.ejs
+19 -23
View File
@@ -1,26 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<%- 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> <header id='page-header'>
<header id='page-header'> <%- include('../headers/user'); %>
<%- include('../headers/user'); %> </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--) { %> <%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
<% if (posts[index].userID == userID) { %> <% } %>
<%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %> </div>
<% } %> <footer id='footer'>
<% } %> <%- include('../partials/footer'); %>
</div> </footer>
<footer id='footer'> </body>
<%- include('../partials/footer'); %>
</footer>
</div>
</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
+12 -11
View File
@@ -6,17 +6,18 @@
<updated><%= func.unix_time_to_date_format(getUnixTime(new Date()),"yyyy-MM-dd'T'HH:mm:ss'Z'") %></updated> <updated><%= func.unix_time_to_date_format(getUnixTime(new Date()),"yyyy-MM-dd'T'HH:mm:ss'Z'") %></updated>
<id><%= config.site_url %></id> <id><%= config.site_url %></id>
<% for (let postID = posts.length-1; postID >= 0; postID--) { %> <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
<% if (posts[postID]["deleted"] != true) { %> <% if (posts[postID]["deleted"] != true) { %>
<entry> <entry>
<title><%= posts[postID]["title"] %></title> <title><%= posts[postID]["title"] %></title>
<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>
<% } %>
<% } %> <% } %>
</feed> </feed>
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;
}
} }