From 95298d4fce2a3a0b8dbc6d3ce5c883f522b099a3 Mon Sep 17 00:00:00 2001 From: Andy Smith Date: Wed, 14 May 2025 14:53:09 -0500 Subject: [PATCH] Stub out considering bubble --- app/assets/stylesheets/bubble.css | 5 +++++ app/models/card/closeable.rb | 7 ++++++- app/views/cards/display/_preview.html.erb | 6 +++++- app/views/cards/display/preview/_bubble.html.erb | 5 +++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/bubble.css b/app/assets/stylesheets/bubble.css index ad84df421..b928b3cac 100644 --- a/app/assets/stylesheets/bubble.css +++ b/app/assets/stylesheets/bubble.css @@ -51,3 +51,8 @@ inset-inline-start: calc(-1 * var(--bubble-gap)); translate: -100% -50%; } + +.bubble--considering { + inset-inline-end: calc(-1 * var(--bubble-gap)); + translate: 100% -50%; +} diff --git a/app/models/card/closeable.rb b/app/models/card/closeable.rb index 121a0e2d4..4db284ebd 100644 --- a/app/models/card/closeable.rb +++ b/app/models/card/closeable.rb @@ -2,7 +2,7 @@ module Card::Closeable extend ActiveSupport::Concern AUTO_CLOSE_AFTER = 30.days - AUTO_CLOSE_REMINDER_BEFORE = 7.days + AUTO_CLOSE_REMINDER_BEFORE = 29.days included do has_one :closure, dependent: :destroy @@ -37,6 +37,11 @@ module Card::Closeable considering? && auto_closing? && Time.current >= auto_close_at - AUTO_CLOSE_REMINDER_BEFORE end + # TMP + def considering_soon? + true + end + def closed? closure.present? end diff --git a/app/views/cards/display/_preview.html.erb b/app/views/cards/display/_preview.html.erb index 986b622fd..ed689b6bf 100644 --- a/app/views/cards/display/_preview.html.erb +++ b/app/views/cards/display/_preview.html.erb @@ -30,7 +30,11 @@ <%= render "cards/display/common/background", card: card %> <% if card.closing_soon? %> - <%= render "cards/display/preview/bubble", days: card.days_until_close, class: "bubble--closing" %> + <%= render "cards/display/preview/bubble", label: "Closes", days: card.days_until_close, class: "bubble--closing" %> + <% end %> + + <% if card.considering_soon? %> + <%= render "cards/display/preview/bubble", label: "Considering", days: card.days_until_close, class: "bubble--considering" %> <% end %> <% end %> <% end %> diff --git a/app/views/cards/display/preview/_bubble.html.erb b/app/views/cards/display/preview/_bubble.html.erb index d6c9e5734..d5300c9f1 100644 --- a/app/views/cards/display/preview/_bubble.html.erb +++ b/app/views/cards/display/preview/_bubble.html.erb @@ -1,9 +1,10 @@ -
"> +
- <%= days < 1 ? "Closes" : "Closes in" %> + <%= local_assigns[:label] %> + <%= " in" if days < 1 %>