From 9ddc05758923169433a4344c7f576f450f0558cf Mon Sep 17 00:00:00 2001 From: farhatahmad <35435341+farhatahmad@users.noreply.github.com> Date: Thu, 22 Aug 2019 12:15:01 -0400 Subject: [PATCH] Added a Maintenance Window flash (#758) --- app/assets/javascripts/cookies.js | 7 +++++++ app/controllers/application_controller.rb | 7 ++++++- app/views/shared/_flash_messages.html.erb | 5 +++++ config/application.rb | 4 ++++ config/locales/en.yml | 2 ++ sample.env | 6 ++++++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/cookies.js b/app/assets/javascripts/cookies.js index efd9d69f..be2c0560 100644 --- a/app/assets/javascripts/cookies.js +++ b/app/assets/javascripts/cookies.js @@ -24,4 +24,11 @@ $(document).on('turbolinks:load', function(){ //hide the banner at the bottom $(".cookies-banner").attr("style","display:none !important") }) + + $("#maintenance-close").click(function(event) { + //create a cookie that lasts 1 year + var cookieDate = new Date(); + cookieDate.setFullYear(cookieDate.getFullYear() + 1); //1 year from now + document.cookie = "maintenance_window=" + $(event.target).data("date") + "; path=/; expires=" + cookieDate.toUTCString() + ";" + }) }) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 833ac5b7..7202898a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base end def maintenance_mode? - if ENV["MAINTENANCE_MODE"] == "true" + if Rails.configuration.maintenance_mode render "errors/greenlight_error", status: 503, formats: :html, locals: { status_code: 503, @@ -61,6 +61,11 @@ class ApplicationController < ActionController::Base help: I18n.t("errors.maintenance.help"), } end + if Rails.configuration.maintenance_window.present? + unless cookies[:maintenance_window] == Rails.configuration.maintenance_window + flash.now[:maintenance] = I18n.t("maintenance.window_alert", date: Rails.configuration.maintenance_window) + end + end end # Sets the appropriate locale. diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb index 6e863608..cd03782d 100644 --- a/app/views/shared/_flash_messages.html.erb +++ b/app/views/shared/_flash_messages.html.erb @@ -24,6 +24,11 @@ <%= value.html_safe %> + <% elsif key.eql? "maintenance" %> +