From 21cc8930b7821075fce8bbcb3f68dcd8fe081ff0 Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Tue, 25 Feb 2014 17:33:25 -0500 Subject: Search bar and footer html. --- app/views/layouts/application.html.erb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app') 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 %> +
+

Leaguer

+ <%= form_tag("/search", method: "get", :id => "search-bar") do %> + <%= text_field_tag(:query, nil, :placeholder => "Search") %> + <%= submit_tag("Go") %> + <% end %> +
<%= yield %> + + -- cgit v1.2.3-2-g168b From b80bd573b31ae7325c493de30c02778621cee18b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 16:59:04 -0500 Subject: add game types --- app/models/game.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/models/game.rb (limited to 'app') 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 -- cgit v1.2.3-2-g168b From d23df885d69889b61e1c77be0ba0d8dc941a84eb Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:09:20 -0500 Subject: Added one line to tournaments controller. --- app/controllers/tournaments_controller.rb | 75 +++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 app/controllers/tournaments_controller.rb (limited to 'app') 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 -- cgit v1.2.3-2-g168b