.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Build and deploy
-        uses: shalzz/zola-deploy-action@v0.15.2
+        uses: shalzz/zola-deploy-action@v0.12.0
         env:
           PAGES_BRANCH: master
           BUILD_DIR: .

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2022 James Dyson
+Copyright (c) 2018-2021 James Dyson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

config.toml

@@ -2,12 +2,11 @@ title = "1bit.pw"
 base_url = "https://1bit.pw"
 description = "Home of avitex"
 
-minify_html = true
 compile_sass = true
-generate_feed = true
 build_search_index = true
+generate_rss = true
 
-taxonomies = [{ name = "blog/tags", feed = true }]
+taxonomies = [{ name = "blog/tags", rss = true }]
 
 [markdown]
 highlight_code = true

content/projects/_index.md

@@ -10,8 +10,8 @@ PRs are always welcome, see my [about page](@/about/_index.md) to contact me.
 
 ## Rust
 
-{{ projects(for_lang="rust") }}
+{{ projects(lang="rust") }}
 
 ## Elixir
 
-{{ projects(for_lang="elixir") }}
+{{ projects(lang="elixir") }}

static/search.js

@@ -39,13 +39,13 @@ function makeTeaser(body, terms) {
   });
   var termFound = false;
   var index = 0;
-  var weighted = []; // contains elements of ["word", weight, index_in_document]
+  var weighted = []; // contains elements of ['word', weight, index_in_document]
 
   // split in sentences, then words
-  var sentences = body.toLowerCase().split(". ");
+  var sentences = body.toLowerCase().split('. ');
 
   for (var i in sentences) {
-    var words = sentences[i].split(" ");
+    var words = sentences[i].split(' ');
     var value = FIRST_WORD_WEIGHT;
 
     for (var j in words) {
@@ -113,79 +113,76 @@ function makeTeaser(body, terms) {
 
     // add <em/> around search terms
     if (word[1] === TERM_WEIGHT) {
-      teaser.push("<b>");
+      teaser.push('<b>');
     }
     startIndex = word[2] + word[0].length;
     teaser.push(body.substring(word[2], startIndex));
 
     if (word[1] === TERM_WEIGHT) {
-      teaser.push("</b>");
+      teaser.push('</b>');
     }
   }
-  teaser.push("…");
-  return teaser.join("");
+  teaser.push('…');
+  return teaser.join('');
 }
 
 function formatSearchResultItem(item, terms) {
-  return '<div class="search-results__item">'
-  + `<a href="${item.ref}">${item.doc.title}</a>`
-  + `<div>${makeTeaser(item.doc.body, terms)}</div>`
-  + '</div>';
+  return '<div class="result">'
+    + `<a href="${item.ref}">${item.doc.title}</a>`
+    + `<div class="summary">${makeTeaser(item.doc.body, terms)}</div>`
+    + '</div>';
 }
 
 function initSearch() {
-  var $searchInput = document.getElementById("search");
-  var $searchResults = document.querySelector(".search-results");
-  var $searchResultsItems = document.querySelector(".search-results__items");
+  var $searchComponent = document.getElementById('search');
+  if ($searchComponent === null) {
+    return;
+  }
+  var $searchInput = $searchComponent.querySelector('input');
+  var $searchResults = $searchComponent.querySelector('.results-container');
+  var $searchResultsItems = $searchComponent.querySelector('.results');
   var MAX_ITEMS = 10;
 
   var options = {
-    bool: "AND",
+    bool: 'AND',
     fields: {
-      title: {boost: 2},
-      body: {boost: 1},
+      title: { boost: 2 },
+      body: { boost: 1 },
     }
   };
-  var currentTerm = "";
+  var currentTerm = '';
   var index = elasticlunr.Index.load(window.searchIndex);
 
-  $searchInput.addEventListener("keyup", debounce(function() {
+  $searchInput.addEventListener("keyup", debounce(function () {
     var term = $searchInput.value.trim();
     if (term === currentTerm || !index) {
       return;
     }
-    $searchResults.style.display = term === "" ? "none" : "block";
-    $searchResultsItems.innerHTML = "";
-    if (term === "") {
+    $searchResults.style.display = term === '' ? 'none' : 'block';
+    $searchResultsItems.innerHTML = '';
+    if (term === '') {
       return;
     }
 
     var results = index.search(term, options);
     if (results.length === 0) {
-      $searchResults.style.display = "none";
+      $searchResults.style.display = 'none';
       return;
     }
 
     currentTerm = term;
     for (var i = 0; i < Math.min(results.length, MAX_ITEMS); i++) {
-      var item = document.createElement("li");
-      item.innerHTML = formatSearchResultItem(results[i], term.split(" "));
+      var item = document.createElement('li');
+      item.innerHTML = formatSearchResultItem(results[i], term.split(' '));
       $searchResultsItems.appendChild(item);
     }
   }, 150));
-
-  window.addEventListener('click', function(e) {
-    if ($searchResults.style.display == "block" && !$searchResults.contains(e.target)) {
-      $searchResults.style.display = "none";
-    }
-  });
 }
 
-
-if (document.readyState === "complete" ||
-    (document.readyState !== "loading" && !document.documentElement.doScroll)
+if (document.readyState === 'complete' ||
+  (document.readyState !== 'loading' && !document.documentElement.doScroll)
 ) {
   initSearch();
 } else {
-  document.addEventListener("DOMContentLoaded", initSearch);
+  document.addEventListener('DOMContentLoaded', initSearch);
 }

templates/blog/tags/single.html

@@ -2,7 +2,7 @@
 {% import "post_macros.html" as post_macros %}
 {% block title %}Tag {{ term.name }} - {{ config.title }}{% endblock %}
 {% block content %}
-	<h1>Tag: <code>{{ term.name }}</code> <small>(<a href="{{ get_taxonomy_url(kind="blog/tags", name=term.name) }}atom.xml">RSS</a>)</small></h1>
+	<h1>Tag: <code>{{ term.name }}</code> <small>(<a href="{{ get_taxonomy_url(kind="blog/tags", name=term.name) }}rss.xml">RSS</a>)</small></h1>
 	{% for page in term.pages %}
 		{{ post_macros::page_in_list(page=page) }}
 	{% endfor %}

templates/root.html

@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="{{ get_url(path="site.css", cachebust=true) | safe }}" />
     <link rel="stylesheet" href="{{ get_url(path="fonts.min.css") | safe }}" />
     <link rel="icon" type="image/png" href="{{ get_url(path="favicon.png") | safe }}" />
-    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ get_url(path="atom.xml") | safe }}" />
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ get_url(path="rss.xml") | safe }}" />
     <title>{% block title %}{{ config.title }}{% endblock title %}</title>
 </head>
 <body>

templates/shortcodes/projects.html

@@ -14,7 +14,7 @@
     </thead>
     <tbody>
         {% for project_name, project in data.project %}
-            {% if project.lang == for_lang %}
+            {% if project.lang == lang %}
             <tr>
                 <td><code>{{ project_name }}</code></td>
                 <td><a href="https://github.com/{{ project.github }}">github</a></td>