Switch from Ruby+Middleman to Hugo (#28)

zofrex · Sep 26, 2024 · 4cefcc9 · 4cefcc9
1 parent 8d22083
commit 4cefcc9
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 458 deletions.
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,3 @@
-.bundle
-.cache
-.DS_Store
-.sass-cache
-build/
+/public/
+/resources/_gen/
+/.hugo_build.lock
diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -26,17 +26,10 @@ Please note it is not a pre-requisite for contributing incidents to this repo to
 
 ### Requirements
 
-* Ruby
-* Bundler
-
-Install the dependencies with:
-
-```
-bundle install
-```
+* [Hugo](https://gohugo.io)
 
 ### Running
 
 ```
-bundle exec middleman serve
+hugo serve
 ```
diff --git a/source/stylesheets/styles.css.scss → assets/styles.scss b/source/stylesheets/styles.css.scss → assets/styles.scss
diff --git a/config.rb b/config.rb
diff --git a/hugo.toml b/hugo.toml
@@ -0,0 +1 @@
+disableKinds = ["taxonomy", "rss", "sitemap"]
diff --git a/source/layouts/layout.liquid → layouts/_default/baseof.html b/source/layouts/layout.liquid → layouts/_default/baseof.html
@@ -11,22 +11,21 @@
       gtag('config', 'UA-12922701-4');
     </script>
     <meta charset="utf-8">
-    <title>{% if current_page.data.title %}{{ current_page.data.title | escape }} || {% endif %}How Many Days Has It Been Since a JWT alg:none Vulnerability?</title>
-    {% stylesheet_link_tag styles %}
+    <title>How Many Days Has It Been Since a JWT alg:none Vulnerability?</title>
+    {{- $style := resources.Get "styles.scss" | css.Sass }}
+    <link rel="stylesheet" href="{{ $style.RelPermalink }}">
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:creator" content="@zofrex" />
-    <meta property="og:title" content="{% if current_page.data.title %}{{ current_page.data.title | escape }} || {% endif %} How Many Days Has It Been Since a JWT alg=none Vulnerability?" />
-    {% if_content_for description %}
-    <meta property="og:description" content="{% yield_content description escape %}" />
-    {% end_if_content_for %}
+    <meta property="og:title" content="How Many Days Has It Been Since a JWT alg:none Vulnerability?" />
+    <meta property="og:description" content="{{ block "description" . }}{{ end }}" />
   </head>
   <body>
     <header>
-      <div class="top"><div class="inner">The more important statistic is that it has been {{ data.misc.russian_invasion_of_ukraine | since }} since Russia invaded Ukraine.</div></div>
+      <div class="top"><div class="inner">The more important statistic is that it has been {{ partial "since.html" .Site.Data.misc.russian_invasion_of_ukraine }} since Russia invaded Ukraine.</div></div>
       <div class="bottom"><div class="inner">Ukraine needs our help and support. If you can, please <a href="https://www.forbes.com/sites/gabbyshacknai/2022/02/24/10-ways-to-help-the-people-of-ukraine-right-now/">donate</a>.</div></div>
     </header>
     <main>
-      {{ yield }}
+      {{ block "main" . }}{{ end }}
     </main>
     <footer>
       <p class="attribution">made by <a href="https://www.zofrex.com">zofrex</a></p>

diff --git a/layouts/_default/home.html b/layouts/_default/home.html
@@ -0,0 +1,13 @@
+{{- define "description" -}}
+{{- $latest := partial "latest.html" . -}}
+It has been {{ partial "since.html" $latest.date }} since the last alg:none JWT vulnerability.
+{{- end -}}
+
+{{ define "main" }}
+{{ $latest := partial "latest.html" . }}
+
+    <h1>It has been <span class="since">{{ partial "since.html" $latest.date }}</span> since the last alg:none JWT vulnerability.</h1>
+
+    <p>{{ $latest.description | safe.HTML }}</p>
+
+{{ end }}
diff --git a/layouts/partials/latest.html b/layouts/partials/latest.html
@@ -0,0 +1,3 @@
+{{ $sorted := sort .Site.Data.vulns "date" "desc" }}
+{{ $latest := index $sorted 0 }}
+{{ return $latest }}
diff --git a/layouts/partials/since.html b/layouts/partials/since.html
@@ -0,0 +1,8 @@
+{{- $date := . | time -}}
+{{- $duration := now.Sub $date -}}
+{{- $days := div $duration.Hours 24 | math.Floor -}}
+{{- if eq $days 1.0 -}}
+  1 day
+{{- else -}}
+  {{ $days }} days
+{{- end -}}