added better forms + buttons

app/views/beerclubs/_form.html.erb

@@ -12,18 +12,18 @@
   <% end %>
 
   <div>
-    <%= form.label :name, style: "display: block" %>
-    <%= form.text_field :name %>
+    <%= form.label :name, class:"form-label", style: "display: block" %>
+    <%= form.text_field :name, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.label :founded, style: "display: block" %>
-    <%= form.number_field :founded %>
+    <%= form.label :founded, class:"form-label", style: "display: block" %>
+    <%= form.number_field :founded, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.label :city, style: "display: block" %>
-    <%= form.text_field :city %>
+    <%= form.label :city, class:"form-label", style: "display: block" %>
+    <%= form.text_field :city, class:"form-control" %>
   </div>
 
   <div>

app/views/beerclubs/index.html.erb

@@ -4,9 +4,9 @@
   <% @beerclubs.each do |beerclub| %>
     <%= render beerclub %>
     <p>
-      <%= link_to "Show this beerclub", beerclub %>
+      <%= link_to "Show this beerclub", beerclub, class:"btn btn-primary" %>
     </p>
   <% end %>
 </div>
 
-<%= link_to "New beerclub", new_beerclub_path if current_user %>
+<%= link_to("New beerclub", new_beerclub_path, class:"btn btn-primary") if current_user %>

app/views/beerclubs/show.html.erb

@@ -6,13 +6,13 @@
       <%= form_with model: Membership.new do |form| %>
         <%= form.hidden_field :beerclub_id, value: @beerclub.id %>
         <%= form.hidden_field :user_id, value: current_user.id %>
-        <%= form.submit "Join the beer club" %>
+        <%= form.submit "Join the beer club", class:"btn btn-primary" %>
       <% end %>
     <% else %>
       <%= form_with(model: @membership, method: :delete) do |form| %>
         <%= form.hidden_field :beer_club_id, value: @beerclub.id %>
         <%= form.hidden_field :user_id, value: current_user.id %>
-        <%= form.submit "End the membership" %>
+        <%= form.submit "End the membership", class:"btn btn-danger" %>
       <% end %>
     <% end %>
 
@@ -24,8 +24,8 @@
 <br>
 
 <div>
-  <%= link_to "Edit this beerclub", edit_beerclub_path(@beerclub) if current_user %> |
-  <%= link_to "Back to beerclubs", beerclubs_path %>
+  <%= link_to("Edit this beerclub", edit_beerclub_path(@beerclub), class:"btn btn-primary") if current_user %>
+  <%= link_to "Back to beerclubs", beerclubs_path, class:"btn btn-primary"%>
 
-  <%= button_to "Destroy this beerclub", @beerclub, method: :delete if current_user %>
+  <%= button_to "Destroy this beerclub", @beerclub, class:"btn btn-danger", method: :delete if current_user %>
 </div>

app/views/beers/_form.html.erb

@@ -12,21 +12,21 @@
   <% end %>
 
   <div>
-    <%= form.label :name, style: "display: block" %>
+    <%= form.label :name, class:"form-label", style: "display: block" %>
     <%= form.text_field :name %>
   </div>
 
   <div>
-    <%= form.label :style_id, style: "display: block" %>
-    <%= form.select :style_id, options_from_collection_for_select(@styles, :id, :name) %>
+    <%= form.label :style_id, class:"form-label", style: "display: block" %>
+    <%= form.select :style_id, options_from_collection_for_select(@styles, :id, :name), {:class => "form-select"} %>
   </div>
 
   <div>
-    <%= form.label :brewery_id, style: "display: block" %>
-    <%= form.select :brewery_id, options_from_collection_for_select(@breweries, :id, :name) %>
+    <%= form.label :brewery_id, class:"form-label", style: "display: block" %>
+    <%= form.select :brewery_id, options_from_collection_for_select(@breweries, :id, :name), {:class => "form-select"} %>
   </div>
 
   <div>
-    <%= form.submit %>
+    <%= form.submit "Create beer", class:"btn btn-primary" %>
   </div>
 <% end %>

app/views/beers/index.html.erb

@@ -1,11 +1,30 @@
 <h1>Beers</h1>
 
 <div id="beers">
-  <% @beers.each do |beer| %>
-    <%= render beer %>
-  <% end %>
+  <table class="table table-hover">
+    <tr>
+      <th scope="col">Name</th>
+      <th scope="col">Style</th>
+      <th scope="col">Brewery</th>
+      <th scope="col">Ratings</th>
+    </tr>
+      <% @beers.each do |beer| %>
+        <tr>
+          <td><%= link_to beer.name, beer %></td>
+          <td><%= link_to beer.style.name, beer.style %></td>
+          <td><%= link_to beer.brewery.name, beer.brewery %></td>
+          <td>
+            <% if beer.ratings.empty? %>
+              0.0
+            <% else %>
+              <%= beer.ratings.average :score %> 
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+  </table>
 </div>
 
 <p>
-  <%= link_to "New beer", new_beer_path if current_user %>
+  <%= link_to("New beer", new_beer_path, class:"btn btn-primary") if current_user %>
 </p>

app/views/beers/show.html.erb

@@ -1,8 +1,8 @@
 <%= render @beer %>
 
 <div>
-  <%= link_to "Edit this beer", edit_beer_path(@beer) %> |
-  <%= link_to "Back to beers", beers_path %>
+  <%= link_to "Edit this beer", edit_beer_path(@beer), class:"btn btn-primary" %>
+  <%= link_to "Back to beers", beers_path, class:"btn btn-primary" %>
 
-  <%= button_to "Destroy this beer", @beer, method: :delete %>
+  <%= button_to "Destroy this beer", @beer, class:"btn btn-danger", method: :delete %>
 </div>

app/views/breweries/_form.html.erb

@@ -12,16 +12,16 @@
   <% end %>
 
   <div>
-    <%= form.label :name, style: "display: block" %>
-    <%= form.text_field :name %>
+    <%= form.label :name, class:"form-label", style: "display: block" %>
+    <%= form.text_field :name, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.label :year, style: "display: block" %>
-    <%= form.number_field :year %>
+    <%= form.label :year, class:"form-label", style: "display: block" %>
+    <%= form.number_field :year, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.submit %>
+    <%= form.submit "Create Brewery", class:"btn btn-primary" %>
   </div>
 <% end %>

app/views/breweries/index.html.erb

@@ -7,5 +7,5 @@
 </div>
 
 <p>
-  <%= link_to "New brewery", new_brewery_path if current_user %>
+  <%= link_to("New brewery", new_brewery_path, class:"btn btn-primary") if current_user %>
 </p>

app/views/breweries/new.html.erb

@@ -5,5 +5,5 @@
 <br>
 
 <div>
-  <%= link_to "Back to breweries", breweries_path %>
+  <%= link_to "Back to breweries", breweries_path, class:"btn btn-primary" %>
 </div>

app/views/breweries/show.html.erb

@@ -1,8 +1,8 @@
 <%= render @brewery %>
 
 <div>
-  <%= link_to "Edit this brewery", edit_brewery_path(@brewery) if current_user %> |
-  <%= link_to "Back to breweries", breweries_path %>
+  <%= link_to("Edit this brewery", edit_brewery_path(@brewery), class:"btn btn-primary") if current_user %>
+  <%= link_to "Back to breweries", breweries_path, class:"btn btn-primary" %>
 
-  <%= button_to "Destroy this brewery", @brewery, method: :delete if current_user%>
+  <%= button_to "Destroy this brewery", @brewery, class:"btn btn-danger", method: :delete if current_user%>
 </div>

app/views/memberships/_form.html.erb

@@ -12,16 +12,16 @@
   <% end %>
 
   <div>
-      <%= form.label :user_id, style: "display: block" %>
-      <%= form.select :user_id, options_from_collection_for_select(@users, :id, :username) %>
+      <%= form.label :user_id, class:"form-label", style: "display: block" %>
+      <%= form.select :user_id, options_from_collection_for_select(@users, :id, :username), {:class => "form-select"} %>
   </div>
 
   <div>
-    <%= form.label :beerclub_id, style: "display: block" %>
-    <%= form.select :beerclub_id, options_from_collection_for_select(@beerclubs, :id, :name) %>
+    <%= form.label :beerclub_id, class:"form-label", style: "display: block" %>
+    <%= form.select :beerclub_id, options_from_collection_for_select(@beerclubs, :id, :name), {:class => "form-select"}  %>
   </div>
 
   <div>
-    <%= form.submit %>
+    <%= form.submit, class:"btn btn-primary" %>
   </div>
 <% end %>

app/views/ratings/index.html.erb

@@ -11,5 +11,5 @@
 </ul>
 
 <p>
-  <%= link_to "New rating", new_rating_path %>
+  <%= link_to "New rating", new_rating_path, class:"btn btn-primary" %>
 </p>

app/views/ratings/new.html.erb

@@ -13,7 +13,7 @@
     </div>
   <% end %>
 
-  <%= f.select :beer_id, options_from_collection_for_select(@beers, :id, :to_s) %>
-  score: <%= f.number_field :score %>
-  <%= f.submit %>
+  <%= f.select :beer_id, options_from_collection_for_select(@beers, :id, :to_s), {:class=>"form-select"} %>
+  score: <%= f.number_field :score, class:"form-control" %>
+  <%= f.submit "Create rating", class:"btn btn-primary"%>
 <% end %>

app/views/styles/_form.html.erb

@@ -1,15 +1,15 @@
 <%= form_with(model: style) do |form| %>
   <div>
-    <%= form.label :name, style: "display: block" %>
-    <%= form.text_field :name %>
+    <%= form.label :name, class:"form-label", style: "display: block" %>
+    <%= form.text_field :name, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.label :description, style: "display: block" %>
-    <%= form.text_field :description %>
+    <%= form.label :description, class:"form-label", style: "display: block" %>
+    <%= form.text_field :description, class:"form-control" %>
   </div>
 
   <div>
-    <%= form.submit %>
+    <%= form.submit "Create style", class:"btn btn-primary" %>
   </div>
 <% end %>

app/views/styles/index.html.erb

@@ -5,3 +5,6 @@
     <%= render style %>
   <% end %>
 <% end %>
+
+
+<%= link_to("New style", new_style_path, class:"btn btn-primary") if current_user %>

app/views/styles/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New style</h1>
+
+<%= render "form", style: @style %>
+
+<br>
+
+<div>
+  <%= link_to "Back to styles", styles_path, class:"btn btn-primary" %>
+</div>

app/views/styles/show.html.erb

@@ -1,8 +1,8 @@
 <%= render @style%>
 
 <div>
-  <%= link_to "Edit this style", edit_style_path(@style) %> |
-  <%= link_to "Back to styles", styles_path %>
+  <%= link_to "Edit this style", edit_style_path(@style), class:"btn btn-primary" %>
+  <%= link_to "Back to styles", styles_path, class:"btn btn-primary" %>
 
-  <%= button_to "Destroy this style", @style, method: :delete %>
+  <%= button_to "Destroy this style", @style, class:"btn btn-danger", method: :delete %>
 </div>

app/views/users/index.html.erb

@@ -4,10 +4,10 @@
   <% @users.each do |user| %>
     <%= render user %>
     <p>
-      <%= link_to "Show this user", user_path(user) %>
+      <%= link_to "Show this user", user_path(user), class:"btn btn-primary" %>
     </p>
   <% end %>
 </div>
 
-<%= link_to "New user", new_user_path %>
-<%= link_to "List of breweries", breweries_path %>
+<%= link_to "New user", new_user_path, class:"btn btn-primary" %>
+<%= link_to "List of breweries", breweries_path, class:"btn btn-primary" %>

app/views/users/show.html.erb

@@ -15,7 +15,7 @@
         <li>
           <%=r.beer.name %> <%= r.score %>
           <% if r.user == current_user %>
-            <%= link_to "Delete", rating_path(r.id), data: { "turbo-method": :delete} %>
+            <%= link_to "Delete", rating_path(r.id), class:"btn btn-danger", data: { "turbo-method": :delete} %>
           <% end %>
         </li>
       <% end %>
@@ -33,8 +33,8 @@
     </ul>
   </p>
 
-  <%= link_to "Edit this user", edit_user_path(@user) %> |
-  <%= link_to "Back to users", users_path %>
+  <%= link_to "Edit this user", edit_user_path(@user), class:"btn btn-primary" %>
+  <%= link_to "Back to users", users_path, class:"btn btn-primary" %>
 
-  <%= button_to "Destroy this user", @user, method: :delete %>
+  <%= button_to "Destroy this user", @user, class:"btn btn-danger", method: :delete %>
 </div>