summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-02-27 17:58:14 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-02-27 17:58:14 -0500
commit96734ca0eef040effd0b5646ceeaccf39e2ebd38 (patch)
tree3e6635856ac2b9a8fd4e8fe11abd5137bc770ffe /app
parent8cb882e53dec7c97ceca0438f9bfdce050766109 (diff)
parent7f769096bfb8a3c982b92e4f67334f8974e6caca (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
-rw-r--r--app/controllers/tournaments_controller.rb75
-rw-r--r--app/models/game.rb3
-rw-r--r--app/views/layouts/application.html.erb11
3 files changed, 89 insertions, 0 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
new file mode 100644
index 0000000..86b869b
--- /dev/null
+++ b/app/controllers/tournaments_controller.rb
@@ -0,0 +1,75 @@
+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
+ @game_names = Game.all
+ @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/models/game.rb b/app/models/game.rb
new file mode 100644
index 0000000..b3b6977
--- /dev/null
+++ b/app/models/game.rb
@@ -0,0 +1,3 @@
+class Game < ActiveRecord::Base
+ has_many :game_attributes
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cefd1be..e2b8e02 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -7,8 +7,19 @@
<%= csrf_meta_tags %>
</head>
<body>
+<header>
+ <h1 id="logo"> Leaguer </h1>
+ <%= form_tag("/search", method: "get", :id => "search-bar") do %>
+ <%= text_field_tag(:query, nil, :placeholder => "Search") %>
+ <%= submit_tag("Go") %>
+ <% end %>
+</header>
<%= yield %>
+<footer >
+<p> Tomer Kimia Andrew Murrell Luke Shumaker Nathaniel Foy Davis Webb Guntas Grewal </p>
+<p> The Leaguer System &#169; <%= Time.now.year %> </p> </footer>
+
</body>
</html>