From 94a5654371812905c154f29cef393d42f13c5eaa Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 18 Feb 2014 18:16:28 -0500
Subject: Added the generate shell command. Please do not commit the generated
 files.

---
 app/controllers/matches_controller.rb     | 74 +++++++++++++++++++++++++++++++
 app/controllers/servers_controller.rb     | 74 +++++++++++++++++++++++++++++++
 app/controllers/teams_controller.rb       | 74 +++++++++++++++++++++++++++++++
 app/controllers/tournaments_controller.rb | 74 +++++++++++++++++++++++++++++++
 app/controllers/users_controller.rb       | 74 +++++++++++++++++++++++++++++++
 5 files changed, 370 insertions(+)
 create mode 100644 app/controllers/matches_controller.rb
 create mode 100644 app/controllers/servers_controller.rb
 create mode 100644 app/controllers/teams_controller.rb
 create mode 100644 app/controllers/tournaments_controller.rb
 create mode 100644 app/controllers/users_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
new file mode 100644
index 0000000..4c0c4e4
--- /dev/null
+++ b/app/controllers/matches_controller.rb
@@ -0,0 +1,74 @@
+class MatchesController < ApplicationController
+  before_action :set_match, only: [:show, :edit, :update, :destroy]
+
+  # GET /matches
+  # GET /matches.json
+  def index
+    @matches = Match.all
+  end
+
+  # GET /matches/1
+  # GET /matches/1.json
+  def show
+  end
+
+  # GET /matches/new
+  def new
+    @match = Match.new
+  end
+
+  # GET /matches/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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[:match]
+    end
+end
diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
new file mode 100644
index 0000000..7d54eb6
--- /dev/null
+++ b/app/controllers/servers_controller.rb
@@ -0,0 +1,74 @@
+class ServersController < ApplicationController
+  before_action :set_server, only: [:show, :edit, :update, :destroy]
+
+  # GET /servers
+  # GET /servers.json
+  def index
+    @servers = Server.all
+  end
+
+  # GET /servers/1
+  # GET /servers/1.json
+  def show
+  end
+
+  # GET /servers/new
+  def new
+    @server = Server.new
+  end
+
+  # GET /servers/1/edit
+  def edit
+  end
+
+  # POST /servers
+  # POST /servers.json
+  def create
+    @server = Server.new(server_params)
+
+    respond_to do |format|
+      if @server.save
+        format.html { redirect_to @server, notice: 'Server was successfully created.' }
+        format.json { render action: 'show', status: :created, location: @server }
+      else
+        format.html { render action: 'new' }
+        format.json { render json: @server.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /servers/1
+  # PATCH/PUT /servers/1.json
+  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
+
+  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
+end
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
new file mode 100644
index 0000000..f14c97f
--- /dev/null
+++ b/app/controllers/teams_controller.rb
@@ -0,0 +1,74 @@
+class TeamsController < ApplicationController
+  before_action :set_team, only: [:show, :edit, :update, :destroy]
+
+  # GET /teams
+  # GET /teams.json
+  def index
+    @teams = Team.all
+  end
+
+  # GET /teams/1
+  # GET /teams/1.json
+  def show
+  end
+
+  # GET /teams/new
+  def new
+    @team = Team.new
+  end
+
+  # GET /teams/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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[:team]
+    end
+end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
new file mode 100644
index 0000000..ea3857c
--- /dev/null
+++ b/app/controllers/tournaments_controller.rb
@@ -0,0 +1,74 @@
+class TournamentsController < ApplicationController
+  before_action :set_tournament, only: [:show, :edit, :update, :destroy]
+
+  # GET /tournaments
+  # GET /tournaments.json
+  def index
+    @tournaments = Tournament.all
+  end
+
+  # GET /tournaments/1
+  # GET /tournaments/1.json
+  def show
+  end
+
+  # GET /tournaments/new
+  def new
+    @tournament = Tournament.new
+  end
+
+  # GET /tournaments/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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[:tournament]
+    end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..da49625
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,74 @@
+class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  # GET /users
+  # GET /users.json
+  def index
+    @users = User.all
+  end
+
+  # GET /users/1
+  # GET /users/1.json
+  def show
+  end
+
+  # GET /users/new
+  def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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[:user]
+    end
+end
-- 
cgit v1.2.3-2-g168b


From 96b97d691f6889004c38bef15411bc27e448fda1 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 18 Feb 2014 20:42:51 -0500
Subject: Changes to generate.sh

---
 app/controllers/alerts_controller.rb  | 74 +++++++++++++++++++++++++++++++++++
 app/controllers/main_controller.rb    |  2 +
 app/controllers/matches_controller.rb |  2 +-
 app/controllers/pms_controller.rb     | 74 +++++++++++++++++++++++++++++++++++
 app/controllers/search_controller.rb  |  2 +
 app/controllers/users_controller.rb   |  2 +-
 6 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 app/controllers/alerts_controller.rb
 create mode 100644 app/controllers/main_controller.rb
 create mode 100644 app/controllers/pms_controller.rb
 create mode 100644 app/controllers/search_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
new file mode 100644
index 0000000..e6158f4
--- /dev/null
+++ b/app/controllers/alerts_controller.rb
@@ -0,0 +1,74 @@
+class AlertsController < ApplicationController
+  before_action :set_alert, only: [:show, :edit, :update, :destroy]
+
+  # GET /alerts
+  # GET /alerts.json
+  def index
+    @alerts = Alert.all
+  end
+
+  # GET /alerts/1
+  # GET /alerts/1.json
+  def show
+  end
+
+  # GET /alerts/new
+  def new
+    @alert = Alert.new
+  end
+
+  # GET /alerts/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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, :message)
+    end
+end
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
new file mode 100644
index 0000000..6519d7b
--- /dev/null
+++ b/app/controllers/main_controller.rb
@@ -0,0 +1,2 @@
+class MainController < ApplicationController
+end
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 4c0c4e4..bb2a67a 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -69,6 +69,6 @@ class MatchesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def match_params
-      params[:match]
+      params.require(:match).permit(:tournament)
     end
 end
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
new file mode 100644
index 0000000..6eb94f9
--- /dev/null
+++ b/app/controllers/pms_controller.rb
@@ -0,0 +1,74 @@
+class PmsController < ApplicationController
+  before_action :set_pm, only: [:show, :edit, :update, :destroy]
+
+  # GET /pms
+  # GET /pms.json
+  def index
+    @pms = Pm.all
+  end
+
+  # GET /pms/1
+  # GET /pms/1.json
+  def show
+  end
+
+  # GET /pms/new
+  def new
+    @pm = Pm.new
+  end
+
+  # GET /pms/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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, :recipient, :message)
+    end
+end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
new file mode 100644
index 0000000..ee61487
--- /dev/null
+++ b/app/controllers/search_controller.rb
@@ -0,0 +1,2 @@
+class SearchController < ApplicationController
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index da49625..4db617e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -69,6 +69,6 @@ class UsersController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def user_params
-      params[:user]
+      params.require(:user).permit(:name, :pw_hash, :groups)
     end
 end
-- 
cgit v1.2.3-2-g168b


From cd1fabe40ca4d290df33a2590f3a1f2072103972 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Thu, 20 Feb 2014 17:13:51 -0500
Subject: fix datatype names in generate.sh

---
 app/controllers/alerts_controller.rb  | 2 +-
 app/controllers/matches_controller.rb | 2 +-
 app/controllers/pms_controller.rb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
index e6158f4..873e9b7 100644
--- a/app/controllers/alerts_controller.rb
+++ b/app/controllers/alerts_controller.rb
@@ -69,6 +69,6 @@ class AlertsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def alert_params
-      params.require(:alert).permit(:author, :message)
+      params.require(:alert).permit(:author_id, :message)
     end
 end
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index bb2a67a..e9f3c5a 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -69,6 +69,6 @@ class MatchesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def match_params
-      params.require(:match).permit(:tournament)
+      params.require(:match).permit(:tournament_id)
     end
 end
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
index 6eb94f9..5dd0d69 100644
--- a/app/controllers/pms_controller.rb
+++ b/app/controllers/pms_controller.rb
@@ -69,6 +69,6 @@ class PmsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def pm_params
-      params.require(:pm).permit(:author, :recipient, :message)
+      params.require(:pm).permit(:author_id, :recipient_id, :message)
     end
 end
-- 
cgit v1.2.3-2-g168b


From 3a7b14f4a51c0fdb8b71720f361a0a8ccf080325 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 27 Feb 2014 16:59:04 -0500
Subject: add game types

---
 app/controllers/games_controller.rb | 74 +++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 app/controllers/games_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
new file mode 100644
index 0000000..0a9d8e8
--- /dev/null
+++ b/app/controllers/games_controller.rb
@@ -0,0 +1,74 @@
+class GamesController < ApplicationController
+  before_action :set_game, only: [:show, :edit, :update, :destroy]
+
+  # GET /games
+  # GET /games.json
+  def index
+    @games = Game.all
+  end
+
+  # GET /games/1
+  # GET /games/1.json
+  def show
+  end
+
+  # GET /games/new
+  def new
+    @game = Game.new
+  end
+
+  # GET /games/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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)
+    end
+end
-- 
cgit v1.2.3-2-g168b


From de40ec53e8b80d8d880214183f19ea93172a0026 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 27 Feb 2014 17:02:10 -0500
Subject: give tournaments a game type

---
 app/controllers/tournaments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index ea3857c..720305f 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[:tournament]
+      params.require(:tournament).permit(:game_id)
     end
 end
-- 
cgit v1.2.3-2-g168b


From f3f17dcd9755020276062caae7c0677eff88cb2f Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Thu, 27 Feb 2014 17:41:59 -0500
Subject: Added the Games Attributes stuff.

---
 app/controllers/games_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 0a9d8e8..4ecff17 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -69,6 +69,6 @@ class GamesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def game_params
-      params.require(:game).permit(:name)
+      params.require(:game).permit(:name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams)
     end
 end
-- 
cgit v1.2.3-2-g168b


From 2eb242f3e5b1f1ab66d84556cabcad965fe387aa Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Sat, 1 Mar 2014 20:23:29 -0500
Subject: changed the user section of the generate

---
 app/controllers/users_controller.rb | 72 -------------------------------------
 1 file changed, 72 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4db617e..3e74dea 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,74 +1,2 @@
 class UsersController < ApplicationController
-  before_action :set_user, only: [:show, :edit, :update, :destroy]
-
-  # GET /users
-  # GET /users.json
-  def index
-    @users = User.all
-  end
-
-  # GET /users/1
-  # GET /users/1.json
-  def show
-  end
-
-  # GET /users/new
-  def new
-    @user = User.new
-  end
-
-  # GET /users/1/edit
-  def edit
-  end
-
-  # 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
-
-  # 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
-
-  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, :pw_hash, :groups)
-    end
 end
-- 
cgit v1.2.3-2-g168b


From fbe54253ea8c31796a16d0fb90b7d3b5be717b1c Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Sun, 2 Mar 2014 11:11:04 -0500
Subject: added preliminary homepage

---
 app/controllers/static_controller.rb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/controllers/static_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
new file mode 100644
index 0000000..c6df11e
--- /dev/null
+++ b/app/controllers/static_controller.rb
@@ -0,0 +1,2 @@
+class StaticController < ApplicationController
+end
-- 
cgit v1.2.3-2-g168b


From eaf3d3cddf418c560c9619f722ea1dbc5d6cc61a Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Sun, 2 Mar 2014 15:59:50 -0500
Subject: currently adding Session controller and view

---
 app/controllers/alerts_controller.rb      | 74 +++++++++++++++++++++++++++++++
 app/controllers/games_controller.rb       | 74 +++++++++++++++++++++++++++++++
 app/controllers/main_controller.rb        |  2 +
 app/controllers/matches_controller.rb     | 74 +++++++++++++++++++++++++++++++
 app/controllers/pms_controller.rb         | 74 +++++++++++++++++++++++++++++++
 app/controllers/search_controller.rb      |  2 +
 app/controllers/servers_controller.rb     | 74 +++++++++++++++++++++++++++++++
 app/controllers/sessions_controller.rb    |  2 +
 app/controllers/static_controller.rb      |  2 +
 app/controllers/teams_controller.rb       | 74 +++++++++++++++++++++++++++++++
 app/controllers/tournaments_controller.rb | 74 +++++++++++++++++++++++++++++++
 app/controllers/users_controller.rb       |  2 +
 12 files changed, 528 insertions(+)
 create mode 100644 app/controllers/alerts_controller.rb
 create mode 100644 app/controllers/games_controller.rb
 create mode 100644 app/controllers/main_controller.rb
 create mode 100644 app/controllers/matches_controller.rb
 create mode 100644 app/controllers/pms_controller.rb
 create mode 100644 app/controllers/search_controller.rb
 create mode 100644 app/controllers/servers_controller.rb
 create mode 100644 app/controllers/sessions_controller.rb
 create mode 100644 app/controllers/static_controller.rb
 create mode 100644 app/controllers/teams_controller.rb
 create mode 100644 app/controllers/tournaments_controller.rb
 create mode 100644 app/controllers/users_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
new file mode 100644
index 0000000..873e9b7
--- /dev/null
+++ b/app/controllers/alerts_controller.rb
@@ -0,0 +1,74 @@
+class AlertsController < ApplicationController
+  before_action :set_alert, only: [:show, :edit, :update, :destroy]
+
+  # GET /alerts
+  # GET /alerts.json
+  def index
+    @alerts = Alert.all
+  end
+
+  # GET /alerts/1
+  # GET /alerts/1.json
+  def show
+  end
+
+  # GET /alerts/new
+  def new
+    @alert = Alert.new
+  end
+
+  # GET /alerts/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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
+end
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
new file mode 100644
index 0000000..4ecff17
--- /dev/null
+++ b/app/controllers/games_controller.rb
@@ -0,0 +1,74 @@
+class GamesController < ApplicationController
+  before_action :set_game, only: [:show, :edit, :update, :destroy]
+
+  # GET /games
+  # GET /games.json
+  def index
+    @games = Game.all
+  end
+
+  # GET /games/1
+  # GET /games/1.json
+  def show
+  end
+
+  # GET /games/new
+  def new
+    @game = Game.new
+  end
+
+  # GET /games/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams)
+    end
+end
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
new file mode 100644
index 0000000..6519d7b
--- /dev/null
+++ b/app/controllers/main_controller.rb
@@ -0,0 +1,2 @@
+class MainController < ApplicationController
+end
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
new file mode 100644
index 0000000..e9f3c5a
--- /dev/null
+++ b/app/controllers/matches_controller.rb
@@ -0,0 +1,74 @@
+class MatchesController < ApplicationController
+  before_action :set_match, only: [:show, :edit, :update, :destroy]
+
+  # GET /matches
+  # GET /matches.json
+  def index
+    @matches = Match.all
+  end
+
+  # GET /matches/1
+  # GET /matches/1.json
+  def show
+  end
+
+  # GET /matches/new
+  def new
+    @match = Match.new
+  end
+
+  # GET /matches/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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(:tournament_id)
+    end
+end
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
new file mode 100644
index 0000000..5dd0d69
--- /dev/null
+++ b/app/controllers/pms_controller.rb
@@ -0,0 +1,74 @@
+class PmsController < ApplicationController
+  before_action :set_pm, only: [:show, :edit, :update, :destroy]
+
+  # GET /pms
+  # GET /pms.json
+  def index
+    @pms = Pm.all
+  end
+
+  # GET /pms/1
+  # GET /pms/1.json
+  def show
+  end
+
+  # GET /pms/new
+  def new
+    @pm = Pm.new
+  end
+
+  # GET /pms/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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
+end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
new file mode 100644
index 0000000..ee61487
--- /dev/null
+++ b/app/controllers/search_controller.rb
@@ -0,0 +1,2 @@
+class SearchController < ApplicationController
+end
diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
new file mode 100644
index 0000000..7d54eb6
--- /dev/null
+++ b/app/controllers/servers_controller.rb
@@ -0,0 +1,74 @@
+class ServersController < ApplicationController
+  before_action :set_server, only: [:show, :edit, :update, :destroy]
+
+  # GET /servers
+  # GET /servers.json
+  def index
+    @servers = Server.all
+  end
+
+  # GET /servers/1
+  # GET /servers/1.json
+  def show
+  end
+
+  # GET /servers/new
+  def new
+    @server = Server.new
+  end
+
+  # GET /servers/1/edit
+  def edit
+  end
+
+  # POST /servers
+  # POST /servers.json
+  def create
+    @server = Server.new(server_params)
+
+    respond_to do |format|
+      if @server.save
+        format.html { redirect_to @server, notice: 'Server was successfully created.' }
+        format.json { render action: 'show', status: :created, location: @server }
+      else
+        format.html { render action: 'new' }
+        format.json { render json: @server.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /servers/1
+  # PATCH/PUT /servers/1.json
+  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
+
+  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
+end
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
new file mode 100644
index 0000000..16d11b5
--- /dev/null
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,2 @@
+class SessionsController < ApplicationController
+end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
new file mode 100644
index 0000000..c6df11e
--- /dev/null
+++ b/app/controllers/static_controller.rb
@@ -0,0 +1,2 @@
+class StaticController < ApplicationController
+end
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
new file mode 100644
index 0000000..f14c97f
--- /dev/null
+++ b/app/controllers/teams_controller.rb
@@ -0,0 +1,74 @@
+class TeamsController < ApplicationController
+  before_action :set_team, only: [:show, :edit, :update, :destroy]
+
+  # GET /teams
+  # GET /teams.json
+  def index
+    @teams = Team.all
+  end
+
+  # GET /teams/1
+  # GET /teams/1.json
+  def show
+  end
+
+  # GET /teams/new
+  def new
+    @team = Team.new
+  end
+
+  # GET /teams/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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[:team]
+    end
+end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
new file mode 100644
index 0000000..720305f
--- /dev/null
+++ b/app/controllers/tournaments_controller.rb
@@ -0,0 +1,74 @@
+class TournamentsController < ApplicationController
+  before_action :set_tournament, only: [:show, :edit, :update, :destroy]
+
+  # GET /tournaments
+  # GET /tournaments.json
+  def index
+    @tournaments = Tournament.all
+  end
+
+  # GET /tournaments/1
+  # GET /tournaments/1.json
+  def show
+  end
+
+  # GET /tournaments/new
+  def new
+    @tournament = Tournament.new
+  end
+
+  # GET /tournaments/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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(:game_id)
+    end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..3e74dea
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,2 @@
+class UsersController < ApplicationController
+end
-- 
cgit v1.2.3-2-g168b


From fefe3f469243d6c932c256cc8798bae35e4ff1c4 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Sun, 2 Mar 2014 21:10:49 -0500
Subject: Added Tournament Name.

---
 app/controllers/matches_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index e9f3c5a..984be3f 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -69,6 +69,6 @@ class MatchesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def match_params
-      params.require(:match).permit(:tournament_id)
+      params.require(:match).permit(:tournament_id, :name)
     end
 end
-- 
cgit v1.2.3-2-g168b


From 7a8f0a0c74c96fcde2a38fbf98123b6c8d44308c Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Mon, 3 Mar 2014 15:03:26 -0500
Subject: Added some partial rendering.

---
 app/controllers/tournaments_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 56233b6..27ba020 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -22,6 +22,12 @@ class TournamentsController < ApplicationController
   def edit
   end
 
+  def selected
+    render :update do |page|
+      page.replace_html 'ajax-form', :partial => 'selected'
+    end
+  end
+
   # POST /tournaments
   # POST /tournaments.json
   def create
-- 
cgit v1.2.3-2-g168b


From b8c14b654255376d79fae55e139a968930be4569 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 19:51:30 -0500
Subject: fixed users table

---
 app/controllers/users_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6436e4e..c14f67c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -15,9 +15,13 @@ class UsersController < ApplicationController
   end
 
 	def show
-		@user = User.find(param[:id])
+		@user = User.find(params[:id])
 	end
 
+	def index
+		@users = User.all
+	end 
+
 	private
 				
 			def user_params
-- 
cgit v1.2.3-2-g168b


From 8f67dafea481f8223983df4dae3a62c92bb5068f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 3 Mar 2014 19:54:47 -0500
Subject: users_controller: indent

---
 app/controllers/users_controller.rb | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6436e4e..d5aa675 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,26 +1,25 @@
 class UsersController < ApplicationController
-
 	def new
 		@user = User.new
 	end
 
-  def create
-    @user = User.new(user_params)
-    if @user.save
-      sign_in @user
-      redirect_to root_path
-    else
-      render 'new'
-    end
-  end
+	def create
+		@user = User.new(user_params)
+		if @user.save
+			sign_in @user
+			redirect_to root_path
+		else
+			render 'new'
+		end
+	end
 
 	def show
 		@user = User.find(param[:id])
 	end
 
 	private
-				
-			def user_params
-				params.require(:user).permit(:name, :email, :user_name, :password, :password_confirmation)
-			end
+
+	def user_params
+		params.require(:user).permit(:name, :email, :user_name, :password, :password_confirmation)
+	end
 end
-- 
cgit v1.2.3-2-g168b


From 661dbaf902d770dfbefa9ba1d9e4c28fc7abf891 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 21:49:38 -0500
Subject: small things

---
 app/controllers/sessions_controller.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 68cb949..3417332 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,22 +1,25 @@
 class SessionsController < ApplicationController
 
 	def new
+		if @user.nil?
+			@user = User.new
+		end
 	end
 	
 	# find the user and create a new session
   def create
-    user = User.find_by(email: params[:session][:email].downcase)
-    if user && user.authenticate(params[:session][:password])
-			sign_in user
+    @user = User.find_by(email: params[:session][:email].downcase)
+    if @user && @user.authenticate(params[:session][:password])
+			sign_in @user
 		  redirect_to root_path
     else
-			render 'new'
-    end
+		  redirect_to signin_path
+	end
   end
 
 	def destroy
-    sign_out
-    redirect_to root_path
+    	sign_out
+    	redirect_to root_path
 	end
 
 end
-- 
cgit v1.2.3-2-g168b


From 423d0e5a440d8d66407522bc842ef273196173bc Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 3 Mar 2014 22:20:02 -0500
Subject: run ./generate.sh

---
 app/controllers/users_controller.rb | 72 +++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3e74dea..b18efed 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,2 +1,74 @@
 class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  # GET /users
+  # GET /users.json
+  def index
+    @users = User.all
+  end
+
+  # GET /users/1
+  # GET /users/1.json
+  def show
+  end
+
+  # GET /users/new
+  def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  # 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
+
+  # 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
+
+  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
 end
-- 
cgit v1.2.3-2-g168b


From 1d90f33bf07f9610d358c6c9c56754784b050541 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 4 Mar 2014 10:57:54 -0500
Subject: simplify the sessions routing

---
 app/controllers/sessions_controller.rb | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 3417332..fa5d024 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,25 +1,28 @@
 class SessionsController < ApplicationController
 
+	# GET /sessions/new
 	def new
 		if @user.nil?
 			@user = User.new
 		end
 	end
 	
-	# find the user and create a new session
-  def create
-    @user = User.find_by(email: params[:session][:email].downcase)
-    if @user && @user.authenticate(params[:session][:password])
+	# POST /sessions
+	def create
+		# find the user...
+		@user = User.find_by(email: params[:session][:email].downcase)
+		# ... and create a new session
+		if @user && @user.authenticate(params[:session][:password])
 			sign_in @user
-		  redirect_to root_path
-    else
-		  redirect_to signin_path
+			redirect_to root_path
+		else
+			redirect_to new_session_path
+		end
 	end
-  end
 
+	# DELETE /sessions/current
 	def destroy
-    	sign_out
-    	redirect_to root_path
+		sign_out
+		redirect_to root_path
 	end
-
 end
-- 
cgit v1.2.3-2-g168b