merged develop

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 3.0.6
           bundler-cache: true
           cache-version: 1
       - name: Run rubocop
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.2
+          ruby-version: 3.0.6
           bundler-cache: true
 
       - uses: actions/setup-node@v1

.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.0.6

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2
+FROM ruby:3.0.6
 
 ENV BUNDLER_VERSION=2.2.8
 

Gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "2.7.2"
+ruby "3.0.6"
 
 gem "cancancan", "~> 3.3"
 gem "jbuilder", "~> 2.7"
@@ -12,8 +12,10 @@ gem "puma", "~> 5.0"
 gem "rails", "~> 6.1.3", ">= 6.1.3.1"
 gem "redis", "~> 4.0"
 gem "sass-rails", ">= 6"
-gem "turbolinks", "~> 5"
-gem "webpacker", "~> 5.4"
+gem "hotwire-rails"
+gem "importmap-rails", "~> 1.1"
+gem "bootstrap", "~> 4.6.0"
+gem "jquery-rails"
 # Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 gem "acts_as_singleton"
@@ -24,7 +26,7 @@ gem "it"
 
 gem "country_select", "~> 4.0"
 
-gem "bigdecimal", "1.3.5"
+gem "bigdecimal", "3.0.2"
 gem "rails-i18n", "~> 7.0.0"
 
 # Use Active Storage variant
@@ -35,7 +37,7 @@ gem "bootsnap", ">= 1.4.4", require: false
 gem "tailwindcss-rails", "~> 2.0"
 
 gem "active_storage_validations"
-gem "font-awesome-rails"
+gem "font-awesome-sass", "~> 6.4"
 gem "mini_magick", ">= 4.9.5"
 gem "factory_bot_rails" # TODO: create ENV staging and use it for this
 
@@ -85,7 +87,7 @@ group :test do
   gem "selenium-webdriver"
   gem "simplecov", require: false
   gem "shoulda-matchers", "~> 4.0"
-  gem "webdrivers"
+  gem "webdrivers", "~> 5.3.1"
   gem "fuubar"
 end
 
@@ -105,7 +107,7 @@ gem "slim-rails"
 gem "stimulus-rails"
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "toastr-rails"
-# gem "importmap-rails", "~> 1.1"
 gem "requestjs-rails"
 gem "flipper"
 gem "flipper-active_record"
+gem "ransack"

Gemfile.lock

@@ -72,8 +72,8 @@ GEM
       zeitwerk (~> 2.3)
     acts_as_singleton (0.0.8)
       activerecord (>= 3.1.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (3.2.0)
@@ -82,11 +82,17 @@ GEM
     any_login (1.5.2)
       rails (>= 6.0)
     ast (2.4.2)
+    autoprefixer-rails (10.4.13.0)
+      execjs (~> 2)
     bcrypt (3.1.16)
-    bigdecimal (1.3.5)
+    bigdecimal (3.0.2)
     bindex (0.8.1)
     bootsnap (1.9.3)
       msgpack (~> 1.0)
+    bootstrap (4.6.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.16.1, < 2)
+      sassc-rails (>= 2.0.0)
     builder (3.2.4)
     cancancan (3.3.0)
     capistrano (3.17.1)
@@ -109,7 +115,7 @@ GEM
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (3.36.0)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -120,7 +126,6 @@ GEM
       xpath (~> 3.2)
     case_transform (0.2)
       activesupport
-    childprocess (4.1.0)
     cocoon (1.2.15)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
@@ -158,6 +163,7 @@ GEM
       railties (>= 3.2)
     ed25519 (1.3.0)
     erubi (1.10.0)
+    execjs (2.8.1)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -191,8 +197,8 @@ GEM
     flipper-active_record (0.26.0)
       activerecord (>= 4.2, < 8)
       flipper (~> 0.26.0)
-    font-awesome-rails (4.7.0.8)
-      railties (>= 3.2, < 8.0)
+    font-awesome-sass (6.4.0)
+      sassc (~> 2.0)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
     fuubar (2.5.1)
@@ -204,6 +210,10 @@ GEM
     globalid (1.0.0)
       activesupport (>= 5.0)
     hashie (5.0.0)
+    hotwire-rails (0.1.3)
+      rails (>= 6.0.0)
+      stimulus-rails
+      turbo-rails
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -213,11 +223,18 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    importmap-rails (1.1.6)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     it (2.0.0)
       actionpack (>= 3.0.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    jquery-rails (4.6.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     json (2.6.3)
     jsonapi-renderer (0.2.2)
     jwt (2.3.0)
@@ -241,8 +258,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.1115)
     mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
     minitest (5.15.0)
     msgpack (1.4.2)
     multi_json (1.15.0)
@@ -252,14 +269,14 @@ GEM
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.0.1)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.12.5-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x64-mingw32)
+    nokogiri (1.15.4-x64-mingw32)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
@@ -292,6 +309,7 @@ GEM
       ast (~> 2.4.1)
     pg (1.2.3)
     pg (1.2.3-x64-mingw32)
+    popper_js (1.16.1)
     pronto (0.11.0)
       gitlab (~> 4.4, >= 4.4.0)
       httparty (>= 0.13.7)
@@ -305,17 +323,15 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.6)
+    public_suffix (5.0.3)
     puma (5.5.2)
       nio4r (~> 2.0)
-    racc (1.6.0)
-    rack (2.2.3)
+    racc (1.7.1)
+    rack (2.2.8)
     rack-mini-profiler (2.3.3)
       rack (>= 1.2.0)
-    rack-proxy (0.7.0)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rails (6.1.4.4)
       actioncable (= 6.1.4.4)
       actionmailbox (= 6.1.4.4)
@@ -351,19 +367,23 @@ GEM
       thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.6)
+    ransack (3.1.0)
+      activerecord (>= 6.0.4)
+      activesupport (>= 6.0.4)
+      i18n
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.5.1)
-    regexp_parser (2.2.0)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
     requestjs-rails (0.0.10)
       rails (>= 6.0.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
@@ -423,11 +443,10 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 5.0)
+    selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2)
-    semantic_range (3.0.0)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
     sidekiq (6.3.1)
@@ -484,9 +503,10 @@ GEM
     tilt (2.0.10)
     toastr-rails (1.0.3)
       railties (>= 3.1.0)
-    turbolinks (5.2.1)
-      turbolinks-source (~> 5.2)
-    turbolinks-source (5.2.0)
+    turbo-rails (1.4.0)
+      actionpack (>= 6.0.0)
+      activejob (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2022.1)
@@ -500,15 +520,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.0.0)
+    webdrivers (5.3.1)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
-    webpacker (5.4.3)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
+      selenium-webdriver (~> 4.0, < 4.11)
+    websocket (1.2.10)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -528,8 +544,9 @@ DEPENDENCIES
   acts_as_singleton
   annotate
   any_login
-  bigdecimal (= 1.3.5)
+  bigdecimal (= 3.0.2)
   bootsnap (>= 1.4.4)
+  bootstrap (~> 4.6.0)
   cancancan (~> 3.3)
   capistrano (~> 3.11)
   capistrano-passenger (~> 0.2.0)
@@ -551,12 +568,15 @@ DEPENDENCIES
   faker
   flipper
   flipper-active_record
-  font-awesome-rails
+  font-awesome-sass (~> 6.4)
   friendly_id (~> 5.4.0)
   fuubar
+  hotwire-rails
   image_processing (~> 1.2)
+  importmap-rails (~> 1.1)
   it
   jbuilder (~> 2.7)
+  jquery-rails
   letter_opener
   listen (~> 3.3)
   mini_magick (>= 4.9.5)
@@ -572,6 +592,7 @@ DEPENDENCIES
   rails (~> 6.1.3, >= 6.1.3.1)
   rails-controller-testing
   rails-i18n (~> 7.0.0)
+  ransack
   redis (~> 4.0)
   requestjs-rails
   rspec-rails (~> 5.0.0)
@@ -591,14 +612,12 @@ DEPENDENCIES
   stimulus-rails
   tailwindcss-rails (~> 2.0)
   toastr-rails
-  turbolinks (~> 5)
   tzinfo-data
   web-console (>= 4.1.0)
-  webdrivers
-  webpacker (~> 5.4)
+  webdrivers (~> 5.3.1)
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 3.0.6p216
 
 BUNDLED WITH
-   2.3.26
+   2.4.18

app/assets/config/manifest.js

@@ -2,3 +2,4 @@
 //= link_directory ../stylesheets .css
 //= require bootstrap
 //= link_tree ../builds
+//= link_tree ../../javascript .js

app/assets/stylesheets/application.scss

@@ -1,10 +1,11 @@
 @import "components/**/*";
 
-@import "bootstrap/scss/bootstrap";
+@import "bootstrap";
 @import "toastr";
 
 @import "pages/**/*";
 
+@import "font-awesome";
 *,
 :after,
 :before {