From f9a4ee4e998f5f113565a93802c041108e9a180d Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 2 Apr 2014 14:53:10 -0400 Subject: now ran generate without ger --- app/assets/javascripts/remote_usernames.js.coffee | 3 + app/assets/stylesheets/remote_usernames.css.scss | 3 + app/controllers/remote_usernames_controller.rb | 74 +++++++++++++++++++++++ app/controllers/tournaments_controller.rb | 2 +- app/helpers/remote_usernames_helper.rb | 2 + app/views/remote_usernames/_form.html.erb | 29 +++++++++ app/views/remote_usernames/edit.html.erb | 6 ++ app/views/remote_usernames/index.html.erb | 31 ++++++++++ app/views/remote_usernames/index.json.jbuilder | 4 ++ app/views/remote_usernames/new.html.erb | 5 ++ app/views/remote_usernames/show.html.erb | 19 ++++++ app/views/remote_usernames/show.json.jbuilder | 1 + app/views/tournaments/_form.html.erb | 20 ++++++ app/views/tournaments/index.html.erb | 10 +++ app/views/tournaments/index.json.jbuilder | 2 +- app/views/tournaments/show.html.erb | 25 ++++++++ app/views/tournaments/show.json.jbuilder | 2 +- 17 files changed, 235 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/remote_usernames.js.coffee create mode 100644 app/assets/stylesheets/remote_usernames.css.scss create mode 100644 app/controllers/remote_usernames_controller.rb create mode 100644 app/helpers/remote_usernames_helper.rb create mode 100644 app/views/remote_usernames/_form.html.erb create mode 100644 app/views/remote_usernames/edit.html.erb create mode 100644 app/views/remote_usernames/index.html.erb create mode 100644 app/views/remote_usernames/index.json.jbuilder create mode 100644 app/views/remote_usernames/new.html.erb create mode 100644 app/views/remote_usernames/show.html.erb create mode 100644 app/views/remote_usernames/show.json.jbuilder (limited to 'app') 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/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb new file mode 100644 index 0000000..fecf01f --- /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/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index c4c41ab..d7db632 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -69,6 +69,6 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_params - params.require(:tournament).permit(:name, :game_id, :status, :randomized_teams) + params.require(:tournament).permit(: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/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/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? %> +
+

<%= pluralize(@remote_username.errors.count, "error") %> prohibited this remote_username from being saved:

+ + +
+ <% end %> + +
+ <%= f.label :game_id %>
+ <%= f.text_field :game_id %> +
+
+ <%= f.label :user_id %>
+ <%= f.text_field :user_id %> +
+
+ <%= f.label :user_name %>
+ <%= f.text_field :user_name %> +
+
+ <%= f.submit %> +
+<% 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 @@ +

Editing remote_username

+ +<%= 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 @@ +

Listing remote_usernames

+ + + + + + + + + + + + + + + <% @remote_usernames.each do |remote_username| %> + + + + + + + + + <% end %> + +
GameUserUser name
<%= remote_username.game %><%= remote_username.user %><%= remote_username.user_name %><%= link_to 'Show', remote_username %><%= link_to 'Edit', edit_remote_username_path(remote_username) %><%= link_to 'Destroy', remote_username, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= 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 @@ +

New remote_username

+ +<%= 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 @@ +

<%= notice %>

+ +

+ Game: + <%= @remote_username.game %> +

+ +

+ User: + <%= @remote_username.user %> +

+ +

+ User name: + <%= @remote_username.user_name %> +

+ +<%= 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 @@ -23,6 +23,26 @@ <%= f.label :status %>
<%= f.number_field :status %> +
+ <%= f.label :min_players_per_team %>
+ <%= f.number_field :min_players_per_team %> +
+
+ <%= f.label :max_players_per_team %>
+ <%= f.number_field :max_players_per_team %> +
+
+ <%= f.label :min_teams_per_match %>
+ <%= f.number_field :min_teams_per_match %> +
+
+ <%= f.label :max_teams_per_match %>
+ <%= f.number_field :max_teams_per_match %> +
+
+ <%= f.label :set_rounds %>
+ <%= f.number_field :set_rounds %> +
<%= f.label :randomized_teams %>
<%= f.check_box :randomized_teams %> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 4c1d0ff..f8f21e7 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -6,6 +6,11 @@ Name Game Status + Min players per team + Max players per team + Min teams per match + Max teams per match + Set rounds Randomized teams @@ -19,6 +24,11 @@ <%= tournament.name %> <%= tournament.game %> <%= tournament.status %> + <%= tournament.min_players_per_team %> + <%= tournament.max_players_per_team %> + <%= tournament.min_teams_per_match %> + <%= tournament.max_teams_per_match %> + <%= tournament.set_rounds %> <%= tournament.randomized_teams %> <%= link_to 'Show', tournament %> <%= link_to 'Edit', edit_tournament_path(tournament) %> 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 d58452b..3cb6179 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -15,6 +15,31 @@ <%= @tournament.status %>

+

+ Min players per team: + <%= @tournament.min_players_per_team %> +

+ +

+ Max players per team: + <%= @tournament.max_players_per_team %> +

+ +

+ Min teams per match: + <%= @tournament.min_teams_per_match %> +

+ +

+ Max teams per match: + <%= @tournament.max_teams_per_match %> +

+ +

+ Set rounds: + <%= @tournament.set_rounds %> +

+

Randomized teams: <%= @tournament.randomized_teams %> 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 -- cgit v1.2.3-54-g00ecf From ef22599880973aae8464bacb82e3a04d6277bc43 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 11:19:10 -0400 Subject: Move things around between users and sessions --- app/controllers/sessions_controller.rb | 2 +- app/views/sessions/_form.html.erb | 4 ++++ app/views/sessions/index.html.erb | 2 ++ app/views/sessions/index.json.jbuilder | 2 +- app/views/sessions/show.html.erb | 5 +++++ app/views/sessions/show.json.jbuilder | 2 +- db/migrate/20140402152830_create_servers.rb | 8 -------- db/migrate/20140402152832_create_matches.rb | 13 ------------- db/migrate/20140402152835_create_teams.rb | 9 --------- db/migrate/20140402152837_create_alerts.rb | 10 ---------- db/migrate/20140402152840_create_pms.rb | 11 ----------- db/migrate/20140402152842_create_tournaments.rb | 17 ----------------- db/migrate/20140402152845_create_games.rb | 15 --------------- db/migrate/20140402152847_create_users.rb | 13 ------------- db/migrate/20140402152850_create_sessions.rb | 9 --------- db/migrate/20140402152852_create_remote_usernames.rb | 11 ----------- db/migrate/20140402152855_create_server_settings.rb | 8 -------- db/migrate/20140402152857_create_game_settings.rb | 15 --------------- .../20140402152900_create_tournament_preferences.rb | 12 ------------ db/migrate/20140402152902_create_scores.rb | 11 ----------- ...140402152907_create_tournament_players_join_table.rb | 8 -------- ...20140402152909_create_tournament_hosts_join_table.rb | 8 -------- .../20140402152912_create_team_user_join_table.rb | 8 -------- .../20140402152914_create_match_team_join_table.rb | 8 -------- db/migrate/20140402152924_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140403151738_create_servers.rb | 8 ++++++++ db/migrate/20140403151741_create_matches.rb | 13 +++++++++++++ db/migrate/20140403151743_create_teams.rb | 9 +++++++++ db/migrate/20140403151746_create_alerts.rb | 10 ++++++++++ db/migrate/20140403151749_create_pms.rb | 11 +++++++++++ db/migrate/20140403151751_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140403151753_create_games.rb | 15 +++++++++++++++ db/migrate/20140403151756_create_users.rb | 13 +++++++++++++ db/migrate/20140403151758_create_sessions.rb | 11 +++++++++++ db/migrate/20140403151801_create_remote_usernames.rb | 11 +++++++++++ db/migrate/20140403151803_create_server_settings.rb | 8 ++++++++ db/migrate/20140403151806_create_game_settings.rb | 15 +++++++++++++++ .../20140403151808_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140403151811_create_scores.rb | 11 +++++++++++ ...140403151815_create_tournament_players_join_table.rb | 8 ++++++++ ...20140403151818_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140403151820_create_team_user_join_table.rb | 8 ++++++++ .../20140403151823_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140403151832_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 8 ++++---- generate.sh | 4 ++-- test/controllers/sessions_controller_test.rb | 4 ++-- test/fixtures/sessions.yml | 2 ++ 48 files changed, 226 insertions(+), 213 deletions(-) delete mode 100644 db/migrate/20140402152830_create_servers.rb delete mode 100644 db/migrate/20140402152832_create_matches.rb delete mode 100644 db/migrate/20140402152835_create_teams.rb delete mode 100644 db/migrate/20140402152837_create_alerts.rb delete mode 100644 db/migrate/20140402152840_create_pms.rb delete mode 100644 db/migrate/20140402152842_create_tournaments.rb delete mode 100644 db/migrate/20140402152845_create_games.rb delete mode 100644 db/migrate/20140402152847_create_users.rb delete mode 100644 db/migrate/20140402152850_create_sessions.rb delete mode 100644 db/migrate/20140402152852_create_remote_usernames.rb delete mode 100644 db/migrate/20140402152855_create_server_settings.rb delete mode 100644 db/migrate/20140402152857_create_game_settings.rb delete mode 100644 db/migrate/20140402152900_create_tournament_preferences.rb delete mode 100644 db/migrate/20140402152902_create_scores.rb delete mode 100644 db/migrate/20140402152907_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140402152909_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140402152912_create_team_user_join_table.rb delete mode 100644 db/migrate/20140402152914_create_match_team_join_table.rb delete mode 100644 db/migrate/20140402152924_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140403151738_create_servers.rb create mode 100644 db/migrate/20140403151741_create_matches.rb create mode 100644 db/migrate/20140403151743_create_teams.rb create mode 100644 db/migrate/20140403151746_create_alerts.rb create mode 100644 db/migrate/20140403151749_create_pms.rb create mode 100644 db/migrate/20140403151751_create_tournaments.rb create mode 100644 db/migrate/20140403151753_create_games.rb create mode 100644 db/migrate/20140403151756_create_users.rb create mode 100644 db/migrate/20140403151758_create_sessions.rb create mode 100644 db/migrate/20140403151801_create_remote_usernames.rb create mode 100644 db/migrate/20140403151803_create_server_settings.rb create mode 100644 db/migrate/20140403151806_create_game_settings.rb create mode 100644 db/migrate/20140403151808_create_tournament_preferences.rb create mode 100644 db/migrate/20140403151811_create_scores.rb create mode 100644 db/migrate/20140403151815_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140403151818_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140403151820_create_team_user_join_table.rb create mode 100644 db/migrate/20140403151823_create_match_team_join_table.rb create mode 100644 db/migrate/20140403151832_add_hidden_attrs_to_user.rb (limited to 'app') diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 2f72bf7..7df8a9a 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -69,6 +69,6 @@ class SessionsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def session_params - params.require(:session).permit(:user_id) + params.require(:session).permit(:user_id, :token) end end diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb index 1b94e77..90ad0ad 100644 --- a/app/views/sessions/_form.html.erb +++ b/app/views/sessions/_form.html.erb @@ -15,6 +15,10 @@ <%= f.label :user_id %>
<%= f.text_field :user_id %>

+
+ <%= f.label :token %>
+ <%= f.text_field :token %> +
<%= f.submit %>
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb index 707a47d..43a7e1f 100644 --- a/app/views/sessions/index.html.erb +++ b/app/views/sessions/index.html.erb @@ -4,6 +4,7 @@ User + Token @@ -14,6 +15,7 @@ <% @sessions.each do |session| %> <%= session.user %> + <%= session.token %> <%= link_to 'Show', session %> <%= link_to 'Edit', edit_session_path(session) %> <%= link_to 'Destroy', session, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/sessions/index.json.jbuilder b/app/views/sessions/index.json.jbuilder index 18fd4fa..5205ede 100644 --- a/app/views/sessions/index.json.jbuilder +++ b/app/views/sessions/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@sessions) do |session| - json.extract! session, :id, :user_id + json.extract! session, :id, :user_id, :token json.url session_url(session, format: :json) end diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb index 5176869..230e6bd 100644 --- a/app/views/sessions/show.html.erb +++ b/app/views/sessions/show.html.erb @@ -5,5 +5,10 @@ <%= @session.user %>

+

+ Token: + <%= @session.token %> +

+ <%= link_to 'Edit', edit_session_path(@session) %> | <%= link_to 'Back', sessions_path %> diff --git a/app/views/sessions/show.json.jbuilder b/app/views/sessions/show.json.jbuilder index 4ebf936..c9efd3b 100644 --- a/app/views/sessions/show.json.jbuilder +++ b/app/views/sessions/show.json.jbuilder @@ -1 +1 @@ -json.extract! @session, :id, :user_id, :created_at, :updated_at +json.extract! @session, :id, :user_id, :token, :created_at, :updated_at diff --git a/db/migrate/20140402152830_create_servers.rb b/db/migrate/20140402152830_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140402152830_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152832_create_matches.rb b/db/migrate/20140402152832_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140402152832_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152835_create_teams.rb b/db/migrate/20140402152835_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140402152835_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152837_create_alerts.rb b/db/migrate/20140402152837_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140402152837_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152840_create_pms.rb b/db/migrate/20140402152840_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140402152840_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152842_create_tournaments.rb b/db/migrate/20140402152842_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140402152842_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152845_create_games.rb b/db/migrate/20140402152845_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140402152845_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152847_create_users.rb b/db/migrate/20140402152847_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140402152847_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140402152850_create_sessions.rb b/db/migrate/20140402152850_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140402152850_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152852_create_remote_usernames.rb b/db/migrate/20140402152852_create_remote_usernames.rb deleted file mode 100644 index b837e53..0000000 --- a/db/migrate/20140402152852_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152855_create_server_settings.rb b/db/migrate/20140402152855_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140402152855_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152857_create_game_settings.rb b/db/migrate/20140402152857_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140402152857_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :type - t.string :name - t.text :default - t.text :discription - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152900_create_tournament_preferences.rb b/db/migrate/20140402152900_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140402152900_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152902_create_scores.rb b/db/migrate/20140402152902_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140402152902_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140402152907_create_tournament_players_join_table.rb b/db/migrate/20140402152907_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140402152907_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb b/db/migrate/20140402152909_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140402152909_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140402152912_create_team_user_join_table.rb b/db/migrate/20140402152912_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140402152912_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140402152914_create_match_team_join_table.rb b/db/migrate/20140402152914_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140402152914_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140402152924_add_hidden_attrs_to_user.rb b/db/migrate/20140402152924_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140402152924_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :remember_token, :string - add_index :users, :remember_token, unique: true - add_column :users, :groups, :integer - end -end diff --git a/db/migrate/20140403151738_create_servers.rb b/db/migrate/20140403151738_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140403151738_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151741_create_matches.rb b/db/migrate/20140403151741_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140403151741_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151743_create_teams.rb b/db/migrate/20140403151743_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140403151743_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151746_create_alerts.rb b/db/migrate/20140403151746_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140403151746_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151749_create_pms.rb b/db/migrate/20140403151749_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140403151749_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151751_create_tournaments.rb b/db/migrate/20140403151751_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140403151751_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151753_create_games.rb b/db/migrate/20140403151753_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140403151753_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151756_create_users.rb b/db/migrate/20140403151756_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140403151756_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140403151758_create_sessions.rb b/db/migrate/20140403151758_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140403151758_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140403151801_create_remote_usernames.rb b/db/migrate/20140403151801_create_remote_usernames.rb new file mode 100644 index 0000000..b837e53 --- /dev/null +++ b/db/migrate/20140403151801_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.string :user_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151803_create_server_settings.rb b/db/migrate/20140403151803_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140403151803_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151806_create_game_settings.rb b/db/migrate/20140403151806_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140403151806_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :type + t.string :name + t.text :default + t.text :discription + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151808_create_tournament_preferences.rb b/db/migrate/20140403151808_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140403151808_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +class CreateTournamentPreferences < ActiveRecord::Migration + def change + create_table :tournament_preferences do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151811_create_scores.rb b/db/migrate/20140403151811_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140403151811_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403151815_create_tournament_players_join_table.rb b/db/migrate/20140403151815_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140403151815_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140403151820_create_team_user_join_table.rb b/db/migrate/20140403151820_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140403151820_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140403151823_create_match_team_join_table.rb b/db/migrate/20140403151823_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140403151823_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 846d2e6..3a87bad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140402152924) do +ActiveRecord::Schema.define(version: 20140403151832) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140402152924) do create_table "sessions", force: true do |t| t.integer "user_id" + t.string "token" t.datetime "created_at" t.datetime "updated_at" end + add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true add_index "sessions", ["user_id"], name: "index_sessions_on_user_id" create_table "teams", force: true do |t| @@ -174,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140402152924) do t.datetime "created_at" t.datetime "updated_at" t.string "password_digest" - t.string "remember_token" - t.integer "groups" + t.integer "permissions" end add_index "users", ["email"], name: "index_users_on_email", unique: true - add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true end diff --git a/generate.sh b/generate.sh index 8fc3368..d960a56 100755 --- a/generate.sh +++ b/generate.sh @@ -32,7 +32,7 @@ bundle exec rails generate scaffold game \ min_teams_per_match:integer max_teams_per_match:integer \ set_rounds:integer randomized_teams:boolean bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq -bundle exec rails generate scaffold session user:references +bundle exec rails generate scaffold session user:references token:string:uniq bundle exec rails generate scaffold remote_username game:references user:references user_name:string # Just models @@ -56,7 +56,7 @@ bundle exec rails generate controller static $NOTEST # Migrations # By having these separate from the original 'generate', it makes it # not stick these in the views or anything. -bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string remember_token:string:uniq groups:integer +bundle exec rails generate migration AddHiddenAttrsToUser password_digest:string permissions:integer #for the tournament controller to generate options #bundle exec rails generate scaffold diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index a5cc8cb..a144bf8 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -18,7 +18,7 @@ class SessionsControllerTest < ActionController::TestCase test "should create session" do assert_difference('Session.count') do - post :create, session: { user_id: @session.user_id } + post :create, session: { token: @session.token, user_id: @session.user_id } end assert_redirected_to session_path(assigns(:session)) @@ -35,7 +35,7 @@ class SessionsControllerTest < ActionController::TestCase end test "should update session" do - patch :update, id: @session, session: { user_id: @session.user_id } + patch :update, id: @session, session: { token: @session.token, user_id: @session.user_id } assert_redirected_to session_path(assigns(:session)) end diff --git a/test/fixtures/sessions.yml b/test/fixtures/sessions.yml index d9098d9..aea4379 100644 --- a/test/fixtures/sessions.yml +++ b/test/fixtures/sessions.yml @@ -2,6 +2,8 @@ one: user_id: + token: MyString two: user_id: + token: MyString -- cgit v1.2.3-54-g00ecf From 8e3e46b7951120f1ec34949d607a7672ad03f820 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 11:52:05 -0400 Subject: run generate.sh --- app/controllers/alerts_controller.rb | 124 ++++++++++----------- app/controllers/application_controller.rb | 6 +- app/controllers/games_controller.rb | 124 ++++++++++----------- app/controllers/matches_controller.rb | 124 ++++++++++----------- app/controllers/pms_controller.rb | 124 ++++++++++----------- app/controllers/remote_usernames_controller.rb | 124 ++++++++++----------- app/controllers/servers_controller.rb | 124 ++++++++++----------- app/controllers/sessions_controller.rb | 124 ++++++++++----------- app/controllers/teams_controller.rb | 124 ++++++++++----------- app/controllers/tournaments_controller.rb | 124 ++++++++++----------- app/controllers/users_controller.rb | 124 ++++++++++----------- app/models/alert.rb | 2 +- app/models/game_setting.rb | 2 +- app/models/match.rb | 4 +- app/models/pm.rb | 4 +- app/models/remote_username.rb | 4 +- app/models/score.rb | 4 +- app/models/session.rb | 2 +- app/models/team.rb | 2 +- app/models/tournament.rb | 2 +- app/models/tournament_preference.rb | 2 +- db/migrate/20140403151738_create_servers.rb | 8 -- db/migrate/20140403151741_create_matches.rb | 13 --- db/migrate/20140403151743_create_teams.rb | 9 -- db/migrate/20140403151746_create_alerts.rb | 10 -- db/migrate/20140403151749_create_pms.rb | 11 -- db/migrate/20140403151751_create_tournaments.rb | 17 --- db/migrate/20140403151753_create_games.rb | 15 --- db/migrate/20140403151756_create_users.rb | 13 --- db/migrate/20140403151758_create_sessions.rb | 11 -- .../20140403151801_create_remote_usernames.rb | 11 -- .../20140403151803_create_server_settings.rb | 8 -- db/migrate/20140403151806_create_game_settings.rb | 15 --- ...20140403151808_create_tournament_preferences.rb | 12 -- db/migrate/20140403151811_create_scores.rb | 11 -- ...3151815_create_tournament_players_join_table.rb | 8 -- ...403151818_create_tournament_hosts_join_table.rb | 8 -- .../20140403151820_create_team_user_join_table.rb | 8 -- .../20140403151823_create_match_team_join_table.rb | 8 -- .../20140403151832_add_hidden_attrs_to_user.rb | 6 - db/migrate/20140403155007_create_servers.rb | 8 ++ db/migrate/20140403155008_create_matches.rb | 13 +++ db/migrate/20140403155011_create_teams.rb | 9 ++ db/migrate/20140403155012_create_alerts.rb | 10 ++ db/migrate/20140403155014_create_pms.rb | 11 ++ db/migrate/20140403155017_create_tournaments.rb | 17 +++ db/migrate/20140403155019_create_games.rb | 15 +++ db/migrate/20140403155020_create_users.rb | 13 +++ db/migrate/20140403155022_create_sessions.rb | 11 ++ .../20140403155024_create_remote_usernames.rb | 11 ++ .../20140403155026_create_server_settings.rb | 8 ++ db/migrate/20140403155029_create_game_settings.rb | 15 +++ ...20140403155030_create_tournament_preferences.rb | 12 ++ db/migrate/20140403155032_create_scores.rb | 11 ++ ...3155035_create_tournament_players_join_table.rb | 8 ++ ...403155038_create_tournament_hosts_join_table.rb | 8 ++ .../20140403155039_create_team_user_join_table.rb | 8 ++ .../20140403155042_create_match_team_join_table.rb | 8 ++ .../20140403155049_add_hidden_attrs_to_user.rb | 6 + db/schema.rb | 2 +- 60 files changed, 840 insertions(+), 840 deletions(-) delete mode 100644 db/migrate/20140403151738_create_servers.rb delete mode 100644 db/migrate/20140403151741_create_matches.rb delete mode 100644 db/migrate/20140403151743_create_teams.rb delete mode 100644 db/migrate/20140403151746_create_alerts.rb delete mode 100644 db/migrate/20140403151749_create_pms.rb delete mode 100644 db/migrate/20140403151751_create_tournaments.rb delete mode 100644 db/migrate/20140403151753_create_games.rb delete mode 100644 db/migrate/20140403151756_create_users.rb delete mode 100644 db/migrate/20140403151758_create_sessions.rb delete mode 100644 db/migrate/20140403151801_create_remote_usernames.rb delete mode 100644 db/migrate/20140403151803_create_server_settings.rb delete mode 100644 db/migrate/20140403151806_create_game_settings.rb delete mode 100644 db/migrate/20140403151808_create_tournament_preferences.rb delete mode 100644 db/migrate/20140403151811_create_scores.rb delete mode 100644 db/migrate/20140403151815_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140403151818_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140403151820_create_team_user_join_table.rb delete mode 100644 db/migrate/20140403151823_create_match_team_join_table.rb delete mode 100644 db/migrate/20140403151832_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140403155007_create_servers.rb create mode 100644 db/migrate/20140403155008_create_matches.rb create mode 100644 db/migrate/20140403155011_create_teams.rb create mode 100644 db/migrate/20140403155012_create_alerts.rb create mode 100644 db/migrate/20140403155014_create_pms.rb create mode 100644 db/migrate/20140403155017_create_tournaments.rb create mode 100644 db/migrate/20140403155019_create_games.rb create mode 100644 db/migrate/20140403155020_create_users.rb create mode 100644 db/migrate/20140403155022_create_sessions.rb create mode 100644 db/migrate/20140403155024_create_remote_usernames.rb create mode 100644 db/migrate/20140403155026_create_server_settings.rb create mode 100644 db/migrate/20140403155029_create_game_settings.rb create mode 100644 db/migrate/20140403155030_create_tournament_preferences.rb create mode 100644 db/migrate/20140403155032_create_scores.rb create mode 100644 db/migrate/20140403155035_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140403155038_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140403155039_create_team_user_join_table.rb create mode 100644 db/migrate/20140403155042_create_match_team_join_table.rb create mode 100644 db/migrate/20140403155049_add_hidden_attrs_to_user.rb (limited to 'app') diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb index 873e9b7..a3cb8f9 100644 --- a/app/controllers/alerts_controller.rb +++ b/app/controllers/alerts_controller.rb @@ -1,74 +1,74 @@ class AlertsController < ApplicationController - before_action :set_alert, only: [:show, :edit, :update, :destroy] + before_action :set_alert, only: [:show, :edit, :update, :destroy] - # GET /alerts - # GET /alerts.json - def index - @alerts = Alert.all - end + # GET /alerts + # GET /alerts.json + def index + @alerts = Alert.all + end - # GET /alerts/1 - # GET /alerts/1.json - def show - end + # GET /alerts/1 + # GET /alerts/1.json + def show + end - # GET /alerts/new - def new - @alert = Alert.new - end + # GET /alerts/new + def new + @alert = Alert.new + end - # GET /alerts/1/edit - def edit - end + # GET /alerts/1/edit + def edit + end - # POST /alerts - # POST /alerts.json - def create - @alert = Alert.new(alert_params) + # POST /alerts + # POST /alerts.json + def create + @alert = Alert.new(alert_params) - respond_to do |format| - if @alert.save - format.html { redirect_to @alert, notice: 'Alert was successfully created.' } - format.json { render action: 'show', status: :created, location: @alert } - else - format.html { render action: 'new' } - format.json { render json: @alert.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @alert.save + format.html { redirect_to @alert, notice: 'Alert was successfully created.' } + format.json { render action: 'show', status: :created, location: @alert } + else + format.html { render action: 'new' } + format.json { render json: @alert.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /alerts/1 - # PATCH/PUT /alerts/1.json - def update - respond_to do |format| - if @alert.update(alert_params) - format.html { redirect_to @alert, notice: 'Alert was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @alert.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /alerts/1 + # PATCH/PUT /alerts/1.json + def update + respond_to do |format| + if @alert.update(alert_params) + format.html { redirect_to @alert, notice: 'Alert was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @alert.errors, status: :unprocessable_entity } + end + end + end - # DELETE /alerts/1 - # DELETE /alerts/1.json - def destroy - @alert.destroy - respond_to do |format| - format.html { redirect_to alerts_url } - format.json { head :no_content } - end - end + # DELETE /alerts/1 + # DELETE /alerts/1.json + def destroy + @alert.destroy + respond_to do |format| + format.html { redirect_to alerts_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_alert - @alert = Alert.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_alert + @alert = Alert.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def alert_params - params.require(:alert).permit(:author_id, :message) - end + # Never trust parameters from the scary internet, only allow the white list through. + def alert_params + params.require(:alert).permit(:author_id, :message) + end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..27ef6a7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base - # Prevent CSRF attacks by raising an exception. - # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception end diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 5780152..e9620b4 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -1,74 +1,74 @@ class GamesController < ApplicationController - before_action :set_game, only: [:show, :edit, :update, :destroy] + before_action :set_game, only: [:show, :edit, :update, :destroy] - # GET /games - # GET /games.json - def index - @games = Game.all - end + # GET /games + # GET /games.json + def index + @games = Game.all + end - # GET /games/1 - # GET /games/1.json - def show - end + # GET /games/1 + # GET /games/1.json + def show + end - # GET /games/new - def new - @game = Game.new - end + # GET /games/new + def new + @game = Game.new + end - # GET /games/1/edit - def edit - end + # GET /games/1/edit + def edit + end - # POST /games - # POST /games.json - def create - @game = Game.new(game_params) + # POST /games + # POST /games.json + def create + @game = Game.new(game_params) - respond_to do |format| - if @game.save - format.html { redirect_to @game, notice: 'Game was successfully created.' } - format.json { render action: 'show', status: :created, location: @game } - else - format.html { render action: 'new' } - format.json { render json: @game.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @game.save + format.html { redirect_to @game, notice: 'Game was successfully created.' } + format.json { render action: 'show', status: :created, location: @game } + else + format.html { render action: 'new' } + format.json { render json: @game.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /games/1 - # PATCH/PUT /games/1.json - def update - respond_to do |format| - if @game.update(game_params) - format.html { redirect_to @game, notice: 'Game was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @game.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /games/1 + # PATCH/PUT /games/1.json + def update + respond_to do |format| + if @game.update(game_params) + format.html { redirect_to @game, notice: 'Game was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @game.errors, status: :unprocessable_entity } + end + end + end - # DELETE /games/1 - # DELETE /games/1.json - def destroy - @game.destroy - respond_to do |format| - format.html { redirect_to games_url } - format.json { head :no_content } - end - end + # DELETE /games/1 + # DELETE /games/1.json + def destroy + @game.destroy + respond_to do |format| + format.html { redirect_to games_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_game - @game = Game.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_game + @game = Game.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def game_params - params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) - end + # Never trust parameters from the scary internet, only allow the white list through. + def game_params + params.require(:game).permit(:name, :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/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 64414cf..32108d9 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -1,74 +1,74 @@ class MatchesController < ApplicationController - before_action :set_match, only: [:show, :edit, :update, :destroy] + before_action :set_match, only: [:show, :edit, :update, :destroy] - # GET /matches - # GET /matches.json - def index - @matches = Match.all - end + # GET /matches + # GET /matches.json + def index + @matches = Match.all + end - # GET /matches/1 - # GET /matches/1.json - def show - end + # GET /matches/1 + # GET /matches/1.json + def show + end - # GET /matches/new - def new - @match = Match.new - end + # GET /matches/new + def new + @match = Match.new + end - # GET /matches/1/edit - def edit - end + # GET /matches/1/edit + def edit + end - # POST /matches - # POST /matches.json - def create - @match = Match.new(match_params) + # POST /matches + # POST /matches.json + def create + @match = Match.new(match_params) - respond_to do |format| - if @match.save - format.html { redirect_to @match, notice: 'Match was successfully created.' } - format.json { render action: 'show', status: :created, location: @match } - else - format.html { render action: 'new' } - format.json { render json: @match.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @match.save + format.html { redirect_to @match, notice: 'Match was successfully created.' } + format.json { render action: 'show', status: :created, location: @match } + else + format.html { render action: 'new' } + format.json { render json: @match.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /matches/1 - # PATCH/PUT /matches/1.json - def update - respond_to do |format| - if @match.update(match_params) - format.html { redirect_to @match, notice: 'Match was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @match.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /matches/1 + # PATCH/PUT /matches/1.json + def update + respond_to do |format| + if @match.update(match_params) + format.html { redirect_to @match, notice: 'Match was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @match.errors, status: :unprocessable_entity } + end + end + end - # DELETE /matches/1 - # DELETE /matches/1.json - def destroy - @match.destroy - respond_to do |format| - format.html { redirect_to matches_url } - format.json { head :no_content } - end - end + # DELETE /matches/1 + # DELETE /matches/1.json + def destroy + @match.destroy + respond_to do |format| + format.html { redirect_to matches_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_match - @match = Match.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_match + @match = Match.find(params[: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) - 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) + end end diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb index 5dd0d69..b62a6ef 100644 --- a/app/controllers/pms_controller.rb +++ b/app/controllers/pms_controller.rb @@ -1,74 +1,74 @@ class PmsController < ApplicationController - before_action :set_pm, only: [:show, :edit, :update, :destroy] + before_action :set_pm, only: [:show, :edit, :update, :destroy] - # GET /pms - # GET /pms.json - def index - @pms = Pm.all - end + # GET /pms + # GET /pms.json + def index + @pms = Pm.all + end - # GET /pms/1 - # GET /pms/1.json - def show - end + # GET /pms/1 + # GET /pms/1.json + def show + end - # GET /pms/new - def new - @pm = Pm.new - end + # GET /pms/new + def new + @pm = Pm.new + end - # GET /pms/1/edit - def edit - end + # GET /pms/1/edit + def edit + end - # POST /pms - # POST /pms.json - def create - @pm = Pm.new(pm_params) + # POST /pms + # POST /pms.json + def create + @pm = Pm.new(pm_params) - respond_to do |format| - if @pm.save - format.html { redirect_to @pm, notice: 'Pm was successfully created.' } - format.json { render action: 'show', status: :created, location: @pm } - else - format.html { render action: 'new' } - format.json { render json: @pm.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @pm.save + format.html { redirect_to @pm, notice: 'Pm was successfully created.' } + format.json { render action: 'show', status: :created, location: @pm } + else + format.html { render action: 'new' } + format.json { render json: @pm.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /pms/1 - # PATCH/PUT /pms/1.json - def update - respond_to do |format| - if @pm.update(pm_params) - format.html { redirect_to @pm, notice: 'Pm was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @pm.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /pms/1 + # PATCH/PUT /pms/1.json + def update + respond_to do |format| + if @pm.update(pm_params) + format.html { redirect_to @pm, notice: 'Pm was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @pm.errors, status: :unprocessable_entity } + end + end + end - # DELETE /pms/1 - # DELETE /pms/1.json - def destroy - @pm.destroy - respond_to do |format| - format.html { redirect_to pms_url } - format.json { head :no_content } - end - end + # DELETE /pms/1 + # DELETE /pms/1.json + def destroy + @pm.destroy + respond_to do |format| + format.html { redirect_to pms_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_pm - @pm = Pm.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_pm + @pm = Pm.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def pm_params - params.require(:pm).permit(:author_id, :recipient_id, :message) - end + # Never trust parameters from the scary internet, only allow the white list through. + def pm_params + params.require(:pm).permit(:author_id, :recipient_id, :message) + end end diff --git a/app/controllers/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb index fecf01f..8676c00 100644 --- a/app/controllers/remote_usernames_controller.rb +++ b/app/controllers/remote_usernames_controller.rb @@ -1,74 +1,74 @@ class RemoteUsernamesController < ApplicationController - before_action :set_remote_username, only: [:show, :edit, :update, :destroy] + 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 + # 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/1 + # GET /remote_usernames/1.json + def show + end - # GET /remote_usernames/new - def new - @remote_username = RemoteUsername.new - end + # GET /remote_usernames/new + def new + @remote_username = RemoteUsername.new + end - # GET /remote_usernames/1/edit - def edit - 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) + # 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 + 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 + # 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 + # 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 + 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 + # 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/servers_controller.rb b/app/controllers/servers_controller.rb index 7d54eb6..43999c4 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -1,74 +1,74 @@ class ServersController < ApplicationController - before_action :set_server, only: [:show, :edit, :update, :destroy] + before_action :set_server, only: [:show, :edit, :update, :destroy] - # GET /servers - # GET /servers.json - def index - @servers = Server.all - end + # GET /servers + # GET /servers.json + def index + @servers = Server.all + end - # GET /servers/1 - # GET /servers/1.json - def show - end + # GET /servers/1 + # GET /servers/1.json + def show + end - # GET /servers/new - def new - @server = Server.new - end + # GET /servers/new + def new + @server = Server.new + end - # GET /servers/1/edit - def edit - end + # GET /servers/1/edit + def edit + end - # POST /servers - # POST /servers.json - def create - @server = Server.new(server_params) + # POST /servers + # POST /servers.json + def create + @server = Server.new(server_params) - respond_to do |format| - if @server.save - format.html { redirect_to @server, notice: 'Server was successfully created.' } - format.json { render action: 'show', status: :created, location: @server } - else - format.html { render action: 'new' } - format.json { render json: @server.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @server.save + format.html { redirect_to @server, notice: 'Server was successfully created.' } + format.json { render action: 'show', status: :created, location: @server } + else + format.html { render action: 'new' } + format.json { render json: @server.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /servers/1 - # PATCH/PUT /servers/1.json - def update - respond_to do |format| - if @server.update(server_params) - format.html { redirect_to @server, notice: 'Server was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @server.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /servers/1 + # PATCH/PUT /servers/1.json + def update + respond_to do |format| + if @server.update(server_params) + format.html { redirect_to @server, notice: 'Server was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @server.errors, status: :unprocessable_entity } + end + end + end - # DELETE /servers/1 - # DELETE /servers/1.json - def destroy - @server.destroy - respond_to do |format| - format.html { redirect_to servers_url } - format.json { head :no_content } - end - end + # DELETE /servers/1 + # DELETE /servers/1.json + def destroy + @server.destroy + respond_to do |format| + format.html { redirect_to servers_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_server - @server = Server.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_server + @server = Server.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def server_params - params[:server] - end + # Never trust parameters from the scary internet, only allow the white list through. + def server_params + params[:server] + end end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 7df8a9a..b035ea0 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,74 +1,74 @@ class SessionsController < ApplicationController - before_action :set_session, only: [:show, :edit, :update, :destroy] + before_action :set_session, only: [:show, :edit, :update, :destroy] - # GET /sessions - # GET /sessions.json - def index - @sessions = Session.all - end + # GET /sessions + # GET /sessions.json + def index + @sessions = Session.all + end - # GET /sessions/1 - # GET /sessions/1.json - def show - end + # GET /sessions/1 + # GET /sessions/1.json + def show + end - # GET /sessions/new - def new - @session = Session.new - end + # GET /sessions/new + def new + @session = Session.new + end - # GET /sessions/1/edit - def edit - end + # GET /sessions/1/edit + def edit + end - # POST /sessions - # POST /sessions.json - def create - @session = Session.new(session_params) + # POST /sessions + # POST /sessions.json + def create + @session = Session.new(session_params) - respond_to do |format| - if @session.save - format.html { redirect_to @session, notice: 'Session was successfully created.' } - format.json { render action: 'show', status: :created, location: @session } - else - format.html { render action: 'new' } - format.json { render json: @session.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @session.save + format.html { redirect_to @session, notice: 'Session was successfully created.' } + format.json { render action: 'show', status: :created, location: @session } + else + format.html { render action: 'new' } + format.json { render json: @session.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /sessions/1 - # PATCH/PUT /sessions/1.json - def update - respond_to do |format| - if @session.update(session_params) - format.html { redirect_to @session, notice: 'Session was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @session.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /sessions/1 + # PATCH/PUT /sessions/1.json + def update + respond_to do |format| + if @session.update(session_params) + format.html { redirect_to @session, notice: 'Session was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @session.errors, status: :unprocessable_entity } + end + end + end - # DELETE /sessions/1 - # DELETE /sessions/1.json - def destroy - @session.destroy - respond_to do |format| - format.html { redirect_to sessions_url } - format.json { head :no_content } - end - end + # DELETE /sessions/1 + # DELETE /sessions/1.json + def destroy + @session.destroy + respond_to do |format| + format.html { redirect_to sessions_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_session - @session = Session.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_session + @session = Session.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def session_params - params.require(:session).permit(:user_id, :token) - end + # Never trust parameters from the scary internet, only allow the white list through. + def session_params + params.require(:session).permit(:user_id, :token) + end end diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index ccd6781..05e7a12 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -1,74 +1,74 @@ class TeamsController < ApplicationController - before_action :set_team, only: [:show, :edit, :update, :destroy] + before_action :set_team, only: [:show, :edit, :update, :destroy] - # GET /teams - # GET /teams.json - def index - @teams = Team.all - end + # GET /teams + # GET /teams.json + def index + @teams = Team.all + end - # GET /teams/1 - # GET /teams/1.json - def show - end + # GET /teams/1 + # GET /teams/1.json + def show + end - # GET /teams/new - def new - @team = Team.new - end + # GET /teams/new + def new + @team = Team.new + end - # GET /teams/1/edit - def edit - end + # GET /teams/1/edit + def edit + end - # POST /teams - # POST /teams.json - def create - @team = Team.new(team_params) + # POST /teams + # POST /teams.json + def create + @team = Team.new(team_params) - respond_to do |format| - if @team.save - format.html { redirect_to @team, notice: 'Team was successfully created.' } - format.json { render action: 'show', status: :created, location: @team } - else - format.html { render action: 'new' } - format.json { render json: @team.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @team.save + format.html { redirect_to @team, notice: 'Team was successfully created.' } + format.json { render action: 'show', status: :created, location: @team } + else + format.html { render action: 'new' } + format.json { render json: @team.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /teams/1 - # PATCH/PUT /teams/1.json - def update - respond_to do |format| - if @team.update(team_params) - format.html { redirect_to @team, notice: 'Team was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @team.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /teams/1 + # PATCH/PUT /teams/1.json + def update + respond_to do |format| + if @team.update(team_params) + format.html { redirect_to @team, notice: 'Team was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @team.errors, status: :unprocessable_entity } + end + end + end - # DELETE /teams/1 - # DELETE /teams/1.json - def destroy - @team.destroy - respond_to do |format| - format.html { redirect_to teams_url } - format.json { head :no_content } - end - end + # DELETE /teams/1 + # DELETE /teams/1.json + def destroy + @team.destroy + respond_to do |format| + format.html { redirect_to teams_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_team - @team = Team.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_team + @team = Team.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def team_params - params.require(:team).permit(:match_id) - end + # Never trust parameters from the scary internet, only allow the white list through. + def team_params + params.require(:team).permit(:match_id) + end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index d7db632..e43976c 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -1,74 +1,74 @@ class TournamentsController < ApplicationController - before_action :set_tournament, only: [:show, :edit, :update, :destroy] + before_action :set_tournament, only: [:show, :edit, :update, :destroy] - # GET /tournaments - # GET /tournaments.json - def index - @tournaments = Tournament.all - end + # GET /tournaments + # GET /tournaments.json + def index + @tournaments = Tournament.all + end - # GET /tournaments/1 - # GET /tournaments/1.json - def show - end + # GET /tournaments/1 + # GET /tournaments/1.json + def show + end - # GET /tournaments/new - def new - @tournament = Tournament.new - end + # GET /tournaments/new + def new + @tournament = Tournament.new + end - # GET /tournaments/1/edit - def edit - end + # GET /tournaments/1/edit + def edit + end - # POST /tournaments - # POST /tournaments.json - def create - @tournament = Tournament.new(tournament_params) + # POST /tournaments + # POST /tournaments.json + def create + @tournament = Tournament.new(tournament_params) - respond_to do |format| - if @tournament.save - format.html { redirect_to @tournament, notice: 'Tournament was successfully created.' } - format.json { render action: 'show', status: :created, location: @tournament } - else - format.html { render action: 'new' } - format.json { render json: @tournament.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @tournament.save + format.html { redirect_to @tournament, notice: 'Tournament was successfully created.' } + format.json { render action: 'show', status: :created, location: @tournament } + else + format.html { render action: 'new' } + format.json { render json: @tournament.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /tournaments/1 - # PATCH/PUT /tournaments/1.json - def update - respond_to do |format| - if @tournament.update(tournament_params) - format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @tournament.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /tournaments/1 + # PATCH/PUT /tournaments/1.json + def update + respond_to do |format| + if @tournament.update(tournament_params) + format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @tournament.errors, status: :unprocessable_entity } + end + end + end - # DELETE /tournaments/1 - # DELETE /tournaments/1.json - def destroy - @tournament.destroy - respond_to do |format| - format.html { redirect_to tournaments_url } - format.json { head :no_content } - end - end + # DELETE /tournaments/1 + # DELETE /tournaments/1.json + def destroy + @tournament.destroy + respond_to do |format| + format.html { redirect_to tournaments_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_tournament - @tournament = Tournament.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_tournament + @tournament = Tournament.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def tournament_params - params.require(:tournament).permit(: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 + # Never trust parameters from the scary internet, only allow the white list through. + def tournament_params + params.require(:tournament).permit(: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/controllers/users_controller.rb b/app/controllers/users_controller.rb index b18efed..58bf4c6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,74 +1,74 @@ class UsersController < ApplicationController - before_action :set_user, only: [:show, :edit, :update, :destroy] + before_action :set_user, only: [:show, :edit, :update, :destroy] - # GET /users - # GET /users.json - def index - @users = User.all - end + # GET /users + # GET /users.json + def index + @users = User.all + end - # GET /users/1 - # GET /users/1.json - def show - end + # GET /users/1 + # GET /users/1.json + def show + end - # GET /users/new - def new - @user = User.new - end + # GET /users/new + def new + @user = User.new + end - # GET /users/1/edit - def edit - end + # GET /users/1/edit + def edit + end - # POST /users - # POST /users.json - def create - @user = User.new(user_params) + # POST /users + # POST /users.json + def create + @user = User.new(user_params) - respond_to do |format| - if @user.save - format.html { redirect_to @user, notice: 'User was successfully created.' } - format.json { render action: 'show', status: :created, location: @user } - else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @user.save + format.html { redirect_to @user, notice: 'User was successfully created.' } + format.json { render action: 'show', status: :created, location: @user } + else + format.html { render action: 'new' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /users/1 - # PATCH/PUT /users/1.json - def update - respond_to do |format| - if @user.update(user_params) - format.html { redirect_to @user, notice: 'User was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /users/1 + # PATCH/PUT /users/1.json + def update + respond_to do |format| + if @user.update(user_params) + format.html { redirect_to @user, notice: 'User was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end - # DELETE /users/1 - # DELETE /users/1.json - def destroy - @user.destroy - respond_to do |format| - format.html { redirect_to users_url } - format.json { head :no_content } - end - end + # DELETE /users/1 + # DELETE /users/1.json + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to users_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_user - @user = User.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_user + @user = User.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def user_params - params.require(:user).permit(:name, :email, :user_name) - end + # Never trust parameters from the scary internet, only allow the white list through. + def user_params + params.require(:user).permit(:name, :email, :user_name) + end end diff --git a/app/models/alert.rb b/app/models/alert.rb index 343c269..0516355 100644 --- a/app/models/alert.rb +++ b/app/models/alert.rb @@ -1,3 +1,3 @@ class Alert < ActiveRecord::Base - belongs_to :author + belongs_to :author end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index e147b15..bff8d97 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,3 +1,3 @@ class GameSetting < ActiveRecord::Base - belongs_to :game + belongs_to :game end diff --git a/app/models/match.rb b/app/models/match.rb index bb814c1..fe68d31 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,4 +1,4 @@ class Match < ActiveRecord::Base - belongs_to :tournament - belongs_to :winner + belongs_to :tournament + belongs_to :winner end diff --git a/app/models/pm.rb b/app/models/pm.rb index ab5af3b..9fce2b3 100644 --- a/app/models/pm.rb +++ b/app/models/pm.rb @@ -1,4 +1,4 @@ class Pm < ActiveRecord::Base - belongs_to :author - belongs_to :recipient + belongs_to :author + belongs_to :recipient end diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index 94e5063..c477f8a 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -1,4 +1,4 @@ class RemoteUsername < ActiveRecord::Base - belongs_to :game - belongs_to :user + belongs_to :game + belongs_to :user end diff --git a/app/models/score.rb b/app/models/score.rb index a9b9c71..11ee9a6 100644 --- a/app/models/score.rb +++ b/app/models/score.rb @@ -1,4 +1,4 @@ class Score < ActiveRecord::Base - belongs_to :user - belongs_to :match + belongs_to :user + belongs_to :match end diff --git a/app/models/session.rb b/app/models/session.rb index c66afec..a5fd26e 100644 --- a/app/models/session.rb +++ b/app/models/session.rb @@ -1,3 +1,3 @@ class Session < ActiveRecord::Base - belongs_to :user + belongs_to :user end diff --git a/app/models/team.rb b/app/models/team.rb index 9e71557..8d89f51 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,3 +1,3 @@ class Team < ActiveRecord::Base - belongs_to :match + belongs_to :match end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index cc915a0..dcdb8d5 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -1,3 +1,3 @@ class Tournament < ActiveRecord::Base - belongs_to :game + belongs_to :game end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb index 1f335e3..3d15061 100644 --- a/app/models/tournament_preference.rb +++ b/app/models/tournament_preference.rb @@ -1,3 +1,3 @@ class TournamentPreference < ActiveRecord::Base - belongs_to :tournament + belongs_to :tournament end diff --git a/db/migrate/20140403151738_create_servers.rb b/db/migrate/20140403151738_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140403151738_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151741_create_matches.rb b/db/migrate/20140403151741_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140403151741_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151743_create_teams.rb b/db/migrate/20140403151743_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140403151743_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151746_create_alerts.rb b/db/migrate/20140403151746_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140403151746_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151749_create_pms.rb b/db/migrate/20140403151749_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140403151749_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151751_create_tournaments.rb b/db/migrate/20140403151751_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140403151751_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151753_create_games.rb b/db/migrate/20140403151753_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140403151753_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :min_players_per_team - t.integer :max_players_per_team - t.integer :min_teams_per_match - t.integer :max_teams_per_match - t.integer :set_rounds - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151756_create_users.rb b/db/migrate/20140403151756_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140403151756_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140403151758_create_sessions.rb b/db/migrate/20140403151758_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140403151758_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - t.string :token - - t.timestamps - end - add_index :sessions, :token, unique: true - end -end diff --git a/db/migrate/20140403151801_create_remote_usernames.rb b/db/migrate/20140403151801_create_remote_usernames.rb deleted file mode 100644 index b837e53..0000000 --- a/db/migrate/20140403151801_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.string :user_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151803_create_server_settings.rb b/db/migrate/20140403151803_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140403151803_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151806_create_game_settings.rb b/db/migrate/20140403151806_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140403151806_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateGameSettings < ActiveRecord::Migration - def change - create_table :game_settings do |t| - t.references :game, index: true - t.integer :type - t.string :name - t.text :default - t.text :discription - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151808_create_tournament_preferences.rb b/db/migrate/20140403151808_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140403151808_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151811_create_scores.rb b/db/migrate/20140403151811_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140403151811_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateScores < ActiveRecord::Migration - def change - create_table :scores do |t| - t.references :user, index: true - t.references :match, index: true - t.integer :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140403151815_create_tournament_players_join_table.rb b/db/migrate/20140403151815_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140403151815_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentPlayersJoinTable < ActiveRecord::Migration - def change - create_join_table :players, :tournaments do |t| - # t.index [:player_id, :tournament_id] - # t.index [:tournament_id, :player_id] - end - end -end diff --git a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb b/db/migrate/20140403151818_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTournamentHostsJoinTable < ActiveRecord::Migration - def change - create_join_table :hosts, :tournaments do |t| - # t.index [:host_id, :tournament_id] - # t.index [:tournament_id, :host_id] - end - end -end diff --git a/db/migrate/20140403151820_create_team_user_join_table.rb b/db/migrate/20140403151820_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140403151820_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140403151823_create_match_team_join_table.rb b/db/migrate/20140403151823_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140403151823_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateMatchTeamJoinTable < ActiveRecord::Migration - def change - create_join_table :matches, :teams do |t| - # t.index [:match_id, :team_id] - # t.index [:team_id, :match_id] - end - end -end diff --git a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb b/db/migrate/20140403151832_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140403155007_create_servers.rb b/db/migrate/20140403155007_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140403155007_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155008_create_matches.rb b/db/migrate/20140403155008_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140403155008_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155011_create_teams.rb b/db/migrate/20140403155011_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140403155011_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155012_create_alerts.rb b/db/migrate/20140403155012_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140403155012_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155014_create_pms.rb b/db/migrate/20140403155014_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140403155014_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155017_create_tournaments.rb b/db/migrate/20140403155017_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140403155017_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155019_create_games.rb b/db/migrate/20140403155019_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140403155019_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + t.integer :min_players_per_team + t.integer :max_players_per_team + t.integer :min_teams_per_match + t.integer :max_teams_per_match + t.integer :set_rounds + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155020_create_users.rb b/db/migrate/20140403155020_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140403155020_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140403155022_create_sessions.rb b/db/migrate/20140403155022_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140403155022_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140403155024_create_remote_usernames.rb b/db/migrate/20140403155024_create_remote_usernames.rb new file mode 100644 index 0000000..b837e53 --- /dev/null +++ b/db/migrate/20140403155024_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.string :user_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155026_create_server_settings.rb b/db/migrate/20140403155026_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140403155026_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155029_create_game_settings.rb b/db/migrate/20140403155029_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140403155029_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :type + t.string :name + t.text :default + t.text :discription + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155030_create_tournament_preferences.rb b/db/migrate/20140403155030_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140403155030_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +class CreateTournamentPreferences < ActiveRecord::Migration + def change + create_table :tournament_preferences do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155032_create_scores.rb b/db/migrate/20140403155032_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140403155032_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140403155035_create_tournament_players_join_table.rb b/db/migrate/20140403155035_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140403155035_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :players, :tournaments do |t| + # t.index [:player_id, :tournament_id] + # t.index [:tournament_id, :player_id] + end + end +end diff --git a/db/migrate/20140403155038_create_tournament_hosts_join_table.rb b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :hosts, :tournaments do |t| + # t.index [:host_id, :tournament_id] + # t.index [:tournament_id, :host_id] + end + end +end diff --git a/db/migrate/20140403155039_create_team_user_join_table.rb b/db/migrate/20140403155039_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140403155039_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140403155042_create_match_team_join_table.rb b/db/migrate/20140403155042_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140403155042_create_match_team_join_table.rb @@ -0,0 +1,8 @@ +class CreateMatchTeamJoinTable < ActiveRecord::Migration + def change + create_join_table :matches, :teams do |t| + # t.index [:match_id, :team_id] + # t.index [:team_id, :match_id] + end + end +end diff --git a/db/migrate/20140403155049_add_hidden_attrs_to_user.rb b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 3a87bad..113f16d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140403151832) do +ActiveRecord::Schema.define(version: 20140403155049) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-54-g00ecf