diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 678ca52..8028e31 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -131,11 +131,11 @@ button.action:hover { } .needs_pwd { - display: none; + display: none !important; } .needs_pwd.shown { - display: block; + display: block !important; } .action.shown { @@ -265,3 +265,10 @@ span#password { .fairy-dot.unclaimed:hover { cursor: pointer; } + +.despawn-note { + color: tomato; + font-size: 10px; + font-weight: normal; + margin-bottom: 5px; +} diff --git a/app/controllers/fairy_controller.rb b/app/controllers/fairy_controller.rb index ebe5e76..50815fd 100644 --- a/app/controllers/fairy_controller.rb +++ b/app/controllers/fairy_controller.rb @@ -2,15 +2,13 @@ class FairyController < ApplicationController def mark instance_id, location = mark_params instance = Instance.find_by(public_id: instance_id) - fairy = Fairy.new(location: location, instance_id: instance.id) - unless params[:pwd] - fairy.is_suggested = true + if params[:pwd] + fairy = Fairy.new(location: location, instance_id: instance.id) + fairy.save end - if fairy.save - new_instance = Instance.includes(:fairies).find(instance.id) - render partial: "instance/fairies", locals: { instance: new_instance } - end + new_instance = Instance.includes(:fairies).find(instance.id) + render partial: "instance/fairies", locals: { instance: new_instance } end def unmark @@ -24,6 +22,15 @@ class FairyController < ApplicationController end def despawn + instance_id, location = mark_params + instance = Instance.find_by(public_id: instance_id) + fairy = Fairy.find_by(instance_id: instance.id, location: location) + unless fairy.is_despawned + fairy.is_despawned = true + fairy.save + new_instance = Instance.includes(:fairies).find(instance.id) + render partial: "instance/fairies", locals: { instance: new_instance } + end end private diff --git a/app/views/instance/_fairies.html.erb b/app/views/instance/_fairies.html.erb index 045994a..e5df2a8 100644 --- a/app/views/instance/_fairies.html.erb +++ b/app/views/instance/_fairies.html.erb @@ -72,10 +72,24 @@ hx-select="#fairies" > remove + <% unless instance.fairies[idx].is_despawned %> +
+ gone? +
+ <% end %> + <% if instance.fairies[idx].is_despawned %> + potentially despawned! + <% end %> <% end %> -
Click on a black dot to mark another Elemental.
+
Click on a black dot to mark another Elemental.
"rails/health#show", as: :rails_health_check