add a button for the settings

Author: fatboypunk

apps/bear_necessities_web/lib/bear_necessities_web/templates/playfield/scoreboard.html.leex

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div class="scoreboard">
   <h1>Contending players</h1>
 
@@ -11,17 +10,4 @@
       <% end %>
     </ul>
   <% end %>
-
 </div>
-=======
-<h1>Contending players</h1>
-<%= for player <- @players do %>
-  <div>
-    <%= if player.id == @id do %>
-      <b><%= player.display_name %></b>
-    <% else %>
-      <%= player.display_name %>
-    <% end %>
-  </div>
-<% end %>
->>>>>>> add a scoreboard with all players

apps/bear_necessities_web/lib/bear_necessities_web/templates/playfield/template.html.leex

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <%= if @set_setting == false do  %>
   <%= if @bear.started do %>
 
@@ -7,7 +6,7 @@
         <h1>Hello, <%= @bear.display_name %></h1>
         <span>X: <%= @pos_x %></span>
         <span>Y: <%= @pos_y %></span>
-        <button phx-click="left" class="button small">left</button>
+        <button phx-click="set_setting" value="<%= @set_setting %>" class="button small">Settings</button>
         <button phx-click="down" class="button small">down</button>
         <button phx-click="up" class="button small">up</button>
         <button phx-click="right" class="button small">right</button>
@@ -42,6 +41,7 @@
         <%= submit("Start", phx_disable_with: "Starting...", class: "button red") %>
       <% end %>
     </div>
+  <% end %>
 <% end %>