feat: migrated to jekyll-based site (#32)

* feat: started working on jekyll integration

* fix: fixed a bunch of jekyll stuff, moved out of temporary jekyll/ folder

* ci: fix Makefile & CI for new jekyll-based site

* build(deps): ran `bundle lock --add-platform x86_64-linux`

* fix: added uncommited html files, fixed css link

* fix: added & setup jekyll-seo-tag, fixed title, removed minima theme dependency

Author: ErikBjare

.github/workflows/pages.yml

@@ -11,12 +11,11 @@ on:
 
 jobs:
   build-and-deploy:
-    name: Build and deploy (py-${{ matrix.python_version }}, ruby-${{ matrix.ruby_version }})
+    name: Build and deploy (ruby-${{ matrix.ruby_version }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['2.7']
-        python_version: ['3.9']
+        ruby_version: ['3.2']
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
@@ -27,23 +26,18 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby_version }}
           bundler-cache: true
-      - name: Setup Python
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python_version }}
       - name: Install dependencies
         run: |
           make install
           sudo npm install --global pug pug-cli
       - name: Build
         run: |
           make build
-          touch build-superuser/.nojekyll
       - name: Deploy 🚀
         uses: JamesIves/[email protected]
         if: github.ref == 'refs/heads/master'
         with:
           branch: gh-pages # The branch the action should deploy to.
-          folder: build-superuser # The folder the action should deploy.
+          folder: _site # The folder the action should deploy.
           git-config-name: GitHub Actions
           git-config-email: [email protected]

.gitignore

@@ -5,7 +5,13 @@ node_modules
 .*cache
 
 # built files
-*.html
 *.css
 *.css.map
 build*
+
+# jekyll
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor

404.html

@@ -0,0 +1,25 @@
+---
+permalink: /404.html
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .container {
+    margin: 10px auto;
+    max-width: 600px;
+    text-align: center;
+  }
+  h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container">
+  <h1>404</h1>
+
+  <p><strong>Page not found :(</strong></p>
+  <p>The requested page could not be found.</p>
+</div>

Gemfile

@@ -0,0 +1,39 @@
+source "https://rubygems.org"
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem "jekyll", "~> 4.3.2"
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.12"
+  gem 'jekyll-last-modified-at'
+  gem "jekyll-redirect-from", "~> 0.16.0"
+  gem 'jekyll-pug'
+  gem 'jekyll-sitemap'
+  gem 'jekyll-compose'
+  gem 'jekyll-toc'
+  gem 'jekyll-seo-tag'
+end
+
+# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
+# and associated library.
+platforms :mingw, :x64_mingw, :mswin, :jruby do
+  gem "tzinfo", ">= 1", "< 3"
+  gem "tzinfo-data"
+end
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
+
+# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem
+# do not have a Java counterpart.
+gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]

Gemfile.lock

@@ -0,0 +1,120 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.2.2)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    execjs (2.9.1)
+    ffi (1.16.3)
+    forwardable-extended (2.6.0)
+    google-protobuf (3.25.0-arm64-darwin)
+    google-protobuf (3.25.0-x86_64-linux)
+    http_parser.rb (0.8.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.3.2)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (>= 0.3.6, < 0.5)
+      pathutil (~> 0.9)
+      rouge (>= 3.0, < 5.0)
+      safe_yaml (~> 1.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-compose (0.12.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-last-modified-at (1.3.0)
+      jekyll (>= 3.7, < 5.0)
+      posix-spawn (~> 0.3.9)
+    jekyll-pug (1.6.1)
+      jekyll (>= 3.6, < 5.0)
+      pug-ruby (~> 2.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-toc (0.18.0)
+      jekyll (>= 3.9)
+      nokogiri (~> 1.12)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.4)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    memoist (0.16.2)
+    mercenary (0.4.0)
+    method-not-implemented (1.0.1)
+    nokogiri (1.15.4-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    posix-spawn (0.3.15)
+    public_suffix (5.0.3)
+    pug-ruby (2.0.1)
+      execjs (~> 2.0)
+      memoist (~> 0.15)
+      method-not-implemented (~> 1.0, >= 1.0.1)
+      regexp-match-polyfill (~> 1.0, >= 1.0.2)
+    racc (1.7.3)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    regexp-match-polyfill (1.0.2)
+    rexml (3.2.6)
+    rouge (4.2.0)
+    safe_yaml (1.0.5)
+    sass-embedded (1.69.5-arm64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.69.5-x86_64-linux-gnu)
+      google-protobuf (~> 3.23)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.5.0)
+    webrick (1.8.1)
+
+PLATFORMS
+  arm64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  http_parser.rb (~> 0.6.0)
+  jekyll (~> 4.3.2)
+  jekyll-compose
+  jekyll-feed (~> 0.12)
+  jekyll-last-modified-at
+  jekyll-pug
+  jekyll-redirect-from (~> 0.16.0)
+  jekyll-seo-tag
+  jekyll-sitemap
+  jekyll-toc
+  tzinfo (>= 1, < 3)
+  tzinfo-data
+  wdm (~> 0.1.1)
+
+BUNDLED WITH
+   2.4.10

Makefile

@@ -1,50 +1,9 @@
-.PHONY: install build build-dev build-superuser build-thankful dev-pug dev-scss host
-
-PUG_OPTS= -O pugopts.js
-
 install:
-	npm install
-
-build: build-superuser build-thankful
-
-build-superuser:
-	$(eval DEST := "build-superuser")
-	npm run pug -- -o ${DEST} $(PUG_OPTS) index.pug
-	npm run pug -- -o ${DEST}/thankful $(PUG_OPTS) thankful
-	npm run sass -- scss/index.scss ${DEST}/index.css
-	cp -r media ${DEST}/
-
-build-thankful:
-	$(eval DEST := "build-thankful")
-	mkdir -p ${DEST}
-	#echo "getthankful.io" > ${DEST}/CNAME
-	npm run pug -- -o ${DEST} $(PUG_OPTS) thankful
-	npm run sass -- scss/index.scss ${DEST}/index.css
-	cp -r media ${DEST}/
-
-build-dev:
-	$(eval DEST := "build-dev")
-	DEV=true npm run pug -- -o ${DEST} $(PUG_OPTS) index.pug
-	DEV=true npm run pug -- -o ${DEST}/thankful $(PUG_OPTS) thankful
-	npm run sass -- scss/index.scss ${DEST}/index.css
-	cp -r media ${DEST}/
-
-dev-pug-superuser:
-	DEV=true npm run pug -- -o build-dev --watch $(PUG_OPTS) index.pug
-
-dev-pug-thankful:
-	DEV=true npm run pug -- -o build-dev/thankful --watch $(PUG_OPTS) thankful/index.pug
-
-dev-scss:
-	npm run sass -- --watch scss --output build-dev
+	bundle install
 
 serve:
-	mkdir -p build-dev
-	cp -r media build-dev/
-	cd build-dev && python -m http.server 8123
+	bundle exec jekyll serve
 
-clean:
-	rm -rf build
-	rm -rf build-dev
-	rm -rf build-superuser
-	rm -rf build-thankful
+build:
+	bundle exec jekyll build
+	touch _site/.nojekyll

_config.yml

@@ -0,0 +1,71 @@
+# 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: Superuser Labs
+email: [email protected]
+description: >- # this means to ignore newlines until "baseurl:"
+  Superuser Labs is a team of developers and researchers who are passionate about free and open-source software,
+  and we are building such software to empower users (like you!).
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "https://superuserlabs.org" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: SuperusrLabs
+github_username: SuperuserLabs
+linkedin_company: superuser-labs
+
+# Build settings
+#theme: minima
+plugins:
+  - jekyll-feed
+  - jekyll-pug
+  - jekyll-sitemap
+  - jekyll-toc
+  - jekyll-last-modified-at
+  - jekyll-redirect-from
+  - jekyll-seo-tag
+
+collections:
+  posts:
+    output: true
+    permalink: /blog/:title/
+
+# jekyll-seo-tag config
+twitter:
+  username: SuperusrLabs
+  card: summary
+
+# 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/

templates/email-signup-horizontal.pug …es/templates/email-signup-horizontal.pugtemplates/email-signup-horizontal.pug renamed to _includes/templates/email-signup-horizontal.pug templates/email-signup-horizontal.pug renamed to _includes/templates/email-signup-horizontal.pug

@@ -1,9 +1,6 @@
 meta(charset="utf-8")
 meta(name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no")
 
-// Favicon
-link(rel="shortcut icon" href="/media/favicon.ico" type="image/x-icon")
-
 // Tailwind
 script(src="https://cdn.tailwindcss.com")
 |<script>
@@ -25,8 +22,11 @@ script(src="https://cdn.tailwindcss.com")
 link(rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous")
 
 // Custom CSS
-link(rel="stylesheet" href="/index.css")
+link(rel="stylesheet" href="/style.css")
 
 // Fonts (Roboto & Varela Round)
 link(rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css")
 link(rel="stylesheet" href="http://fonts.googleapis.com/css?family=Varela+Round" type="text/css")
+
+// jekyll-seo-tag
+| {% seo %}