Merge pull request #11 from Klemek/dev

v1.2.0
Updated coverage
2019-06-26 19:00:30 +02:00 · 2019-06-26 18:56:01 +02:00 · 2019-06-26 18:44:31 +02:00 · 2019-06-26 18:43:41 +02:00 · 2019-06-26 18:34:40 +02:00 · 2019-06-26 18:21:44 +02:00
12 changed files with 63 additions and 53 deletions
@@ -3,6 +3,7 @@
 /config.json
 /config.example.json
 /data
 /data/*
 /test_data
 /access.log
 /error.log
@@ -132,7 +132,10 @@ You need to [create a new repository](https://github.com/new) on your favorite G
 ```bash
 #gitblog.md/
 cd data
 git init
 git remote add origin <url_of_your_repo.git>
 git add .
 git commit -m "initial commit"
 git push -u origin master
 ```
@@ -157,7 +160,7 @@ Here are the steps for Github, if you use another platform adapt it your way (he
 ```json
 "webhook": {
    "endpoint": "/webhook",
-    "secret": "sha1=<value>",
+    "secret": "<value>",
    "signature_header": "X-Hub-Signature"
  },
 ```
@@ -1,6 +1,6 @@
 {
  "name": "gitblog.md",
-  "version": "1.1.4",
+  "version": "1.2.0",
  "description": "A static blog using Markdown pulled from your git repository.",
  "main": "src/server.js",
  "dependencies": {
@@ -3,17 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <title><%= info.title %> - Error <%= error %></title>
-
+    <%- include('head'); %>
    <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">
 </head>
 <body>
 <main>
@@ -1,6 +1,6 @@
 <hr>
 <footer>
-    <small><a href="/rss">RSS feed</a> - @<%= new Date().getFullYear() %> - Made with <a
+    <small><a href="/rss">RSS feed</a> - <%= new Date().getFullYear() %> - Made with <a
                href="https://github.com/klemek/gitblog.md">GitBlog.md</a> (v<%= info.version %>)
    </small>
-</footer>
+</footer>
@@ -0,0 +1,25 @@
 <meta name="twitter:card" content="summary_large_image">
 <% if(locals.article){ %>
    <%- `<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="og:image" content="${info.host}/${article.thumbnail}">` %>
        <%- `<meta property="twitter:image" content="${info.host}/${article.thumbnail}">` %>
    <% } %>
    <link rel="stylesheet" type="text/css" href="/prism.css">
 <% } else { %>
    <%- `<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}/">` %>
 <% } %>
 <link rel="alternate" type="application/rss+xml" title="RSS feed" href="/rss"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
 <link rel="stylesheet" type="text/css" href="/style.css">
@@ -3,17 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <title><%= info.title %> - Home</title>
-
+    <%- include('head'); %>
    <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">
 </head>
 <body>
 <main>
@@ -8,7 +8,7 @@ body, html {
 }
 body {
-    font: 14px/1.45 -apple-system, BlinkMacSystemFont, Segoe UI, sans-serif;
+    font: 15px sans-serif;
    color: #111;
    -webkit-text-size-adjust: none;
    background-color: #F5F5F5;
@@ -16,8 +16,8 @@ body {
 }
 main {
-    max-width: 75ch;
+    max-width: 42rem;
-    padding: 2ch;
+    padding: 2rem;
    margin: auto;
    background-color: #F0F0F0;
    min-height: 100vh;
@@ -58,7 +58,7 @@ blockquote {
    border-left: 0.5em solid #ccc;
    padding-left: 1em;
    margin: 0.25em 0;
-    color: #333;
+    color: #555;
 }
 blockquote > p {
@@ -108,7 +108,7 @@ main.article div.header a.link-home {
    line-height: 2.4;
 }
-main.article div.header h1, main.article div.header h2, div.article h3 {
+main.article div.header h1, main.article div.header h2 {
    margin-top: 0.85em;
    margin-bottom: 0.25em;
    font-size: 2em;
@@ -123,11 +123,19 @@ main.article div.header span.time, div.article span.time {
 }
 div.article {
-    margin-left: 1em;
+    margin: 0 1em 1em 1em;
 }
 div.article h3 {
    font-size: 1.3em;
    margin:0;
 }
 div.article img{
    max-width: 100%;
    height: auto;
    margin-right:1em;
    margin-top:0.25em;
 }
 #text {
@@ -142,4 +150,4 @@ div.article h3 {
 #text img {
    max-width: 100%;
    height: auto;
-}
+}
@@ -3,22 +3,7 @@
 <head>
    <meta charset="UTF-8">
    <title><%= info.title %> - <%= article.title %></title>
-
+    <%- include('head'); %>
    <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="/style.css">
 </head>
 <body>
 <main class="article">
@@ -33,4 +18,4 @@
    <%- include('footer'); %>
 </main>
 </body>
-</html>
+</html>
@@ -160,7 +160,7 @@ module.exports = (config) => {
          });
        lastRSS = feed.xml();
      }
-      res.type('rss').send(lastRSS);
+      res.type(req.headers['user-agent'].match(/Mozilla/) ? 'text/xml' : 'rss').send(lastRSS);
    } else {
      showError(req.path, 404, res);
    }
@@ -37,7 +37,7 @@
    "endpoint": "/webhook",
    "secret": "",
    "signature_header": "",
-    "pull_command": "git pull"
+    "pull_command": "git pull origin master"
  },
  "showdown": {
    "parseImgDimensions": true,
@@ -54,4 +54,4 @@
  "plantuml": {
    "output_format": "svg"
  }
-}
+}
@@ -175,11 +175,19 @@ describe('Test RSS feed', () => {
  test('200 empty rss', (done) => {
    request(app).get('/rsstest').then((response) => {
      expect(response.statusCode).toBe(200);
      expect(response.type).toBe('application/rss+xml');
      expect(response.text.length).toBeGreaterThan(0);
      expect(response.text.split('<item>').length).toBe(1);
      done();
    });
  });
  test('200 Mozilla fix', (done) => {
    request(app).get('/rsstest').set('user-agent', 'Mozilla Firefox 64.0').then((response) => {
      expect(response.statusCode).toBe(200);
      expect(response.type).toBe('text/xml');
      done();
    });
  });
  test('200 rss cache', (done) => {
    request(app).get('/rsstest').then(() => {
      request(app).get('/rsstest').then((response) => {
Author	SHA1	Message	Date
Klemek	ea95a285c9	Merge pull request #11 from Klemek/dev v1.2.0	2019-06-26 19:00:30 +02:00
Klemek	0fde428806	Updated coverage	2019-06-26 18:56:01 +02:00
Klemek	8fc7ff1ca7	Updated version	2019-06-26 18:44:31 +02:00
Klemek	ae4e2eb8d5	Fixing Firefox RSS handling	2019-06-26 18:43:41 +02:00
Klemek	528e4be1fe	Updated templates	2019-06-26 18:34:40 +02:00
Klemek	bd42883330	Update template.ejs	2019-06-26 18:21:44 +02:00
Klemek	b6ac0a73b4	Update style.css	2019-06-26 18:21:26 +02:00
Klemek	aebc3da5bc	Update template.ejs	2019-06-26 16:43:03 +02:00
Klemek	7a4a4f9006	Update footer.ejs	2019-06-26 15:07:32 +02:00
Klemek	1341aa5a56	Update config.default.json	2019-06-26 11:46:06 +02:00
Klemek	5e05f250f4	Update style.css	2019-06-26 10:06:12 +02:00
Klemek	6cf7be3afb	Update README.md	2019-06-23 15:37:23 +02:00
Klemek	6aceacad18	Update README.md	2019-06-23 15:34:46 +02:00
Klemek	a3a23be1c2	Update README.md	2019-06-23 15:34:34 +02:00
Klemek	e8e8024021	Merge pull request #10 from Klemek/dev v1.1.5	2019-06-23 15:15:45 +02:00
Klemek	1806d60ca7	Fixed meta tags being wrong	2019-06-23 15:14:47 +02:00