Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

11 files changed, 142 insertions, 2 deletions

diff --git a/app/views/remote_usernames/_form.html.erb b/app/views/remote_usernames/_form.html.erb
new file mode 100644
index 0000000..5da1f8f
--- /dev/null
+++ b/app/views/remote_usernames/_form.html.erb
@@ -0,0 +1,29 @@
+<%= form_for(@remote_username) do |f| %>
+  <% if @remote_username.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@remote_username.errors.count, "error") %> prohibited this remote_username from being saved:</h2>
+
+      <ul>
+      <% @remote_username.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :game_id %><br>
+    <%= f.text_field :game_id %>
+  </div>
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= f.text_field :user_id %>
+  </div>
+  <div class="field">
+    <%= f.label :user_name %><br>
+    <%= f.text_field :user_name %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>
diff --git a/app/views/remote_usernames/edit.html.erb b/app/views/remote_usernames/edit.html.erb
new file mode 100644
index 0000000..52d4b37
--- /dev/null
+++ b/app/views/remote_usernames/edit.html.erb
@@ -0,0 +1,6 @@
+<h1>Editing remote_username</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @remote_username %> |
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/index.html.erb b/app/views/remote_usernames/index.html.erb
new file mode 100644
index 0000000..14f5876
--- /dev/null
+++ b/app/views/remote_usernames/index.html.erb
@@ -0,0 +1,31 @@
+<h1>Listing remote_usernames</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Game</th>
+      <th>User</th>
+      <th>User name</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @remote_usernames.each do |remote_username| %>
+      <tr>
+        <td><%= remote_username.game %></td>
+        <td><%= remote_username.user %></td>
+        <td><%= remote_username.user_name %></td>
+        <td><%= link_to 'Show', remote_username %></td>
+        <td><%= link_to 'Edit', edit_remote_username_path(remote_username) %></td>
+        <td><%= link_to 'Destroy', remote_username, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Remote username', new_remote_username_path %>
diff --git a/app/views/remote_usernames/index.json.jbuilder b/app/views/remote_usernames/index.json.jbuilder
new file mode 100644
index 0000000..c9fbc0f
--- /dev/null
+++ b/app/views/remote_usernames/index.json.jbuilder
@@ -0,0 +1,4 @@
+json.array!(@remote_usernames) do |remote_username|
+  json.extract! remote_username, :id, :game_id, :user_id, :user_name
+  json.url remote_username_url(remote_username, format: :json)
+end
diff --git a/app/views/remote_usernames/new.html.erb b/app/views/remote_usernames/new.html.erb
new file mode 100644
index 0000000..b9cfcf4
--- /dev/null
+++ b/app/views/remote_usernames/new.html.erb
@@ -0,0 +1,5 @@
+<h1>New remote_username</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/show.html.erb b/app/views/remote_usernames/show.html.erb
new file mode 100644
index 0000000..416ca9d
--- /dev/null
+++ b/app/views/remote_usernames/show.html.erb
@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Game:</strong>
+  <%= @remote_username.game %>
+</p>
+
+<p>
+  <strong>User:</strong>
+  <%= @remote_username.user %>
+</p>
+
+<p>
+  <strong>User name:</strong>
+  <%= @remote_username.user_name %>
+</p>
+
+<%= link_to 'Edit', edit_remote_username_path(@remote_username) %> |
+<%= link_to 'Back', remote_usernames_path %>
diff --git a/app/views/remote_usernames/show.json.jbuilder b/app/views/remote_usernames/show.json.jbuilder
new file mode 100644
index 0000000..1a0f6f9
--- /dev/null
+++ b/app/views/remote_usernames/show.json.jbuilder
@@ -0,0 +1 @@
+json.extract! @remote_username, :id, :game_id, :user_id, :user_name, :created_at, :updated_at
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 3dadbf7..38855a0 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -24,6 +24,26 @@
     <%= f.number_field :status %>
   </div>
   <div class="field">
+    <%= f.label :min_players_per_team %><br>
+    <%= f.number_field :min_players_per_team %>
+  </div>
+  <div class="field">
+    <%= f.label :max_players_per_team %><br>
+    <%= f.number_field :max_players_per_team %>
+  </div>
+  <div class="field">
+    <%= f.label :min_teams_per_match %><br>
+    <%= f.number_field :min_teams_per_match %>
+  </div>
+  <div class="field">
+    <%= f.label :max_teams_per_match %><br>
+    <%= f.number_field :max_teams_per_match %>
+  </div>
+  <div class="field">
+    <%= f.label :set_rounds %><br>
+    <%= f.number_field :set_rounds %>
+  </div>
+  <div class="field">
     <%= f.label :randomized_teams %><br>
     <%= f.check_box :randomized_teams %>
   </div>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 32587df..4038f04 100644
--- a/app/views/tournaments/index.json.jbuilder
+++ b/app/views/tournaments/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@tournaments) do |tournament|
-  json.extract! tournament, :id, :name, :game_id, :status, :randomized_teams
+  json.extract! tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 1ebf4c5..b771701 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -46,6 +46,31 @@
 </p>
 
 <p>
+  <strong>Min players per team:</strong>
+  <%= @tournament.min_players_per_team %>
+</p>
+
+<p>
+  <strong>Max players per team:</strong>
+  <%= @tournament.max_players_per_team %>
+</p>
+
+<p>
+  <strong>Min teams per match:</strong>
+  <%= @tournament.min_teams_per_match %>
+</p>
+
+<p>
+  <strong>Max teams per match:</strong>
+  <%= @tournament.max_teams_per_match %>
+</p>
+
+<p>
+  <strong>Set rounds:</strong>
+  <%= @tournament.set_rounds %>
+</p>
+
+<p>
   <strong>Randomized teams:</strong>
   <%= @tournament.randomized_teams %>
 </p>
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index d543c76..27fd5c0 100644
--- a/app/views/tournaments/show.json.jbuilder
+++ b/app/views/tournaments/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @tournament, :id, :name, :game_id, :status, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at