summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/controllers/search_controller.rb13
-rw-r--r--app/views/common/_show_tournament.html.erb32
-rw-r--r--app/views/layouts/application.html.erb12
-rw-r--r--app/views/search/go.html.erb23
-rw-r--r--app/views/tournaments/index.html.erb38
-rw-r--r--config/routes.rb6
-rw-r--r--lib/pairing/PairingAlgorithm.rb6
-rw-r--r--lib/playing/.keep0
-rw-r--r--lib/scoring/fibonacci_peer_with_blowout.rb (renamed from lib/scoring/FibonacciPeerWithBlowout.rb)0
-rw-r--r--lib/scoring/marginal_peer.rb (renamed from lib/scoring/MarginalPeer.rb)0
-rw-r--r--lib/scoring/scoring_algorithm.rb (renamed from lib/scoring/ScoringAlgorithm.rb)0
-rw-r--r--lib/scoring/winner_takes_all.rb (renamed from lib/scoring/WinnerTakesAll.rb)0
12 files changed, 94 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>
diff --git a/config/routes.rb b/config/routes.rb
index f94bd2f..c1bbf52 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,8 +24,14 @@ Leaguer::Application.routes.draw do
end
root to: 'static#homepage'
+
get '/testsvg', to: 'static#test'
+
+ get '/search', to: 'search#go'
+
end
+
+
Leaguer::Application.routes.named_routes.module.module_eval do
def match_path(match, options={})
tournament_match_path(match.tournament_stage.tournament, match, options)
diff --git a/lib/pairing/PairingAlgorithm.rb b/lib/pairing/PairingAlgorithm.rb
new file mode 100644
index 0000000..c3d7f7b
--- /dev/null
+++ b/lib/pairing/PairingAlgorithm.rb
@@ -0,0 +1,6 @@
+module Leaguer
+ class PairingAlgorithm
+ def self.pair(matches, players)
+ end
+ end
+end
diff --git a/lib/playing/.keep b/lib/playing/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/playing/.keep
diff --git a/lib/scoring/FibonacciPeerWithBlowout.rb b/lib/scoring/fibonacci_peer_with_blowout.rb
index 19ac9a7..19ac9a7 100644
--- a/lib/scoring/FibonacciPeerWithBlowout.rb
+++ b/lib/scoring/fibonacci_peer_with_blowout.rb
diff --git a/lib/scoring/MarginalPeer.rb b/lib/scoring/marginal_peer.rb
index 0e1cfa8..0e1cfa8 100644
--- a/lib/scoring/MarginalPeer.rb
+++ b/lib/scoring/marginal_peer.rb
diff --git a/lib/scoring/ScoringAlgorithm.rb b/lib/scoring/scoring_algorithm.rb
index 6277da8..6277da8 100644
--- a/lib/scoring/ScoringAlgorithm.rb
+++ b/lib/scoring/scoring_algorithm.rb
diff --git a/lib/scoring/WinnerTakesAll.rb b/lib/scoring/winner_takes_all.rb
index ad2471b..ad2471b 100644
--- a/lib/scoring/WinnerTakesAll.rb
+++ b/lib/scoring/winner_takes_all.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 18:34:27 +0000