From 19e50bd6796ff6773c724b2ed417a83af550b117 Mon Sep 17 00:00:00 2001
From: YarekTenko <yarektenko@gmail.com>
Date: Tue, 28 Mar 2017 13:17:56 -0700
Subject: [PATCH] Display all Bets

-All bets are displayed on /bets page.
---
 app/views/bets/_bet.html.erb          |  7 +++++++
 app/views/bets/_display_bets.html.erb | 14 --------------
 app/views/bets/index.html.erb         | 23 ++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 app/views/bets/_bet.html.erb
 delete mode 100644 app/views/bets/_display_bets.html.erb

diff --git a/app/views/bets/_bet.html.erb b/app/views/bets/_bet.html.erb
new file mode 100644
index 0000000..87890d0
--- /dev/null
+++ b/app/views/bets/_bet.html.erb
@@ -0,0 +1,7 @@
+<tr>
+  <td class="col-md-2"><%= bet.creator_id %></td>
+  <td class="col-md-2"><%= bet.created_at %></td>
+  <td class="col-md-2"><%= bet.expires_at %></td>
+  <td class="col-md-2"><%= bet.bet_total %></td>
+  <td class="col-md-4"><%= bet.bet %></td>
+</tr>
diff --git a/app/views/bets/_display_bets.html.erb b/app/views/bets/_display_bets.html.erb
deleted file mode 100644
index 37c7d69..0000000
--- a/app/views/bets/_display_bets.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="row">
-  <div class="col col-lg-12">
-    <table class="table table-hover">
-      <thead class="thead-default">
-        <tr>
-          <th class="col-md-2">Created By</th>
-          <th class="col-md-2">Created at</th>
-          <th class="col-md-2">Total amount bet</th>
-          <th class="col-md-6">Bet description</th>
-        </tr>
-      </thead>
-    </table>
-  </div>
-</div>
diff --git a/app/views/bets/index.html.erb b/app/views/bets/index.html.erb
index 7ade0da..f110418 100644
--- a/app/views/bets/index.html.erb
+++ b/app/views/bets/index.html.erb
@@ -5,5 +5,26 @@
       <h4>This page will display all the existing bets (25/page) and allow the user to use custom search criteria.</h4>
     </div>
   </div>
-  <%= render 'bets/display_bets' %>
+  <div class="d-flex flex-column">
+    <div class="p-2">
+      <div class="row">
+        <div class="col col-lg-12">
+          <table class="table table-hover">
+            <thead class="thead-default">
+              <tr>
+                <th class="col-md-2">Created By</th>
+                <th class="col-md-2">Created at</th>
+                <th class="col-md-2">Expires at</th>
+                <th class="col-md-2">Total amount bet</th>
+                <th class="col-md-4">Bet description</th>
+              </tr>
+            </thead>
+            <tbody>
+              <%= render @bets%>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
 <% end %>