diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-22 18:17:47 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-22 18:17:47 -0400 |
commit | 7f452e8d99a86af2e3dc2f743158951092aedeb7 (patch) | |
tree | 103f3cb57b05c5a580c3a5152a2a97f5a8070d1e /app | |
parent | 7fe1f6a809d68648bede431b84692bf7d8bb0c01 (diff) | |
parent | 7deb9c1c7acadf9a5b638313f51ba9dc60624672 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/search_controller.rb | 13 | ||||
-rw-r--r-- | app/views/common/_show_tournament.html.erb | 32 | ||||
-rw-r--r-- | app/views/layouts/application.html.erb | 12 | ||||
-rw-r--r-- | app/views/search/go.html.erb | 23 | ||||
-rw-r--r-- | app/views/tournaments/index.html.erb | 38 |
5 files changed, 82 insertions, 36 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index ee61487..51aee9e 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,2 +1,15 @@ class SearchController < ApplicationController + + def go + @query = params[:query] + + if (@query.nil?) then + return + end + + @tournaments = Tournament.where("name LIKE '%#{@query}%'") + @players = User.where("name LIKE '%#{@query}%'") + + end + end diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb new file mode 100644 index 0000000..89d8f53 --- /dev/null +++ b/app/views/common/_show_tournament.html.erb @@ -0,0 +1,32 @@ +<div class="row tournament-listing"> + <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag ('http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(target.hosts.first.email) + '?s=100&d=mm') %></div> + <div class="col-md-8 col-sm-7 col-xs-6"> + <%# "header" %> + <%= link_to(target) do %><h3><%= target.name %></h3><% end %> + <div class="row" style="margin-left:2%;"> + <div class="col-md-4 host"> + Hosted by: <%= target.hosts.first.name %> + </div> + <div class="col-md-4 things"> + <p> Players per team: <%= target.min_players_per_team %></p> + <p> Players signed up: <%= target.players.count %> </p> + </div> + <div class="col-md-4 things"> + <p> <%= (target.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p> + <p> Players signed up: <%= target.players.count %> </p> + </div> + </div> + </div> + <div class="col-md-2 col-sm-2 col-xs-2"> + <% if signed_in? %> + <% if !target.players.include?(current_user) %> + <%= form_tag(tournament_path(target), method: "put") do %> + <input type="hidden" name="update_action" value="join"> + <%= submit_tag("Join")%> + <% end %> + <% else %> + <p style="margin-top:10px;"> You've signed up for this tournament! </p> + <% end %> + <% end %> + </div> +</div>
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e6b5b25..fb5c1c5 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,15 +13,20 @@ BetterDragSort.makeListSortable(document.getElementById("boxes")); }; </script> -<header><nav> +<header> + <nav> + <%# This is the logo %> <div class="navbar-brand"><%= link_to('Leaguer', root_path) %></div> + + <%# This is the search bar #%> <div> <%= form_tag("/search", method: "get", :class => "search") do %> <%= text_field_tag(:query, nil, :placeholder => "Search") %> - <%= submit_tag("Go") %> + <%= submit_tag("Go", :name=>nil) %> <% end %> </div> + <%# these are the log in buttons #%> <div id="log-buttons"> <% if signed_in? %> <%= link_to current_user.user_name, current_user, :class => "user" %> @@ -34,7 +39,8 @@ <%= link_to "Sign up", new_user_path, :class => "signup" %> <% end %> </div> -</nav></header> + </nav> +</header> <% if notice %><div id="notice"><p><%= notice %></p></div><% end %> diff --git a/app/views/search/go.html.erb b/app/views/search/go.html.erb new file mode 100644 index 0000000..6d5826f --- /dev/null +++ b/app/views/search/go.html.erb @@ -0,0 +1,23 @@ + +<%# Show search results if a query was not nill %> +<% if !@query.empty? %> + <h3> Showing results for: <span><%= @query %></span></h3> + <% if @tournaments.empty? and @players.empty? %> + <p> No results found for "<%= @query %>" </p> + <% else %> + <% if @tournaments.length > 0 %> + <h4> Tournaments </h4> + <% end %> + <% @tournaments.each do |t| %> + <%= render "common/show_tournament", :target => t %> + <% end %> + + <% if @players.length > 0 %> + <h4> Players </h4> + <% end %> + <% @players.each do |p| %> + <%= render "common/show_player", :target => p %> + <% end %> + + <% end %> +<% end %>
\ No newline at end of file diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index eef9577..06e1b25 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -2,48 +2,20 @@ <div id="tournament-list"> <% if @tournaments.length > 0 %> + <%# Each tournament has a div for its listing %> <% @tournaments.each do |t| %> - <div class="row tournament-listing"> - <div class="col-md-2 col-sm-3 col-xs-6"><%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(t.hosts.first.email) + '?s=100&d=mm' %></div> - <div class="col-md-8 col-sm-7 col-xs-6"> - <%# "header" %> - <%= link_to(t) do %><h3><%= t.name %></h3><% end %> - <div class="row" style="margin-left:2%;"> - <div class="col-md-4 host"> - Hosted by: <%= t.hosts.first.name %> - </div> - <div class="col-md-4 things"> - <p> Players per team: <%= t.min_players_per_team %></p> - <p> Players signed up: <%= t.players.count %> </p> - </div> - <div class="col-md-4 things"> - <p> <%= (t.randomized_teams)? "Teams are Random" : "Teams are Chosen" %></p> - <p> Players signed up: <%= t.players.count %> </p> - </div> - </div> - </div> - <div class="col-md-2 col-sm-2 col-xs-2"> - <% if signed_in? %> - <% if !t.players.include?(current_user) %> - <%= form_tag(tournament_path(t), method: "put") do %> - <input type="hidden" name="update_action" value="join"> - <%= submit_tag("Join") - %> - <% end %> - <% else %> - <p style="margin-top:10px;"> You've signed up for this tournament! </p> - <% end %> - <% end %> - </div> - </div> + <%= render "common/show_tournament", :target => t %> <% end %> + <% else %> + <p class="no-entries"> No tournaments going on right now... <% if current_user.can?(:create_tournament) %> Why not start your own? <% end %> </p> + <% end %> </div> |