Beautify collections

Author: Theresa

app/controllers/collections_controller.rb

@@ -25,6 +25,7 @@ def edit
   # POST /collections.json
   def create
     @collection = Collection.new(collection_params)
+    @collection.user = current_user
 
     respond_to do |format|
       if @collection.save
@@ -69,6 +70,6 @@ def set_collection
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def collection_params
-      params.require(:collection).permit(:user_id)
+      params.require(:collection).permit(:title)
     end
 end

app/views/collections/_form.html.erb

@@ -10,12 +10,11 @@
       </ul>
     </div>
   <% end %>
-
   <div class="field">
-    <%= f.label :user_id %><br>
-    <%= f.text_field :user_id %>
+    <%= f.label :title %><br>
+    <%= f.text_field :title%>
   </div>
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit nil, class:'btn btn-primary' %>
   </div>
 <% end %>

app/views/collections/index.html.erb

@@ -1,27 +1,34 @@
 <p id="notice"><%= notice %></p>
 
-<h1>Listing Collections</h1>
+<h2>Your Collections <%= link_to 'New Collection', new_collection_path, class:'btn btn-success' %> </h2>
 
-<table>
+<table class="table">
   <thead>
     <tr>
-      <th>User</th>
-      <th colspan="3"></th>
+      <th>Title</th>
+      <th>Exercises</th>
+      <th colspan="2">Actions</th>
     </tr>
   </thead>
 
   <tbody>
     <% @collections.each do |collection| %>
-      <tr>
-        <td><%= collection.user %></td>
-        <td><%= link_to 'Show', collection %></td>
-        <td><%= link_to 'Edit', edit_collection_path(collection) %></td>
-        <td><%= link_to 'Destroy', collection, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+      <% if collection.user === current_user %>
+        <tr>
+          <td><%= collection.title %></td>
+          <% if collection.exercises %>
+            <% collection.exercises.each do |exercise| %>
+              <td><%= link_to exercise.title, exercise_path(exercise) %></td>
+            <% end %>
+          <% else%>
+            <td> <%= 'No exercises added' %></td>
+          <% end %>
+          <td><%= link_to 'Edit', edit_collection_path(collection), class:'btn btn-warning btn-xs' %></td>
+          <td><%= link_to 'Destroy', collection, method: :delete, data: { confirm: 'Are you sure?' }, class:'btn btn-danger btn-xs' %></td>
+        </tr>
+      <% end %>
     <% end %>
   </tbody>
 </table>
 
 <br>
-
-<%= link_to 'New Collection', new_collection_path %>

app/views/collections/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', collections_path %>
+<%= link_to 'Back', :back, class: 'btn btn-default'%>

app/views/collections/show.html.erb

@@ -1,9 +1,9 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>User:</strong>
-  <%= @collection.user %>
+  <strong>Collection:</strong>
+  <%= @collection.title %>
 </p>
 
-<%= link_to 'Edit', edit_collection_path(@collection) %> |
+<%= link_to 'Edit', edit_collection_path(@collection), class:'btn btn-warning' %> |
 <%= link_to 'Back', collections_path %>

db/migrate/20160215215407_add_title_to_collection.rb

@@ -0,0 +1,5 @@
+class AddTitleToCollection < ActiveRecord::Migration
+  def change
+    add_column :collections, :title, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160213230122) do
+ActiveRecord::Schema.define(version: 20160215215407) do
 
   create_table "account_links", force: :cascade do |t|
     t.datetime "created_at",   null: false
@@ -63,6 +63,7 @@
     t.integer  "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string   "title"
   end
 
   add_index "collections", ["user_id"], name: "index_collections_on_user_id"