Migrate templates from Slim to ERB and update dependencies

Author: thibaudgg

Gemfile

@@ -1,21 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'middleman', '~> 4.5'
+gem 'middleman'
 gem 'middleman-favicon-maker'
 gem 'middleman-gh-pages'
 gem 'middleman-inline_svg'
 gem 'middleman-livereload'
 gem 'middleman-minify-html'
 gem 'middleman-robots'
 gem "middleman-tailwind", github: "teaforthecat/middleman-tailwind", branch: "upgrade-execs-to-3.4.1"
-
-# Version 5 not yet supported
-# https://github.com/middleman/middleman/issues/2619
-gem 'slim', '~> 4.0'
-gem 'builder'
-
-# Ruby 3.4 support
-gem "bigdecimal"
-gem "mutex_m"
-gem "base64"
-gem "csv"

Gemfile.lock

@@ -9,86 +9,95 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    backports (3.25.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.3.4)
-    contracts (0.17)
-    csv (3.3.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    contracts (0.17.2)
     docile (1.4.1)
-    dotenv (3.1.2)
+    dotenv (3.1.8)
+    drb (2.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    erubis (2.7.0)
+    erubi (1.13.1)
     eventmachine (1.2.7)
-    execjs (2.9.1)
+    execjs (2.10.0)
     fast_blank (1.0.1)
-    fastimage (2.3.1)
+    fastimage (2.4.0)
     favicon_maker (1.3.1)
       docile (~> 1.1)
-    ffi (1.17.0)
+    ffi (1.17.2)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.6.0)
+    hashie (5.0.0)
     htmlcompressor (0.2.0)
     http_parser.rb (0.8.0)
-    i18n (1.6.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    kramdown (2.4.0)
-      rexml
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     memoist (0.16.2)
-    middleman (4.5.0)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.5.0)
-      middleman-core (= 4.5.0)
-    middleman-cli (4.5.0)
-      thor (>= 0.17.0, < 2.0)
-    middleman-core (4.5.0)
-      activesupport (>= 6.1, < 7.1)
+    middleman (4.6.2)
+      middleman-cli (= 4.6.2)
+      middleman-core (= 4.6.2)
+    middleman-cli (4.6.2)
+      thor (>= 0.17.0, < 2)
+    middleman-core (4.6.2)
+      activesupport (>= 6.1)
       addressable (~> 2.4)
-      backports (~> 3.6)
       bundler (~> 2.0)
-      contracts (~> 0.13)
+      coffee-script (~> 2.2)
+      contracts
       dotenv
-      erubis
+      erubi
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
+      haml (>= 4.0.5)
       hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 1.6.0)
+      hashie (>= 3.4, < 6.0)
+      i18n (>= 1.6, < 1.15)
+      kramdown (~> 2.4)
       listen (~> 3.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.15.0)
       parallel
-      rack (>= 1.4.5, < 3)
+      rack (>= 3)
+      rackup
       sassc (~> 2.0)
       servolux
-      tilt (~> 2.0.9)
+      tilt (~> 2.2)
       toml
-      uglifier (~> 3.0)
+      uglifier (>= 3, < 5)
       webrick
     middleman-favicon-maker (4.1.0)
       favicon_maker (~> 1.3, >= 1.3.1)
@@ -108,66 +117,58 @@ GEM
     middleman-robots (1.3.7)
       middleman-cli (~> 4.0)
       middleman-core (~> 4.0)
-    mini_portile2 (2.8.7)
-    minitest (5.25.1)
-    mutex_m (0.2.0)
-    nokogiri (1.16.7)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     padrino-helpers (0.15.3)
       i18n (>= 0.6.7, < 2)
       padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
     padrino-support (0.15.3)
-    parallel (1.26.3)
+    parallel (1.27.0)
     parslet (2.0.0)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (3.2.1)
     rack-livereload (0.3.17)
       rack
-    rake (13.2.1)
+    rackup (2.2.1)
+      rack (>= 3)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.3.6)
-      strscan
+    rexml (3.4.4)
     sassc (2.4.0)
       ffi (~> 1.9)
+    securerandom (0.4.1)
     servolux (0.13.0)
-    slim (4.1.0)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 2.0.6, < 2.1)
-    strscan (3.1.0)
-    temple (0.8.2)
-    thor (1.3.2)
-    tilt (2.0.11)
+    temple (0.10.4)
+    thor (1.4.0)
+    tilt (2.6.1)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (3.2.0)
+    uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
-    webrick (1.8.1)
+    uri (1.0.3)
+    webrick (1.9.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  base64
-  bigdecimal
-  builder
-  csv
-  middleman (~> 4.5)
+  middleman
   middleman-favicon-maker
   middleman-gh-pages
   middleman-inline_svg
   middleman-livereload
   middleman-minify-html
   middleman-robots
   middleman-tailwind!
-  mutex_m
-  slim (~> 4.0)
 
 BUNDLED WITH
    2.5.10

config.rb

@@ -1,5 +1,3 @@
-require 'slim'
-
 Dir['./*/*.rb'].each { |file| load file }
 include FaviconsHelper
 

source/_feature.erb

@@ -0,0 +1,13 @@
+<dl class="mt-12 md:mt-6 relative bg-green-50 rounded-md p-4 pb-6">
+  <dt>
+    <div class="absolute -top-6 left-1/2 flex items-center bg-green-400 rounded-full -ml-6 p-2 drop-shadow">
+      <%= inline_svg "#{logo}.svg", class: 'w-8 h-8 text-white' %>
+    </div>
+    <h3 class="mt-6 text-center text-lg font-extrabold">
+      <%= title %>
+    </h3>
+  </dt>
+  <dd class="mt-2 text-center text font-light">
+    <%== description %>
+  </dd>
+</dl>

source/_feature.slim

@@ -0,0 +1,35 @@
+<footer class="w-full pt-32 pb-4">
+  <ul class="flex justify-center items-center tracking-tight gap-2 text-lg">
+    <li>
+      <%= link_to 'EN', '/', class: 'font-semibold p-1' %>
+    </li>
+    <li class="text-gray-500 font-extralight text-xs">
+      /
+    </li>
+    <li>
+      <%= link_to 'FR', '/acp', class: 'font-semibold p-1' %>
+    </li>
+    <li class="text-gray-500 font-extralight text-xs">
+      /
+    </li>
+    <li>
+      <%= link_to 'DE', '/solawi', class: 'font-semibold p-1' %>
+    </li>
+  </ul>
+
+  <div class="mt-8 md:mt-16 flex items-center justify-center">
+    <%= inline_svg 'logo.svg', class: 'fill-current w-8 h-8', alt: t("logo_alt") %>
+    <strong class="text-logo-green ml-2 font-bold text-lg tracking-tight">
+      <%= data.site.name %>
+    </strong>
+  </div>
+
+  <div class="mt-4 md:mt-8 flex flex-col md:flex-row items-center md:justify-center">
+    <%= link_to (inline_svg('envelope.svg', class: 'w-5 h-5 mr-2 mt-0.5', alt: t('email')) + content_tag(:strong, data.site.contact.email, class: 'font-semibold')).html_safe, data.site.contact.email_link, class: 'md:mr-8 flex items-center no-underline', title: t('email') %>
+    <%= link_to (inline_svg('phone.svg', class: 'w-5 h-5 mr-2', alt: t('phone')) + content_tag(:strong, data.site.contact.phone, class: 'font-semibold')).html_safe, data.site.contact.phone_link, class: 'mt-2 md:mt-0 flex items-center no-underline', title: t('phone') %>
+  </div>
+
+  <p class="mt-4 md:mt-8 text-center text-sm text-gray-500">
+    <%= I18n.t("footer.developed_by", author_link: link_to(data.site.author.name, data.site.author.website, class: 'whitespace-nowrap no-underline text-gray-500 font-normal', title: "thibaud.gg")) %>
+  </p>
+</footer>

source/_footer.erb

@@ -0,0 +1,36 @@
+<header class="my-6 md:my-12 flex flex-wrap md:flex-nowrap justify-between">
+  <div class="flex items-center grow w-full md:w-fit justify-center md:justify-start">
+    <%= inline_svg 'logo.svg', class: 'fill-current w-10 h-10 md:w-12 md:h-12', alt: t("logo_alt") %>
+    <nav class="text-logo-green ml-3 font-bold text-2xl tracking-tight flex items-center">
+      <span>
+        <%= link_to "CSA", "/", class: "font-bold  #{"no-underline" unless I18n.locale == :en} decoration-2 hover:underline" %>
+      </span>
+      <span class="font-extralight text-base px-1 md:px-2">
+        /
+      </span>
+      <span>
+        <%= link_to "ACP", "/acp", class: "font-bold #{"no-underline" unless I18n.locale == :fr} decoration-2 hover:underline" %>
+      </span>
+      <span class="font-extralight text-base px-1 md:px-2">
+        /
+      </span>
+      <span>
+        <%= link_to "Solawi", "/solawi", class: "font-bold #{"no-underline" unless I18n.locale == :de} decoration-2 hover:underline" %>
+      </span>
+      <span class="ml-3">
+        Admin
+      </span>
+    </nav>
+  </div>
+
+  <div class="flex items-center gap-4 w-full md:text-base md:w-fit mt-6 md:mt-0 justify-center md:justify-end">
+    <%= link_to t('header.features'), '#features', class: 'text-gray-800 text-lg font-medium' %>
+    <%= link_to t('header.demo'), '#contact', class: 'text-gray-800 text-lg font-medium' %>
+    <%= link_to t('header.about'), '#about', class: 'text-gray-800 text-lg font-medium' %>
+  </div>
+
+  <div class="flex flex-col items-center md:items-end w-full md:w-fit mt-6 md:mt-0 md:ml-16 justify-center md:justify-end">
+    <%= link_to (inline_svg('envelope.svg', class: 'w-5 h-5 md:order-2 mr-2 md:mr-0 md:ml-3 mt-0.5', alt: t('email')) + content_tag(:strong, data.site.contact.email, class: 'font-semibold md:order-1')).html_safe, data.site.contact.email_link, class: 'flex items-center no-underline text-gray-800', title: t('email') %>
+    <%= link_to (inline_svg('phone.svg', class: 'w-5 h-5 md:order-2 mr-2 md:mr-0 md:ml-3', alt: t('phone')) + content_tag(:strong, data.site.contact.phone, class: 'font-semibold md:order-1')).html_safe, data.site.contact.phone_link, class: 'mt-0.5 flex items-center no-underline text-gray-800', title: t('phone') %>
+  </div>
+</header