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

Compare commits

base: deadvey/blogger-nodejs:5a14b125d28189ec678eb274ff08571953996f74
Branches Tags
deadvey/blogger-nodejs:master deadvey/blogger-nodejs:dev
..
compare: deadvey/blogger-nodejs:master
Branches Tags
deadvey/blogger-nodejs:master deadvey/blogger-nodejs:dev

5 Commits
5a14b125d2 .. master

Author SHA1 Message Date
deadvey 0cfb3f6e60 fixed a syntax error smh 2026-06-02 00:25:12 +01:00
deadvey 46e7394a6f fixed incorrect title in the html <head> <title> 2026-06-02 00:18:29 +01:00
deadvey 736edee1b0 fixed some incorrect routes 2026-06-02 00:17:04 +01:00
deadvey 63ca617895 syntax highlighting 2026-06-01 15:20:30 +01:00
deadvey 9aff454ec2 added site header in forms routes 2026-06-01 14:07:19 +01:00
16 changed files with 131 additions and 170 deletions
Expand all files Collapse all files
package.json
+2
View File
@@ -9,7 +9,9 @@
"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/functions.js
+16
View File
@@ -127,6 +127,8 @@ 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,
@@ -135,7 +137,21 @@ 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)
}; };
src/routes/form_actions.js
+1 -1
View File
@@ -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, `/post/${id}`); res.redirect(302, `${config.sitr_path}/post/${id}`);
} }
else { else {
res.render("partials/message", { res.render("partials/message", {
src/routes/forms.js
+11 -4
View File
@@ -5,12 +5,15 @@ const func = require('../functions')
const router = express.Router(); const router = express.Router();
///////////////////// Form pages //////////////////////////// ///////////////////// Form pages ////////////////////////////
// new post
router.get(`${config.site_path}/${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
// signup
router.get(`${config.site_path}/${config.signup_url}`, (req,res) => { 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) {
@@ -29,24 +32,28 @@ 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,"/") res.redirect(301,config.site_path)
console.log("Error, invalid value for allow_signup (bool)") console.log("Error, invalid value for allow_signup (bool)")
} }
}); // /signup }); // /signup
// edit account
router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => { router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => {
const userID = parseInt(req.params.user_id); 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), user: data.getdata('users', 'id', userID)[0],
userID userID
}); });
}); // /delete_account }); // /delete_account
// edit post
router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => { router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => {
const postID = req.params.post_id const postID = req.params.post_id
const post = data.getdata('posts','id', postID) const post = data.getdata('posts','id', postID)[0]
const user = data.getdata('users', 'id', post.userID) const user = data.getdata('users', 'id', post.userID)[0]
res.render("forms/edit_post", res.render("forms/edit_post",
{ {
config, config,
src/routes/standard_pages.js
+2 -2
View File
@@ -89,7 +89,7 @@ router.get(`${config.site_path}/post/:post_index`, (req, res) => {
} }
else { else {
console.log("Error loading page") console.log("Error loading page")
res.redirect(301,"/") res.redirect(301,config.site_path)
} }
}); // /post/:post_index }); // /post/:post_index
@@ -118,7 +118,7 @@ router.get(`${config.site_path}/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)["comments"] let posts_comments = data.getdata('comments', 'id', postID)[0]["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/server.js
+4 -1
View File
@@ -50,6 +50,9 @@ 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)
@@ -83,6 +86,6 @@ 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} webroot: ${config.root_path}`); console.log(`Server is running at http://localhost:${config.port}${config.site_path} webroot: ${config.root_path}`);
console.log("Running in: ", __dirname) console.log("Running in: ", __dirname)
}) })
views/forms/edit_account.ejs
+22 -17
View File
@@ -1,22 +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>
<form action="<%= config.site_path %>/submit_edit_user" method="POST"> <div id="main">
<input name="userID" type="hidden" value="<%= userID %>"> <header id="site-header">
<label><%= locale.password %>:</label><br/> <%- include("../headers/site_wide") %>
<input type="password" required id="password" name="password"><br/><br/> </header>
<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>
</body> </div>
</body>
</html> </html>
views/forms/edit_post.ejs
+24 -19
View File
@@ -1,27 +1,32 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.language %>"> <html lang="<%= config.language %>">
<head> <head>
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<form action="<%= config.site_path %>/submit_edit_post" method="POST" onsubmit="sha512password()"> <div id="main">
<input name="userID" type="hidden" value="<%= post['userID'] %>"> <header id="site-header">
<input name="postID" type="hidden" value="<%= postID %>"> <%- 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="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>
</body> </div>
</body>
</html> </html>
views/forms/new_post.ejs
+20 -14
View File
@@ -4,22 +4,28 @@
<%- include('../partials/head.ejs') %> <%- include('../partials/head.ejs') %>
</head> </head>
<body> <body>
<form action="<%= config.site_path %>/submit_post" method="POST"> <div id="main">
<label><%= locale.username %>:</label><br/> <header id="site-header">
<input required name="username"><br/><br/> <%- include("../headers/site_wide") %>
</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/>
</body> </form>
</form></html> </div>
</body>
</html>
views/forms/signup.ejs
+22 -17
View File
@@ -1,24 +1,29 @@
<!DOCTYPE html> <!DOCTYPE html>
</html lang="<%= config.language %>"> </html lang="<%= config.language %>">
<head> <head>
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<form action="<%= config.site_path %>/submit_signup" method="POST"> <div id="main">
<label><%= locale.username %></label><br/> <header id="site-header">
<input required name="username"><br/><br/> <%- include("../headers/site_wide") %>
</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>
</body> </div>
</body>
</html> </html>
views/partials/head.ejs
+1 -1
View File
@@ -1,6 +1,6 @@
<meta charset="<%- config.charset %>"> <meta charset="<%- config.charset %>">
<meta name='robots' content='noindex'> <meta name='robots' content='noindex'>
<title><%= config.site_path %></title> <title><%= config.site_name %></title>
<style> <style>
views/syndication/global_atom.ejs
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="<%= config.charset %>" ?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title><%= config.site_name %></title>
<link><%= config.site_url %></title>
<description><%= config.site_description %></description>
<updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
<id><%= config.site_url %></id>
<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
<% if (posts[postID]["deleted"] != true) { %>
<entry>
<title><%= posts[postID]["title"] %></title>
<link><%= config.site_url %>/post/<%= postID %></link>
<summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
<% } %>
</entry>
<% } %>
<% } %>
</feed>
views/syndication/global_rss.ejs
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="<%= config.charset %>" ?>
<rss version="2.0">
<channel>
<title><%= config.site_name %></title>
<link><%= config.site_url %></title>
<description><%= config.site_description %></description>
<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
<% if (posts[postID]["deleted"] != true) { %>
<item>
<title><%= posts[postID]["title"] %></title>
<link><%= config.site_url %>/post/<%= postID %></link>
<description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
<% } %>
</item>
<% } %>
<% } %>
</channel>
</rss>
views/syndication/user_atom.ejs
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="<%= config.charset %>" ?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title><%= config.site_name %></title>
<link><%= config.site_url %></title>
<description><%= config.site_description %></description>
<updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
<id><%= config.site_url %></id>
<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
<% if (posts[postID]["userID"] == userID) { %>
<% if (posts[postID]["deleted"] != true) { %>
<entry>
<title><%= posts[postID]["title"] %></title>
<link><%= config.site_url %>/post/<%= postID %></link>
<summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
<% } %>
</entry>
<% } %>
<% } %>
<% } %>
</feed>
views/syndication/user_rss.ejs
-24
View File
@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="<%= config.charset %>" ?>
<rss version="2.0">
<channel>
<title><%= config.site_name %></title>
<link><%= config.site_url %></title>
<description><%= config.site_description %></description>
<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
<% if (posts[postID]["userID"] == userID) { %>
<% if (posts[postID]["deleted"] != true) { %>
<item>
<title><%= posts[postID]["title"] %></title>
<link><%= config.site_url %>/post/<%= postID %></link>
<description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
<pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
<% } %>
</item>
<% } %>
<% } %>
<% } %>
</channel>
</rss>
webroot/default.css
+6 -2
View File
@@ -30,7 +30,6 @@ 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;
@@ -56,7 +55,9 @@ 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) {
@@ -70,4 +71,7 @@ a:hover {
.comment:nth-child(even) { .comment:nth-child(even) {
background: #EEEEEE; background: #EEEEEE;
} }
.named-fence-filename {
border: 1px black solid;
}
} }