🏗🔧：pre-empt our new dark theme #1131

PR URL: #1131
Reviewed-by: OpenINF-bot <[email protected]>

---------

Signed-off-by: Derek Lewis <[email protected]>

Co-authored-by: OpenINF Bot <[email protected]>

Author: DerekNonGeneric

.rubocop.yml

@@ -0,0 +1,4 @@
+# Omakase Ruby styling for Rails
+inherit_gem:
+  rubocop-rails-omakase: rubocop.yml
+# Your own specialized rules go here

Gemfile

@@ -2,14 +2,21 @@
 
 source 'https://rubygems.org'
 
-gem 'github-linguist', '~> 7.24'
+gem 'rubocop', require: false
+gem 'rubocop-rails-omakase', require: false, group: [ :development ]
 
-gem 'jekyll', '~> 4.3.0'
-gem 'kramdown-parser-gfm', '~> 1.1'
+gem 'github-linguist'
+
+gem 'jekyll'
+gem 'kramdown-parser-gfm'
 
 group :jekyll_plugins do
   gem 'jekyll-redirect-from'
   gem 'jekyll-relative-links'
+  gem 'jekyll-sitemap'
+  gem 'jekyll-seo-tag'
+  # gem 'jekyll-asset-path', git: 'https://github.com/OpenINF/openinf-jekyll-asset-path-plugin'
+  # gem 'jekyll-assets', git: 'https://github.com/envygeeks/jekyll-assets'
   # gem 'jekyll-paginate-v2'
   # gem 'jekyll-auto-authors'
 end
@@ -23,7 +30,7 @@ gem 'dotenv'
 
 gem 'rb-inotify'
 
-# Preparing for Ruby 3.4.0; these deps will no longer be present.
+# Dig out bundled core deps as we prep to begin Ruby 3.4.0 support.
 gem 'csv'
 gem 'base64'
 gem 'bigdecimal'

Gemfile.lock

@@ -1,16 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.7)
     cgi (0.4.1)
     charlock_holmes (0.7.7)
     colorator (1.1.0)
     concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     csv (3.3.0)
     dotenv (3.1.0)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
@@ -59,30 +72,76 @@ GEM
       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-watch (2.2.1)
       listen (~> 3.0)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     liquid (4.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     mini_mime (1.1.5)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.5)
     rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rouge (4.2.1)
+    rubocop (1.62.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-minitest (0.35.0)
+      rubocop (>= 1.61, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.24.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails-omakase (1.0.0)
+      rubocop
+      rubocop-minitest
+      rubocop-performance
+      rubocop-rails
+    ruby-progressbar (1.13.0)
     rugged (1.7.2)
     safe_yaml (1.0.5)
-    sass-embedded (1.74.1-aarch64-linux-android)
+    sass-embedded (1.72.0)
+      google-protobuf (>= 3.25, < 5.0)
+      rake (>= 13.0.0)
+    sass-embedded (1.72.0-aarch64-linux-android)
       google-protobuf (>= 3.25, < 5.0)
     sass-embedded (1.74.1-aarch64-linux-gnu)
       google-protobuf (>= 3.25, < 5.0)
@@ -112,6 +171,8 @@ GEM
       google-protobuf (>= 3.25, < 5.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
     yaml-lint (0.1.2)
@@ -125,11 +186,13 @@ PLATFORMS
   arm-linux-gnueabihf
   arm-linux-musleabihf
   arm64-darwin
+  ruby
   x86-linux
   x86-linux-android
   x86-linux-gnu
   x86-linux-musl
   x86_64-darwin
+  x86_64-linux
   x86_64-linux-android
   x86_64-linux-gnu
   x86_64-linux-musl
@@ -139,12 +202,16 @@ DEPENDENCIES
   bigdecimal
   csv
   dotenv
-  github-linguist (~> 7.24)
-  jekyll (~> 4.3.0)
+  github-linguist
+  jekyll
   jekyll-redirect-from
   jekyll-relative-links
-  kramdown-parser-gfm (~> 1.1)
+  jekyll-seo-tag
+  jekyll-sitemap
+  kramdown-parser-gfm
   rb-inotify
+  rubocop
+  rubocop-rails-omakase
   webrick
   yaml-lint
 

_config.yml

@@ -1,72 +1,110 @@
-# Welcome to Jekyll!
-
-# This master configuration file contains global configurations and variable
-# definitions that are meant for settings that affect the whole microsite with
-# values that are expected to be set up once and that rarely need to be edited
-# after that, which is why they are only read once at execution time.
-#
-# For technical reasons, changes made to this file are *NOT* reloaded
-# automatically during automatic regeneration when using 'jekyll serve'. If
-# you change this file, please restart the server process as changes are not
-# loaded until the next execution.
-#
-# Note: Data Files _are_ included and reloaded during automatic regeneration.
-#
-# Site personalization settings accessed in templates via {{ site.myvariable }}.
+---
 title: OpenINF
-email: [email protected]
-description: >-
-  Aggregate, curate, disseminate, and apply information derived from diverse
-  sources.
+email: [email protected]
+description: Aggregate, curate, disseminate, and apply information derived from
+  diverse sources.
 baseurl: ''
-url: 'https://open.inf.is'
+url: https://open.inf.is
 twitter_username: OpenINF
 github_username: OpenINF
 repository: OpenINF/openinf.github.io
 
-# Site build settings.
+# Site build settings
 markdown: kramdown
 plugins:
   - jekyll-redirect-from
   - jekyll-relative-links
+  - jekyll-sitemap
+  - jekyll-seo-tag
+  # - jekyll-asset-path
+  # - jekyll-assets
+compress_html:
+  clippings: all
+  comments:
+    - '<!-- '
+    - ' -->'
+  endings: all
+  ignore:
+    envs:
+      - local
+  blanklines: false
+  profile: false
+  startings:
+    - html
+    - head
+    - body
 
-# Document collections.
+## Content collections
+# @see https://jekyllrb.com/docs/collections
 collections_dir: collections
-
 collections:
   authors:
     output: true
   docs:
-    permalink: '/:collection/:path/'
+    permalink: :collection/:path
     output: true
   posts:
-    permalink: '/news/:year/:month/:day/:title/'
+    permalink: news/:year/:month/:day/:title
     output: true
 defaults:
+  - scope:
+      path: ''
+      type: pages
+    values:
+      ##
+      # @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/compress.html
+      layout: compress
+      locale: en
+  - scope:
+      path: _layouts
+      type: pages
+    values:
+      ##
+      # @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/default.html
+      layout: default
   - scope:
       path: _docs
       type: docs
     values:
+      ##
+      # @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/docs.html
       layout: docs
+      editable: true
+      toc: true
+      breadcrumbs: true
+      body_classes:
+        - hide-butterbar
   - scope:
       path: _posts
       type: posts
     values:
+      ##
+      # @see https://github.com/OpenINF/openinf.github.io/blob/HEAD/_layouts/news_item.html
       layout: news_item
+      editable: true
+      toc: true
+      breadcrumbs: true
+      body_classes:
+        - hide-butterbar
+sass:
+  sass_dir: _sass
+  style: compressed
+  load_paths:
+    - _includes/assets/scss
 
-# Exclude from processing.
+# Exclude from processing
 exclude:
+  - AUTHORS
   - build/
+  - CNAME
   - Gemfile
   - Gemfile.lock
+  - LICENSE
   - node_modules/
   - package.json
   - pnpm-lock.json
   - project-terms.txt
-  - AUTHORS
-  - CNAME
-  - LICENSE
   - README.md
-  - tools/
   - tmp/
+  - tools/
   - vendor/

_includes/head.html

@@ -12,7 +12,7 @@
     crossorigin="anonymous" />
   <meta
     name="description"
-    content="Aggregate, curate, disseminate, and apply information derived from diverse sources." />
+    content="{{ site.description }}" />
   <link
     rel="stylesheet"
     href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.min.css"
@@ -81,9 +81,25 @@
       {{ styles | scssify }}
     {% endif %}
   </style>
-  <link rel="canonical" href="." />
-  <title>
-    {% if page.class != 'home' %}{{ page.title }} &middot; {% endif %}{{
-    site.title }}
-  </title>
+  {% if page.custom_css %}{% for stylesheet_hotlink in page.custom_css -%}
+    <link rel="stylesheet" href="{{ stylesheet_hotlink }}">
+  {%- endfor %}{% endif %}
+  <meta name="format-detection" content="telephone=no">
+  {% if post.status == 'unpublished' or page.status == 'unpublished' %}
+  <meta name="robots" content="noindex, nofollow, noarchive">
+  {% endif %}
+  <title>{% if page.permalink == '/' %}{{ site.title }}{% else %}{{ page.title }} &middot; {{ site.title }}{% endif %}</title>
+  <link rel="canonical" href="{{ site.url }}{{ page.url }}" />
+  {% if page.permalink == '/' %}
+  <script type="application/ld+json">
+    {
+      "@context": "http://schema.org",
+      "@type": "WebSite",
+      "license": "https://open.inf.is/license",
+      "about": {
+        "description": "{{ site.description }}"
+      }
+    }
+  </script>
+  {% endif %}
 </head>

_layouts/default.html

@@ -1,12 +1,14 @@
 ---
-editable: false
+layout: compress
 ---
 
-<!doctype html>
-<html lang="en">
-  {%- include head.html -%}
+<!DOCTYPE html>
+<html {% if page.locale.is_rtl %}dir="rtl" lang="ar"{% else %}dir="ltr" lang="{{ page.locale }}"{% endif %}>
+{%- include head.html -%}
 
-  <body class="{{ page.class }}">
-    {%- include header.html -%} {{- content -}} {%- include footer.html -%}
-  </body>
+{%- assign classes = page.body_classes | join: " " | where: 'page.body_classes', empty -%}
+
+<body vocab="http://schema.org/" typeof="WebPage" id="top"{% if classes %} class="{{- classes -}}"{% endif %}>
+  {%- include header.html -%} {{- content -}} {%- include footer.html -%}
+</body>
 </html>