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

fixed issues with site urls not being a site root (hopefully)

Browse Source
This commit is contained in:
deadvey
2026-05-30 18:34:18 +01:00
parent 4955ebe7bd
commit dd317883be
17 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
views/forms/edit_account.ejs
+2 -2
View File
@@ -1,10 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= config.language %> <html lang="<%= config.language %">
<head> <head>
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<form action="/submit_edit_user" method="POST"> <form action="<%= config.site_url %>/submit_edit_user" method="POST">
<input name="userID" type="hidden" value="<%= userID %>"> <input name="userID" type="hidden" value="<%= userID %>">
<label><%= locale.password %>:</label><br/> <label><%= locale.password %>:</label><br/>
<input type="password" required id="password" name="password"><br/><br/> <input type="password" required id="password" name="password"><br/><br/>
views/forms/edit_post.ejs
+1 -1
View File
@@ -4,7 +4,7 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<form action="/submit_edit_post" method="POST" onsubmit="sha512password()"> <form action="<%= config.site_url %>/submit_edit_post" method="POST" onsubmit="sha512password()">
<input name="userID" type="hidden" value="<%= post['userID'] %>"> <input name="userID" type="hidden" value="<%= post['userID'] %>">
<input name="postID" type="hidden" value="<%= postID %>"> <input name="postID" type="hidden" value="<%= postID %>">
views/forms/new_post.ejs
+1 -1
View File
@@ -4,7 +4,7 @@
<%- include('../partials/head.ejs') %> <%- include('../partials/head.ejs') %>
</head> </head>
<body> <body>
<form action="/submit_post" method="POST"> <form action="<%= config.site_url %>/submit_post" method="POST">
<label><%= locale.username %>:</label><br/> <label><%= locale.username %>:</label><br/>
<input required name="username"><br/><br/> <input required name="username"><br/><br/>
views/forms/signup.ejs
+1 -1
View File
@@ -4,7 +4,7 @@
<%- include("../partials/head") %> <%- include("../partials/head") %>
</head> </head>
<body> <body>
<form action="/submit_signup" method="POST"> <form action="<%= config.site_url %>/submit_signup" method="POST">
<label><%= locale.username %></label><br/> <label><%= locale.username %></label><br/>
<input required name="username"><br/><br/> <input required name="username"><br/><br/>
views/headers/site_wide.ejs
+9 -9
View File
@@ -1,28 +1,28 @@
<a id='home-page-link' href="/"><%= locale.home_page %></a> <a id='home-page-link' href="<%= config.site_url %>"><%= locale.home_page %></a>
/ /
<% if (config.rss == true) { %> <% if (config.rss == true) { %>
<a id='rss-link' href="/rss"> <a id='rss-link' href="<%= config.site_url %>/rss">
<img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'> <img class='icon' src='<%= config.site_url %>/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="/atom"> <a id='atom-link' href="<%= config.site_url %>/atom">
<img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'> <img class='icon' src='<%= config.site_url %>/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
</a> </a>
<% } %> <% } %>
/ /
<a id='new-post-link' href="<%= config.new_post_url %>"><%= locale.new_post %></a> <a id='new-post-link' href="<%= config.site_url %><%= config.new_post_url %>"><%= locale.new_post %></a>
/ /
<% if (config.allow_signup == true) { %> <% if (config.allow_signup == true) { %>
<a id='signup-link' href="<%= config.signup_url %>"><%= locale.sign_up %></a> <a id='signup-link' href="<%= config.site_url %><%= config.signup_url %>"><%= locale.sign_up %></a>
<% } %> <% } %>
/ /
<form id='search-form' method="GET" action="/search" style="display: inline"> <form id='search-form' method="GET" action="<%= config.site_url %>/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_name %></a></h1> <h1><a id='home-page-link' href="<%= config.site_url %>"><%= 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.edit_account_base_url %>/<%= userID %>"> <a if='edit-account-link' href="<%= config.site_url %><%= config.edit_account_base_url %>/<%= userID %>">
<img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'> <img class='icon' src='<%= config.site_url %>/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'>
</a> </a>
| |
<a id='rss-link' href="/user/<%= user.username %>/rss"> <a id='rss-link' href="<%= config.site_url %>/user/<%= user.username %>/rss">
<img class='icon' src='/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'> <img class='icon' src='<%= config.site_url %>/icons/rss.png' alt="<%= locale.rss_feed %>" title='<%= locale.rss_feed %>'>
</a> </a>
<a id='atom-link' href="/user/<%= user.username %>/atom"> <a id='atom-link' href="<%= config.site_url %>/user/<%= user.username %>/atom">
<img class='icon' src='/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'> <img class='icon' src='<%= config.site_url %>/icons/atom.png' alt='<%= locale.atom_feed %>' title='<%= locale.atom_feed %>'>
</a> </a>
<%- config.seperator %> <%- config.seperator %>
views/indexes/all_pages.ejs
+11 -11
View File
@@ -5,41 +5,41 @@
</head> </head>
<body> <body>
Misc:<br/> Misc:<br/>
<a href="/">Home Page</a><br/> <a href="<%= config.site_url %>/">Home Page</a><br/>
<a href="<%= config.new_post_url %>">New Post Form</a><br/> <a href="<%= config.site_url %><%= config.new_post_url %>">New Post Form</a><br/>
<a href="<%= config.signup_url %>">Signup Form</a><br/> <a href="<%= config.site_url %><%= config.signup_url %>">Signup Form</a><br/>
Indexes:<br/> Indexes:<br/>
<a href="/index/posts">Posts Index</a><br/> <a href="<%= config.site_url %>/index/posts">Posts Index</a><br/>
<a href="/index/users">Users Index</a><br/> <a href="<%= config.site_url %>/index/users">Users Index</a><br/>
<a href="/index/comments">Comments Index</a><br/> <a href="<%= config.site_url %>/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_url %>/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_url %>/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_url %>/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_url %><%= 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_url %><%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
<!-- TODO add tags --> <!-- TODO add tags -->
views/indexes/comments.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<body> <body>
<% 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_url %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</body> </body>
views/indexes/posts.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<body> <body>
<% 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_url %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</body> </body>
views/indexes/users.ejs
+1 -1
View File
@@ -6,7 +6,7 @@
<body> <body>
<% 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_url %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
<% }; %> <% }; %>
<% }; %> <% }; %>
</body> </body>
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='/comment/<%= postID %>-<%= comment.id %>'>No. <%= postID %>-<%= comment.id %></a>:<br/> <a href='<%= config.site_url %>/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="/index/pages"><%= locale.site_index %></a><br/> <a id='site-index-link' href="<%= config.site_url %>/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 -2
View File
@@ -5,5 +5,5 @@
</style> </style>
<link rel="stylesheet" href="/default.css"> <link rel="stylesheet" href="<%= config.site_url %>/default.css">
<link rel="stylesheet" href="/custom.css"> <link rel="stylesheet" href="<%= config.site_url %>/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='/post/<%= post['id'] %>'><%= post.title %></a> <a href='<%= config.site_url %>/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="/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><%= locale.written_by %> <a href="<%= config.site_url %>/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.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.site_url %><%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='<%= config.site_url %>/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="/submit_comment"> <form method="POST" action="<%= config.site_url %>/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='/post/<%= post['id'] %>'><%= post.title %></a> <a href='<%= config.site_url %>/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="/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="<%= config.site_url %>/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='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='<%= config.site_url %>/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='/post/<%= post['id'] %>'><%= post.title %></a> <a href='<%= config.site_url %>/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="/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="<%= config.site_url %>/user/<%= user.username %>"><%= user.prettyname %></a></i>
</span> </span>
- -
<a if='edit-account-link' href="<%= config.edit_account_base_url %>/<%= user.id %>"> <a if='edit-account-link' href="<%= config.site_url %><%= config.edit_account_base_url %>/<%= user.id %>">
<img class='icon' src='/icons/edit.png' alt='<%= locale.edit_account %>' title='<%= locale.edit_account %>'> <img class='icon' src='<%= config.site_url %>/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.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.site_url %><%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='<%= config.site_url %>/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='/post/<%= post['id'] %>'><%= post.title %></a> <a href='<%= config.site_url %>/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="/user/<%= user.username %>"><%= user.prettyname %></a></i> <i><a href="<%= config.site_url %>/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.edit_post_base_url %>/<%= post["id"] %>"> <a href="<%= config.site_url %><%= config.edit_post_base_url %>/<%= post["id"] %>">
<img class='icon' src='/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'> <img class='icon' src='<%= config.site_url %>/icons/edit.png' alt='<%= locale.edit_post %>' title='<%= locale.edit_post %>'>
</a><br/> </a><br/>
</div> </div>
</div> </div>