good_job 2.11.3 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c804e28bcaae78b4af5a654da6cacd9fba979159fb57cbbcfb4bcb348b947fa
-  data.tar.gz: cbd920c5050bcf5da2e328a3aa5c3bb638b5a077a3f67e6dbbf76202a38ec723
+  metadata.gz: 398864eebf8f617924967bf2a73679bd0584493299570c20ea6dbc9598d23ff3
+  data.tar.gz: d781885d188ec4b3dab51f9609ba7a3935027426edf6cbf8147ae2b11a51ac72
 SHA512:
-  metadata.gz: cef26c910377e43dc66facdb2ccbde95ace6b38c8a1a6672100496919573f3ce07f0e59cd68ee22f195f72590313ff66757086123be3beee07f0801ecf258bf8
-  data.tar.gz: ee5553f45df7ea0bb4eb7abb870a879556292a7b25247db8d40700347f639b98bfdc758105588a8059a07ac4d7a5d7ccc6e0ba5543daf5cae4e035431f021174
+  metadata.gz: e9830078953d473bb48ec24cfcd4841029614be85c910b493d670eb1cfbbad287e95ce854a65aec609dd97954d6bb19f3a30c6a95cfd5d18c6913d777bab4d0f
+  data.tar.gz: ba0beb2c46d7f7044d1a7f2d5b1cb006ee67433432fb18e7bb04c7d4452df2e10ad45eff884c66bd7c1069ec47fee4fa18d776814dde4adf5b8a5bb4fb722904

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [v2.12.0](https://github.com/bensheldon/good_job/tree/v2.12.0) (2022-04-05)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.11.3...v2.12.0)
+
+**Closed issues:**
+
+- TimeTask timeouts are now ignored as these were not able to be implemented correctly [\#555](https://github.com/bensheldon/good_job/issues/555)
+- undefined method `relative\_time' when include\_all\_helpers is false [\#550](https://github.com/bensheldon/good_job/issues/550)
+- ArgumentError: wrong number of arguments \(given 1, expected 0; required keyword: schedule\) - cron [\#546](https://github.com/bensheldon/good_job/issues/546)
+
+**Merged pull requests:**
+
+- Deprecate Adapter configuration of job execution/cron [\#558](https://github.com/bensheldon/good_job/pull/558) ([bensheldon](https://github.com/bensheldon))
+- Remove usage of Concurrent::TimerTask's timeout\_interval [\#557](https://github.com/bensheldon/good_job/pull/557) ([bensheldon](https://github.com/bensheldon))
+- Include locale in html lang attribute [\#556](https://github.com/bensheldon/good_job/pull/556) ([bensheldon](https://github.com/bensheldon))
+- Rename `GoodJob::BaseController` to `GoodJob::ApplicationController` [\#553](https://github.com/bensheldon/good_job/pull/553) ([shouichi](https://github.com/shouichi))
+- Internationalize/I18n the Dashboard Engine [\#497](https://github.com/bensheldon/good_job/pull/497) ([JuanVqz](https://github.com/JuanVqz))
+
 ## [v2.11.3](https://github.com/bensheldon/good_job/tree/v2.11.3) (2022-03-30)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.11.2...v2.11.3)
@@ -10,7 +28,6 @@
 
 **Closed issues:**
 
-- ArgumentError: wrong number of arguments \(given 1, expected 0; required keyword: schedule\) - cron [\#546](https://github.com/bensheldon/good_job/issues/546)
 - How to run clean up preserved jobs in cron? [\#541](https://github.com/bensheldon/good_job/issues/541)
 - Erroring with "Too many open files" when good\_job tries reconnecting to database [\#530](https://github.com/bensheldon/good_job/issues/530)
 - Can't cast Array [\#529](https://github.com/bensheldon/good_job/issues/529)

data/engine/app/controllers/good_job/{base_controller.rb → application_controller.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GoodJob
-  class BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
+  class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
     around_action :switch_locale
@@ -24,10 +24,28 @@ module GoodJob
       request.content_security_policy_nonce_generator = ->(_request) { SecureRandom.base64(16) }
     end
 
+    def default_url_options(options = {})
+      { locale: I18n.locale }.merge(options)
+    end
+
     private
 
     def switch_locale(&action)
-      I18n.with_locale(:en, &action)
+      I18n.with_locale(current_locale, &action)
+    end
+
+    def current_locale
+      if params[:locale]
+        params[:locale]
+      elsif good_job_available_locales.exclude?(I18n.default_locale) && I18n.available_locales.include?(:en)
+        :en
+      else
+        I18n.default_locale
+      end
+    end
+
+    def good_job_available_locales
+      @_good_job_available_locales ||= GoodJob::Engine.root.join("config/locales").glob("*.yml").map { |path| File.basename(path, ".yml").to_sym }.uniq
     end
   end
 end

data/engine/app/controllers/good_job/cron_entries_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GoodJob
-  class CronEntriesController < GoodJob::BaseController
+  class CronEntriesController < GoodJob::ApplicationController
     def index
       @cron_entries = CronEntry.all
     end

data/engine/app/controllers/good_job/executions_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GoodJob
-  class ExecutionsController < GoodJob::BaseController
+  class ExecutionsController < GoodJob::ApplicationController
     def index
       @filter = ExecutionsFilter.new(params)
     end

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GoodJob
-  class JobsController < GoodJob::BaseController
+  class JobsController < GoodJob::ApplicationController
     rescue_from GoodJob::ActiveJobJob::AdapterNotGoodJobError,
                 GoodJob::ActiveJobJob::ActionForStateMismatchError,
                 with: :redirect_on_error

data/engine/app/controllers/good_job/processes_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module GoodJob
-  class ProcessesController < GoodJob::BaseController
+  class ProcessesController < GoodJob::ApplicationController
     def index
       @processes = GoodJob::Process.active.order(created_at: :desc) if GoodJob::Process.migrated?
     end

data/engine/app/views/good_job/shared/_alert.erb

@@ -0,0 +1,13 @@
+<% if notice %>
+  <div class="alert alert-success alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
+    <%= render "good_job/shared/icons/check", class: "flex-shrink-0 me-2" %>
+    <div><%= notice %></div>
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+  </div>
+<% elsif alert %>
+  <div class="alert alert-warning alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
+    <%= render "good_job/shared/icons/exclamation", class: "flex-shrink-0 me-2" %>
+    <div><%= alert %></div>
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+  </div>
+<% end %>

data/engine/app/views/good_job/shared/_announcement.erb

@@ -0,0 +1,7 @@
+<div class="card border-warning text-dark my-3">
+  <div class="card-body">
+    <p class="card-text">
+      <%= t(".work_in_progress_html") %>
+    </p>
+  </div>
+</div>

data/engine/app/views/good_job/shared/_footer.erb

@@ -0,0 +1,15 @@
+<footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-6">
+        <span class="text-muted">
+          <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
+        </span>
+      </div>
+
+      <div class="col-6 text-end">
+        <%= t(".wording") %>
+      </div>
+    </div>
+  </div>
+</footer>

data/engine/app/views/good_job/shared/_navbar.erb

@@ -0,0 +1,49 @@
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <div class="container-fluid">
+    <%= link_to t(".name"), root_path, class: "navbar-brand mb-0 h1" %>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav me-auto">
+        <li class="nav-item">
+          <%= link_to t(".executions"), root_path, class: ["nav-link", ("active" if current_page?(root_path))] %>
+        </li>
+        <li class="nav-item">
+          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if current_page?(jobs_path))] %>
+        </li>
+        <li class="nav-item">
+          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if current_page?(cron_entries_path))] %>
+        </li>
+        <li class="nav-item">
+          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if current_page?(processes_path))] %>
+        </li>
+        <li class="nav-item">
+          <div class="nav-link">
+            <span class="badge bg-secondary"><%= t(".coming_soon") %></span>
+          </div>
+        </li>
+      </ul>
+      <div class="nav-item pe-2">
+        <div class="form-check">
+          <input type="checkbox" id="toggle-poll" name="toggle-poll" data-gj-action='change#togglePoll' <%= 'checked' if params[:poll].present? %>>
+          <label for="toggle-poll"><%= t(".live_poll") %></label>
+        </div>
+      </div>
+      <ul class="navbar-nav">
+        <li class="nav-item dropdown">
+          <a href="#" class="nav-link dropdown-toggle" type="button" id="localeOptions" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <%= I18n.locale %>
+          </a>
+
+          <ul class="dropdown-menu" aria-labelledby="localeOptions">
+            <% I18n.available_locales.reject { |locale| locale == I18n.locale }.each do |locale| %>
+              <li><%= link_to locale, url_for(locale: locale), class: "dropdown-item" %></li>
+            <% end %>
+          </ul>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>

data/engine/app/views/layouts/good_job/application.html.erb

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+<head>
+  <title>Good Job Dashboard</title>
+  <meta charset="utf-8">
+  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+
+  <%# Assets must use *_url route helpers to avoid being overriden by config.asset_host %>
+  <%= stylesheet_link_tag bootstrap_url(format: :css, v: GoodJob::VERSION), skip_pipeline: true %>
+  <%= stylesheet_link_tag style_url(format: :css, v: GoodJob::VERSION) %>
+
+  <%= javascript_include_tag bootstrap_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+  <%= javascript_include_tag chartjs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+  <%= javascript_include_tag scripts_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+
+  <%= javascript_include_tag rails_ujs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+</head>
+<body>
+  <%= render "good_job/shared/navbar" %>
+
+  <div class="container-fluid">
+    <%= render "good_job/shared/announcement" %>
+    <%= render "good_job/shared/alert" %>
+
+    <%= yield %>
+  </div>
+
+    <%= render "good_job/shared/footer" %>
+</body>
+</html>

data/engine/config/locales/en.yml

@@ -0,0 +1,56 @@
+---
+en:
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: about 1 hour
+        other: about %{count} hours
+      about_x_months:
+        one: about 1 month
+        other: about %{count} months
+      about_x_years:
+        one: about 1 year
+        other: about %{count} years
+      almost_x_years:
+        one: almost 1 year
+        other: almost %{count} years
+      half_a_minute: half a minute
+      less_than_x_minutes:
+        one: less than a minute
+        other: less than %{count} minutes
+      less_than_x_seconds:
+        one: less than 1 second
+        other: less than %{count} seconds
+      over_x_years:
+        one: over 1 year
+        other: over %{count} years
+      x_days:
+        one: 1 day
+        other: "%{count} days"
+      x_minutes:
+        one: 1 minute
+        other: "%{count} minutes"
+      x_months:
+        one: 1 month
+        other: "%{count} months"
+      x_seconds:
+        one: 1 second
+        other: "%{count} seconds"
+      x_years:
+        one: 1 year
+        other: "%{count} years"
+  good_job:
+    shared:
+      announcement:
+        work_in_progress_html: "🚧 GoodJob's dashboard is a work in progress. Please contribute ideas and code on <a href=\"https://github.com/bensheldon/good_job/issues\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">Github</a>."
+      footer:
+        last_update_html: Last updated <time id="page-updated-at" datetime="%{time}">%{time}</time>
+        wording: Remember, you're doing a Good Job too!
+      navbar:
+        coming_soon: More views coming soon
+        cron_schedules: Cron Schedules
+        executions: All Executions
+        jobs: All Jobs
+        live_poll: Live Poll
+        name: "GoodJob 👍"
+        processes: Processes

data/engine/config/locales/es.yml

@@ -0,0 +1,56 @@
+---
+es:
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: alrededor de 1 hora
+        other: alrededor de %{count} horas
+      about_x_months:
+        one: alrededor de 1 mes
+        other: alrededor de %{count} meses
+      about_x_years:
+        one: alrededor de 1 año
+        other: alrededor de %{count} años
+      almost_x_years:
+        one: casi 1 año
+        other: casi %{count} años
+      half_a_minute: medio minuto
+      less_than_x_minutes:
+        one: menos de un minuto
+        other: menos de %{count} minutos
+      less_than_x_seconds:
+        one: menos de 1 segundo
+        other: menos de %{count} segundos
+      over_x_years:
+        one: más de 1 año
+        other: durante %{count} años
+      x_days:
+        one: 1 día
+        other: "%{count} días"
+      x_minutes:
+        one: 1 minuto
+        other: "%{count} minutos"
+      x_months:
+        one: 1 mes
+        other: "%{count} meses"
+      x_seconds:
+        one: 1 segundo
+        other: "%{count} segundos"
+      x_years:
+        one: 1 año
+        other: "%{count} años"
+  good_job:
+    shared:
+      announcement:
+        work_in_progress_html: "🚧 GoodJob se encuentra en desarrollo. Por favor contribuya en <a href=\"https://github.com/bensheldon/good_job/issues\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">GoodJob</a> con ideas y código."
+      footer:
+        last_update_html: Última actualización <time id="page-updated-at" datetime="%{time}">%{time}</time>
+        wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
+      navbar:
+        coming_soon: Próximamente más vistas
+        cron_schedules: Tareas Programadas
+        executions: Ejecuciones
+        jobs: Tareas
+        live_poll: En vivo
+        name: "GoodJob 👍"
+        processes: Procesos

data/lib/good_job/adapter.rb

@@ -27,7 +27,13 @@ module GoodJob
     # @param queues [String, nil] determines which queues to execute jobs from when +execution_mode+ is set to +:async+. See {file:README.md#optimize-queues-threads-and-processes} for more details on the format of this string. You can also set this with the environment variable +GOOD_JOB_QUEUES+. Defaults to +"*"+.
     # @param poll_interval [Integer, nil] sets the number of seconds between polls for jobs when +execution_mode+ is set to +:async+. You can also set this with the environment variable +GOOD_JOB_POLL_INTERVAL+. Defaults to +1+.
     # @param start_async_on_initialize [Boolean] whether to start the async scheduler when the adapter is initialized.
-    def initialize(execution_mode: nil, queues: nil, max_threads: nil, poll_interval: nil, start_async_on_initialize: GoodJob.async_ready?)
+    def initialize(execution_mode: nil, queues: nil, max_threads: nil, poll_interval: nil, start_async_on_initialize: nil)
+      if execution_mode || queues || max_threads || poll_interval || start_async_on_initialize
+        ActiveSupport::Deprecation.warn(
+          "The GoodJob::Adapter's initialization parameters have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
+        )
+      end
+
       @configuration = GoodJob::Configuration.new(
         {
           execution_mode: execution_mode,
@@ -39,7 +45,7 @@ module GoodJob
       @configuration.validate!
       self.class.instances << self
 
-      start_async if start_async_on_initialize
+      start_async if start_async_on_initialize || GoodJob.async_ready?
     end
 
     # Enqueues the ActiveJob job to be performed.

data/lib/good_job/poller.rb

@@ -6,13 +6,10 @@ module GoodJob # :nodoc:
   # Pollers regularly wake up execution threads to check for new work.
   #
   class Poller
-    TIMEOUT_INTERVAL = 5
-
     # Defaults for instance of Concurrent::TimerTask.
     # The timer controls how and when sleeping threads check for new work.
     DEFAULT_TIMER_OPTIONS = {
       execution_interval: Configuration::DEFAULT_POLL_INTERVAL,
-      timeout_interval: TIMEOUT_INTERVAL,
       run_now: true,
     }.freeze
 

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.11.3'
+  VERSION = '2.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.12.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -367,8 +367,8 @@ files:
 - engine/app/assets/vendor/chartjs/chart.min.js
 - engine/app/assets/vendor/rails_ujs.js
 - engine/app/charts/good_job/scheduled_by_queue_chart.rb
+- engine/app/controllers/good_job/application_controller.rb
 - engine/app/controllers/good_job/assets_controller.rb
-- engine/app/controllers/good_job/base_controller.rb
 - engine/app/controllers/good_job/cron_entries_controller.rb
 - engine/app/controllers/good_job/executions_controller.rb
 - engine/app/controllers/good_job/jobs_controller.rb
@@ -385,8 +385,12 @@ files:
 - engine/app/views/good_job/jobs/index.html.erb
 - engine/app/views/good_job/jobs/show.html.erb
 - engine/app/views/good_job/processes/index.html.erb
+- engine/app/views/good_job/shared/_alert.erb
+- engine/app/views/good_job/shared/_announcement.erb
 - engine/app/views/good_job/shared/_chart.erb
 - engine/app/views/good_job/shared/_filter.erb
+- engine/app/views/good_job/shared/_footer.erb
+- engine/app/views/good_job/shared/_navbar.erb
 - engine/app/views/good_job/shared/icons/_arrow_clockwise.html.erb
 - engine/app/views/good_job/shared/icons/_check.html.erb
 - engine/app/views/good_job/shared/icons/_exclamation.html.erb
@@ -394,7 +398,9 @@ files:
 - engine/app/views/good_job/shared/icons/_skip_forward.html.erb
 - engine/app/views/good_job/shared/icons/_stop.html.erb
 - engine/app/views/good_job/shared/icons/_trash.html.erb
-- engine/app/views/layouts/good_job/base.html.erb
+- engine/app/views/layouts/good_job/application.html.erb
+- engine/config/locales/en.yml
+- engine/config/locales/es.yml
 - engine/config/routes.rb
 - engine/lib/good_job/engine.rb
 - exe/good_job

data/engine/app/views/layouts/good_job/base.html.erb

@@ -1,96 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Good Job Dashboard</title>
-  <meta charset="utf-8">
-  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%# Assets must use *_url route helpers to avoid being overriden by config.asset_host %>
-  <%= stylesheet_link_tag bootstrap_url(format: :css, v: GoodJob::VERSION), skip_pipeline: true %>
-  <%= stylesheet_link_tag style_url(format: :css, v: GoodJob::VERSION) %>
-
-  <%= javascript_include_tag bootstrap_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-  <%= javascript_include_tag chartjs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-  <%= javascript_include_tag scripts_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-
-  <%= javascript_include_tag rails_ujs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-</head>
-<body>
-  <nav class="navbar navbar-expand-lg navbar-light bg-light">
-    <div class="container-fluid">
-      <%= link_to "GoodJob 👍", root_path, class: 'navbar-brand mb-0 h1' %>
-      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav me-auto">
-          <li class="nav-item">
-            <%= link_to "All Executions", root_path, class: ["nav-link", ("active" if current_page?(root_path))] %>
-          </li>
-          <li class="nav-item">
-            <%= link_to "All Jobs", jobs_path, class: ["nav-link", ("active" if current_page?(jobs_path))] %>
-          </li>
-          <li class="nav-item">
-            <%= link_to "Cron Schedules", cron_entries_path, class: ["nav-link", ("active" if current_page?(cron_entries_path))] %>
-          </li>
-          <li class="nav-item">
-            <%= link_to "Processes", processes_path, class: ["nav-link", ("active" if current_page?(processes_path))] %>
-          </li>
-          <li class="nav-item">
-            <div class="nav-link">
-              <span class="badge bg-secondary">More views coming soon</span>
-            </div>
-          </li>
-        </ul>
-        <div>
-          <input type="checkbox" id="toggle-poll" name="toggle-poll" data-gj-action='change#togglePoll' <%= 'checked' if params[:poll].present? %>>
-          <label for="toggle-poll">Live Poll</label>
-        </div>
-      </div>
-    </div>
-  </nav>
-
-  <div class="container-fluid">
-    <div class="card border-warning text-dark my-3">
-      <div class="card-body">
-        <p class="card-text">🚧 GoodJob's dashboard is a work in progress. Please contribute ideas and code on <a href="https://github.com/bensheldon/good_job/issues" target="_blank" rel="nofollow noopener noreferrer">Github</a>.</p>
-      </div>
-    </div>
-
-    <% if notice %>
-      <div class="alert alert-success alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
-        <%= render "good_job/shared/icons/check", class: "flex-shrink-0 me-2" %>
-        <div><%= notice %></div>
-        <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-      </div>
-    <% elsif alert %>
-      <div class="alert alert-warning alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
-        <%= render "good_job/shared/icons/exclamation", class: "flex-shrink-0 me-2" %>
-        <div><%= alert %></div>
-        <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-      </div>
-    <% end %>
-
-    <%= yield %>
-  </div>
-
-  <footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
-    <div class="container-fluid">
-      <div class="row">
-        <div class="col-6">
-          <span class="text-muted">
-            Last updated: <time id="page-updated-at" datetime="<%= Time.current.utc.iso8601 %>"><%= Time.current %></time>
-          </span>
-        </div>
-
-        <div class="col-6 text-end">
-          Remember, you're doing a Good Job too!
-        </div>
-      </div>
-    </div>
-  </footer>
-</body>
-</html>