diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b76295b..4607609 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -197,21 +197,6 @@ a:visited { 0 0 50px #b16286, 0 0 60px #b16286, 0 0 70px #b16286; - - /* Animation for bouncing/moving effect */ - animation: bounce 1.5s ease infinite alternate; -} - -@keyframes bounce { - 0% { - transform: translateY(0) rotate(0deg); - } - 50% { - transform: translateY(-10px) rotate(5deg); - } - 100% { - transform: translateY(0) rotate(-5deg); - } } select { diff --git a/app/models/player.rb b/app/models/player.rb index 86c1059..f6b20db 100644 --- a/app/models/player.rb +++ b/app/models/player.rb @@ -35,8 +35,10 @@ class Player < ApplicationRecord self.main_player end - def alts_concat - self.alternate_players.map(&:name).join(", ") + def main_name + if alt? + self.main_player.name + end end def no_circular_references diff --git a/app/views/game/index.html.erb b/app/views/game/index.html.erb index b67daf8..5bbca9f 100644 --- a/app/views/game/index.html.erb +++ b/app/views/game/index.html.erb @@ -28,4 +28,5 @@ </div> <% else %> <p>No recent games</p> + <a href="/">Leaderboard</a> <% end %> \ No newline at end of file diff --git a/app/views/leaderboard/index.html.erb b/app/views/leaderboard/index.html.erb index ad3d3fa..3cc14e5 100644 --- a/app/views/leaderboard/index.html.erb +++ b/app/views/leaderboard/index.html.erb @@ -24,7 +24,7 @@ </div> <% @players.each do |player| %> <div class="row"> - <div class="cell" data-title="Player"><%= player.name %></div> + <div class="cell" data-title="Player"><%= link_to player.name, player_path(player) %></div> <div class="cell" data-title="Purse"><%= player.total_purse %></div> <div class="cell" data-title="Wins"><%= player.total_wins %></div> <div class="cell" data-title="Losses"><%= player.total_losses %></div> diff --git a/app/views/player/show.html.erb b/app/views/player/show.html.erb index cd634c6..2748dcc 100644 --- a/app/views/player/show.html.erb +++ b/app/views/player/show.html.erb @@ -1,20 +1,42 @@ <h1><%= @player.name %></h1> -<table><thead> -<tr> - <th>Player</th> - <th>Purse</th> - <th>Wins</th> - <th>Losses</th> -</tr></thead> - <tbody> - <% @player.each do |game| %> - <tr> - <td><% @player.name %></td> - <td><% @player.purse %></td> - <td><% @player.wins %></td> - <td><% @player.losses %></td> - </tr> +<div class="wrapper"> + <div class="table"> + <div class="row header"> + <div class="cell">Name</div> + <div class="cell">Purse</div> + <div class="cell">Wins</div> + <div class="cell">Losses</div> + </div> + <div class="row"> + <div class="cell" data-title="Player"><%= @player.name %></div> + <div class="cell" data-title="Purse"><%= @player.total_purse %></div> + <div class="cell" data-title="Wins"><%= @player.total_wins %></div> + <div class="cell" data-title="Losses"><%= @player.total_losses %></div> + </div> + </div> + + <% if @player.alternate_players.count > 0 %> + <h2>Alts</h2> + <div class="table"> + <div class="row header"> + <div class="cell">Alt</div> + <div class="cell">Purse</div> + <div class="cell">Wins</div> + <div class="cell">Losses</div> + </div> + <% @player.alternate_players.each do |alt| %> + <div class="row"> + <div class="cell" data-title="Player"><%= link_to alt.name, player_path(alt) %></div> + <div class="cell" data-title="Purse"><%= alt.total_purse %></div> + <div class="cell" data-title="Wins"><%= alt.total_wins %></div> + <div class="cell" data-title="Losses"><%= alt.total_losses %></div> + </div> + <% end %> + </div> + <% elsif @player.alt? %> + <h2>Alt Status</h2> + <p><%= @player.name %> is set as an alt of <%= link_to @player.main_name, player_path(@player.main_player) %></p> <% end %> - </tbody> -</table> \ No newline at end of file + <a href="/">Leaderboard</a> +</div> diff --git a/config/routes.rb b/config/routes.rb index 3460f26..bea0bd0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,7 @@ Rails.application.routes.draw do resources :game, only: [ :create ], defaults: { format: :json } # Player - get "player/:id", to: "player#show" + resources :player, only: [ :show ] # Leaderboard get "leaderboard", to: "leaderboard#index", as: "leaderboard", defaults: { format: :html }