Merge pull request #49 from lyonrb/new-design

Introducing new design using Jekyll & Bootstrap
lyonrb · Oct 24, 2024 · 9672d91 · 9672d91
2 parents 8935d42 + fe1bb18
commit 9672d91
Show file tree

Hide file tree

Showing 102 changed files with 612 additions and 1,178 deletions.
diff --git a/.bundle/config b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -1,4 +1,4 @@
-name: Test Middleman build
+name: Test Jekyll build
 on:
   push:
     branches: [master]
@@ -9,9 +9,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0 # Not needed with a .ruby-version file
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - run: bundle exec middleman build
+        bundler-cache: true
+    - run: bundle exec jekyll build
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["main"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+  #        ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -1,32 +1,6 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-# git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the build directory
-/build
-
-# Ignore bower packages
-/vendor/assets/bower
-
-# Ignore RVM/RBEnv config files
-/.rvmrc
-/.ruby-version
-/.ruby-gemset
-
-# Ignore cache
-/.sass-cache
-/.cache
-
-# Ignore .DS_store file
-.DS_Store
-
-# Ignore DotEnv file
-/.env
-
-# IntellijIDEA
-.idea/
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
+!.bundle
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+3.3.5
diff --git a/.travis.yml b/.travis.yml
diff --git a/source/CNAME → CNAME b/source/CNAME → CNAME
diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,8 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
 
-gem 'middleman', '~> 4.4'
-gem 'middleman-minify-html'
-gem 'middleman-favicon-maker'
-gem 'middleman-gh-pages'
-gem 'middleman-livereload'
+source "https://rubygems.org"
 
-gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
-gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw]
+ruby file: ".ruby-version"
 
-gem 'dotenv'
+gem "jekyll", "~> 4.3.4"
+gem "bootstrap", "~> 5.3.3"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,139 +1,86 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    backports (3.21.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
-    contracts (0.13.0)
-    docile (1.3.2)
-    dotenv (2.7.6)
-    em-websocket (0.5.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    autoprefixer-rails (10.4.19.0)
+      execjs (~> 2)
+    bigdecimal (3.1.8)
+    bootstrap (5.3.3)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.8, < 3)
+    colorator (1.1.0)
+    concurrent-ruby (1.3.4)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    erubis (2.7.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    fast_blank (1.0.0)
-    fastimage (2.2.5)
-    favicon_maker (1.3.1)
-      docile (~> 1.1)
-    ffi (1.15.3)
-    haml (5.2.2)
-      temple (>= 0.8.0)
-      tilt
-    hamster (3.0.0)
+    execjs (2.9.1)
+    ffi (1.17.0)
+    forwardable-extended (2.6.0)
+    google-protobuf (4.28.2)
+      bigdecimal
+      rake (>= 13)
+    http_parser.rb (0.8.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    hashie (3.6.0)
-    htmlcompressor (0.2.0)
-    http_parser.rb (0.6.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    kramdown (2.3.1)
-      rexml
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    memoist (0.16.2)
-    middleman (4.4.0)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.4.0)
-      middleman-core (= 4.4.0)
-    middleman-cli (4.4.0)
-      thor (>= 0.17.0, < 2.0)
-    middleman-core (4.4.0)
-      activesupport (>= 6.1, < 7.0)
+    jekyll (4.3.4)
       addressable (~> 2.4)
-      backports (~> 3.6)
-      bundler (~> 2.0)
-      contracts (~> 0.13.0)
-      dotenv
-      erubis
-      execjs (~> 2.0)
-      fast_blank
-      fastimage (~> 2.0)
-      hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 1.6.0)
-      listen (~> 3.0.0)
-      memoist (~> 0.14)
-      padrino-helpers (~> 0.15.0)
-      parallel
-      rack (>= 1.4.5, < 3)
-      sassc (~> 2.0)
-      servolux
-      tilt (~> 2.0.9)
-      toml
-      uglifier (~> 3.0)
-      webrick
-    middleman-favicon-maker (4.1.0)
-      favicon_maker (~> 1.3, >= 1.3.1)
-      middleman-core (~> 4.0)
-    middleman-gh-pages (0.4.1)
-      rake (> 0.9.3)
-    middleman-livereload (3.4.6)
-      em-websocket (~> 0.5.1)
-      middleman-core (>= 3.3)
-      rack-livereload (~> 0.3.15)
-    middleman-minify-html (3.4.1)
-      htmlcompressor (~> 0.2.0)
-      middleman-core (>= 3.2)
-    minitest (5.14.4)
-    padrino-helpers (0.15.1)
-      i18n (>= 0.6.7, < 2)
-      padrino-support (= 0.15.1)
-      tilt (>= 1.4.1, < 3)
-    padrino-support (0.15.1)
-    parallel (1.20.1)
-    parslet (2.0.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-livereload (0.3.17)
-      rack
-    rake (13.0.1)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+      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-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+    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.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    popper_js (2.11.8)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    servolux (0.13.0)
-    temple (0.8.2)
-    thor (1.1.0)
-    tilt (2.0.10)
-    toml (0.3.0)
-      parslet (>= 1.8.0, < 3.0.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    uglifier (3.2.0)
-      execjs (>= 0.3.0, < 3)
-    webrick (1.7.0)
-    zeitwerk (2.4.2)
+    rexml (3.3.8)
+    rouge (4.4.0)
+    safe_yaml (1.0.5)
+    sass-embedded (1.79.5)
+      google-protobuf (~> 4.27)
+      rake (>= 13)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.6.0)
+    webrick (1.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dotenv
-  middleman (~> 4.4)
-  middleman-favicon-maker
-  middleman-gh-pages
-  middleman-livereload
-  middleman-minify-html
-  tzinfo-data
-  wdm (~> 0.1)
+  bootstrap (~> 5.3.3)
+  jekyll (~> 4.3.4)
+
+RUBY VERSION
+   ruby 3.3.5p100
 
 BUNDLED WITH
-   2.2.24
+   2.5.21
diff --git a/LICENSE.md → LICENSE b/LICENSE.md → LICENSE
diff --git a/README.md b/README.md
@@ -1,29 +1,13 @@
 # Lyon.rb website
 
-This repository holds the Middleman source code for [Lyon.rb website](https://www.lyonrb.fr).
+This repository holds the Jekyll source code for [Lyon.rb website](https://www.lyonrb.fr).
 
 ## Usage
 
 1. Clone this repository: `git clone [email protected]:lyonrb/website.git lyonrb-website`
 2. Install Ruby requirements: `bundle install`
-3. Run server for development: `bundle exec middleman server`
-4. Build static website: `bundle exec middleman build`
-5. Deploy !: `bundle exec rake publish`
-
-## Contributing
-
-1. Fork it!
-2. Create your feature branch: `git checkout -b my-new-feature`
-3. Commit your changes: `git commit -am 'Add some feature'`
-4. Push to the branch: `git push origin my-new-feature`
-5. Submit a pull request :D
-
-## Credits
-
-* Michael Baudino (@michaelbaudino)
-* Laurie Guetat (@laurieguetat)
-* Camille Appert (@cappert)
-* Jean-Michel Gigault (@jgigault)
+3. Run server for development: `bundle exec jekyll server --livereload`
+4. Build static website: `bundle exec jekyll build`
 
 ## License