diff --git a/app/assets/images/pop.svg b/app/assets/images/pop.svg new file mode 100644 index 000000000..9a72ca8da --- /dev/null +++ b/app/assets/images/pop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/views/bubbles/_bubble.html.erb b/app/views/bubbles/_bubble.html.erb index 8d97161f7..85f654e2a 100644 --- a/app/views/bubbles/_bubble.html.erb +++ b/app/views/bubbles/_bubble.html.erb @@ -8,17 +8,41 @@ <% end %> - + <% if bubble.popped? %> + + <% else %> + + <% end %> <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "bubble__link" do %> <%= bubble.title %> <% end %> - <% if bubble.popped? %> - POPPED! - <% end %> <%= render "bubbles/assignments", bubble: bubble %> <%= render "bubbles/boosts", bubble: bubble %> diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb index c5c6aa756..ee9cfbad8 100644 --- a/app/views/bubbles/show.html.erb +++ b/app/views/bubbles/show.html.erb @@ -6,7 +6,19 @@ <%= image_tag "arrow-left.svg", aria: { hidden: true }, size: 24 %> All Bubbles <% end %> - + + <% if @bubble.popped? %> + <%= button_to bucket_bubble_pop_path(@bubble.bucket, @bubble), method: :delete, class: "btn" do %> + <%= image_tag "pop.svg", aria: { hidden: true }, size: 24 %> + Un-pop + <% end %> + <% else %> + <%= button_to bucket_bubble_pop_path(@bubble.bucket, @bubble), class: "btn" do %> + <%= image_tag "pop.svg", aria: { hidden: true }, size: 24 %> + Pop + <% end %> + <% end %> + <% end %>