Add tags and migrate to pagination v2

Author: shomykohai

Gemfile

@@ -17,6 +17,7 @@ gem 'jekyll-dash', '~> 2'
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.12"
   gem 'jekyll-tagging'
+  gem 'jekyll-paginate-v2', '~> 3.0'
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -11,14 +11,10 @@ GEM
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     ffi (1.17.0-x64-mingw-ucrt)
-    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
     google-protobuf (4.27.1-x64-mingw-ucrt)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.27.1-x86_64-linux)
-      bigdecimal
-      rake (>= 13)
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -46,6 +42,8 @@ GEM
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
+    jekyll-paginate-v2 (3.0.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-sass-converter (3.0.0)
       sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
@@ -73,12 +71,10 @@ GEM
       ffi (~> 1.0)
     rexml (3.3.0)
       strscan
-    rouge (4.2.1)
+    rouge (4.3.0)
     safe_yaml (1.0.5)
     sass-embedded (1.77.5-x64-mingw-ucrt)
       google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.5-x86_64-linux-gnu)
-      google-protobuf (>= 3.25, < 5.0)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -91,12 +87,12 @@ GEM
 
 PLATFORMS
   x64-mingw-ucrt
-  x86_64-linux
 
 DEPENDENCIES
   http_parser.rb (~> 0.6.0)
   jekyll-dash (~> 2)
   jekyll-feed (~> 0.12)
+  jekyll-paginate-v2 (~> 3.0)
   jekyll-tagging
   tzinfo (>= 1, < 3)
   tzinfo-data

_config.yml

@@ -1,61 +1,57 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely edit after that. If you find
-# yourself editing this file very often, consider using Jekyll's data files
-# feature for the data you need to update frequently.
-#
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
-#
-# If you need help with YAML syntax, here are some quick references for you:
-# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
-# https://learnxinyminutes.com/docs/yaml/
-#
-# Site settings
-# These are used to personalize your new site. If you look in the HTML files,
-# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
-# You can create any custom variable you would like, and they will be accessible
-# in the templates via {{ site.myvariable }}.
-
 title: shomy
 description:
   Musician, gamer and developer.
   Currently making my dream game 🎮.
-baseurl: "" # the subpath of your site, e.g. /blog
-url: "shomykohai.github.io" # the base hostname & protocol for your site, e.g. http://example.com
+baseurl: ""
+url: "shomykohai.github.io"
 twitter_username: shomykohai
 github_username:  shomykohai
 
+theme: jekyll-dash
+plugins:
+  - jekyll-feed
+  - jekyll/tagging
+  - jekyll-paginate-v2
 
-routes: [
-  blog
-]
+defaults:
+  -
+    scope:
+      path: ""
+      type: "posts"
+    values:
+      permalink: "/blog/article/:title"
 
-projects: [
-  https://github.com/shomykohai/quest-system,
-  https://github.com/shomykohai/askitsu,
-  https://github.com/shomykohai/kitsu-bot
-]
+# For compatibility with dash's pagination.html
+paginate_path: /page/:num/
+
+pagination:
+  enabled: true
+  debug: true
+  collection: 'posts'
+  per_page: 5
+  permalink: 'page/:num/'
+  title: ':title - page'
+  sort_field: 'date'
+  sort_reverse: true
 
-paginate: 5
-paginate_path: "/blog/page:num"
 
 tag_permalink_style: pretty
 tag_page_layout: tag_page
 tag_page_dir: tag
 
-# Build settings
-theme: jekyll-dash
-plugins:
-  - jekyll-feed
-  - jekyll-paginate
+routes: [
+  blog
+]
 
+projects: [
+  https://github.com/shomykohai/kitsu-bot
+  https://github.com/shomykohai/quest-system,
+  https://github.com/shomykohai/askitsu,
+]
 
 dash:
   date_format: "%b %-d, %Y"
 
-
   social_links:
     - url: https://github.com/shomykohai
       icon: github
@@ -67,22 +63,3 @@ dash:
   show_author: true
   github-username: shomykohai
   avatar_source: github
-# Exclude from processing.
-# The following items will not be processed, by default.
-# Any item listed under the `exclude:` key here will be automatically added to
-# the internal "default list".
-#
-# Excluded items can be processed by explicitly listing the directories or
-# their entries' file path in the `include:` list.
-#
-# exclude:
-#   - .sass-cache/
-#   - .jekyll-cache/
-#   - gemfiles/
-#   - Gemfile
-#   - Gemfile.lock
-#   - node_modules/
-#   - vendor/bundle/
-#   - vendor/cache/
-#   - vendor/gems/
-#   - vendor/ruby/

_includes/pagination.html

@@ -0,0 +1,26 @@
+<!-- pagination -->
+{% if paginator.total_pages > 1 %}
+<div class="pagination">
+  {% if paginator.previous_page %}
+    <a href="{{ paginator.previous_page_path | prepend: site.baseurl | replace: '//', '/' }}"><i class="fas fa-chevron-left"></i></a>
+  {% else %}
+    <span><i class="fas fa-chevron-left"></i></span>
+  {% endif %}
+
+  {% for page in (1..paginator.total_pages) %}
+    {% if page == paginator.page %}
+      <span class="webjeda">{{ page }}</span>
+    {% elsif page == 1 %}
+      <a href="{{site.url | append: paginator.first_page_path}}">{{ page }}</a>
+    {% else %}
+      <a href="{{site.url | append: paginator.first_page_path }}{{ site.pagination.permalink | replace: '//', '/' | replace: ':num', page }}">{{ page }}</a>
+    {% endif %}
+  {% endfor %}
+
+  {% if paginator.next_page %}
+    <a href="{{ paginator.next_page_path | prepend: site.baseurl | replace: '//', '/' }}"><i class="fas fa-chevron-right"></i></a>
+  {% else %}
+    <span><i class="fas fa-chevron-right"></i></span>
+  {% endif %}
+</div>
+{% endif %}

_layouts/blog.html

@@ -2,10 +2,10 @@
 layout: page
 ---
 <h1>Articles</h1>
-{% assign posts_count = site.posts | size %}
+{% assign posts_count = paginator.total_posts %}
 {% if posts_count > 0 %}   
     <div class="post-links">
-      {% for post in site.posts %}
+      {% for post in paginator.posts %}
         <div class="post-link-wrapper">
           <a href="{{ post.url | relative_url }}" class="post-link">{{ post.title }}</a>
           <div class="post-meta">
@@ -31,7 +31,8 @@ <h1>Articles</h1>
     </div>
 
     {% include pagination.html %}
-
+    <h1>All tags</h1>
+    {% include tags.html %}
 
 {% else %}
 This place is empty... It's awful out here, Socrates.

_layouts/home.html

@@ -5,7 +5,7 @@
   {% include author.html %}
 {% endunless %}
 {{ content }}
-{% assign posts_count = paginator.posts | size %}
+{% assign posts_count = paginator.total_posts %}
 <h1>Projects</h1>
 <div class="projects">
   {% for project in site.projects %}
@@ -49,8 +49,6 @@ <h1>Recent articles</h1>
       {% endfor %}
     </div>
 
-    {% include pagination.html %}
-    {% include tags.html %}
 {% else %}
 It seems like there's nothing in here yet... mmh.
 {% endif %}

_layouts/post.html

@@ -0,0 +1,49 @@
+---
+layout: default
+categories: blog
+---
+{% unless site.dash.show_author == false %}
+  {% include author.html %}
+{% endunless %}
+<div class="post">
+    <h1 class="post-title">{{ page.title }}</h1>
+    <div class="post-date">
+      <i class="fa fa-clock"></i>
+      <!-- xf017 -->
+      Published on {{ page.date | date_to_string }}
+      {% if page.author != null %}
+      by {{ page.author }}
+      {% endif %}
+    </div>
+    {% if page.description != null %}
+    <noscript>
+        <div class="post-description">{{ page.description }}</div>
+    </noscript>
+    <div id="animated-post-description" class="post-description" style="display: none;"></div>
+    {% endif %}
+    {{ content }}
+    <div class="post-tags">
+        {% for tag in page.tags %}
+        <a class="tag" href="{{ tag | tag_url }}">{{ tag }}</a>
+        {% endfor %}
+    </div>
+</div>
+  
+{% assign size = site.related_posts | size %}
+{% if size != 0 %}
+<div class="related">
+<h2>related articles</h2>
+<ul class="related-posts">
+    {% for post in site.related_posts limit:3 %}
+    <li>
+        <h3>
+        <a href="{{ post.url }}">
+            {{ post.title }}
+        </a>
+        </h3>
+    </li>
+    {% endfor %}
+</ul>
+</div>
+{% endif %}
+

_layouts/tag_page.html

@@ -0,0 +1,37 @@
+---
+layout: default
+---
+{% unless site.dash.show_author == false %}
+  {% include author.html %}
+{% endunless %}
+<h1 class="post-title">Articles tagged with: <b class="tag-name">{{ page.tag }}</b></h1>
+  <div class="post-links">
+  {% for post in site.posts %}
+  {% for tag in post.tags %}
+  {% if tag == page.tag %}
+
+
+      <div class="post-link-wrapper">
+        <a href="{{ post.url | relative_url }}" class="post-link">{{ post.title }}</a>
+        <div class="post-meta">
+
+          <div class="post-tags">
+              {% for tag in post.tags %}
+              <a class="tag" href="{{ tag | tag_url }}">{{ tag }}</a>
+              {% endfor %}
+          </div>
+          {% if site.dash.date_format %}
+            {{ post.date | date: site.dash.date_format }}
+          {% else %}
+            {{ post.date | date: "%b %-d, %Y" }}
+          {% endif %}
+        </div>
+
+        </div>
+  {% endif %}
+  {% endfor %}
+  {% endfor %}
+
+  </div>
+<h1>All tags</h1>
+{% include tags.html %}