From 0c32a47e95e0e5026be2a7758b13de612b46b849 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:11:29 -0400 Subject: generate.sh: remove $NOTEST garbage --- generate.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/generate.sh b/generate.sh index 1e15106..451490c 100755 --- a/generate.sh +++ b/generate.sh @@ -15,11 +15,11 @@ git checkout clean-start -- app test config/routes.rb bundle exec rails generate simple_captcha # The whole shebang, models, views, and controllers -bundle exec rails generate scaffold server --force $NOTEST -bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string $NOTEST -bundle exec rails generate scaffold team match:references $NOTEST -bundle exec rails generate scaffold alert author:references message:text $NOTEST -bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST +bundle exec rails generate scaffold server --force +bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string +bundle exec rails generate scaffold team match:references +bundle exec rails generate scaffold alert author:references message:text +bundle exec rails generate scaffold pm author:references recipient:references message:text bundle exec rails generate scaffold tournament name:string:unique game:references status:integer \ min_players_per_team:integer max_players_per_team:integer \ min_teams_per_match:integer max_teams_per_match:integer \ @@ -33,10 +33,10 @@ bundle exec rails generate scaffold user name:string email:string:uniq user_name bundle exec rails generate scaffold session user:references token:string:uniq # Just models -bundle exec rails generate model server_setting $NOTEST -bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer $NOTEST -bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text $NOTEST -bundle exec rails generate model score user:references match:references value:integer $NOTEST +bundle exec rails generate model server_setting +bundle exec rails generate model game_setting game:references stype:integer name:string default:text description:text type_opt:text display_order:integer +bundle exec rails generate model tournament_preference tournament:references vartype:integer name:string value:text +bundle exec rails generate model score user:references match:references value:integer bundle exec rails generate model remote_username game:references user:references json_value:text # Join tables @@ -46,9 +46,9 @@ bundle exec rails generate migration CreateTeamUserJoinTable teams users bundle exec rails generate migration CreateMatchTeamJoinTable matches teams # Just controllers -bundle exec rails generate controller search $NOTEST -bundle exec rails generate controller main $NOTEST -bundle exec rails generate controller static $NOTEST +bundle exec rails generate controller search +bundle exec rails generate controller main +bundle exec rails generate controller static # Migrations # By having these separate from the original 'generate', it makes it -- cgit v1.2.3-54-g00ecf From 540980e84dc22e2064ad33f79c0b526628848fa9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:13:10 -0400 Subject: generate.sh: add a default_user_permissions server setting --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 451490c..e6385bf 100755 --- a/generate.sh +++ b/generate.sh @@ -15,7 +15,7 @@ git checkout clean-start -- app test config/routes.rb bundle exec rails generate simple_captcha # The whole shebang, models, views, and controllers -bundle exec rails generate scaffold server --force +bundle exec rails generate scaffold server default_user_permissions:integer bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string bundle exec rails generate scaffold team match:references bundle exec rails generate scaffold alert author:references message:text -- cgit v1.2.3-54-g00ecf From d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:18:00 -0400 Subject: run generate --- app/controllers/servers_controller.rb | 2 +- app/views/servers/_form.html.erb | 4 ++++ app/views/servers/index.html.erb | 2 ++ app/views/servers/index.json.jbuilder | 2 +- app/views/servers/show.html.erb | 5 +++++ app/views/servers/show.json.jbuilder | 2 +- db/migrate/20140405215315_create_simple_captcha_data.rb | 15 --------------- db/migrate/20140406015318_create_servers.rb | 8 -------- db/migrate/20140406015321_create_matches.rb | 13 ------------- db/migrate/20140406015324_create_teams.rb | 9 --------- db/migrate/20140406015327_create_alerts.rb | 10 ---------- db/migrate/20140406015330_create_pms.rb | 11 ----------- db/migrate/20140406015332_create_tournaments.rb | 17 ----------------- db/migrate/20140406015335_create_games.rb | 15 --------------- db/migrate/20140406015338_create_users.rb | 13 ------------- db/migrate/20140406015341_create_sessions.rb | 11 ----------- db/migrate/20140406015344_create_server_settings.rb | 8 -------- db/migrate/20140406015347_create_game_settings.rb | 15 --------------- .../20140406015350_create_tournament_preferences.rb | 12 ------------ db/migrate/20140406015353_create_scores.rb | 11 ----------- db/migrate/20140406015356_create_remote_usernames.rb | 11 ----------- ...140406015359_create_tournament_players_join_table.rb | 8 -------- ...20140406015401_create_tournament_hosts_join_table.rb | 8 -------- .../20140406015404_create_team_user_join_table.rb | 8 -------- .../20140406015406_create_match_team_join_table.rb | 8 -------- db/migrate/20140406015417_add_hidden_attrs_to_user.rb | 6 ------ db/migrate/20140406131442_create_simple_captcha_data.rb | 15 +++++++++++++++ db/migrate/20140406171445_create_servers.rb | 9 +++++++++ db/migrate/20140406171448_create_matches.rb | 13 +++++++++++++ db/migrate/20140406171451_create_teams.rb | 9 +++++++++ db/migrate/20140406171453_create_alerts.rb | 10 ++++++++++ db/migrate/20140406171456_create_pms.rb | 11 +++++++++++ db/migrate/20140406171459_create_tournaments.rb | 17 +++++++++++++++++ db/migrate/20140406171502_create_games.rb | 15 +++++++++++++++ db/migrate/20140406171505_create_users.rb | 13 +++++++++++++ db/migrate/20140406171508_create_sessions.rb | 11 +++++++++++ db/migrate/20140406171510_create_server_settings.rb | 8 ++++++++ db/migrate/20140406171513_create_game_settings.rb | 15 +++++++++++++++ .../20140406171516_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140406171519_create_scores.rb | 11 +++++++++++ db/migrate/20140406171522_create_remote_usernames.rb | 11 +++++++++++ ...140406171525_create_tournament_players_join_table.rb | 8 ++++++++ ...20140406171527_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140406171530_create_team_user_join_table.rb | 8 ++++++++ .../20140406171532_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140406171543_add_hidden_attrs_to_user.rb | 6 ++++++ db/schema.rb | 3 ++- generate.sh | 2 +- test/controllers/servers_controller_test.rb | 4 ++-- test/fixtures/servers.yml | 14 +++++--------- 50 files changed, 242 insertions(+), 233 deletions(-) delete mode 100644 db/migrate/20140405215315_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140406015318_create_servers.rb delete mode 100644 db/migrate/20140406015321_create_matches.rb delete mode 100644 db/migrate/20140406015324_create_teams.rb delete mode 100644 db/migrate/20140406015327_create_alerts.rb delete mode 100644 db/migrate/20140406015330_create_pms.rb delete mode 100644 db/migrate/20140406015332_create_tournaments.rb delete mode 100644 db/migrate/20140406015335_create_games.rb delete mode 100644 db/migrate/20140406015338_create_users.rb delete mode 100644 db/migrate/20140406015341_create_sessions.rb delete mode 100644 db/migrate/20140406015344_create_server_settings.rb delete mode 100644 db/migrate/20140406015347_create_game_settings.rb delete mode 100644 db/migrate/20140406015350_create_tournament_preferences.rb delete mode 100644 db/migrate/20140406015353_create_scores.rb delete mode 100644 db/migrate/20140406015356_create_remote_usernames.rb delete mode 100644 db/migrate/20140406015359_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140406015401_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140406015404_create_team_user_join_table.rb delete mode 100644 db/migrate/20140406015406_create_match_team_join_table.rb delete mode 100644 db/migrate/20140406015417_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140406131442_create_simple_captcha_data.rb create mode 100644 db/migrate/20140406171445_create_servers.rb create mode 100644 db/migrate/20140406171448_create_matches.rb create mode 100644 db/migrate/20140406171451_create_teams.rb create mode 100644 db/migrate/20140406171453_create_alerts.rb create mode 100644 db/migrate/20140406171456_create_pms.rb create mode 100644 db/migrate/20140406171459_create_tournaments.rb create mode 100644 db/migrate/20140406171502_create_games.rb create mode 100644 db/migrate/20140406171505_create_users.rb create mode 100644 db/migrate/20140406171508_create_sessions.rb create mode 100644 db/migrate/20140406171510_create_server_settings.rb create mode 100644 db/migrate/20140406171513_create_game_settings.rb create mode 100644 db/migrate/20140406171516_create_tournament_preferences.rb create mode 100644 db/migrate/20140406171519_create_scores.rb create mode 100644 db/migrate/20140406171522_create_remote_usernames.rb create mode 100644 db/migrate/20140406171525_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140406171527_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140406171530_create_team_user_join_table.rb create mode 100644 db/migrate/20140406171532_create_match_team_join_table.rb create mode 100644 db/migrate/20140406171543_add_hidden_attrs_to_user.rb diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index 43999c4..4c12c7e 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -69,6 +69,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params[:server] + params.require(:server).permit(:default_user_permissions) end end diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index b08654b..6211f9a 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -11,6 +11,10 @@ <% end %> +
+ <%= f.label :default_user_permissions %>
+ <%= f.number_field :default_user_permissions %> +
<%= f.submit %>
diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb index f45d393..b3064f4 100644 --- a/app/views/servers/index.html.erb +++ b/app/views/servers/index.html.erb @@ -3,6 +3,7 @@ + @@ -12,6 +13,7 @@ <% @servers.each do |server| %> + diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder index 2776abc..3c9df60 100644 --- a/app/views/servers/index.json.jbuilder +++ b/app/views/servers/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@servers) do |server| - json.extract! server, :id + json.extract! server, :id, :default_user_permissions json.url server_url(server, format: :json) end diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 039cd8f..b18f09f 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -1,4 +1,9 @@

<%= notice %>

+

+ Default user permissions: + <%= @server.default_user_permissions %> +

+ <%= link_to 'Edit', edit_server_path(@server) %> | <%= link_to 'Back', servers_path %> diff --git a/app/views/servers/show.json.jbuilder b/app/views/servers/show.json.jbuilder index 972b1c0..c566f76 100644 --- a/app/views/servers/show.json.jbuilder +++ b/app/views/servers/show.json.jbuilder @@ -1 +1 @@ -json.extract! @server, :id, :created_at, :updated_at +json.extract! @server, :id, :default_user_permissions, :created_at, :updated_at diff --git a/db/migrate/20140405215315_create_simple_captcha_data.rb b/db/migrate/20140405215315_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140405215315_create_simple_captcha_data.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration - def self.up - create_table :simple_captcha_data do |t| - t.string :key, :limit => 40 - t.string :value, :limit => 6 - t.timestamps - end - - add_index :simple_captcha_data, :key, :name => "idx_key" - end - - def self.down - drop_table :simple_captcha_data - end -end diff --git a/db/migrate/20140406015318_create_servers.rb b/db/migrate/20140406015318_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140406015318_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/20140406015321_create_matches.rb b/db/migrate/20140406015321_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140406015321_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/20140406015324_create_teams.rb b/db/migrate/20140406015324_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140406015324_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/20140406015327_create_alerts.rb b/db/migrate/20140406015327_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140406015327_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/20140406015330_create_pms.rb b/db/migrate/20140406015330_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140406015330_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/20140406015332_create_tournaments.rb b/db/migrate/20140406015332_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140406015332_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/20140406015335_create_games.rb b/db/migrate/20140406015335_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140406015335_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/20140406015338_create_users.rb b/db/migrate/20140406015338_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140406015338_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/20140406015341_create_sessions.rb b/db/migrate/20140406015341_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140406015341_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/20140406015344_create_server_settings.rb b/db/migrate/20140406015344_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140406015344_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/20140406015347_create_game_settings.rb b/db/migrate/20140406015347_create_game_settings.rb deleted file mode 100644 index b1caf5d..0000000 --- a/db/migrate/20140406015347_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 :stype - t.string :name - t.text :default - t.text :description - t.text :type_opt - t.integer :display_order - - t.timestamps - end - end -end diff --git a/db/migrate/20140406015350_create_tournament_preferences.rb b/db/migrate/20140406015350_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140406015350_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/20140406015353_create_scores.rb b/db/migrate/20140406015353_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140406015353_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/20140406015356_create_remote_usernames.rb b/db/migrate/20140406015356_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140406015356_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.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140406015359_create_tournament_players_join_table.rb b/db/migrate/20140406015359_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140406015359_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/20140406015401_create_tournament_hosts_join_table.rb b/db/migrate/20140406015401_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140406015401_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/20140406015404_create_team_user_join_table.rb b/db/migrate/20140406015404_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140406015404_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/20140406015406_create_match_team_join_table.rb b/db/migrate/20140406015406_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140406015406_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/20140406015417_add_hidden_attrs_to_user.rb b/db/migrate/20140406015417_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140406015417_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/20140406131442_create_simple_captcha_data.rb b/db/migrate/20140406131442_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140406131442_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140406171445_create_servers.rb b/db/migrate/20140406171445_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140406171445_create_servers.rb @@ -0,0 +1,9 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + t.integer :default_user_permissions + + t.timestamps + end + end +end diff --git a/db/migrate/20140406171448_create_matches.rb b/db/migrate/20140406171448_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140406171448_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/20140406171451_create_teams.rb b/db/migrate/20140406171451_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140406171451_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/20140406171453_create_alerts.rb b/db/migrate/20140406171453_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140406171453_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/20140406171456_create_pms.rb b/db/migrate/20140406171456_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140406171456_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/20140406171459_create_tournaments.rb b/db/migrate/20140406171459_create_tournaments.rb new file mode 100644 index 0000000..c0d8929 --- /dev/null +++ b/db/migrate/20140406171459_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/20140406171502_create_games.rb b/db/migrate/20140406171502_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140406171502_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/20140406171505_create_users.rb b/db/migrate/20140406171505_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140406171505_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/20140406171508_create_sessions.rb b/db/migrate/20140406171508_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140406171508_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/20140406171510_create_server_settings.rb b/db/migrate/20140406171510_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140406171510_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/20140406171513_create_game_settings.rb b/db/migrate/20140406171513_create_game_settings.rb new file mode 100644 index 0000000..b1caf5d --- /dev/null +++ b/db/migrate/20140406171513_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 :stype + t.string :name + t.text :default + t.text :description + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140406171516_create_tournament_preferences.rb b/db/migrate/20140406171516_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140406171516_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/20140406171519_create_scores.rb b/db/migrate/20140406171519_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140406171519_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/20140406171522_create_remote_usernames.rb b/db/migrate/20140406171522_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140406171522_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.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140406171525_create_tournament_players_join_table.rb b/db/migrate/20140406171525_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140406171525_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/20140406171527_create_tournament_hosts_join_table.rb b/db/migrate/20140406171527_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140406171527_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/20140406171530_create_team_user_join_table.rb b/db/migrate/20140406171530_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140406171530_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/20140406171532_create_match_team_join_table.rb b/db/migrate/20140406171532_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140406171532_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/20140406171543_add_hidden_attrs_to_user.rb b/db/migrate/20140406171543_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140406171543_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 829ad0e..53bc413 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: 20140406015417) do +ActiveRecord::Schema.define(version: 20140406171543) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -115,6 +115,7 @@ ActiveRecord::Schema.define(version: 20140406015417) do end create_table "servers", force: true do |t| + t.integer "default_user_permissions" t.datetime "created_at" t.datetime "updated_at" end diff --git a/generate.sh b/generate.sh index e6385bf..18d0f63 100755 --- a/generate.sh +++ b/generate.sh @@ -9,7 +9,7 @@ set -xe srcdir=$(dirname "$(readlink -f "$0")") cd "$srcdir" -git rm -rf app test config/routes.rb db/migrate +git rm -rf -- app test config/routes.rb db/migrate || true git checkout clean-start -- app test config/routes.rb bundle exec rails generate simple_captcha diff --git a/test/controllers/servers_controller_test.rb b/test/controllers/servers_controller_test.rb index 5891bb0..3a01d56 100644 --- a/test/controllers/servers_controller_test.rb +++ b/test/controllers/servers_controller_test.rb @@ -18,7 +18,7 @@ class ServersControllerTest < ActionController::TestCase test "should create server" do assert_difference('Server.count') do - post :create, server: { } + post :create, server: { default_user_permissions: @server.default_user_permissions } end assert_redirected_to server_path(assigns(:server)) @@ -35,7 +35,7 @@ class ServersControllerTest < ActionController::TestCase end test "should update server" do - patch :update, id: @server, server: { } + patch :update, id: @server, server: { default_user_permissions: @server.default_user_permissions } assert_redirected_to server_path(assigns(:server)) end diff --git a/test/fixtures/servers.yml b/test/fixtures/servers.yml index 937a0c0..3001059 100644 --- a/test/fixtures/servers.yml +++ b/test/fixtures/servers.yml @@ -1,11 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -# This model initially had no columns defined. If you add columns to the -# model remove the '{}' from the fixture names and add the columns immediately -# below each fixture, per the syntax in the comments below -# -one: {} -# column: value -# -two: {} -# column: value +one: + default_user_permissions: 1 + +two: + default_user_permissions: 1 -- cgit v1.2.3-54-g00ecf From a81c1ca571b0bb41f0acba6594559c7405fc2bb1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:58:00 -0400 Subject: Simplify the server controller and views, as it is a singular resource --- app/controllers/servers_controller.rb | 51 +++++------------------------------ app/views/servers/index.html.erb | 27 ------------------- app/views/servers/index.json.jbuilder | 4 --- app/views/servers/new.html.erb | 5 ---- 4 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 app/views/servers/index.html.erb delete mode 100644 app/views/servers/index.json.jbuilder delete mode 100644 app/views/servers/new.html.erb diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index 27c6f9f..e3850b8 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -1,43 +1,15 @@ class ServersController < ApplicationController - - # GET /servers - # GET /servers.json - def index - @servers = Server.all - end - - # GET /servers/1 - # GET /servers/1.json + # GET /server + # GET /server.json def show end - # GET /servers/new - def new - @server = Server.new - end - - # GET /servers/1/edit + # GET /server/edit def edit end - # 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 - - # PATCH/PUT /servers/1 - # PATCH/PUT /servers/1.json + # PATCH/PUT /server + # PATCH/PUT /server.json def update respond_to do |format| if @server.update(server_params) @@ -50,20 +22,11 @@ class ServersController < ApplicationController 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]) + @server = Server.first end # Never trust parameters from the scary internet, only allow the white list through. diff --git a/app/views/servers/index.html.erb b/app/views/servers/index.html.erb deleted file mode 100644 index b3064f4..0000000 --- a/app/views/servers/index.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -

Listing servers

- -
Default user permissions
<%= server.default_user_permissions %> <%= link_to 'Show', server %> <%= link_to 'Edit', edit_server_path(server) %> <%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %>
- - - - - - - - - - - <% @servers.each do |server| %> - - - - - - - <% end %> - -
Default user permissions
<%= server.default_user_permissions %><%= link_to 'Show', server %><%= link_to 'Edit', edit_server_path(server) %><%= link_to 'Destroy', server, method: :delete, data: { confirm: 'Are you sure?' } %>
- -
- -<%= link_to 'New Server', new_server_path %> diff --git a/app/views/servers/index.json.jbuilder b/app/views/servers/index.json.jbuilder deleted file mode 100644 index 3c9df60..0000000 --- a/app/views/servers/index.json.jbuilder +++ /dev/null @@ -1,4 +0,0 @@ -json.array!(@servers) do |server| - json.extract! server, :id, :default_user_permissions - json.url server_url(server, format: :json) -end diff --git a/app/views/servers/new.html.erb b/app/views/servers/new.html.erb deleted file mode 100644 index 0422009..0000000 --- a/app/views/servers/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New server

- -<%= render 'form' %> - -<%= link_to 'Back', servers_path %> -- cgit v1.2.3-54-g00ecf From 6be38bc3b6ee5546c0d1f26497c2687b4138df35 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 13:58:56 -0400 Subject: User.permission_bits: return 2^n instead of n for each. This way they can easily be ORed together, C-like. --- app/models/user.rb | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 626e4bf..0b77ab1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,31 +11,32 @@ class User < ActiveRecord::Base def self.permission_bits return { - :create_tournament => 1, - :edit_tournament => 2, - :join_tournament => 3, - :delete_tournament => 4, + :create_tournament => (2**1), + :edit_tournament => (2**2), + :join_tournament => (2**3), + :delete_tournament => (2**4), - :create_game => 5, - :edit_game => 6, - :delete_game => 7, + :create_game => (2**5), + :edit_game => (2**6), + :delete_game => (2**7), - :create_user => 8, - :edit_user => 9, - :delete_user => 10, + :create_user => (2**8), + :edit_user => (2**9), + :delete_user => (2**10), - :create_alert => 11, - :edit_alert => 12, - :delete_alert => 13, + :create_alert => (2**11), + :edit_alert => (2**12), + :delete_alert => (2**13), - :create_pm => 14, - :edit_pm => 15, - :delete_pm => 16, + :create_pm => (2**14), + :edit_pm => (2**15), + :delete_pm => (2**16), - :create_session => 17, - :delete_session => 18, + :create_session => (2**17), + :delete_session => (2**18), - :edit_permissions => 19, + :edit_permissions => (2**19), + :edit_server => (2**20), } end @@ -44,21 +45,21 @@ class User < ActiveRecord::Base if bit.nil? return false else - return (self.permissions & (2**bit) != 0) + return (self.permissions & bit != 0) end end def add_ability(action) bit = User.permission_bits[action.to_sym] unless bit.nil? - self.permissions |= 2**bit + self.permissions |= bit end end def remove_ability(action) bit = User.permission_bits[action.to_sym] unless bit.nil? - self.permissions &= ~ (2**bit) + self.permissions &= ~ bit end end -- cgit v1.2.3-54-g00ecf From 2b5b1d4aba906bc5fb5b219a02a611b6b25253e3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:00:03 -0400 Subject: seed the server settings --- db/seeds.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 986256c..6efc3e7 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -6,6 +6,9 @@ # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) # +p = User.permission_bits +Server.create(default_user_permissions: p[:join_tournament] | p[:create_pm]) + Game.create(name: "League of Legends",min_players_per_team: 5, max_players_per_team: 5, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) Game.create(name: "Chess", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: nil, randomized_teams: true) Game.create(name: "Hearthstone", min_players_per_team: 1, max_players_per_team: 1, min_teams_per_match: 2, max_teams_per_match: 2, set_rounds: 1, randomized_teams: false) -- cgit v1.2.3-54-g00ecf From 2da3c10d18856c254457a3106eb8f1762b5077a9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:04:21 -0400 Subject: oops --- app/views/servers/edit.html.erb | 3 +-- app/views/servers/show.html.erb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb index a92cdb5..99f7faa 100644 --- a/app/views/servers/edit.html.erb +++ b/app/views/servers/edit.html.erb @@ -2,5 +2,4 @@ <%= render 'form' %> -<%= link_to 'Show', @server %> | -<%= link_to 'Back', servers_path %> +<%= link_to 'Show', @server %> diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index aa6752a..875be5d 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -3,5 +3,4 @@ <%= @server.default_user_permissions %>

-<%= link_to 'Edit', edit_server_path(@server) %> | -<%= link_to 'Back', servers_path %> +<%= link_to 'Edit', edit_server_path(@server) %> -- cgit v1.2.3-54-g00ecf From cfaff7870d0348b25b3b4b2597950894ab25d989 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:32:38 -0400 Subject: implement editing the default user permissions --- app/controllers/servers_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/models/server.rb | 36 +++++++++++++++++++++++++++++++++++ app/views/servers/_form.html.erb | 23 ++++++++++------------ app/views/servers/edit.html.erb | 2 +- app/views/servers/show.html.erb | 2 +- 6 files changed, 50 insertions(+), 17 deletions(-) diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index e3850b8..83a9f31 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -31,6 +31,6 @@ class ServersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def server_params - params.require(:server).permit(:default_user_permissions) + params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dd66c18..637480f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -33,7 +33,7 @@ class UsersController < ApplicationController return end - @user.permissions = 0 + @user.permissions = Server.first.default_user_permissions respond_to do |format| if @user.save sign_in @user diff --git a/app/models/server.rb b/app/models/server.rb index 120f0fa..5ba7524 100644 --- a/app/models/server.rb +++ b/app/models/server.rb @@ -1,2 +1,38 @@ class Server < ActiveRecord::Base + def default_user_abilities + @abilities ||= User::Abilities.new(DefaultUser.new(self)) + end + def default_user_abilities=(new) + new.each do |k,v| + if v == "0" + v = false + end + default_user_abilities[k] = v + end + end + class DefaultUser + def initialize(server) + @server = server + end + def can?(action) + bit = User.permission_bits[action] + if bit.nil? + return false + else + return (@server.default_user_permissions & bit != 0) + end + end + def add_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions |= bit + end + end + def remove_ability(action) + bit = User.permission_bits[action.to_sym] + unless bit.nil? + @server.default_user_permissions &= ~ bit + end + end + end end diff --git a/app/views/servers/_form.html.erb b/app/views/servers/_form.html.erb index 6211f9a..1afde11 100644 --- a/app/views/servers/_form.html.erb +++ b/app/views/servers/_form.html.erb @@ -1,20 +1,17 @@ <%= form_for(@server) do |f| %> - <% if @server.errors.any? %> -
-

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

+ <%= render "common/error_messages", :target => @server %> -
    - <% @server.errors.full_messages.each do |msg| %> -
  • <%= msg %>
    • +
    + Default permissions for new users +
      + <%= fields_for "server[default_user_abilities]", @server.default_user_abilities do |a| %> + <% @server.default_user_abilities.keys.each do |ability| %> +
      • <% end %> -
    -
- <% end %> + <% end %> + + -
- <%= f.label :default_user_permissions %>
- <%= f.number_field :default_user_permissions %> -
<%= f.submit %>
diff --git a/app/views/servers/edit.html.erb b/app/views/servers/edit.html.erb index 99f7faa..d37864f 100644 --- a/app/views/servers/edit.html.erb +++ b/app/views/servers/edit.html.erb @@ -2,4 +2,4 @@ <%= render 'form' %> -<%= link_to 'Show', @server %> +<%= link_to server_path %> diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 875be5d..54aaf66 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -3,4 +3,4 @@ <%= @server.default_user_permissions %>

-<%= link_to 'Edit', edit_server_path(@server) %> +<%= link_to 'Edit', edit_server_path %> -- cgit v1.2.3-54-g00ecf From 353a5dfcc1782744684922b7d41c8030750d1533 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 14:54:24 -0400 Subject: add a server settings button to the top bar if you have permission --- app/assets/stylesheets/custom.css.scss | 1 + app/views/layouts/application.html.erb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 1a9b09a..febcbb8 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -24,6 +24,7 @@ a, input[type="submit"] { &.signup { @extend .btn-success; } &.signin { @extend .btn-info; } &.signout { @extend .btn-danger; } + &.server { @extend .btn-danger; } } p.errors { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 976ee85..6d1d7f4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,6 +21,9 @@ <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> <%= link_to "Sign out", session_path("current"), method: "delete", :class => "signout" %> + <% if current_user.can? :edit_server %> + <%= link_to "Server settings", edit_server_path, :class => "server" %> + <% end %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin" %> <%= link_to "Sign up", new_user_path, :class => "signup" %> -- cgit v1.2.3-54-g00ecf From 7e7b56d0a722e6c7e453d83f65324ec9d571b109 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 6 Apr 2014 17:23:21 -0400 Subject: Fixed match view, GUNTAS --- app/views/matches/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 6fb4042..20860e2 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -61,8 +61,8 @@ Players see the Peer Review Page Host see the Game Status --> -<% if (@match.status==0) %> - <% if (@tournament.players.include?(current_user) %> +<% if @match.status == 0 %> + <% if @tournament.players.include?(current_user) %> <% @match.teams.each do |team| %>
    <% team.users.collect{|u| u.user_name}.each do |k| %> -- cgit v1.2.3-54-g00ecf From 8f1a442b8f647ddca49572c8deb63f035d85ccf8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 6 Apr 2014 17:32:34 -0400 Subject: I swear I have fixed this before --- app/controllers/tournaments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index a9e91b0..2fc82ed 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -99,7 +99,7 @@ class TournamentsController < ApplicationController format.html { redirect_to @tournament, notice: 'You have joined this tournament.' } format.json { head :no_content } else - format.html { render action: 'permission_denied', status: :forbidden } + format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." } format.json { render json: "Permission denied", status: :forbidden } end end -- cgit v1.2.3-54-g00ecf From f85943114dba527a1f87abb03229553472f57c0c Mon Sep 17 00:00:00 2001 From: tkimia Date: Sun, 6 Apr 2014 18:45:41 -0400 Subject: started SVG generation --- app/controllers/matches_controller.rb | 4 ++++ app/models/tournament.rb | 4 ++-- app/views/matches/index.html.erb | 32 +++++++++++++++++++++++++++----- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 31fc9ad..e773667 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -8,6 +8,10 @@ class MatchesController < ApplicationController def index @matches = @tournament.matches + # width of SVG + @width = 300 * (Math.log2(@matches.count).floor + 1) + 300; + # height of SVG + @height = 200 * 2**Math.log2(@matches.count).floor + 100; end def get_riot_info diff --git a/app/models/tournament.rb b/app/models/tournament.rb index e408cfe..0029de7 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -31,7 +31,7 @@ class Tournament < ActiveRecord::Base for i in 1..num_matches self.matches.create(name: "Match #{i}", status: 0) end - match_num = 0 + match_num = num_matches-1 team_num = 0 #for each grouping of min_players_per_team self.players.each_slice(min_players_per_team) do |players| @@ -39,7 +39,7 @@ class Tournament < ActiveRecord::Base self.matches[match_num].teams.push(Team.create(users: players)) #if the match is full, move to the next match, otherwise move to the next team if (team_num != 0 and team_num % max_teams_per_match == 0) - match_num += 1 + match_num -= 1 team_num = 0 else team_num += 1 diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 219507d..031b2a9 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -26,17 +26,39 @@
    - +
    - + <% (1..@matches.count).each do |i| %> - + <% when 0 %> + <% if @matches[i-1].teams.count < @tournament.min_teams_per_match %> + stroke="red" + fill-opacity="0.6" + <% else %> + stroke="green" + <% end %> + <% when 1 %> + stroke="orange" + <% when 2 %> + stroke="yellow" + <% when 3 %> + stroke="grey" + <% end %> + /> <% end %> + +
    \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 2fd131ea6c6a1810d27941d85bcf5a5eb2d8669f Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:54:04 -0400 Subject: add delayed_job_active_record to Gemfile --- Gemfile | 2 +- Gemfile.lock | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a34b0a6..c33683a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks -gem 'delayed_job' +gem 'delayed_job_active_record' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails -- cgit v1.2.3-54-g00ecf From d1bdf1ea4e3120c133cc5e81970958355a9719a1 Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:55:33 -0400 Subject: pull changes to Gemfile from master --- Gemfile | 2 +- Gemfile.lock | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a34b0a6..c33683a 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' # Asynchronously handle longer or delayed tasks -gem 'delayed_job' +gem 'delayed_job_active_record' group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 51e29e7..fd03576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,6 +40,9 @@ GEM coffee-script-source (1.7.0) delayed_job (4.0.0) activesupport (>= 3.0, < 4.1) + delayed_job_active_record (4.0.0) + activerecord (>= 3.0, < 4.1) + delayed_job (>= 3.0, < 4.1) erubis (2.7.0) execjs (2.0.2) hike (1.2.3) @@ -128,7 +131,7 @@ DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass coffee-rails (~> 4.0.0) - delayed_job + delayed_job_active_record httparty jbuilder (~> 1.2) jquery-rails -- cgit v1.2.3-54-g00ecf From 7014368b151cba5b17ceaa85a107674d5865b22c Mon Sep 17 00:00:00 2001 From: nfoy Date: Sun, 6 Apr 2014 19:59:12 -0400 Subject: generate stuff for delayed job --- generate.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/generate.sh b/generate.sh index 18d0f63..e3e07f9 100755 --- a/generate.sh +++ b/generate.sh @@ -13,6 +13,7 @@ git rm -rf -- app test config/routes.rb db/migrate || true git checkout clean-start -- app test config/routes.rb bundle exec rails generate simple_captcha +bundle exec rails generate delayed_job:active_record # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server default_user_permissions:integer -- cgit v1.2.3-54-g00ecf From dc417a48ec2abc83a3ffad742c3c4a4207054300 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Sun, 6 Apr 2014 20:03:32 -0400 Subject: Dragging to Rank --- app/assets/javascripts/application.js | 3 +++ app/assets/stylesheets/matches.css.scss | 24 ++++++++++++++++++++++ app/views/layouts/application.html.erb | 5 +++++ app/views/matches/show.html.erb | 36 +++++++++++---------------------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..cb6edeb 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,6 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require 'drag.js' +//= require 'dragsort.js' +//= require 'coordinates.js' diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss index 4c396e3..3ef9170 100644 --- a/app/assets/stylesheets/matches.css.scss +++ b/app/assets/stylesheets/matches.css.scss @@ -1,3 +1,27 @@ // Place all the styles related to the matches controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ +#boxes li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +} +#numeric li { + cursor: move; + position: relative; + float: left; + margin: 5px; + width: 180px; + height: 240px; + border: 1px solid rgb(0, 0, 0); + text-align: center; + padding-top: 10px; + background-color: rgb(238, 238, 255); +} \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 976ee85..8a5f985 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,11 @@ <%= yield :head %> +