From aa6e8f12a24e33d88a5751cee5e93bf4a038e2ef Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Tue, 1 Apr 2014 18:51:03 -0400 Subject: AJAX is now working in the tournament loading page --- app/assets/stylesheets/tournaments.css.scss | 7 +++++++ app/controllers/tournaments_controller.rb | 18 ++++++++++++++---- app/views/matches/index.html.erb | 4 ++-- app/views/tournaments/show.html.erb | 29 +++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss index 8857d38..2074783 100644 --- a/app/assets/stylesheets/tournaments.css.scss +++ b/app/assets/stylesheets/tournaments.css.scss @@ -73,4 +73,11 @@ div.tournament-listing { padding: 5px 0 0 0; } } +} + +div.leave-buttons { + margin-top: 50px; + form { + display: inline; + } } \ No newline at end of file diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 2f04e1f..4455ad2 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -11,10 +11,20 @@ class TournamentsController < ApplicationController # GET /tournaments/1 # GET /tournaments/1.json def show - case @tournament.status - when 0 - when 1..2 - redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament) + respond_to do |format| + format.html { + case @tournament.status + when 0 + render action: 'show' + when 1..2 + redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament) + end + } + format.json { + data = JSON.parse(@tournament.to_json) + data["players"] = @tournament.players; + render :json => data.to_json + } end end diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index f1019ec..e8d304a 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -38,9 +38,9 @@ width="<%= 300 * @matches.count / 2 + 50 %>" height="<%= 200 * @matches.count + 50 %>" xmlns="http://www.w3.org/2000/svg"> - <% @matches.each do |tournament | %> + <% (1..@matches.count).each do |i| %> - + <% end %> diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index df85dcf..7bdbdc0 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -3,7 +3,7 @@
- <%= tag("div", {:class => "progress-bar progress-bar-warning", :style => "width: " +(@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s + "%", "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => (@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s, "role" => "progressbar"}) %> + <%= tag("div", {:id => "prog-bar", :class => "progress-bar progress-bar-warning", :style => "width: " +(@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s + "%", "aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => (@tournament.players.count * 100 / (@tournament.min_players_per_team * @tournament.min_teams_per_match)).to_s, "role" => "progressbar"}) %> 60% Complete (warning)
@@ -65,6 +65,7 @@

Hmmm.... nobody's here yet! You and your friends should join the tournament.

<% end %> +
<%# If user can join, and user hasn't joined already, show the join tournment tag %> <% if @tournament.joinable_by?(current_user) && !@tournament.players.include?(current_user) %> <%= form_tag(tournament_path(@tournament), method: "put") do %> @@ -94,8 +95,32 @@ <%= link_to 'Back', tournaments_path %> | <%= link_to 'Cancel Tournament', @tournament, method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> - +
<%end %> + \ No newline at end of file -- cgit v1.2.3-2-g168b 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:

+ +
    + <% @remote_username.errors.full_messages.each do |msg| %> +
  • <%= msg %>
    • + <% end %> +
+
+ <% 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-2-g168b 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 +- 6 files changed, 14 insertions(+), 3 deletions(-) (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 -- cgit v1.2.3-2-g168b 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 +- 21 files changed, 637 insertions(+), 637 deletions(-) (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 -- cgit v1.2.3-2-g168b From c0b705f1397ce442427638f92b185d630db73ec5 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 12:12:04 -0400 Subject: normalize to tab indent --- app/controllers/alerts_controller.rb | 126 +++++++------- app/controllers/application_controller.rb | 8 +- app/controllers/games_controller.rb | 124 +++++++------- app/controllers/matches_controller.rb | 132 +++++++-------- app/controllers/pms_controller.rb | 124 +++++++------- app/controllers/servers_controller.rb | 126 +++++++------- app/controllers/sessions_controller.rb | 18 +- app/controllers/teams_controller.rb | 124 +++++++------- app/controllers/tournaments_controller.rb | 270 +++++++++++++++--------------- app/controllers/users_controller.rb | 166 +++++++++--------- app/helpers/sessions_helper.rb | 70 ++++---- app/models/alert.rb | 2 +- app/models/game_setting.rb | 2 +- app/models/match.rb | 6 +- 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 | 6 +- app/models/tournament_preference.rb | 2 +- app/models/user.rb | 8 +- 21 files changed, 664 insertions(+), 664 deletions(-) (limited to 'app') diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb index ac11854..d2b1558 100644 --- a/app/controllers/alerts_controller.rb +++ b/app/controllers/alerts_controller.rb @@ -1,72 +1,72 @@ class AlertsController < ApplicationController - before_action :set_alert, only: [:show, :edit, :update, :destroy] - before_action :check_perms, only: [:new, :create, :edit, :update, :destroy] + before_action :set_alert, only: [:show, :edit, :update, :destroy] + before_action :check_perms, only: [:new, :create, :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 def check_perms unless (signed_in? and (current_user.in_group?(:admin) or current_user.in_group?(:host))) @@ -77,8 +77,8 @@ class AlertsController < ApplicationController end 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 7487f87..0ac3486 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,8 +1,8 @@ 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 + #include sessionhelper for the session controller and view include SessionsHelper 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 53028a4..8d65960 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -1,77 +1,77 @@ class MatchesController < ApplicationController - before_action :set_tournament, only: [:index, :new, :create] - before_action :set_match, only: [:show, :edit, :update, :destroy] - # GET /matches - # GET /matches.json - def index - @matches = @tournament.matches - end + before_action :set_tournament, only: [:index, :new, :create] + before_action :set_match, only: [:show, :edit, :update, :destroy] + # GET /matches + # GET /matches.json + def index + @matches = @tournament.matches + 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 + # GET /matches/new + def new - end + end - # GET /matches/1/edit - def edit - end + # GET /matches/1/edit + def edit + end - # POST /matches - # POST /matches.json - def create - @match = @tournament.matches.build(match_params) + # POST /matches + # POST /matches.json + def create + @match = @tournament.matches.build(match_params) - respond_to do |format| - if @match.save - format.html { redirect_to tournament_matches_path, 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 tournament_matches_path, 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 [@tournament, @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 [@tournament, @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 tournament_matches_path } - end - end + # DELETE /matches/1 + # DELETE /matches/1.json + def destroy - private - # Use callbacks to share common setup or constraints between actions. - def set_match - @tournament = Tournament.find(params[:tournament_id]) - @match = @tournament.matches.find(params[:id]); - end - def set_tournament - @tournament = Tournament.find(params[:tournament_id]) - end - # Never trust parameters from the scary internet, only allow the white list through. - def match_params - params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) - end + @match.destroy + respond_to do |format| + format.html { redirect_to tournament_matches_path } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_match + @tournament = Tournament.find(params[:tournament_id]) + @match = @tournament.matches.find(params[:id]); + end + def set_tournament + @tournament = Tournament.find(params[:tournament_id]) + end + # Never trust parameters from the scary internet, only allow the white list through. + def match_params + params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) + 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/servers_controller.rb b/app/controllers/servers_controller.rb index bb5d5f7..f23f2bf 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -1,72 +1,72 @@ class ServersController < ApplicationController - before_action :set_server, only: [:show, :edit, :update, :destroy] - before_action :check_perms + before_action :set_server, only: [:show, :edit, :update, :destroy] + before_action :check_perms - # 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 def check_perms unless (signed_in? and current_user.in_group?(:admin)) @@ -77,8 +77,8 @@ class ServersController < ApplicationController end 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 7cb16e8..aaaccd7 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -6,7 +6,7 @@ class SessionsController < ApplicationController @user = User.new #@session = Session.new end - + # POST /sessions # POST /sessions.json def create @@ -40,13 +40,13 @@ class SessionsController < ApplicationController private - # Use callbacks to share common setup or constraints between actions. - def set_session - #@session = Session.find(cookies[:remember_token]) - end + # Use callbacks to share common setup or constraints between actions. + def set_session + #@session = Session.find(cookies[:remember_token]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def session_params - params.require(:session).permit(:session_email, :session_user_name, :session_password) - end + # Never trust parameters from the scary internet, only allow the white list through. + def session_params + params.require(:session).permit(:session_email, :session_user_name, :session_password) + 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 799a13f..9cf3404 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -1,148 +1,148 @@ class TournamentsController < ApplicationController - before_action :set_tournament, only: [:show, :edit, :update, :destroy, :join] - before_action :check_perms, only: [:new, :create, :edit, :destroy] + before_action :set_tournament, only: [:show, :edit, :update, :destroy, :join] + before_action :check_perms, only: [:new, :create, :edit, :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 - respond_to do |format| - format.html { - case @tournament.status - when 0 - render action: 'show' - when 1..2 - redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament) - end - } - format.json { - data = JSON.parse(@tournament.to_json) - data["players"] = @tournament.players; - render :json => data.to_json - } - end - end + # GET /tournaments/1 + # GET /tournaments/1.json + def show + respond_to do |format| + format.html { + case @tournament.status + when 0 + render action: 'show' + when 1..2 + redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament) + end + } + format.json { + data = JSON.parse(@tournament.to_json) + data["players"] = @tournament.players; + render :json => data.to_json + } + end + end - # GET /tournaments/new - def new - @games = Game.all - @tournament = Tournament.new(game: Game.find_by_id(params[:game])) - end + # GET /tournaments/new + def new + @games = Game.all + @tournament = Tournament.new(game: Game.find_by_id(params[:game])) + end - # GET /tournaments/1/edit - def edit - if params['close_action'] == 'close' - @tournament.status = 1 - @tournament.save - @tournament.setup(@tournament) - redirect_to "/tournaments" - end - end + # GET /tournaments/1/edit + def edit + if params['close_action'] == 'close' + @tournament.status = 1 + @tournament.save + @tournament.setup(@tournament) + redirect_to "/tournaments" + end + end - # POST /tournaments - # POST /tournaments.json - def create - @tournament = Tournament.new(tournament_params) - @tournament.status = 0 - respond_to do |format| - if @tournament.save - @tournament.hosts.push(current_user) - 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 + # POST /tournaments + # POST /tournaments.json + def create + @tournament = Tournament.new(tournament_params) + @tournament.status = 0 + respond_to do |format| + if @tournament.save + @tournament.hosts.push(current_user) + 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 - - if params[:update_action].nil? - check_perms - 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 - else - case params[:update_action] - when "join" - respond_to do |format| - if @tournament.join(current_user) - format.html { render action: 'show', notice: 'You have joined this tournament.' } - format.json { head :no_content } - end - format.html { render action: 'permission_denied', status: :forbidden } - format.json { render json: "Permission denied", status: :forbidden } - end - when "leave" - respond_to do |format| - if @tournament.leave(current_user) - format.html {redirect_to tournaments_url, notice: 'You have left the tournament.' } - format.json { head :no_content } - end - format.html {redirect_to @tournament, notice: 'You were\'t a part of this tournament.' } - format.json { render json: "Permission denied", status: :forbidden } - end - when "open" - respond_to do |format| - if @tournament.setup - format.html { render action: 'show', notice: 'You have joined this tournament.' } - format.json { head :no_content } - end - format.html { render action: 'permission_denied', status: :forbidden } - format.json { render json: "Permission denied", status: :forbidden } - end - #when "close" - # TODO - else - respond_to do |format| - format.html { render action: 'show', notice: "Invalid action", status: :unprocessable_entity } - format.json { render json: @tournament.errors, status: :unprocessable_entity } - end - end - end - end + # PATCH/PUT /tournaments/1 + # PATCH/PUT /tournaments/1.json + def update - # 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 + if params[:update_action].nil? + check_perms + 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 + else + case params[:update_action] + when "join" + respond_to do |format| + if @tournament.join(current_user) + format.html { render action: 'show', notice: 'You have joined this tournament.' } + format.json { head :no_content } + end + format.html { render action: 'permission_denied', status: :forbidden } + format.json { render json: "Permission denied", status: :forbidden } + end + when "leave" + respond_to do |format| + if @tournament.leave(current_user) + format.html {redirect_to tournaments_url, notice: 'You have left the tournament.' } + format.json { head :no_content } + end + format.html {redirect_to @tournament, notice: 'You were\'t a part of this tournament.' } + format.json { render json: "Permission denied", status: :forbidden } + end + when "open" + respond_to do |format| + if @tournament.setup + format.html { render action: 'show', notice: 'You have joined this tournament.' } + format.json { head :no_content } + end + format.html { render action: 'permission_denied', status: :forbidden } + format.json { render json: "Permission denied", status: :forbidden } + end + #when "close" + # TODO + else + respond_to do |format| + format.html { render action: 'show', notice: "Invalid action", status: :unprocessable_entity } + format.json { render json: @tournament.errors, status: :unprocessable_entity } + end + end + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_tournament - @tournament = Tournament.find(params[:id]) - 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 def check_perms - unless (signed_in? and current_user.in_group?(:host)) - respond_to do |format| - format.html { render action: 'permission_denied', status: :forbidden } - format.json { render json: "Permission denied", status: :forbidden } - end - end - end + unless (signed_in? and current_user.in_group?(:host)) + respond_to do |format| + format.html { render action: 'permission_denied', status: :forbidden } + format.json { render json: "Permission denied", status: :forbidden } + end + end + end - # Never trust parameters from the scary internet, only allow the white list through. - def tournament_params - params.require(:tournament).permit(:game, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) - end + # Never trust parameters from the scary internet, only allow the white list through. + def tournament_params + params.require(:tournament).permit(:game, :name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 70facca..26c5d49 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,96 +1,96 @@ class UsersController < ApplicationController - before_action :set_user, only: [:show, :edit, :update, :destroy] - before_action :perms_edit, only: [:edit, :update, :destroy] - before_action :perms_create, only: [:new, :create] + before_action :set_user, only: [:show, :edit, :update, :destroy] + before_action :perms_edit, only: [:edit, :update, :destroy] + before_action :perms_create, only: [:new, :create] - # 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 - @user = User.find(params[:id]) - end + # GET /users/1 + # GET /users/1.json + def show + @user = User.find(params[:id]) + 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) - @user.groups = 0 - respond_to do |format| - if @user.save - sign_in @user - format.html { redirect_to root_path, notice: 'User was successfully created.' } - format.json { render action: 'show', status: :created, location: @user } - else - format.html { render action: 'new', status: :unprocessable_entity } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end + # POST /users + # POST /users.json + def create + @user = User.new(user_params) + @user.groups = 0 + respond_to do |format| + if @user.save + sign_in @user + format.html { redirect_to root_path, notice: 'User was successfully created.' } + format.json { render action: 'show', status: :created, location: @user } + else + format.html { render action: 'new', status: :unprocessable_entity } + 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 - def perms_edit - unless (current_user == @user) or (signed_in? and current_user.in_group? :admin) - respond_to do |format| - format.html { render action: 'permission_denied', status: :forbidden } - format.json { render json: "Permission denied", status: :forbidden } - end - end - end + def perms_edit + unless (current_user == @user) or (signed_in? and current_user.in_group? :admin) + respond_to do |format| + format.html { render action: 'permission_denied', status: :forbidden } + format.json { render json: "Permission denied", status: :forbidden } + end + end + end - def perms_create - if signed_in? - respond_to do |format| - format.html { render action: 'already_signed_in', status: :unprocessable_entity } - format.json { render json: "Already signed in", status: :unprocessable_entity } - end - end - end + def perms_create + if signed_in? + respond_to do |format| + format.html { render action: 'already_signed_in', status: :unprocessable_entity } + format.json { render json: "Already signed in", status: :unprocessable_entity } + end + end + 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, :password, :password_confirmation) - 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, :password, :password_confirmation) + end end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 046ca6f..5a238a0 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -7,67 +7,67 @@ module SessionsHelper cookies.permanent[:remember_token] = remember_token #save the hashed token to the database user.update_attribute(:remember_token, - User.hash(remember_token)) + User.hash(remember_token)) #set the current user to be the given user self.current_user = user end -# The curret_user=(user) is the conversion of self.current_user = user + # The curret_user=(user) is the conversion of self.current_user = user def current_user=(user) @current_user = user end -# sets the @current_user instance virable to the user corresponding -# to the remember token, but only if @current_user is undefined -# since the remember token is hashed, we need to hash the cookie -# to find match the remember token - def current_user - remember_token = User.hash(cookies[:remember_token]) - @current_user ||= User.find_by(remember_token: remember_token) - end + # sets the @current_user instance virable to the user corresponding + # to the remember token, but only if @current_user is undefined + # since the remember token is hashed, we need to hash the cookie + # to find match the remember token + def current_user + remember_token = User.hash(cookies[:remember_token]) + @current_user ||= User.find_by(remember_token: remember_token) + end # checks if someone is currently signed in def signed_in? !current_user.nil? end - def sign_out - current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) - cookies.delete(:remember_token) - self.current_user = nil - end + def sign_out + current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) + cookies.delete(:remember_token) + self.current_user = nil + end -=begin + =begin -This is for anyone that cares about how long a user is signed -in: + This is for anyone that cares about how long a user is signed + in: -Currently I have a user to be signed in forever unless they -log out (cookies.permanent....). + Currently I have a user to be signed in forever unless they + log out (cookies.permanent....). -If you want to change that, change line 7 to this: + If you want to change that, change line 7 to this: -cookies[:remember_token] = { value: remember_token, - expires: 20.years.from_now.utc } + cookies[:remember_token] = { value: remember_token, + expires: 20.years.from_now.utc } -which will expire the cookie in 20 years from its date of -creation. + which will expire the cookie in 20 years from its date of + creation. -Oddly enough, this line above is equivalent to the: + Oddly enough, this line above is equivalent to the: -cookies.permanent + cookies.permanent -This is just a short cut for this line since most people -create permanent cookies these days. + This is just a short cut for this line since most people + create permanent cookies these days. -Other times are: + Other times are: -10.weeks.from_now + 10.weeks.from_now -5.days.ago + 5.days.ago -etc... + etc... -=end + =end -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 782dce8..35deb20 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,8 +1,8 @@ class Match < ActiveRecord::Base - belongs_to :tournament + belongs_to :tournament - has_and_belongs_to_many :teams + has_and_belongs_to_many :teams - belongs_to :winner, class_name: "Team" + belongs_to :winner, class_name: "Team" 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 2348de5..7aae7c2 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,5 +1,5 @@ class Team < ActiveRecord::Base - belongs_to :match - has_and_belongs_to_many :matches - has_and_belongs_to_many :users + belongs_to :match + has_and_belongs_to_many :matches + has_and_belongs_to_many :users 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/app/models/user.rb b/app/models/user.rb index 6e439fb..85f1982 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -77,11 +77,11 @@ class User < ActiveRecord::Base # validity validates(:name, presence: true, length: { maximum: 50 }) validates(:email, presence: true, format: {with: - VALID_EMAIL_REG}, - uniqueness: { case_sensitive: false }) + VALID_EMAIL_REG}, + uniqueness: { case_sensitive: false }) validates(:user_name, presence: true, length:{maximum: 50}, - format: {with: VALID_USER_NAME_REG }, - uniqueness: {case_sensitive: false }) + format: {with: VALID_USER_NAME_REG }, + uniqueness: {case_sensitive: false }) ## # Instead of adding password and password_confirmation -- cgit v1.2.3-2-g168b From 8d5325cd6019b784ba2da66d19c41daaadbc19e0 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 12:14:48 -0400 Subject: do things to avoid merge conflicts with clean2 --- app/views/tournaments/show.html.erb | 81 ++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 42 deletions(-) (limited to 'app') diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 7bdbdc0..1ebf4c5 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -11,45 +11,45 @@ +

+ Status: + <% if @tournament.status == 0 %> + Waiting for players... + <% else %> + Started + <% end %> +

+ +

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

-

- Status: - <% if @tournament.status == 0 %> - Waiting for players... - <% else %> - Started - <% end %> -

- -

- 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 %> -

@@ -120,7 +120,4 @@ function donehandle( tournament ) { $.ajax({url: "<%= url_for @tournament %>.json"}) .done(donehandle); - - - - \ No newline at end of file + -- cgit v1.2.3-2-g168b From afaeb054e6ac35c186af9c563f85f8ac58076b81 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 12:43:31 -0400 Subject: fix auto-indent mess up --- app/helpers/sessions_helper.rb | 67 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 36 deletions(-) (limited to 'app') diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 5a238a0..9be3abc 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -6,8 +6,8 @@ module SessionsHelper #place token inside of the browser cookies.permanent[:remember_token] = remember_token #save the hashed token to the database - user.update_attribute(:remember_token, - User.hash(remember_token)) + user.update_attribute(:remember_token, + User.hash(remember_token)) #set the current user to be the given user self.current_user = user end @@ -37,37 +37,32 @@ module SessionsHelper self.current_user = nil end - =begin - - This is for anyone that cares about how long a user is signed - in: - - Currently I have a user to be signed in forever unless they - log out (cookies.permanent....). - - If you want to change that, change line 7 to this: - - cookies[:remember_token] = { value: remember_token, - expires: 20.years.from_now.utc } - - which will expire the cookie in 20 years from its date of - creation. - - Oddly enough, this line above is equivalent to the: - - cookies.permanent - - This is just a short cut for this line since most people - create permanent cookies these days. - - Other times are: - - 10.weeks.from_now - - 5.days.ago - - etc... - - =end - - end + # This is for anyone that cares about how long a user is signed + # in: + # + # Currently I have a user to be signed in forever unless they + # log out (cookies.permanent....). + # + # If you want to change that, change line 7 to this: + # + # cookies[:remember_token] = { value: remember_token, + # expires: 20.years.from_now.utc } + # + # which will expire the cookie in 20 years from its date of + # creation. + # + # Oddly enough, this line above is equivalent to the: + # + # cookies.permanent + # + # This is just a short cut for this line since most people + # create permanent cookies these days. + # + # Other times are: + # + # 10.weeks.from_now + # + # 5.days.ago + # + # etc... +end -- cgit v1.2.3-2-g168b From 9f19d0e16d7920e07255c0fbe596c518d1aa415f Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 15:04:42 -0400 Subject: fix login with tokens belonging to sessions --- app/controllers/users_controller.rb | 1 - app/helpers/sessions_helper.rb | 31 ++++++++--------- app/models/session.rb | 39 ++++++++++++++++++++++ app/models/user.rb | 66 +++---------------------------------- 4 files changed, 57 insertions(+), 80 deletions(-) (limited to 'app') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8a8b994..60857f1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -27,7 +27,6 @@ class UsersController < ApplicationController # POST /users.json def create @user = User.new(user_params) - @user.groups = 0 respond_to do |format| if @user.save sign_in @user diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb index 9be3abc..54e4b0d 100644 --- a/app/helpers/sessions_helper.rb +++ b/app/helpers/sessions_helper.rb @@ -1,19 +1,13 @@ module SessionsHelper - def sign_in(user) - #create a new remember token - remember_token = User.new_remember_token - #place token inside of the browser - cookies.permanent[:remember_token] = remember_token - #save the hashed token to the database - user.update_attribute(:remember_token, - User.hash(remember_token)) - #set the current user to be the given user - self.current_user = user - end + @session = Session.new(user: user) + raw_token = @session.create_token + @session.save # FIXME: error handling - # The curret_user=(user) is the conversion of self.current_user = user - def current_user=(user) + @token = Session.hash_token(raw_token) + cookies.permanent[:remember_token] = raw_token + + #set the current user to be the given user @current_user = user end @@ -22,8 +16,9 @@ module SessionsHelper # since the remember token is hashed, we need to hash the cookie # to find match the remember token def current_user - remember_token = User.hash(cookies[:remember_token]) - @current_user ||= User.find_by(remember_token: remember_token) + @token ||= Session.hash_token(cookies[:remember_token]) + @session ||= Session.find_by(token: @token) + @current_user ||= (@session.nil? ? nil : @session.user) end # checks if someone is currently signed in @@ -32,9 +27,11 @@ module SessionsHelper end def sign_out - current_user.update_attribute(:remember_token, User.hash(User.new_remember_token)) + if signed_in? + @session.destroy + end + @current_user = nil cookies.delete(:remember_token) - self.current_user = nil end # This is for anyone that cares about how long a user is signed diff --git a/app/models/session.rb b/app/models/session.rb index a5fd26e..f5e642b 100644 --- a/app/models/session.rb +++ b/app/models/session.rb @@ -1,3 +1,42 @@ class Session < ActiveRecord::Base belongs_to :user + + ## + # Create a random remember token for the user. This will be + # changed every time the user creates a new session. + # + # If you want this value, hang on to it; the raw value is + # discarded afterward. + # + # By changing the cookie every new session, any hijacked sessions + # (where the attacker steals a cookie to sign in as a certain + # user) will expire the next time the user signs back in. + # + # The random string is of length 16 composed of A-Z, a-z, 0-9 + # This is the browser's cookie value. + def create_token() + t = SecureRandom.urlsafe_base64 + self.token = Session.hash_token(t) + t + end + + ## + # Encrypt the remember token. + # This is the encrypted version of the cookie stored on + # the database. + # + # The reasoning for storing a hashed token is so that even if + # the database is compromised, the attacker won't be able to use + # the remember tokens to sign in. + def Session.hash_token(token) + # SHA-1 (Secure Hash Algorithm) is a US engineered hash + # function that produces a 20 byte hash value which typically + # forms a hexadecimal number 40 digits long. + # The reason I am not using the Bcrypt algorithm is because + # SHA-1 is much faster and I will be calling this on + # every page a user accesses. + # + # https://en.wikipedia.org/wiki/SHA-1 + Digest::SHA1.hexdigest(token.to_s) + end end diff --git a/app/models/user.rb b/app/models/user.rb index 85f1982..277d885 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,17 +2,14 @@ class User < ActiveRecord::Base has_and_belongs_to_many :tournaments_played, class_name: "Tournament", foreign_key: "player_id", join_table: "players_tournaments" has_and_belongs_to_many :tournaments_hosted, class_name: "Tournament", foreign_key: "host_id", join_table: "hosts_tournaments" has_and_belongs_to_many :teams + has_many :sessions before_save { self.email = email.downcase } before_save { self.user_name = user_name } - ## - # Rails looks for the create_remember_token and runs the method - # before anything else. - # - # This method cannot be called by a user since it is denoted - # as private. - before_create :create_remember_token + def after_initialize + self.permissions = 0 + end def in_group?(group) case group @@ -93,59 +90,4 @@ class User < ActiveRecord::Base has_secure_password validates :password, length: { minimum: 6 } - - ## - # Create a random remember token for the user. This will be - # changed every time the user creates a new session. - # - # By changing the cookie every new session, any hijacked sessions - # (where the attacker steals a cookie to sign in as a certain - # user) will expire the next time the user signs back in. - # - # The random string is of length 16 composed of A-Z, a-z, 0-9 - # This is the browser's cookie value. - def User.new_remember_token - SecureRandom.urlsafe_base64 - end - - ## - # Encrypt the remember token. - # This is the encrypted version of the cookie stored on - # the database. - # - # The reasoning for storing a hashed token is so that even if - # the database is compromised, the attacker won't be able to use - # the remember tokens to sign in. - def User.hash(token) - Digest::SHA1.hexdigest(token.to_s) - end - - ## - # SHA-1 (Secure Hash Algorithm) is a US engineered hash - # function that produces a 20 byte hash value which typically - # forms a hexadecimal number 40 digits long. - # The reason I am not using the Bcrypt algorithm is because - # SHA-1 is much faster and I will be calling this on - # every page a user accesses. - # - # https://en.wikipedia.org/wiki/SHA-1 - - - # Everything under private is hidden so you cannot call. - private - - ## - # Create_remember_token in order to ensure a user always has - # a remember token. - def create_remember_token - self.remember_token = User.hash(User.new_remember_token) - end - - ## - # In order to ensure that someone did not accidentally submit - # two accounts rapidly (which would throw off the validates - # for user_name and email), I added an index to the Users - # email and user_name in the database to ensure uniqueness - # This also gives and index to the user_name and email - # so finding a user SHOULD be easier for the database. end -- cgit v1.2.3-2-g168b