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(+) 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-54-g00ecf From 81edd21f907d9da523dae3bc5f3017355dca7dba Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 26 Feb 2014 20:07:42 -0500 Subject: Possibly broke everything. Added another model for populating tournament options. --- generate.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 666869c..52d0f90 100755 --- a/generate.sh +++ b/generate.sh @@ -4,7 +4,8 @@ # To Start Rails Server: # bundle exec rails server # -# +# To Clear the Generated Files: +# # set -x @@ -20,6 +21,11 @@ bundle exec rails generate scaffold pm author:references recipient:references me bundle exec rails generate model server_settings bundle exec rails generate controller search bundle exec rails generate controller main + +#for the tournament controller to generate options +bundle exec rails generate model tournament_options + bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development + #bundle exec rails generate scaffold -- cgit v1.2.3-54-g00ecf 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 +++ generate.sh | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 app/models/game.rb 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/generate.sh b/generate.sh index 52d0f90..7dbb444 100755 --- a/generate.sh +++ b/generate.sh @@ -5,7 +5,7 @@ # bundle exec rails server # # To Clear the Generated Files: -# +# git clean -df # set -x @@ -18,6 +18,8 @@ bundle exec rails generate model user_team_pair user:references team:references bundle exec rails generate model team_match_pair team:references match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text +bundle exec rails generate scaffold game name:text +bundle exec rails generate model game_attribute game:references key:text type:integer bundle exec rails generate model server_settings bundle exec rails generate controller search bundle exec rails generate controller main -- cgit v1.2.3-54-g00ecf From 19703afb4cf13e934a2786190a2ad4dd52904f26 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 17:02:10 -0500 Subject: give tournaments a game type --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 7dbb444..b384813 100755 --- a/generate.sh +++ b/generate.sh @@ -10,7 +10,7 @@ set -x bundle exec rails generate scaffold server -bundle exec rails generate scaffold tournament +bundle exec rails generate scaffold tournament game:references bundle exec rails generate scaffold match tournament:references bundle exec rails generate scaffold team bundle exec rails generate scaffold user name:text pw_hash:text groups:integer -- cgit v1.2.3-54-g00ecf 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 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-54-g00ecf From ef1d20f498cf130374334bad291f1196e8694f27 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:41:59 -0500 Subject: Added the Games Attributes stuff. --- db/seeds.rb | 4 ++++ generate.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 4edb1e8..58c9eba 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,7 @@ # # cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) # Mayor.create(name: 'Emanuel', city: cities.first) +# +league = Game.create([{name: "League of Legends"}, {players_per_team: 5}, {teams_per_match: 2}, {set_rounds: 1}, {randomized_teams: 0}]) + + diff --git a/generate.sh b/generate.sh index b384813..77d6cb9 100755 --- a/generate.sh +++ b/generate.sh @@ -18,7 +18,7 @@ bundle exec rails generate model user_team_pair user:references team:references bundle exec rails generate model team_match_pair team:references match:references bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text -bundle exec rails generate scaffold game name:text +bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer bundle exec rails generate model game_attribute game:references key:text type:integer bundle exec rails generate model server_settings bundle exec rails generate controller search -- cgit v1.2.3-54-g00ecf From 7f769096bfb8a3c982b92e4f67334f8974e6caca Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:44:37 -0500 Subject: Added the seeding to generation. --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index 77d6cb9..9c6a1ab 100755 --- a/generate.sh +++ b/generate.sh @@ -29,5 +29,5 @@ bundle exec rails generate model tournament_options bundle exec rake db:drop RAILS_ENV=development bundle exec rake db:migrate RAILS_ENV=development - +bundle exec rake db:seed #bundle exec rails generate scaffold -- cgit v1.2.3-54-g00ecf