diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-02-27 17:58:14 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-02-27 17:58:14 -0500 |
| commit | 96734ca0eef040effd0b5646ceeaccf39e2ebd38 (patch) | |
| tree | 3e6635856ac2b9a8fd4e8fe11abd5137bc770ffe | |
| parent | 8cb882e53dec7c97ceca0438f9bfdce050766109 (diff) | |
| parent | 7f769096bfb8a3c982b92e4f67334f8974e6caca (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 75 | ||||
| -rw-r--r-- | app/models/game.rb | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 11 | ||||
| -rw-r--r-- | db/seeds.rb | 4 | ||||
| -rwxr-xr-x | generate.sh | 12 |
5 files changed, 103 insertions, 2 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 © <%= Time.now.year %> </p> </footer> + </body> </html> 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 36a74ef..07a7688 100755 --- a/generate.sh +++ b/generate.sh @@ -7,12 +7,13 @@ # To Start Rails Server: # bundle exec rails server # -# +# To Clear the Generated Files: +# git clean -df # 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 @@ -20,9 +21,16 @@ 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 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 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 rake db:seed #bundle exec rails generate scaffold |