Merge pull request #9 from Klemek/dev

v1.1.4
This commit is contained in:
Klemek
2019-06-23 15:09:27 +02:00
committed by GitHub
7 changed files with 60 additions and 6 deletions
+6
View File
@@ -232,6 +232,12 @@ Any URL like `/year/month/day/anything/` will redirect to this article (and link
* `plantuml` (default: true) * `plantuml` (default: true)
activate PlantUML diagram rendering activate PlantUML diagram rendering
* `home` * `home`
* `title` (default: GitBlog.md)
the title of your blog, **strongly advised to be changed**
given to the template to complete page title and metadata
* `description` (default: A static blog using Markdown pulled from your git repository)
the description of your blog, **strongly advised to be changed**
given to the template to complete page title and metadata
* `index` (default: index.ejs) * `index` (default: index.ejs)
the name of the home page template on the data directory the name of the home page template on the data directory
it will receive `articles`, a list of articles for rendering it will receive `articles`, a list of articles for rendering
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "gitblog.md", "name": "gitblog.md",
"version": "1.1.3", "version": "1.1.4",
"description": "A static blog using Markdown pulled from your git repository.", "description": "A static blog using Markdown pulled from your git repository.",
"main": "src/server.js", "main": "src/server.js",
"dependencies": { "dependencies": {
+11 -1
View File
@@ -2,7 +2,17 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Error <%= error %></title> <title><%= info.title %> - Error <%= error %></title>
<meta name="twitter:card" content="summary_large_image">
<%= `<meta property="og:title" content="${info.title} - Home">` %>
<%= `<meta property="twitter:title" content="${info.title} - Home">` %>
<%= `<meta property="og:description" content="${info.description}">` %>
<%= `<meta property="twitter:description" content="${info.description}">` %>
<%= `<meta property="org:url" content="${info.host}/">` %>
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<link rel="stylesheet" type="text/css" href="/style.css"> <link rel="stylesheet" type="text/css" href="/style.css">
</head> </head>
<body> <body>
+13 -3
View File
@@ -2,13 +2,23 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>GitBlog.md - Home</title> <title><%= info.title %> - Home</title>
<meta name="twitter:card" content="summary_large_image">
<%= `<meta property="og:title" content="${info.title} - Home">` %>
<%= `<meta property="twitter:title" content="${info.title} - Home">` %>
<%= `<meta property="og:description" content="${info.description}">` %>
<%= `<meta property="twitter:description" content="${info.description}">` %>
<%= `<meta property="org:url" content="${info.host}/">` %>
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<link rel="stylesheet" type="text/css" href="style.css"> <link rel="stylesheet" type="text/css" href="style.css">
</head> </head>
<body> <body>
<main> <main>
<h1>GitBlog.md</h1> <h1><%= info.title %></h1>
A static blog using Markdown pulled from your git repository <%= info.description %>
<h2>Articles in this blog :</h2> <h2>Articles in this blog :</h2>
<% articles.forEach((article) => { %> <% articles.forEach((article) => { %>
<div class="article"> <div class="article">
+15 -1
View File
@@ -2,7 +2,21 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>GitBlog.md - <%= article.title %></title> <title><%= info.title %> - <%= article.title %></title>
<meta name="twitter:card" content="summary_large_image">
<%= `<meta property="og:title" content="${info.title} - ${article.title}">` %>
<%= `<meta property="twitter:title" content="${info.title} - ${article.title}">` %>
<%= `<meta property="og:description" content="${info.description}">` %>
<%= `<meta property="twitter:description" content="${info.description}">` %>
<%= `<meta property="org:url" content="${info.host + article.url}">` %>
<% if (article.thumbnail) { %>
<%= `<meta property="org:image" content="${info.host + article.thumbnail}">` %>
<%= `<meta property="twitter:image" content="${info.host + article.thumbnail}">` %>
<% } %>
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<link rel="stylesheet" type="text/css" href="/prism.css"> <link rel="stylesheet" type="text/css" href="/prism.css">
<link rel="stylesheet" type="text/css" href="/style.css"> <link rel="stylesheet" type="text/css" href="/style.css">
</head> </head>
+12
View File
@@ -36,6 +36,7 @@ module.exports = (config) => {
const articles = {}; const articles = {};
let lastRSS = ''; let lastRSS = '';
let host;
/** /**
* Fetch articles from the data folder and send success as a response * Fetch articles from the data folder and send success as a response
@@ -73,6 +74,9 @@ module.exports = (config) => {
*/ */
const render = (res, vPath, data, code = 200) => { const render = (res, vPath, data, code = 200) => {
data.info = { data.info = {
title: config['home']['title'],
description: config['home']['description'],
host: host,
version: pjson.version version: pjson.version
}; };
res.render(vPath, data, (err, html) => { res.render(vPath, data, (err, html) => {
@@ -100,6 +104,14 @@ module.exports = (config) => {
}); });
}; };
app.use((req, res, next) => {
if (!host) {
host = 'http://' + req.headers.host;
console.log(cons.ok, 'Currently hosted on ' + host);
}
next();
});
//log request at result end //log request at result end
app.use((req, res, next) => { app.use((req, res, next) => {
if (config['access_log']) { if (config['access_log']) {
+2
View File
@@ -12,6 +12,8 @@
"plantuml": true "plantuml": true
}, },
"home": { "home": {
"title": "GitBlog.md",
"description": "A static blog using Markdown pulled from your git repository",
"index": "index.ejs", "index": "index.ejs",
"error": "error.ejs", "error": "error.ejs",
"hidden": [ "hidden": [