19 files changed, 226 insertions, 8 deletions
diff --git a/app/assets/javascripts/remote_usernames.js.coffee b/app/assets/javascripts/remote_usernames.js.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/remote_usernames.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/remote_usernames.css.scss b/app/assets/stylesheets/remote_usernames.css.scss
new file mode 100644
index 0000000..b9e841e
--- /dev/null
+++ b/app/assets/stylesheets/remote_usernames.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the remote_usernames controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 8d65960..ba6ab16 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -14,7 +14,6 @@ class MatchesController < ApplicationController
 
 	# GET /matches/new
 	def new
-
 	end
 
 	# GET /matches/1/edit
@@ -54,10 +53,10 @@ class MatchesController < ApplicationController
 	# DELETE /matches/1
 	# DELETE /matches/1.json
 	def destroy
-
 		@match.destroy
 		respond_to do |format|
 			format.html { redirect_to tournament_matches_path }
+			format.json { head :no_content }
 		end
 	end
 
@@ -70,6 +69,7 @@ class MatchesController < ApplicationController
 	def set_tournament
 		@tournament = Tournament.find(params[:tournament_id])
 	end
+
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def match_params
 		params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id)
diff --git a/app/controllers/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb
new file mode 100644
index 0000000..8676c00
--- /dev/null
+++ b/app/controllers/remote_usernames_controller.rb
@@ -0,0 +1,74 @@
+class RemoteUsernamesController < ApplicationController
+	before_action :set_remote_username, only: [:show, :edit, :update, :destroy]
+
+	# GET /remote_usernames
+	# GET /remote_usernames.json
+	def index
+		@remote_usernames = RemoteUsername.all
+	end
+
+	# GET /remote_usernames/1
+	# GET /remote_usernames/1.json
+	def show
+	end
+
+	# GET /remote_usernames/new
+	def new
+		@remote_username = RemoteUsername.new
+	end
+
+	# GET /remote_usernames/1/edit
+	def edit
+	end
+
+	# POST /remote_usernames
+	# POST /remote_usernames.json
+	def create
+		@remote_username = RemoteUsername.new(remote_username_params)
+
+		respond_to do |format|
+			if @remote_username.save
+				format.html { redirect_to @remote_username, notice: 'Remote username was successfully created.' }
+				format.json { render action: 'show', status: :created, location: @remote_username }
+			else
+				format.html { render action: 'new' }
+				format.json { render json: @remote_username.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+
+	# PATCH/PUT /remote_usernames/1
+	# PATCH/PUT /remote_usernames/1.json
+	def update
+		respond_to do |format|
+			if @remote_username.update(remote_username_params)
+				format.html { redirect_to @remote_username, notice: 'Remote username was successfully updated.' }
+				format.json { head :no_content }
+			else
+				format.html { render action: 'edit' }
+				format.json { render json: @remote_username.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+
+	# DELETE /remote_usernames/1
+	# DELETE /remote_usernames/1.json
+	def destroy
+		@remote_username.destroy
+		respond_to do |format|
+			format.html { redirect_to remote_usernames_url }
+			format.json { head :no_content }
+		end
+	end
+
+	private
+	# Use callbacks to share common setup or constraints between actions.
+	def set_remote_username
+		@remote_username = RemoteUsername.find(params[:id])
+	end
+
+	# Never trust parameters from the scary internet, only allow the white list through.
+	def remote_username_params
+		params.require(:remote_username).permit(:game_id, :user_id, :user_name)
+	end
+end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index aaaccd7..1bae258 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -39,7 +39,6 @@ class SessionsController < ApplicationController
 	end
 
 	private
-
 	# Use callbacks to share common setup or constraints between actions.
 	def set_session
 		#@session = Session.find(cookies[:remember_token])
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 26c5d49..8a8b994 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -12,7 +12,6 @@ class UsersController < ApplicationController
 	# GET /users/1
 	# GET /users/1.json
 	def show
-		@user = User.find(params[:id])
 	end
 
 	# GET /users/new
diff --git a/app/helpers/remote_usernames_helper.rb b/app/helpers/remote_usernames_helper.rb
new file mode 100644
index 0000000..3240c4f
--- /dev/null
+++ b/app/helpers/remote_usernames_helper.rb
@@ -0,0 +1,2 @@
+module RemoteUsernamesHelper
+end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 21dc9bb..87b516e 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -43,6 +43,4 @@ class Tournament < ActiveRecord::Base
 			end
 		end
 	end
-
-
 end
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