Merge branch 'master' of git.ukko.mx:psanchezp/quiniela-mundial

+WAIT=7
+ATTEMPTS=10
+/                   

 source 'https://rubygems.org'
 source 'https://rubygems.org'
 
 
+ruby '2.3.0'
 git_source(:github) do |repo_name|
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
   "https://github.com/#{repo_name}.git"
@@ -62,3 +63,7 @@ end
 
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :production do
+  gem 'rails_12factor'
+end

@@ -148,6 +148,11 @@ GEM
       nokogiri (>= 1.6)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
       loofah (~> 2.2, >= 2.2.2)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (5.0.7)
     railties (5.0.7)
       actionpack (= 5.0.7)
       actionpack (= 5.0.7)
       activesupport (= 5.0.7)
       activesupport (= 5.0.7)
@@ -246,6 +251,7 @@ DEPENDENCIES
   pry
   pry
   puma (~> 3.0)
   puma (~> 3.0)
   rails (~> 5.0.6)
   rails (~> 5.0.6)
+  rails_12factor
   sass-rails (~> 5.0)
   sass-rails (~> 5.0)
   simple_form
   simple_form
   slim
   slim

+web: bundle exec puma -C config/puma.rb
+worker: bundle exec sidekiq

@@ -73,7 +73,8 @@ table {
 
 
 .upcoming {
 .upcoming {
   td {
   td {
-    width: 33%;
+    width: 25%;
+    font-size: 12px;
   }
   }
 }
 }
 
 
@@ -94,9 +95,9 @@ table {
     text-align: left;
     text-align: left;
   }
   }
 
 
-  td, th {
-    width: 50%;
-  }
+  // td, th {
+  //   // width: 50%;
+  // }
 }
 }
 
 
 // Bets
 // Bets
@@ -182,3 +183,15 @@ input[type="submit"] {
     max-width: 70vw;
     max-width: 70vw;
   }
   }
 }
 }
+
+.vs-cell {
+  width: 40px;
+}
+
+.text-left { text-align: left; width: 100%; }
+
+td.points {
+  font-weight: 700;
+  &.zero { color: red }
+  &.positive { color: green }
+}

@@ -2,15 +2,20 @@ class ApplicationController < HeimdallEngine::ApplicationController
   protect_from_forgery with: :exception
   protect_from_forgery with: :exception
 
 
   def root
   def root
-    leaderboard
+    load_leaderboard
     check_matches
     check_matches
     recent_matches
     recent_matches
     @results = check_results
     @results = check_results
   end
   end
 
 
+  def leaderboard
+    @leaders = Bet.joins(:user).group('users.name').sum(:points)
+                  .sort_by { |k,v| v }
+  end
+
   private
   private
 
 
-  def leaderboard
+  def load_leaderboard
     @leaders = Bet.joins(:user).group('users.name').sum(:points)
     @leaders = Bet.joins(:user).group('users.name').sum(:points)
                   .sort_by { |k,v| v }.take(5)
                   .sort_by { |k,v| v }.take(5)
   end
   end
@@ -28,7 +33,7 @@ class ApplicationController < HeimdallEngine::ApplicationController
   def check_results
   def check_results
     return [] unless current_user
     return [] unless current_user
     current_user.bets.joins(:match).order('matches.date desc')
     current_user.bets.joins(:match).order('matches.date desc')
-      .where.not(result: nil)
+      .where.not(points: nil)
       .limit(5)
       .limit(5)
   end
   end
 end
 end

+class MyProfileController < CrudController::Base
+  enable_gatekeeper
+
+
+  private
+
+  def object_params
+    params.require(:user).permit(
+      :name, :mail, :password, :password_confirmation
+    )
+  end
+end

 h1 Leaderboard
 h1 Leaderboard
 table.leaderboard
 table.leaderboard
   tbody
   tbody
-    - @leaders.each do |group_name, data|
-      tr
-        td colspan=2 = group_name
-      - data[:leaderboard].each do |user_name, points|
+    - @leaders.each.with_index do |(user_name, points), i|
       tr
       tr
+        td style='width: 50px' = 1 + i
         td = user_name
         td = user_name
         td = points
         td = points
-      - if data[:leaderboard].empty?
+    - if @leaders.empty?
       tr
       tr
         td colspan=2 There are no results yet
         td colspan=2 There are no results yet
+.text-left style='margin-top: 10px;'
+  = link_to 'See everyone', leaderboard_path

@@ -6,7 +6,7 @@ table
         td = r.match.local
         td = r.match.local
         td VS
         td VS
         td = r.match.visit
         td = r.match.visit
-        td = r.points
+        td.points class="#{r.points.to_i.zero? ? 'zero' : 'positive'}" = r.points
     - if @results.empty?
     - if @results.empty?
       tr
       tr
         td colspan=4 There are no finished matches yet.
         td colspan=4 There are no finished matches yet.

@@ -5,19 +5,6 @@ table.upcoming
       tr
       tr
         td = l(u.date, format: :short)
         td = l(u.date, format: :short)
         td = u.local
         td = u.local
-        td VS
+        td.vs-cell VS
         td = u.visit
         td = u.visit
 
 
-h1 Recent matches
-table.recent
-  tbody
-    - @recent_matches.each do |match|
-        tr
-          td = l(match.date, format: :short)
-          td = match.local
-          td = match.score_local
-          td = match.visit
-          td = match.score_visit
-    - if @recent_matches.empty?
-      tr
-        td colspan=4 There are no finished matches yet.

+.middle.content
+  h1 Leaderboard
+  table.leaderboard
+    tbody
+      - @leaders.each.with_index do |(user_name, points), i|
+        tr
+          td style='width: 50px' = 1 + i
+          td = user_name
+          td = points
+      - if @leaders.empty?
+        tr
+          td colspan=2 There are no results yet
+  .text-left style='margin-top: 10px;'
+    = link_to 'Back', root_path

 table
 table
   thead
   thead
-    th Day
-    th Home
-    th Your bet
-    th Away
-    th Your bet
-    th Result
-    th Home Score
-    th Away Score
-    th Points
+    th style='text-align: left' Day
+    th style='text-align: left' Home
+    th style='text-align: left' Your bet
+    th style='text-align: left' Away
+    th style='text-align: left' Your bet
+    th style='text-align: left' Result
+    th style='text-align: left' Home Score
+    th style='text-align: left' Away Score
+    th style='text-align: left' Points
   - pool.matches.each do |match|
   - pool.matches.each do |match|
     - bet = current_user.bets.find_or_initialize_by(match_id: match.id)
     - bet = current_user.bets.find_or_initialize_by(match_id: match.id)
     tr
     tr
@@ -20,5 +20,5 @@ table
       td = match.result ? match.result.upcase : 'PENDING'
       td = match.result ? match.result.upcase : 'PENDING'
       td = match.score_local
       td = match.score_local
       td = match.score_visit
       td = match.score_visit
-      td = bet.try(:points)
+      td.points class="#{bet.points.to_i.zero? ? 'zero' : 'positive'}" = bet.try(:points)
 
 

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   HeimdallEngine.load_routes
   HeimdallEngine.load_routes
   root 'application#root'
   root 'application#root'
+  get 'leaderboard', to: 'application#leaderboard', as: :leaderboard
   resources :bets, only: [:index] do
   resources :bets, only: [:index] do
     collection do
     collection do
       patch :update, as: :put
       patch :update, as: :put