From a31f3a79ead257aa54cae532538c2d7748ae4e85 Mon Sep 17 00:00:00 2001 From: "Seth A. Johnson" Date: Tue, 5 Jul 2022 15:29:29 -0400 Subject: [PATCH] HELIO-4295 update resque, resque-web, resque-pool added 'font-awesome-sass' for resque-web copied over app/views/layouts/resque_web/application.html.erb for resque_web, https://github.com/resque/resque-web/issues/156 --- Gemfile | 8 +- Gemfile.lock | 49 +++++------ .../stylesheets/_font-awesome-sprockets.scss | 6 ++ app/assets/stylesheets/application.css | 1 + .../layouts/resque_web/application.html.erb | 83 +++++++++++++++++++ 5 files changed, 119 insertions(+), 28 deletions(-) create mode 100644 app/assets/stylesheets/_font-awesome-sprockets.scss create mode 100644 app/views/layouts/resque_web/application.html.erb diff --git a/Gemfile b/Gemfile index a9709f2e3..707d7872c 100644 --- a/Gemfile +++ b/Gemfile @@ -110,6 +110,10 @@ gem 'devise-guests', '~> 0.7' gem 'faraday', '~> 0.9' # NOTE: This is the last minor release in the v0.x series, next release will be 1.0 to match Faraday v1.0 release and from then on only fixes will be applied to v0.14.x! gem 'faraday_middleware', '~> 0.14.0' + +# needed by resque-web +gem 'font-awesome-sass', '>= 6.0' + # # # Use gem version of handle_rest gem 'handle_rest', git: 'https://github.com/mlibrary/handle_rest', ref: 'baed402b5a530eb57e838443ce292ec3f46cd5e6' @@ -164,9 +168,9 @@ gem 'prawn', '~> 2.2' gem 'redcarpet', '~> 3.5.1' gem 'reverse_markdown' -gem 'resque', '~> 1.26.0' +gem 'resque', '~> 2.2.1 ' gem 'resque-pool' -gem 'resque-web', '~> 0.0.7', require: 'resque_web' +gem 'resque-web', '~> 0.0.12', require: 'resque_web' gem 'riiif', '1.4.1' diff --git a/Gemfile.lock b/Gemfile.lock index e28495edf..005823933 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -347,8 +347,8 @@ GEM jquery-rails font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) - font-awesome-sass (5.2.0) - sassc (>= 1.11) + font-awesome-sass (6.1.1) + sassc (~> 2.0) forwardable-extended (2.6.0) geocoder (1.8.0) globalid (1.0.0) @@ -600,11 +600,10 @@ GEM multi_json less (2.6.0) commonjs (~> 0.2.7) - less-rails (2.8.0) - actionpack (>= 4.0) + less-rails (4.0.0) + actionpack (>= 4) less (~> 2.6.0) - sprockets (> 2, < 4) - tilt + sprockets (>= 2) link_header (0.0.8) linkeddata (3.2.0) json-ld (~> 3.2) @@ -666,8 +665,8 @@ GEM mini_mime (1.1.2) mini_portile2 (2.8.0) minitar (0.8) - minitest (5.15.0) - mono_logger (1.1.0) + minitest (5.16.2) + mono_logger (1.1.1) msgpack (1.3.3) multi_json (1.15.0) multi_xml (0.6.0) @@ -743,13 +742,13 @@ GEM rails (>= 5.0, < 6.2) rdf racc (1.6.0) - rack (2.2.3.1) + rack (2.2.4) rack-protection (2.2.0) rack rack-proxy (0.7.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails (5.2.7.1) actioncable (= 5.2.7.1) actionmailer (= 5.2.7.1) @@ -851,7 +850,7 @@ GEM redcarpet (3.5.1) redic (1.5.3) hiredis - redis (4.6.0) + redis (4.7.1) redis-namespace (1.8.2) redis (>= 3.0.4) redlock (1.2.2) @@ -873,15 +872,14 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) - resque (1.26.0) + resque (2.2.1) mono_logger (~> 1.0) multi_json (~> 1.0) - redis-namespace (~> 1.3) + redis-namespace (~> 1.6) sinatra (>= 0.9.2) - vegas (~> 0.1.2) - resque-pool (0.6.0) - rake - resque (~> 1.22) + resque-pool (0.7.1) + rake (>= 10.0, < 14.0) + resque (>= 1.22, < 3) resque-web (0.0.12) coffee-rails font-awesome-sass @@ -1087,11 +1085,11 @@ GEM turbolinks (5.2.0) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - twitter-bootstrap-rails (4.0.0) - actionpack (~> 5.0, >= 5.0.1) + twitter-bootstrap-rails (5.0.0) + actionpack (>= 5.0, < 8.0) execjs (~> 2.7) - less-rails (~> 2.8, >= 2.8.0) - railties (~> 5.0, >= 5.0.1) + less-rails (>= 3.0, < 5.0) + railties (>= 5.0, < 8.0) twitter-typeahead-rails (0.11.1.pre.corejavascript) actionpack (>= 3.1) jquery-rails @@ -1126,8 +1124,6 @@ GEM rdf-vocab reform (~> 2.2) reform-rails - vegas (0.1.11) - rack (>= 1.0.0) warden (1.2.8) rack (>= 2.0.6) web-console (3.6.2) @@ -1193,6 +1189,7 @@ DEPENDENCIES faraday (~> 0.9) faraday_middleware (~> 0.14.0) fcrepo_wrapper (= 0.5.2) + font-awesome-sass (>= 6.0) handle_rest! hyrax (= 3.4.1) i18n (~> 0.7) @@ -1226,9 +1223,9 @@ DEPENDENCIES rails-controller-testing rails-html-sanitizer (~> 1.3.0) redcarpet (~> 3.5.1) - resque (~> 1.26.0) + resque (~> 2.2.1) resque-pool - resque-web (~> 0.0.7) + resque-web (~> 0.0.12) reverse_markdown riiif (= 1.4.1) rsolr (~> 2.0.1) diff --git a/app/assets/stylesheets/_font-awesome-sprockets.scss b/app/assets/stylesheets/_font-awesome-sprockets.scss new file mode 100644 index 000000000..778551de0 --- /dev/null +++ b/app/assets/stylesheets/_font-awesome-sprockets.scss @@ -0,0 +1,6 @@ +/* removed sometime after font-awesome v5, needed by resque-web v0.0.12 */ +@function fa-font-path($path) { + @return font-path($path); +} + +$fa-sass-asset-helper: true; \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 2a6f8a154..780ad8a88 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -20,3 +20,4 @@ * require_tree . * require_self */ + diff --git a/app/views/layouts/resque_web/application.html.erb b/app/views/layouts/resque_web/application.html.erb new file mode 100644 index 000000000..17313cd87 --- /dev/null +++ b/app/views/layouts/resque_web/application.html.erb @@ -0,0 +1,83 @@ +<%# copied over from the resque_web gem due to https://github.com/resque/resque-web/issues/156 %> +<%# It's just "Resque::VERSION" instead of Resque::Version at the bottom of this file %> + + + + + + + + + + Resque. + <%= stylesheet_link_tag "resque_web/application", :media => "all" %> + <%= + ResqueWeb::Plugins.plugins.collect do |p| + file_path = "#{p.name.underscore.downcase}/application.css" + if (Rails.application.assets && Rails.application.assets.find_asset(file_path)) || + (Rails.application.assets_manifest && Rails.application.assets_manifest.assets[file_path]) + stylesheet_link_tag "#{p.name.underscore.downcase}/application" + end + end.join("\n").html_safe + %> + <%= javascript_include_tag "resque_web/application" %> + <%= + ResqueWeb::Plugins.plugins.collect do |p| + file_path = "#{p.name.underscore.downcase}/application.js" + if (Rails.application.assets && Rails.application.assets.find_asset(file_path)) || + (Rails.application.assets_manifest && Rails.application.assets_manifest.assets[file_path]) + javascript_include_tag "#{p.name.underscore.downcase}/application" + end + end.join("\n").html_safe + %> + <%= csrf_meta_tags %> + + + +
+
+
+ + + + + + <%= image_tag "resque_web/lifebuoy.png", class: 'logo' %> + <%= link_to "Resque", ResqueWeb::Engine.app.url_helpers.root_path, :class => "brand navbar-brand" %> +
+
    + <% tabs.each do |tab_name,path| %> + <%= tab tab_name,path %> + <% end %> + <% if respond_to?(:main_app) %> +
  • <%= link_to "Return to Application", main_app.root_path, :class => "nav navbar-nav" %>
    • + <% end %> +
+
+
+
+
+ +<% unless subtabs.empty? %> + +<% end %> + +
+ <%= yield %> +
+ + + + + \ No newline at end of file