rush_job 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ada70c720203358ce0ed61959e120ac3b4e3b32ec4c7ad501fe112440b907f03
-  data.tar.gz: 8b4d72d6b264eb13045c38c1ad84516f997f1a3132b0f28b6496bc256074a35b
+  metadata.gz: 62c92632ff547f79e44137da7c5d1fa32abebf73e193e415704b04bd981d6256
+  data.tar.gz: 2bb2cbb6fbd881c7c9419ffdb0b9bbe3ace33d3077f44ef3ee5ff1b4c08df6c3
 SHA512:
-  metadata.gz: 831e166008796c689ac46afd00e03b8ddc5a14c37dda4e1ccf08cc84d422e463aa1b17044708e5e79a9dac7d2152a2f392e922830778adba4abec0aafca13825
-  data.tar.gz: 82fc84d217653ee917b8043664690b68ec3b8c2be78ea770e3c58100007cc655ca86a538bbbb27972245b14f24ae820d1e6276b84a3f4d114db0f637f0cc664b
+  metadata.gz: 5ab20e3517d870afec5c08873854ed7191daae8efb8b462537d1f04545f2ce7b49ec57a0d3996ac2efa7246a5073e856b19d7420006708bd4d6dd2f369f4a9dd
+  data.tar.gz: 40421bf79367edd3e4ee1b4211adae3e9e918c69a76203cc2468c5779a6d19169b832d56cb9ce672cd8694b09f3f23df83e82aac6c5e5dd4c71bf59eac586925

data/README.md

@@ -2,7 +2,8 @@
 User interface for Delayed Job (https://github.com/collectiveidea/delayed_job) in Ruby on Rails 
 
 ### Note
-This has only been tested with SQLite and Postgresql.
+ - This has only been tested with SQLite and Postgresql.
+ - This app uses cookies to store the dark mode selection.
 
 ## Usage
 You will need Delayed Job, `delayed_job`, and Delayed Job ActiveRecord, `delayed_job_active_record`, installed in a Ruby on Rails application for this gem to work properly.
@@ -13,7 +14,7 @@ Navigate to the `/rush_job` route in your application to see the Delayed Jobs. L
 Add this line to your Ruby on Rails application's Gemfile:
 
 ```ruby
-gem "rush_job", '~> 0.1'
+gem 'rush_job', '~> 0.3.1'
 ```
 
 And then execute:

data/app/assets/config/rush_job_manifest.js

@@ -1,5 +1,4 @@
 //= link_directory ../stylesheets/rush_job .scss
 //= link_directory ../../../vendor/stylesheets/rush_job .css
 //= link_tree ../javascript/rush_job .js
-//= link_directory ../../../vendor/javascript/rush_job .js
 //= link_directory ../images/rush_job .svg

data/app/assets/images/rush_job/{arrow-down.svg → arrow-down-dark.svg}

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-down" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="rgb(0, 0, 0)" class="bi bi-arrow-down" viewBox="0 0 16 16">
   <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>
 </svg>

data/app/assets/images/rush_job/arrow-down-light.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="rgb(255, 255, 255)" class="bi bi-arrow-down" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8 1a.5.5 0 0 1 .5.5v11.793l3.146-3.147a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 .708-.708L7.5 13.293V1.5A.5.5 0 0 1 8 1z"/>
+</svg>

data/app/assets/images/rush_job/{arrow-up.svg → arrow-up-dark.svg}

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-up" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="rgb(0, 0, 0)" class="bi bi-arrow-up" viewBox="0 0 16 16">
   <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>
 </svg>

data/app/assets/images/rush_job/arrow-up-light.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="rgb(255, 255, 255)" class="bi bi-arrow-up" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8 15a.5.5 0 0 0 .5-.5V2.707l3.146 3.147a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 1 0 .708.708L7.5 2.707V14.5a.5.5 0 0 0 .5.5z"/>
+</svg>

data/app/assets/stylesheets/rush_job/application.scss

@@ -12,4 +12,6 @@
  *
  */
 @import "../../../vendor/stylesheets/rush_job/bootstrap";
+@import "themes/dark";
+@import "themes/light";
 @import "pages/index";

data/app/assets/stylesheets/rush_job/pages/_index.scss

@@ -20,4 +20,16 @@
   margin-left: 5%;
   margin-right: 5%;
   float: right;
+}
+
+.page-link.disabled, .disabled > .page-link {
+  color: rgb(68, 110, 155);
+}
+
+.page-item:first-child .page-link {
+  color: rgb(68, 110, 155);
+}
+
+.page-item:last-child .page-link {
+  color: rgb(68, 110, 155);
 }

data/app/assets/stylesheets/rush_job/themes/_dark.scss

@@ -0,0 +1,3 @@
+.background-color-dark {
+  background-color: #000;
+}

data/app/assets/stylesheets/rush_job/themes/_light.scss

@@ -0,0 +1,3 @@
+.background-color-light {
+  background-color: #fff;
+}

data/app/controllers/rush_job/themes_controller.rb

@@ -0,0 +1,13 @@
+module RushJob
+  class ThemesController < ApplicationController
+    def update
+      cookies.permanent[:rush_job_theme] = if cookies[:rush_job_theme] == 'dark'
+                                             'light'
+                                           else
+                                             'dark'
+                                           end
+
+      redirect_to root_path
+    end
+  end
+end

data/app/helpers/rush_job/application_helper.rb

@@ -1,4 +1,11 @@
 module RushJob
   module ApplicationHelper
+    def current_theme
+      cookies[:rush_job_theme] == 'dark' ? 'dark' : 'light'
+    end
+
+    def invert_theme
+      cookies[:rush_job_theme] == 'dark' ? 'light' : 'dark'
+    end
   end
 end

data/app/helpers/rush_job/rush_jobs_helper.rb

@@ -1,20 +1,21 @@
 module RushJob
   module RushJobsHelper
+    include ApplicationHelper
     include SortHelper
     include Pagy::Frontend
 
     def sortable(column)
       direction = column == sort_column && sort_direction == 'asc' ? 'desc' : 'asc'
-      link_to t(column), rush_job.root_path({ sort: column, direction: })
+      link_to t(column), rush_job.root_path({ sort: column, direction: }), class: "link-#{invert_theme}"
     end
 
     def sort_arrow(column)
       return unless column == sort_column
 
       if sort_direction == 'desc'
-        image_tag('rush_job/arrow-down.svg', id: 'rush-job-down-arrow', alt: 'down arrow')
+        image_tag("rush_job/arrow-down-#{invert_theme}.svg", id: 'rush-job-down-arrow', alt: 'down arrow')
       else
-        image_tag('rush_job/arrow-up.svg', id: 'rush-job-up-arrow', alt: 'up arrow')
+        image_tag("rush_job/arrow-up-#{invert_theme}.svg", id: 'rush-job-up-arrow', alt: 'up arrow')
       end
     end
   end

data/app/views/layouts/rush_job/application.html.erb

@@ -10,7 +10,7 @@
 
   <%= stylesheet_link_tag    "rush_job/application", media: "all" %>
 </head>
-<body>
+<body class="background-color-<%= current_theme %>">
 
 <%= yield %>
 

data/app/views/rush_job/rush_jobs/index.html.erb

@@ -1,12 +1,12 @@
-<div class="header-container">
+<div class="header-container" role="heading" aria-level="1">
   <div class="container text-center">
     <div class="row align-items-center">
-      <div class="col-6">
+      <div class="col-6" role="banner">
         <h2 class="delayed_title">
           <%= t :delayed_title %>
         </h2>
       </div>
-      <div class="col-6">
+      <div class="col-3">
         <button
           type="button"
           class="btn btn-primary"
@@ -14,15 +14,21 @@
           <%= t :reload %>
         </button>
       </div>
+      <div class="col-3">
+        <%= form_with url: theme_path, method: 'patch' do |form| %>
+          <%= form.button "#{invert_theme.titleize} Mode", class: "btn btn-#{invert_theme}" %>
+        <% end %>
+      </div>
     </div>
   </div>
 </div>
 
-<div class="jobs-container">
+<div class="jobs-container" role="main">
   <div class="table-responsive">
     <table class="table
                   table-bordered
-                  table-striped">
+                  table-striped
+                  table-<%= current_theme %>">
       <thead>
         <tr>
           <th><%= sortable 'id' %><%= sort_arrow 'id' %></th>

data/config/importmap.rb

@@ -1,2 +1,3 @@
 pin 'rush_job/application', preload: true
-pin 'bootstrap', to: 'rush_job/bootstrap.bundle.min.js', preload: true
+pin 'bootstrap', to: 'https://ga.jspm.io/npm:bootstrap@5.3.1/dist/js/bootstrap.esm.js'
+pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.8/lib/index.js'

data/config/routes.rb

@@ -1,3 +1,4 @@
 RushJob::Engine.routes.draw do
   root 'rush_jobs#index'
+  patch '/theme', to: 'themes#update'
 end

data/lib/rush_job/engine.rb

@@ -17,9 +17,10 @@ module RushJob
         rush_job/application.css
         rush_job/application.scss
         rush_job/application.js
-        rush_job/arrow-up.svg
-        rush_job/arrow-down.svg
-        rush_job/bootstrap.bundle.min.js
+        rush_job/arrow-up-light.svg
+        rush_job/arrow-up-dark.svg
+        rush_job/arrow-down-light.svg
+        rush_job/arrow-down-dark.svg
         rush_job_manifest.js
       ]
     end

data/lib/rush_job/version.rb

@@ -1,3 +1,3 @@
 module RushJob
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.1'.freeze
 end