From 5e05f250f4682df1b253652d211db3e7e748ba57 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 10:06:12 +0200 Subject: [PATCH 01/10] Update style.css --- sample_data/home/style.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sample_data/home/style.css b/sample_data/home/style.css index fb4ca4e..cbd8361 100644 --- a/sample_data/home/style.css +++ b/sample_data/home/style.css @@ -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; -} \ No newline at end of file +} From 1341aa5a56b90816166b025043c877ec11346679 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 11:46:06 +0200 Subject: [PATCH 02/10] Update config.default.json --- src/config.default.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.default.json b/src/config.default.json index 687ef07..c13b358 100644 --- a/src/config.default.json +++ b/src/config.default.json @@ -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" } -} \ No newline at end of file +} From 7a4a4f9006b555b67954d4f61e0609d553cda1b8 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 15:07:32 +0200 Subject: [PATCH 03/10] Update footer.ejs --- sample_data/home/footer.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample_data/home/footer.ejs b/sample_data/home/footer.ejs index 1008e4e..4695f3c 100644 --- a/sample_data/home/footer.ejs +++ b/sample_data/home/footer.ejs @@ -1,6 +1,6 @@
- RSS feed - @<%= new Date().getFullYear() %> - Made with RSS feed - <%= new Date().getFullYear() %> - Made with GitBlog.md (v<%= info.version %>) -
\ No newline at end of file + From aebc3da5bce40134f1036228257790088395b866 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 16:43:03 +0200 Subject: [PATCH 04/10] Update template.ejs --- sample_data/home/template.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample_data/home/template.ejs b/sample_data/home/template.ejs index 5855270..35602f1 100644 --- a/sample_data/home/template.ejs +++ b/sample_data/home/template.ejs @@ -11,7 +11,7 @@ <%- `` %> <%- `` %> <% if (article.thumbnail) { %> - <%- `` %> + <%- `` %> <%- `` %> <% } %> @@ -33,4 +33,4 @@ <%- include('footer'); %> - \ No newline at end of file + From b6ac0a73b406fd5783015d98f2ca03926d51c4cb Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:21:26 +0200 Subject: [PATCH 05/10] Update style.css --- sample_data/home/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sample_data/home/style.css b/sample_data/home/style.css index cbd8361..e0b0dcc 100644 --- a/sample_data/home/style.css +++ b/sample_data/home/style.css @@ -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; - padding: 2ch; + max-width: 42rem; + padding: 2rem; margin: auto; background-color: #F0F0F0; min-height: 100vh; From bd42883330781dc1e8e8f097e6bb9ceda29ec27c Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:21:44 +0200 Subject: [PATCH 06/10] Update template.ejs --- sample_data/home/template.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sample_data/home/template.ejs b/sample_data/home/template.ejs index 35602f1..adac905 100644 --- a/sample_data/home/template.ejs +++ b/sample_data/home/template.ejs @@ -11,8 +11,8 @@ <%- `` %> <%- `` %> <% if (article.thumbnail) { %> - <%- `` %> - <%- `` %> + <%- `` %> + <%- `` %> <% } %> From 528e4be1fefc1515d84fb5f7ad1e882c19c9c785 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:34:40 +0200 Subject: [PATCH 07/10] Updated templates --- .gitignore | 1 + sample_data/home/error.ejs | 12 +----------- sample_data/home/head.ejs | 25 +++++++++++++++++++++++++ sample_data/home/index.ejs | 12 +----------- sample_data/home/template.ejs | 17 +---------------- 5 files changed, 29 insertions(+), 38 deletions(-) create mode 100644 sample_data/home/head.ejs diff --git a/.gitignore b/.gitignore index 9295227..32b7f43 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /config.json /config.example.json /data +/data/* /test_data /access.log /error.log diff --git a/sample_data/home/error.ejs b/sample_data/home/error.ejs index c6c5597..2fdfeea 100644 --- a/sample_data/home/error.ejs +++ b/sample_data/home/error.ejs @@ -3,17 +3,7 @@ <%= info.title %> - Error <%= error %> - - - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - - - - + <%- include('head'); %>
diff --git a/sample_data/home/head.ejs b/sample_data/home/head.ejs new file mode 100644 index 0000000..0829bed --- /dev/null +++ b/sample_data/home/head.ejs @@ -0,0 +1,25 @@ + +<% if(locals.article){ %> + <%- `` %> + <%- `` %> + <%- `` %> + <%- `` %> + <%- `` %> + <% if (article.thumbnail) { %> + <%- `` %> + <%- `` %> + <% } %> + +<% } else { %> + <%- `` %> + <%- `` %> + <%- `` %> + <%- `` %> + <%- `` %> +<% } %> + + + + + + \ No newline at end of file diff --git a/sample_data/home/index.ejs b/sample_data/home/index.ejs index e91b227..7f975b6 100644 --- a/sample_data/home/index.ejs +++ b/sample_data/home/index.ejs @@ -3,17 +3,7 @@ <%= info.title %> - Home - - - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - - - - + <%- include('head'); %>
diff --git a/sample_data/home/template.ejs b/sample_data/home/template.ejs index adac905..6e54334 100644 --- a/sample_data/home/template.ejs +++ b/sample_data/home/template.ejs @@ -3,22 +3,7 @@ <%= info.title %> - <%= article.title %> - - - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - <%- `` %> - <% if (article.thumbnail) { %> - <%- `` %> - <%- `` %> - <% } %> - - - - - + <%- include('head'); %>
From ae4e2eb8d5e48eded072aa4faa0be6306b9475d7 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:43:41 +0200 Subject: [PATCH 08/10] Fixing Firefox RSS handling --- src/app.js | 2 +- test/app.test.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index e0bb3cb..36cfd71 100644 --- a/src/app.js +++ b/src/app.js @@ -160,7 +160,7 @@ module.exports = (config) => { }); lastRSS = feed.xml(); } - res.type('rss').send(lastRSS); + res.type(req.headers['user-agent'].match(/Mozilla/) ? 'xml' : 'rss').send(lastRSS); } else { showError(req.path, 404, res); } diff --git a/test/app.test.js b/test/app.test.js index 9db6f98..2cb744d 100644 --- a/test/app.test.js +++ b/test/app.test.js @@ -175,6 +175,7 @@ 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('').length).toBe(1); done(); From 8fc7ff1ca76728a28d8d673fbcd7515aaf787212 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:44:31 +0200 Subject: [PATCH 09/10] Updated version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e65711..b4cf32e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gitblog.md", - "version": "1.1.5", + "version": "1.2.0", "description": "A static blog using Markdown pulled from your git repository.", "main": "src/server.js", "dependencies": { From 0fde4288064da6b0939dd7610de339ae017ee6dd Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 26 Jun 2019 18:56:01 +0200 Subject: [PATCH 10/10] Updated coverage --- src/app.js | 2 +- test/app.test.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 36cfd71..b47aa2b 100644 --- a/src/app.js +++ b/src/app.js @@ -160,7 +160,7 @@ module.exports = (config) => { }); lastRSS = feed.xml(); } - res.type(req.headers['user-agent'].match(/Mozilla/) ? 'xml' : 'rss').send(lastRSS); + res.type(req.headers['user-agent'].match(/Mozilla/) ? 'text/xml' : 'rss').send(lastRSS); } else { showError(req.path, 404, res); } diff --git a/test/app.test.js b/test/app.test.js index 2cb744d..1f3e453 100644 --- a/test/app.test.js +++ b/test/app.test.js @@ -181,6 +181,13 @@ describe('Test RSS feed', () => { 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) => {