Beautify cart view

Author: Theresa

app/views/carts/_form.html.erb

@@ -11,11 +11,23 @@
     </div>
   <% end %>
 
-  <div class="field">
-    <%= f.label :user_id %><br>
-    <%= f.text_field :user_id %>
-  </div>
+  <% if @cart.persisted?%>
+    <dl class="dl-horizontal">
+      <dt>Exercises</dt>
+        <% if @cart.user === current_user %>
+            <% if @cart.exercises %>
+                <% @cart.exercises.each do |exercise| %>
+                    <dd><%= link_to exercise.title, exercise_path(exercise) %></dd>
+                    <dd><%= link_to 'Delete', nil, class:'btn btn-danger btn-xs' %></dd>
+                <% end %>
+            <% else%>
+                <dd> <%= 'No exercises added' %></dd>
+            <% end %>
+        <% end %>
+    </dl>
+  <% end %>
+
   <div class="actions">
-    <%= f.submit %>
+    <%= f.submit nil, class:'btn btn-primary' %>
   </div>
 <% end %>

app/views/carts/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @cart %> |
-<%= link_to 'Back', carts_path %>
+<%= link_to 'Back', :back, class:'btn btn-default btn-xs' %>

app/views/carts/index.html.erb

@@ -1,27 +1,24 @@
 <p id="notice"><%= notice %></p>
 
-<h1>Listing Carts</h1>
+<h2>Your Cart <%= link_to 'New Cart', new_cart_path, class:'btn  btn-success' %></h2>
 
-<table>
-  <thead>
-    <tr>
-      <th>User</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
 
-  <tbody>
-    <% @carts.each do |cart| %>
-      <tr>
-        <td><%= cart.user %></td>
-        <td><%= link_to 'Show', cart %></td>
-        <td><%= link_to 'Edit', edit_cart_path(cart) %></td>
-        <td><%= link_to 'Destroy', cart, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<dl class="dl-horizontal">
+  <dt>Exercises</dt>
+  <% @carts.each do |cart| %>
+      <% if cart.user === current_user %>
+        <% if cart.exercises %>
+          <% cart.exercises.each do |exercise| %>
+            <dd><%= link_to exercise.title, exercise_path(exercise) %></dd>
+          <% end %>
+        <% else%>
+          <dd> <%= 'No exercises added' %></dd>
+        <% end %>
+      <% end %>
+      <dt>Actions</dt>
+      <dd><%= link_to 'Edit', edit_cart_path(cart), class:'btn btn-warning btn-xs' %> <%= link_to 'Destroy', cart, method: :delete, data: { confirm: 'Are you sure?' }, class:'btn btn-danger btn-xs' %></dd>
+  <% end %>
+</dl>
 
-<br>
 
-<%= link_to 'New Cart', new_cart_path %>
+<br>

app/views/carts/show.html.erb

@@ -1,8 +1,8 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>User:</strong>
-  <%= @cart.user %>
+  <strong>Exercise:</strong>
+  <%= @cart.exercises %>
 </p>
 
 <%= link_to 'Edit', edit_cart_path(@cart) %> |

app/views/layouts/application.html.erb

@@ -31,7 +31,7 @@
         <%= menu_group pull: :right do %>
             <% if current_user %>
               <% if current_user.cart %>
-                <%= menu_item 'Cart (' + current_user.cart_count.to_s + ')', cart_path(current_user.cart) %>
+                <%= menu_item 'Cart (' + current_user.cart_count.to_s + ')', carts_path %>
               <% end %>
               <%= menu_item current_user.email, user_path(current_user) %>
               <%= menu_item 'Log out',  logout_path, method: :delete %>