diff --git a/content b/content index 1918a51..44e5f68 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit 1918a5114fc8557ddef594e8d135a0636c66853d +Subproject commit 44e5f68fa51837b540608d5fabff2a1d5acf50ca diff --git a/src/routes/sitemap.js b/src/routes/sitemap.js index bd2c356..e82624c 100644 --- a/src/routes/sitemap.js +++ b/src/routes/sitemap.js @@ -7,7 +7,7 @@ const getBaseContext = require("../utils/baseContext"); const sitemapService = require("../services/sitemapService"); const { qualifyLink } = require("../utils/qualifyLinks.js"); -const { baseUrl } = require("../utils/baseUrl"); +// const { baseUrl } = require("../utils/baseUrl"); // Precompile XML template once const xmlTplSrc = fs.readFileSync( @@ -33,7 +33,8 @@ res.render("pages/sitemap", context); }); -const getBaseUrl = require("../utils/baseUrl"); +// const getBaseUrl = require("../utils/baseUrl"); + // XML sitemap endpoint router.get("/sitemap.xml", async (req, res) => { const urls = await sitemapService.getAllUrls(); @@ -47,7 +48,7 @@ priority: url.priority, })); - const xml = xmlTpl({ urls: formattedUrls, baseUrl }); + const xml = xmlTpl({ urls: formattedUrls }); res.type("application/xml").send(xml); }); diff --git a/src/utils/baseContext.js b/src/utils/baseContext.js index e57f45a..06c45b9 100644 --- a/src/utils/baseContext.js +++ b/src/utils/baseContext.js @@ -3,6 +3,7 @@ const getPostsMenu = require("../services/postsMenuService"); const { formatMonth } = require("./formatMonth"); const { qualifyNavLinks } = require("./qualifyLinks.js"); +const { baseUrl } = require("./baseUrl.js"); const navLinks = require(path.join(__dirname, "../../content/navLinks.json")); async function getBaseContext(overrides = {}) { @@ -18,6 +19,7 @@ navLinks: qualifiedNavLinks, years: menu, formatMonth, + baseUrl }, overrides ); diff --git a/src/views/layouts/logs.handlebars b/src/views/layouts/logs.handlebars index 42aef0f..e0b5520 100644 --- a/src/views/layouts/logs.handlebars +++ b/src/views/layouts/logs.handlebars @@ -5,7 +5,7 @@ Logs Viewer - + diff --git a/src/views/layouts/main.handlebars b/src/views/layouts/main.handlebars index 9e03539..a7c27f3 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -4,9 +4,10 @@ - - - {{{_sections.styles}}} {{title}} diff --git a/src/views/pages/about.handlebars b/src/views/pages/about.handlebars index af53a48..bacc213 100644 --- a/src/views/pages/about.handlebars +++ b/src/views/pages/about.handlebars @@ -5,5 +5,5 @@ {{#section "scripts"}} - + {{/section}} diff --git a/src/views/pages/blog_index.handlebars b/src/views/pages/blog_index.handlebars index 21d429b..8eb8b78 100644 --- a/src/views/pages/blog_index.handlebars +++ b/src/views/pages/blog_index.handlebars @@ -1,5 +1,5 @@ {{#section "styles"}} - + {{/section}}

Blog Posts

diff --git a/src/views/pages/construction.handlebars b/src/views/pages/construction.handlebars index 59d4db7..5bd37d7 100644 --- a/src/views/pages/construction.handlebars +++ b/src/views/pages/construction.handlebars @@ -1,5 +1,5 @@ {{#section "styles"}} - + {{/section}}

{{title}}

diff --git a/src/views/pages/contact.handlebars b/src/views/pages/contact.handlebars index 69f3bbd..9583fa1 100644 --- a/src/views/pages/contact.handlebars +++ b/src/views/pages/contact.handlebars @@ -1,13 +1,13 @@ {{#section "styles"}} - + {{/section}} {{#section "scripts"}} - + {{/section}}

{{title}}

-
+ {{!-- Honeypot fiel for bot detection --}} diff --git a/src/views/pages/logs.handlebars b/src/views/pages/logs.handlebars index 01734cb..d54a0ba 100644 --- a/src/views/pages/logs.handlebars +++ b/src/views/pages/logs.handlebars @@ -34,4 +34,4 @@ - + diff --git a/src/views/pages/newsletter.handlebars b/src/views/pages/newsletter.handlebars index 59470c0..3df07b8 100644 --- a/src/views/pages/newsletter.handlebars +++ b/src/views/pages/newsletter.handlebars @@ -1,12 +1,12 @@ {{#section "styles"}} - + {{/section}} {{#section "scripts"}} {{/section}}

{{title}}

- +
diff --git a/src/views/pages/page.handlebars b/src/views/pages/page.handlebars index 807b311..db87044 100644 --- a/src/views/pages/page.handlebars +++ b/src/views/pages/page.handlebars @@ -1,9 +1,9 @@ {{#section "styles"}} - + {{/section}}
{{{content}}}
{{#section "scripts"}} - + {{/section}} diff --git a/src/views/pages/post.handlebars b/src/views/pages/post.handlebars index 0b36552..40615e8 100644 --- a/src/views/pages/post.handlebars +++ b/src/views/pages/post.handlebars @@ -1,11 +1,11 @@ {{#section "styles"}} - + {{/section}}
{{{content}}}
{{#section "scripts"}} - - - + + + {{/section}} diff --git a/src/views/pages/sitemap.handlebars b/src/views/pages/sitemap.handlebars index dad897e..38dee42 100644 --- a/src/views/pages/sitemap.handlebars +++ b/src/views/pages/sitemap.handlebars @@ -1,6 +1,6 @@ {{!-- views/pages/sitemap.handlebars --}} {{#section "styles"}} - + {{/section}}