mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 11:42:07 +00:00
show live player count on landing page
This commit is contained in:
@@ -59,6 +59,17 @@ defmodule Chesstrainer.Attempts do
|
|||||||
|> Repo.one()
|
|> Repo.one()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Returns the number of users who have recorded at least one attempt.
|
||||||
|
|
||||||
|
A retry does not count twice: the count is over distinct users.
|
||||||
|
"""
|
||||||
|
def count_users_with_attempts do
|
||||||
|
Attempt
|
||||||
|
|> select([a], count(a.user_id, :distinct))
|
||||||
|
|> Repo.one()
|
||||||
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
The distinct endgame ids `user_id` has attempted in the last `days` days.
|
The distinct endgame ids `user_id` has attempted in the last `days` days.
|
||||||
|
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ defmodule ChesstrainerWeb.LandingComponents do
|
|||||||
LiveView, use `board_grid/1` directly.
|
LiveView, use `board_grid/1` directly.
|
||||||
"""
|
"""
|
||||||
attr :endgame, :map, default: nil
|
attr :endgame, :map, default: nil
|
||||||
|
attr :date, :any, default: nil
|
||||||
|
|
||||||
def board_preview(assigns) do
|
def board_preview(assigns) do
|
||||||
endgame = assigns.endgame
|
endgame = assigns.endgame
|
||||||
@@ -188,20 +189,20 @@ defmodule ChesstrainerWeb.LandingComponents do
|
|||||||
end
|
end
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Formats the puzzle count for the landing-page stat.
|
Formats a landing-page stat count.
|
||||||
|
|
||||||
Counts below 100 are shown exactly. Larger counts are floored to the nearest
|
Counts below 100 are shown exactly. Larger counts are floored to the nearest
|
||||||
hundred or thousand and suffixed with `+`, so the claim is never overstated.
|
hundred or thousand and suffixed with `+`, so the claim is never overstated.
|
||||||
"""
|
"""
|
||||||
def puzzle_count_label(count) when is_integer(count) and count < 100 do
|
def count_label(count) when is_integer(count) and count < 100 do
|
||||||
Integer.to_string(count)
|
Integer.to_string(count)
|
||||||
end
|
end
|
||||||
|
|
||||||
def puzzle_count_label(count) when is_integer(count) and count < 1000 do
|
def count_label(count) when is_integer(count) and count < 1000 do
|
||||||
"#{div(count, 100) * 100}+"
|
"#{div(count, 100) * 100}+"
|
||||||
end
|
end
|
||||||
|
|
||||||
def puzzle_count_label(count) when is_integer(count) do
|
def count_label(count) when is_integer(count) do
|
||||||
"#{div(count, 1000) * 1000}+"
|
"#{div(count, 1000) * 1000}+"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
defmodule ChesstrainerWeb.PageController do
|
defmodule ChesstrainerWeb.PageController do
|
||||||
use ChesstrainerWeb, :controller
|
use ChesstrainerWeb, :controller
|
||||||
|
|
||||||
|
alias Chesstrainer.Attempts
|
||||||
alias Chesstrainer.DailyPuzzles
|
alias Chesstrainer.DailyPuzzles
|
||||||
alias Chesstrainer.Endgames
|
alias Chesstrainer.Endgames
|
||||||
|
|
||||||
@@ -20,6 +21,7 @@ defmodule ChesstrainerWeb.PageController do
|
|||||||
endgames: endgames,
|
endgames: endgames,
|
||||||
active_endgame: DailyPuzzles.today(),
|
active_endgame: DailyPuzzles.today(),
|
||||||
puzzle_count: Endgames.count_endgames(),
|
puzzle_count: Endgames.count_endgames(),
|
||||||
|
user_count: Attempts.count_users_with_attempts(),
|
||||||
today: Date.utc_today()
|
today: Date.utc_today()
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
<i>♜</i>
|
<i>♜</i>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
<strong>12,400+</strong> players training
|
<strong>{count_label(@user_count)}</strong> players training
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
<span>minutes a day</span>
|
<span>minutes a day</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="stat">
|
<div class="stat">
|
||||||
<strong>{puzzle_count_label(@puzzle_count)}</strong>
|
<strong>{count_label(@puzzle_count)}</strong>
|
||||||
<span>puzzles</span>
|
<span>puzzles</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="stat">
|
<div class="stat">
|
||||||
|
|||||||
@@ -39,6 +39,26 @@ defmodule Chesstrainer.AttemptsTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "count_users_with_attempts/0" do
|
||||||
|
test "counts distinct users who have recorded an attempt" do
|
||||||
|
first = user_fixture()
|
||||||
|
second = user_fixture()
|
||||||
|
endgame = endgame_fixture()
|
||||||
|
|
||||||
|
{:ok, _} = Attempts.record_attempt(Scope.for_user(first), endgame, :solved)
|
||||||
|
{:ok, _} = Attempts.record_attempt(Scope.for_user(first), endgame, :failed)
|
||||||
|
{:ok, _} = Attempts.record_attempt(Scope.for_user(second), endgame, :solved)
|
||||||
|
|
||||||
|
assert Attempts.count_users_with_attempts() == 2
|
||||||
|
end
|
||||||
|
|
||||||
|
test "ignores users without attempts" do
|
||||||
|
user_fixture()
|
||||||
|
|
||||||
|
assert Attempts.count_users_with_attempts() == 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "cascade" do
|
describe "cascade" do
|
||||||
test "deleting a user removes their attempts" do
|
test "deleting a user removes their attempts" do
|
||||||
user = user_fixture()
|
user = user_fixture()
|
||||||
|
|||||||
@@ -54,23 +54,23 @@ defmodule ChesstrainerWeb.LandingComponentsTest do
|
|||||||
assert html =~ "currentColor"
|
assert html =~ "currentColor"
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "puzzle_count_label/1" do
|
describe "count_label/1" do
|
||||||
test "shows counts below 100 exactly" do
|
test "shows counts below 100 exactly" do
|
||||||
assert LandingComponents.puzzle_count_label(0) == "0"
|
assert LandingComponents.count_label(0) == "0"
|
||||||
assert LandingComponents.puzzle_count_label(47) == "47"
|
assert LandingComponents.count_label(47) == "47"
|
||||||
assert LandingComponents.puzzle_count_label(99) == "99"
|
assert LandingComponents.count_label(99) == "99"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "floors counts of 100 or more to hundreds" do
|
test "floors counts of 100 or more to hundreds" do
|
||||||
assert LandingComponents.puzzle_count_label(100) == "100+"
|
assert LandingComponents.count_label(100) == "100+"
|
||||||
assert LandingComponents.puzzle_count_label(199) == "100+"
|
assert LandingComponents.count_label(199) == "100+"
|
||||||
assert LandingComponents.puzzle_count_label(999) == "900+"
|
assert LandingComponents.count_label(999) == "900+"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "floors counts of 1000 or more to thousands" do
|
test "floors counts of 1000 or more to thousands" do
|
||||||
assert LandingComponents.puzzle_count_label(1000) == "1000+"
|
assert LandingComponents.count_label(1000) == "1000+"
|
||||||
assert LandingComponents.puzzle_count_label(1999) == "1000+"
|
assert LandingComponents.count_label(1999) == "1000+"
|
||||||
assert LandingComponents.puzzle_count_label(2400) == "2000+"
|
assert LandingComponents.count_label(2400) == "2000+"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,7 +2,10 @@ defmodule ChesstrainerWeb.PageControllerTest do
|
|||||||
use ChesstrainerWeb.ConnCase
|
use ChesstrainerWeb.ConnCase
|
||||||
|
|
||||||
import Chesstrainer.AccountsFixtures
|
import Chesstrainer.AccountsFixtures
|
||||||
|
import Chesstrainer.EndgamesFixtures
|
||||||
|
|
||||||
|
alias Chesstrainer.Accounts.Scope
|
||||||
|
alias Chesstrainer.Attempts
|
||||||
alias Chesstrainer.DailyPuzzles
|
alias Chesstrainer.DailyPuzzles
|
||||||
alias Chesstrainer.Endgames
|
alias Chesstrainer.Endgames
|
||||||
alias Chesstrainer.Themes
|
alias Chesstrainer.Themes
|
||||||
@@ -89,6 +92,17 @@ defmodule ChesstrainerWeb.PageControllerTest do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "hero shows the number of players with at least one attempt", %{conn: conn} do
|
||||||
|
user = user_fixture()
|
||||||
|
endgame = endgame_fixture()
|
||||||
|
{:ok, _} = Attempts.record_attempt(Scope.for_user(user), endgame, :solved)
|
||||||
|
|
||||||
|
html = conn |> get(~p"/") |> html_response(200)
|
||||||
|
document = LazyHTML.from_document(html)
|
||||||
|
|
||||||
|
assert LazyHTML.text(LazyHTML.query(document, ".rating-note strong")) == "1"
|
||||||
|
end
|
||||||
|
|
||||||
test "guest navbar links to log in and register", %{conn: conn} do
|
test "guest navbar links to log in and register", %{conn: conn} do
|
||||||
html = conn |> get(~p"/") |> html_response(200)
|
html = conn |> get(~p"/") |> html_response(200)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user