From 3e0efb5d500550ea2a5687f080582e200a495d25 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 12:17:24 +0400 Subject: Removed sidebar Signed-off-by: Valentin Popov --- _includes/aside.html | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 _includes/aside.html (limited to '_includes') diff --git a/_includes/aside.html b/_includes/aside.html deleted file mode 100644 index 311b826..0000000 --- a/_includes/aside.html +++ /dev/null @@ -1,41 +0,0 @@ - -- cgit v1.2.3 From 30c54ec5a3a436de0f775ac617c1d70fd4f4ff77 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 19:41:44 +0400 Subject: Updated homepage Signed-off-by: Valentin Popov --- _data/aside_links.yml | 15 --------------- _data/contacts.yml | 7 +++++++ _data/links.yml | 11 +++++++++++ _includes/contacts.html | 19 +++++++++++++++++++ _includes/links.html | 19 +++++++++++++++++++ _includes/posts.html | 18 ++++++++++++++++++ _pages/index.html | 26 +++----------------------- 7 files changed, 77 insertions(+), 38 deletions(-) delete mode 100644 _data/aside_links.yml create mode 100644 _data/contacts.yml create mode 100644 _data/links.yml create mode 100644 _includes/contacts.html create mode 100644 _includes/links.html create mode 100644 _includes/posts.html (limited to '_includes') diff --git a/_data/aside_links.yml b/_data/aside_links.yml deleted file mode 100644 index 43bcd9c..0000000 --- a/_data/aside_links.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: 'e-mail' - tag: 'info@valentineus.link' - url: 'mailto:info@valentineus.link' - -- name: 'telegram' - tag: '@valentineus' - url: 'https://t.me/valentineus' - -- name: 'github' - tag: '@valentineus' - url: 'https://github.com/valentineus' - -- name: 'pgp' - tag: 'A90A8EA3' - url: '/publickey.txt' diff --git a/_data/contacts.yml b/_data/contacts.yml new file mode 100644 index 0000000..479d0c8 --- /dev/null +++ b/_data/contacts.yml @@ -0,0 +1,7 @@ +- title: "info@valentineus.link" + description: "E-Mail" + url: "mailto:info@valentineus.link" + +- title: "@valentineus" + description: "Telegram" + url: "https://t.me/valentineus" diff --git a/_data/links.yml b/_data/links.yml new file mode 100644 index 0000000..23447af --- /dev/null +++ b/_data/links.yml @@ -0,0 +1,11 @@ +- title: "code.valentineus.link" + description: "Code repositories" + url: "https://code.valentineus.link" + +- title: "@valentineus" + description: "GitHub" + url: "https://github.com/valentineus" + +- title: "@valyaha" + description: "Twitter" + url: "https://twitter.com/valyaha" diff --git a/_includes/contacts.html b/_includes/contacts.html new file mode 100644 index 0000000..06df563 --- /dev/null +++ b/_includes/contacts.html @@ -0,0 +1,19 @@ +

Contacts

+ +
    + {% for contact in site.data.contacts %} +
  • + {% assign description = contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} + + {{ title }} + — + {{ description }} +
    • + {% endfor %} +
+ +{% assign description = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_includes/links.html b/_includes/links.html new file mode 100644 index 0000000..d301161 --- /dev/null +++ b/_includes/links.html @@ -0,0 +1,19 @@ +

Related links

+ +
    + {% for link in site.data.links %} +
  • + {% assign description = link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} + + {{ title }} + — + {{ description }} +
    • + {% endfor %} +
+ +{% assign description = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_includes/posts.html b/_includes/posts.html new file mode 100644 index 0000000..6dc0d2b --- /dev/null +++ b/_includes/posts.html @@ -0,0 +1,18 @@ +

Posts

+ +
    + {% for post in site.posts %} +
  • + {% assign date = post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = post.url | relative_url | uri_escape %} + + {{ title }} + () +
    • + {% endfor %} +
+ +{% assign date = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_pages/index.html b/_pages/index.html index 2c09cfb..71414c7 100644 --- a/_pages/index.html +++ b/_pages/index.html @@ -4,26 +4,6 @@ permalink: "index.html" title: "" --- -{% assign postsByYear = site.posts | group_by_exp: "post", "post.date | date: '%Y'" %} - -{% for year in postsByYear %} -
-

{{ year.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | slugify }}

- - -
-{% endfor %} +{% include contacts.html %} +{% include links.html %} +{% include posts.html %} -- cgit v1.2.3 From 28aec1dfdd90b7ffdd11321895ac37c0c2ab6fc6 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 20:08:52 +0400 Subject: Deleted variable declaration Signed-off-by: Valentin Popov --- _includes/contacts.html | 12 ++---------- _includes/head.html | 16 ++++++---------- _includes/links.html | 12 ++---------- _includes/posts.html | 12 ++---------- _layouts/page.html | 2 +- _layouts/post.html | 12 +++--------- 6 files changed, 16 insertions(+), 50 deletions(-) (limited to '_includes') diff --git a/_includes/contacts.html b/_includes/contacts.html index 06df563..1389c30 100644 --- a/_includes/contacts.html +++ b/_includes/contacts.html @@ -3,17 +3,9 @@
    {% for contact in site.data.contacts %}
  • - {% assign description = contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} - - {{ title }} + {{ contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} — - {{ description }} + {{ contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
    • {% endfor %}
- -{% assign description = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_includes/head.html b/_includes/head.html index 9078aad..aa6fb4f 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,6 +1,3 @@ -{% assign description = page.description | default: site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} -{% assign title = page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - @@ -11,21 +8,20 @@ {% for tag in site.data.meta_tags %} - + {% endfor %} - - + + - - - {{ title }} + + + {{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} diff --git a/_includes/links.html b/_includes/links.html index d301161..e7a2801 100644 --- a/_includes/links.html +++ b/_includes/links.html @@ -3,17 +3,9 @@
    {% for link in site.data.links %}
  • - {% assign description = link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} - - {{ title }} + {{ link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} — - {{ description }} + {{ link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
    • {% endfor %}
- -{% assign description = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_includes/posts.html b/_includes/posts.html index 6dc0d2b..fee0c31 100644 --- a/_includes/posts.html +++ b/_includes/posts.html @@ -3,16 +3,8 @@
    {% for post in site.posts %}
  • - {% assign date = post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = post.url | relative_url | uri_escape %} - - {{ title }} - () + {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + ()
    • {% endfor %}
- -{% assign date = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_layouts/page.html b/_layouts/page.html index 01d6fcd..28cdb0f 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,7 +4,7 @@ layout: default
-

{{ page.title | default: site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape }}

+

{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}

{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 9e0a766..7731828 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,25 +2,19 @@ layout: default --- -{% assign date = page.date | date: '%Y-%m-%d' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} -{% assign title = site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape %} - - -{% assign date = "" %} -{% assign title = "" %} -- cgit v1.2.3 From 11c402a2938935111fc6c82f53b720eb71e355c7 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 20:21:21 +0400 Subject: Simplified data generation code Signed-off-by: Valentin Popov --- _includes/contacts.html | 4 ++-- _includes/head.html | 12 ++++++------ _includes/links.html | 4 ++-- _includes/posts.html | 4 ++-- _layouts/default.html | 2 +- _layouts/page.html | 2 +- _layouts/post.html | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to '_includes') diff --git a/_includes/contacts.html b/_includes/contacts.html index 1389c30..6a9cef4 100644 --- a/_includes/contacts.html +++ b/_includes/contacts.html @@ -3,9 +3,9 @@ diff --git a/_includes/head.html b/_includes/head.html index aa6fb4f..e7fe582 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,20 +8,20 @@ {% for tag in site.data.meta_tags %} - + {% endfor %} - - + + - - - {{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + + + {{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }} diff --git a/_includes/links.html b/_includes/links.html index e7a2801..8d40d6d 100644 --- a/_includes/links.html +++ b/_includes/links.html @@ -3,9 +3,9 @@ diff --git a/_includes/posts.html b/_includes/posts.html index fee0c31..4638c9b 100644 --- a/_includes/posts.html +++ b/_includes/posts.html @@ -3,8 +3,8 @@ diff --git a/_layouts/default.html b/_layouts/default.html index ee363a2..cabcd0b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ layout: compress --- - + {% include head.html %} diff --git a/_layouts/page.html b/_layouts/page.html index 28cdb0f..32c9b9f 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,7 +4,7 @@ layout: default
-

{{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}

+

{{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }}

{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 7731828..edbc5b7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -5,15 +5,15 @@ layout: default
Published - + on - {{ site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + {{ site.title | strip | normalize_whitespace | xml_escape }} | Permalink
-

{{ site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}

+

{{ site.title | strip | normalize_whitespace | xml_escape }}

{{ content }} -- cgit v1.2.3