Settled Merge Conflicts.

16 files changed, 25 insertions, 35 deletions

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index b312e9e..53028a4 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -72,6 +72,6 @@ class MatchesController < ApplicationController
     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)
+      params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id)
     end
 end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 8d90758..027aad6 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -124,8 +124,6 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-
       params.require(:tournament).permit(:game, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
-      
     end
 end
diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb
new file mode 100644
index 0000000..94e5063
--- /dev/null
+++ b/app/models/remote_username.rb
@@ -0,0 +1,4 @@
+class RemoteUsername < ActiveRecord::Base
+  belongs_to :game
+  belongs_to :user
+end
diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb
new file mode 100644
index 0000000..28ae943
--- /dev/null
+++ b/app/models/server_setting.rb
@@ -0,0 +1,2 @@
+class ServerSetting < ActiveRecord::Base
+end
diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb
deleted file mode 100644
index 7f49863..0000000
--- a/app/models/server_settings.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ServerSettings < ActiveRecord::Base
-end
diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb
deleted file mode 100644
index 242a6f6..0000000
--- a/app/models/tournament_option.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class TournamentOption < ActiveRecord::Base
-  belongs_to :tournament
-end
diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb
new file mode 100644
index 0000000..1f335e3
--- /dev/null
+++ b/app/models/tournament_preference.rb
@@ -0,0 +1,3 @@
+class TournamentPreference < ActiveRecord::Base
+  belongs_to :tournament
+end
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb
index 3efb566..e2ec73b 100644
--- a/app/views/matches/_form.html.erb
+++ b/app/views/matches/_form.html.erb
@@ -12,6 +12,14 @@
     <%= f.label :name %><br>
     <%= f.text_field :name %>
   </div>
+  <div class="field">
+    <%= f.label :winner_id %><br>
+    <%= f.text_field :winner_id %>
+  </div>
+  <div class="field">
+    <%= f.label :remote_id %><br>
+    <%= f.text_field :remote_id %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb
index d862d57..d463e50 100644
--- a/app/views/matches/index.html.erb
+++ b/app/views/matches/index.html.erb
@@ -7,6 +7,7 @@
       <th>Tournament</th>
       <th>Name</th>
       <th>Winner</th>
+      <th>Remote</th>
       <th></th>
       <th></th>
       <th></th>
@@ -21,9 +22,6 @@
         <td><%= match.tournament %></td>
         <td><%= match.name %></td>
         <td><%= match.winner %></td>
-        <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td>
-        <td><%= link_to 'Edit', edit_tournament_match_path(@tournament, match) %></td>
-        <td><%= link_to 'Destroy', tournament_match_path(@tournament, match), method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder
index 1a63f5f..18f172d 100644
--- a/app/views/matches/index.json.jbuilder
+++ b/app/views/matches/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@matches) do |match|
-  json.extract! match, :id, :status, :tournament_id, :name, :winner_id
+  json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id
   json.url match_url(match, format: :json)
 end
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 6b962ad..53c3b38 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -32,4 +32,3 @@
 	</p>
 <% end %>
 
-<%= link_to 'Back', tournament_matches_path %>
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index a3ef588..bfd2be4 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :created_at, :updated_at
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index 38855a0..fe92318 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -24,24 +24,8 @@
     <%= 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 %>
+    <%= f.label :ger %><br>
+    <%= f.text_field :ger %>
   </div>
   <div class="field">
     <%= f.label :randomized_teams %><br>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index b7c9118..6a86955 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -43,7 +43,6 @@
       </div>
     <% end %>
 
-
   </div>
 <% else %>
   <p class="no-entries"> No tournaments going on right now... Why not start your own? </p>
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder
index 4038f04..653442f 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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams
+  json.extract! tournament, :id, :name, :game_id, :status, :ger, :randomized_teams
   json.url tournament_url(tournament, format: :json)
 end
diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder
index 27fd5c0..d70a27a 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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :created_at, :updated_at
+json.extract! @tournament, :id, :name, :game_id, :status, :ger, :randomized_teams, :created_at, :updated_at