diff --git a/data/data.json b/data/data.json index 99f8070..1098b3b 100644 --- a/data/data.json +++ b/data/data.json @@ -1 +1 @@ -{"hitcount":27} \ No newline at end of file +{"hitcount":37} \ No newline at end of file diff --git a/src/routes/forms.js b/src/routes/forms.js index 3bdc4f4..6d03969 100644 --- a/src/routes/forms.js +++ b/src/routes/forms.js @@ -38,19 +38,19 @@ router.get(`${config.edit_account_base_url}/:user_id`, (req,res) => { res.render("forms/edit_account", { config, locale, - user: users[userID], + user: data.getdata('users', userID), userID }); }); // /delete_account router.get(`${config.edit_post_base_url}/:post_id`, (req,res) => { - const post_id = req.params.post_id - const post = posts[post_id] - const user = users[post['userID']] + const postID = req.params.post_id + const post = data.getdata('posts', postID) + const user = data.getdata('users', post.userID) res.render("forms/edit_post", { config, locale, post, - post_id, + postID, user, }); }); // /edit/:post_id diff --git a/src/routes/indexes.js b/src/routes/indexes.js index 64894c9..fba0931 100644 --- a/src/routes/indexes.js +++ b/src/routes/indexes.js @@ -9,9 +9,9 @@ const router = express.Router(); router.get("/index/pages", (req,res) => { res.render("indexes/all_pages", { config, - posts, - users, - comments: comments.comments, + posts: data.getdata('posts'), + users: data.getdata('users'), + comments: data.getdata('comments'), }); }); // /index/posts router.get("/index/posts", (req,res) => { diff --git a/src/routes/standard_pages.js b/src/routes/standard_pages.js index fb66446..16b9da0 100644 --- a/src/routes/standard_pages.js +++ b/src/routes/standard_pages.js @@ -7,6 +7,8 @@ const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date util const router = express.Router(); ///////////////////// Standard Pages ////////////////////// + +// Timeline router.get("/", (req,res) => { // Increment the hitcount if (config.enable_hitcount) { @@ -27,6 +29,8 @@ router.get("/", (req,res) => { func, }) }); // / + +// Users router.get("/user/:username", (req, res) => { const userID = func.get_userID(req.params.username) let user = data.getdata('users', userID) @@ -53,6 +57,8 @@ router.get("/user/:username", (req, res) => { }) } }); // /user/:username + +// Posts router.get("/post/:post_index", (req, res) => { const postID = req.params.post_index let post = data.getdata('posts', postID) @@ -85,6 +91,7 @@ router.get("/post/:post_index", (req, res) => { }); // /post/:post_index +// Tags router.get("/tag/:tag", (req,res) => { const tag = req.params.tag res.render("pages/tag", @@ -101,6 +108,9 @@ router.get("/tag/:tag", (req,res) => { func, }) }); // /tag/:tag + + +// Comments router.get("/comment/:postID-:commentID", (req,res) => { const commentID = req.params.commentID; const postID = req.params.postID; diff --git a/src/routes/syndication.js b/src/routes/syndication.js index 603532e..9e8bb80 100644 --- a/src/routes/syndication.js +++ b/src/routes/syndication.js @@ -3,6 +3,8 @@ const config = require('../../config') const data = require('../data') const func = require('../functions') +const { fromUnixTime, format, getUnixTime } = require("date-fns") // A date utility library + const router = express.Router(); ////////////////////// SYNDICATION //////////////////////// diff --git a/views/forms/edit_post.ejs b/views/forms/edit_post.ejs index bfed15a..5db1c1f 100644 --- a/views/forms/edit_post.ejs +++ b/views/forms/edit_post.ejs @@ -6,7 +6,7 @@
- +


diff --git a/views/headers/user.ejs b/views/headers/user.ejs index e1541fe..e27f9b0 100644 --- a/views/headers/user.ejs +++ b/views/headers/user.ejs @@ -1,7 +1,7 @@

<%= user.prettyname %>

-

<%# func.render_md(user.description) %>

+

<%- func.render_md(user.description) %>

<%= locale.edit_account %>
<%= locale.rss_feed %>
<%= locale.atom_feed %> diff --git a/views/indexes/all_pages.ejs b/views/indexes/all_pages.ejs index b1e51ed..1f645ea 100644 --- a/views/indexes/all_pages.ejs +++ b/views/indexes/all_pages.ejs @@ -21,7 +21,7 @@ Comments:
<% for (let postID = 0; postID < comments.length; postID++) { %> <% for (let comment_index = 0; comment_index < comments[postID].length; comment_index++) { %> - "><%= comments[postID][comment_index]["id"] %>
+ <%= postID %>-<%= comment_index %>
<% }; %> <% }; %> Users:
@@ -33,13 +33,13 @@ Edit Posts:
<% for (let postID = 0; postID < posts.length; postID++) { %> <% if (posts[postID]["deleted"] != true) { %> - Edit <%= posts[postID]["title"] %>
+ Edit <%= posts[postID]["title"] %>
<% }; %> <% }; %> Edit Users:
<% for (let userID = 0; userID < users.length; userID++) { %> <% if (users[userID]["deleted"] != true) { %> - ">Edit <%= users[userID]["username"] %>
+ ">Edit <%= users[userID]["username"] %>
<% }; %> <% }; %> diff --git a/views/indexes/comments.ejs b/views/indexes/comments.ejs index 15846e4..39192ea 100644 --- a/views/indexes/comments.ejs +++ b/views/indexes/comments.ejs @@ -6,7 +6,7 @@ <% for (let postID = 0; postID < comments.length; postID++) { %> <% for (let comment_index = 0; comment_index < comments[postID].length; comment_index++) { %> - "><%= comments[postID][comment_index]["id"] %>
+ <%= postID %>-<%= comment_index %>
<% }; %> <% }; %> diff --git a/views/pages/tag.ejs b/views/pages/tag.ejs index 38d81c7..bd007e6 100644 --- a/views/pages/tag.ejs +++ b/views/pages/tag.ejs @@ -13,7 +13,7 @@ <% if ( posts[index].deleted != true) { %> <% posts[index].tags.forEach((current_tag, tag_index) => { %> <% if (current_tag == tag) { %> - <%- include('../posts/tag', {post: posts[index], user: users[posts[index].userID], comments: comments[index]}); %> + <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %> <% } %> <% }) %> <% } %>