diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/brackets.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/brackets.css.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 61 | ||||
| -rw-r--r-- | app/controllers/brackets_controller.rb | 74 | ||||
| -rw-r--r-- | app/helpers/brackets_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/bracket.rb | 4 | ||||
| -rw-r--r-- | app/models/bracket_match.rb | 5 | ||||
| -rw-r--r-- | app/views/brackets/_form.html.erb | 29 | ||||
| -rw-r--r-- | app/views/brackets/edit.html.erb | 6 | ||||
| -rw-r--r-- | app/views/brackets/index.html.erb | 31 | ||||
| -rw-r--r-- | app/views/brackets/index.json.jbuilder | 4 | ||||
| -rw-r--r-- | app/views/brackets/new.html.erb | 5 | ||||
| -rw-r--r-- | app/views/brackets/show.html.erb | 19 | ||||
| -rw-r--r-- | app/views/brackets/show.json.jbuilder | 1 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 7 |
16 files changed, 247 insertions, 10 deletions
diff --git a/app/assets/javascripts/brackets.js.coffee b/app/assets/javascripts/brackets.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/brackets.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index dd7588a..ab45dd0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -26,5 +26,8 @@ footer { clear: both; + margin: 0 auto; margin-top: 10px; + color: white; + width: 90%; }
\ No newline at end of file diff --git a/app/assets/stylesheets/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss new file mode 100644 index 0000000..481e6e6 --- /dev/null +++ b/app/assets/stylesheets/brackets.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the brackets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 6700fef..02b96a2 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,15 +1,56 @@ @import "bootstrap"; +$page-color: #444; +$toolbar-color: black; + +html{ + height: 100%; +} + body { - background-color: #fff; - color: #333; + background-color: $page-color; + color: $page-color; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; + height: 100%; +} + +.wrapper { + padding-left: 5%; + padding-right: 5%; + margin: 0 auto; + background-color: #fff; + padding-top: 10px; + height: 90%; + box-shadow: 1px 1px 7px orange; + border-radius: 0px 0px 5px 5px; +} + +footer { + clear: both; + margin: 0 auto; + margin-top: 10px; + color: white; + +} + +@media screen and (min-width: 480px) { + .wrapper, footer { + width: 80%; + min-width: 480px; + max-width: 1024px; + } +} + +@media screen and (max-width: 480px) { + .wrapper, footer { + width: 100%; + } } h1, h2, h3, h4, h5{ - color: #0f0f0f; + color: #030303; } p, ol, ul, td { @@ -75,6 +116,9 @@ div { } } + +/* NAVBAR */ + .navbar-brand { @extend .no-dec; a{ @@ -87,11 +131,12 @@ div { } } -footer { - text-align: center; - border-top: solid 1px #999999; - padding-top: 18px; - margin-top: 18px; +.navbar-inverse, header > nav { + background-color: $toolbar-color; + border-color: #0F4070; + border-radius: 0px 0px 5px 5px; + margin-bottom: 0px; + } button, input[type="submit"] { diff --git a/app/controllers/brackets_controller.rb b/app/controllers/brackets_controller.rb new file mode 100644 index 0000000..fe43ca9 --- /dev/null +++ b/app/controllers/brackets_controller.rb @@ -0,0 +1,74 @@ +class BracketsController < ApplicationController + before_action :set_bracket, only: [:show, :edit, :update, :destroy] + + # GET /brackets + # GET /brackets.json + def index + @brackets = Bracket.all + end + + # GET /brackets/1 + # GET /brackets/1.json + def show + end + + # GET /brackets/new + def new + @bracket = Bracket.new + end + + # GET /brackets/1/edit + def edit + end + + # POST /brackets + # POST /brackets.json + def create + @bracket = Bracket.new(bracket_params) + + respond_to do |format| + if @bracket.save + format.html { redirect_to @bracket, notice: 'Bracket was successfully created.' } + format.json { render action: 'show', status: :created, location: @bracket } + else + format.html { render action: 'new' } + format.json { render json: @bracket.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /brackets/1 + # PATCH/PUT /brackets/1.json + def update + respond_to do |format| + if @bracket.update(bracket_params) + format.html { redirect_to @bracket, notice: 'Bracket was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @bracket.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /brackets/1 + # DELETE /brackets/1.json + def destroy + @bracket.destroy + respond_to do |format| + format.html { redirect_to brackets_url } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_bracket + @bracket = Bracket.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def bracket_params + params.require(:bracket).permit(:user_id, :tournament_id, :name) + end +end diff --git a/app/helpers/brackets_helper.rb b/app/helpers/brackets_helper.rb new file mode 100644 index 0000000..8c380fd --- /dev/null +++ b/app/helpers/brackets_helper.rb @@ -0,0 +1,2 @@ +module BracketsHelper +end diff --git a/app/models/bracket.rb b/app/models/bracket.rb new file mode 100644 index 0000000..e8d9c5a --- /dev/null +++ b/app/models/bracket.rb @@ -0,0 +1,4 @@ +class Bracket < ActiveRecord::Base + belongs_to :user + belongs_to :tournament +end diff --git a/app/models/bracket_match.rb b/app/models/bracket_match.rb new file mode 100644 index 0000000..823bc40 --- /dev/null +++ b/app/models/bracket_match.rb @@ -0,0 +1,5 @@ +class BracketMatch < ActiveRecord::Base + belongs_to :bracket + belongs_to :match + belongs_to :predicted_winner +end diff --git a/app/views/brackets/_form.html.erb b/app/views/brackets/_form.html.erb new file mode 100644 index 0000000..5050fc1 --- /dev/null +++ b/app/views/brackets/_form.html.erb @@ -0,0 +1,29 @@ +<%= form_for(@bracket) do |f| %> + <% if @bracket.errors.any? %> + <div id="error_explanation"> + <h2><%= pluralize(@bracket.errors.count, "error") %> prohibited this bracket from being saved:</h2> + + <ul> + <% @bracket.errors.full_messages.each do |msg| %> + <li><%= msg %></li> + <% end %> + </ul> + </div> + <% end %> + + <div class="field"> + <%= f.label :user_id %><br> + <%= f.text_field :user_id %> + </div> + <div class="field"> + <%= f.label :tournament_id %><br> + <%= f.text_field :tournament_id %> + </div> + <div class="field"> + <%= f.label :name %><br> + <%= f.text_field :name %> + </div> + <div class="actions"> + <%= f.submit %> + </div> +<% end %> diff --git a/app/views/brackets/edit.html.erb b/app/views/brackets/edit.html.erb new file mode 100644 index 0000000..10a2b3e --- /dev/null +++ b/app/views/brackets/edit.html.erb @@ -0,0 +1,6 @@ +<h1>Editing bracket</h1> + +<%= render 'form' %> + +<%= link_to 'Show', @bracket %> | +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/index.html.erb b/app/views/brackets/index.html.erb new file mode 100644 index 0000000..2195d69 --- /dev/null +++ b/app/views/brackets/index.html.erb @@ -0,0 +1,31 @@ +<h1>Listing brackets</h1> + +<table> + <thead> + <tr> + <th>User</th> + <th>Tournament</th> + <th>Name</th> + <th></th> + <th></th> + <th></th> + </tr> + </thead> + + <tbody> + <% @brackets.each do |bracket| %> + <tr> + <td><%= bracket.user %></td> + <td><%= bracket.tournament %></td> + <td><%= bracket.name %></td> + <td><%= link_to 'Show', bracket %></td> + <td><%= link_to 'Edit', edit_bracket_path(bracket) %></td> + <td><%= link_to 'Destroy', bracket, method: :delete, data: { confirm: 'Are you sure?' } %></td> + </tr> + <% end %> + </tbody> +</table> + +<br> + +<%= link_to 'New Bracket', new_bracket_path %> diff --git a/app/views/brackets/index.json.jbuilder b/app/views/brackets/index.json.jbuilder new file mode 100644 index 0000000..8a66626 --- /dev/null +++ b/app/views/brackets/index.json.jbuilder @@ -0,0 +1,4 @@ +json.array!(@brackets) do |bracket| + json.extract! bracket, :id, :user_id, :tournament_id, :name + json.url bracket_url(bracket, format: :json) +end diff --git a/app/views/brackets/new.html.erb b/app/views/brackets/new.html.erb new file mode 100644 index 0000000..c379c15 --- /dev/null +++ b/app/views/brackets/new.html.erb @@ -0,0 +1,5 @@ +<h1>New bracket</h1> + +<%= render 'form' %> + +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb new file mode 100644 index 0000000..9c7c14b --- /dev/null +++ b/app/views/brackets/show.html.erb @@ -0,0 +1,19 @@ +<p id="notice"><%= notice %></p> + +<p> + <strong>User:</strong> + <%= @bracket.user %> +</p> + +<p> + <strong>Tournament:</strong> + <%= @bracket.tournament %> +</p> + +<p> + <strong>Name:</strong> + <%= @bracket.name %> +</p> + +<%= link_to 'Edit', edit_bracket_path(@bracket) %> | +<%= link_to 'Back', brackets_path %> diff --git a/app/views/brackets/show.json.jbuilder b/app/views/brackets/show.json.jbuilder new file mode 100644 index 0000000..6a8d478 --- /dev/null +++ b/app/views/brackets/show.json.jbuilder @@ -0,0 +1 @@ +json.extract! @bracket, :id, :user_id, :tournament_id, :name, :created_at, :updated_at diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index de9f3b8..e6b5b25 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -38,11 +38,14 @@ <% if notice %><div id="notice"><p><%= notice %></p></div><% end %> -<div class="container"><%= yield %></div> +<div class="wrapper"> + <%= yield %> +</div> <footer> <p>Leaguer © 2014, Tomer Kimia, Andrew Murrell, Luke Shumaker, Nathaniel Foy, Davis Webb, and Guntas Grewal</p> + <%= debug(params) if Rails.env.development? %> </footer> -<%= debug(params) if Rails.env.development? %> + </body> </html> |