added delete favorite

acmei · Oct 30, 2015 · c6d87a5 · c6d87a5
1 parent 91eead3
commit c6d87a5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/app/assets/stylesheets/skills.scss b/app/assets/stylesheets/skills.scss
@@ -106,3 +106,7 @@ p.card-title {
 }
 
 /* FAVORITE */
+
+.favorite-delete {
+  float: right;
+}
diff --git a/app/controllers/skills_controller.rb b/app/controllers/skills_controller.rb
@@ -22,6 +22,14 @@ def favorite
     render nothing: true
   end
 
+  def destroy_favorite
+    skill_id = params[:format]
+    @user.skills.find_by(id: skill_id).destroy
+    @user.save
+
+    redirect_to favorites_path
+  end
+
   private
 
     def skill_params

diff --git a/app/views/users/_favorite.html.erb b/app/views/users/_favorite.html.erb
@@ -1,11 +1,10 @@
 <div class="panel panel-default">
-  <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse<%= number %>" aria-expanded="false" aria-controls="collapse<%= number %>">
-    <div class="panel-heading" role="tab" id="heading<%= number %>">
+    <div class="panel-heading" role="tab" id="heading<%= number %>" data-toggle="collapse" data-parent="#accordion" href="#collapse<%= number %>" aria-expanded="false" aria-controls="collapse<%= number %>">
+      <%= link_to "\u00D7", favorite_path(id), class: 'favorite-delete', method: :delete, data: { confirm: "Delete this favorite?" } %>
       <h4 class="panel-title">
         <%= fa_icon 'star' %><%= title %>
       </h4>
     </div>
-  </a>
   <div id="collapse<%= number %>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading<%= number %>">
     <div class="panel-body">
       <%= desc %>

diff --git a/app/views/users/favorites.html.erb b/app/views/users/favorites.html.erb
@@ -4,7 +4,8 @@
       <%= render partial: 'favorite', locals: { 
         number: favorite.id,
         title: favorite.text.titlecase,
-        desc: favorite.description
+        desc: favorite.description,
+        id: favorite.id
         } %>
     <% end %>
   </div>

diff --git a/config/routes.rb b/config/routes.rb
@@ -22,8 +22,9 @@
   delete "logout"             => "sessions#destroy"
 
   # Favorite
-  get  "favorites" => "users#favorites"
-  post "favorite"  => "skills#favorite"
+  get     "favorites" => "users#favorites"
+  post    "favorite"  => "skills#favorite"
+  delete  "favorite"  => "skills#destroy_favorite"
 
   # Account Activation
   resources :account_activations, only: [:edit]