mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 11:42:07 +00:00
show error page puzzle link only for premium users
This commit is contained in:
@@ -30,4 +30,13 @@ defmodule Chesstrainer.Accounts.Scope do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def for_user(nil), do: nil
|
def for_user(nil), do: nil
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
True when the scope belongs to a premium user.
|
||||||
|
|
||||||
|
`for_user/1` returns `nil` for anonymous visitors, so the catch-all covers
|
||||||
|
both nil scopes and free plans.
|
||||||
|
"""
|
||||||
|
def premium?(%__MODULE__{user: %User{plan: :premium}}), do: true
|
||||||
|
def premium?(_scope), do: false
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ defmodule ChesstrainerWeb.Layouts do
|
|||||||
use ChesstrainerWeb, :html
|
use ChesstrainerWeb, :html
|
||||||
|
|
||||||
alias Chesstrainer.Accounts.Role
|
alias Chesstrainer.Accounts.Role
|
||||||
|
alias Chesstrainer.Accounts.Scope
|
||||||
|
|
||||||
# Embed all files in layouts/* within this module.
|
# Embed all files in layouts/* within this module.
|
||||||
# The default root.html.heex file contains the HTML
|
# The default root.html.heex file contains the HTML
|
||||||
@@ -110,7 +111,7 @@ defmodule ChesstrainerWeb.Layouts do
|
|||||||
|
|
||||||
defp nav_links(scope) do
|
defp nav_links(scope) do
|
||||||
marketing =
|
marketing =
|
||||||
if premium?(scope) do
|
if Scope.premium?(scope) do
|
||||||
[
|
[
|
||||||
%{label: "Puzzle Search", href: "/endgames"}
|
%{label: "Puzzle Search", href: "/endgames"}
|
||||||
]
|
]
|
||||||
@@ -147,8 +148,6 @@ defmodule ChesstrainerWeb.Layouts do
|
|||||||
defp admin?(%{user: %{role: role}}), do: Role.admin?(role)
|
defp admin?(%{user: %{role: role}}), do: Role.admin?(role)
|
||||||
defp admin?(_scope), do: false
|
defp admin?(_scope), do: false
|
||||||
|
|
||||||
defp premium?(scope), do: match?(%{user: %{plan: :premium}}, scope)
|
|
||||||
|
|
||||||
# Signed-in users start a puzzle session; visitors browse the public list.
|
# Signed-in users start a puzzle session; visitors browse the public list.
|
||||||
defp start_href(%{user: %{}}), do: ~p"/train"
|
defp start_href(%{user: %{}}), do: ~p"/train"
|
||||||
defp start_href(_scope), do: ~p"/guest-train"
|
defp start_href(_scope), do: ~p"/guest-train"
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ defmodule ChesstrainerWeb.ErrorHTML do
|
|||||||
"""
|
"""
|
||||||
use ChesstrainerWeb, :html
|
use ChesstrainerWeb, :html
|
||||||
|
|
||||||
|
alias Chesstrainer.Accounts.Scope
|
||||||
|
|
||||||
embed_templates "error_html/*"
|
embed_templates "error_html/*"
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
@@ -22,7 +24,7 @@ defmodule ChesstrainerWeb.ErrorHTML do
|
|||||||
attr :title, :string, required: true
|
attr :title, :string, required: true
|
||||||
attr :message, :string, required: true
|
attr :message, :string, required: true
|
||||||
attr :hint, :string, default: nil
|
attr :hint, :string, default: nil
|
||||||
attr :puzzles, :boolean, default: true
|
attr :current_scope, :map, default: nil
|
||||||
|
|
||||||
def error_page(assigns) do
|
def error_page(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
@@ -36,7 +38,7 @@ defmodule ChesstrainerWeb.ErrorHTML do
|
|||||||
<.pill_button variant={:primary} href={~p"/"}>
|
<.pill_button variant={:primary} href={~p"/"}>
|
||||||
Back to home <.icon_arrow />
|
Back to home <.icon_arrow />
|
||||||
</.pill_button>
|
</.pill_button>
|
||||||
<.pill_button :if={@puzzles} variant={:light} href={~p"/endgames"}>
|
<.pill_button :if={Scope.premium?(@current_scope)} variant={:light} href={~p"/endgames"}>
|
||||||
Browse puzzles
|
Browse puzzles
|
||||||
</.pill_button>
|
</.pill_button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
status={404}
|
status={404}
|
||||||
title="This page isn't on the board"
|
title="This page isn't on the board"
|
||||||
message="The page you were looking for moved, or never existed. Check the address, or head back to the trainer."
|
message="The page you were looking for moved, or never existed. Check the address, or head back to the trainer."
|
||||||
|
current_scope={assigns[:current_scope]}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Layouts.footer />
|
<Layouts.footer />
|
||||||
|
|||||||
@@ -34,6 +34,7 @@
|
|||||||
title="Something went wrong"
|
title="Something went wrong"
|
||||||
message="An unexpected error stopped this page from loading. It's on us, not you — please try again in a moment."
|
message="An unexpected error stopped this page from loading. It's on us, not you — please try again in a moment."
|
||||||
hint={"If it keeps happening, email #{Branding.support_email()}."}
|
hint={"If it keeps happening, email #{Branding.support_email()}."}
|
||||||
|
current_scope={assigns[:current_scope]}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Layouts.footer />
|
<Layouts.footer />
|
||||||
|
|||||||
@@ -4,4 +4,5 @@
|
|||||||
status={404}
|
status={404}
|
||||||
title="This page isn't on the board"
|
title="This page isn't on the board"
|
||||||
message="The page you were looking for moved, or never existed. Check the address, or head back to the trainer."
|
message="The page you were looking for moved, or never existed. Check the address, or head back to the trainer."
|
||||||
|
current_scope={@current_scope}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ defmodule ChesstrainerWeb.EndgameLive.Train do
|
|||||||
|
|
||||||
use ChesstrainerWeb, :live_view
|
use ChesstrainerWeb, :live_view
|
||||||
|
|
||||||
|
alias Chesstrainer.Accounts.Scope
|
||||||
alias Chesstrainer.Puzzles
|
alias Chesstrainer.Puzzles
|
||||||
alias ChesstrainerWeb.EndgameLive.PlayCore
|
alias ChesstrainerWeb.EndgameLive.PlayCore
|
||||||
alias ChesstrainerWeb.PlayComponents
|
alias ChesstrainerWeb.PlayComponents
|
||||||
@@ -31,7 +32,7 @@ defmodule ChesstrainerWeb.EndgameLive.Train do
|
|||||||
<.icon name="hero-x-mark" /> Stop session
|
<.icon name="hero-x-mark" /> Stop session
|
||||||
</.button>
|
</.button>
|
||||||
<.button
|
<.button
|
||||||
:if={premium?(@current_scope)}
|
:if={Scope.premium?(@current_scope)}
|
||||||
id="puzzle-search"
|
id="puzzle-search"
|
||||||
navigate={~p"/endgames"}
|
navigate={~p"/endgames"}
|
||||||
>
|
>
|
||||||
@@ -310,9 +311,6 @@ defmodule ChesstrainerWeb.EndgameLive.Train do
|
|||||||
%{user | rating: socket.assigns.user_rating || user.rating}
|
%{user | rating: socket.assigns.user_rating || user.rating}
|
||||||
end
|
end
|
||||||
|
|
||||||
defp premium?(%{user: %{plan: :premium}}), do: true
|
|
||||||
defp premium?(_scope), do: false
|
|
||||||
|
|
||||||
defp summarise(session, rating) do
|
defp summarise(session, rating) do
|
||||||
%{
|
%{
|
||||||
difficulty: session.difficulty,
|
difficulty: session.difficulty,
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
defmodule ChesstrainerWeb.ErrorHTMLTest do
|
defmodule ChesstrainerWeb.ErrorHTMLTest do
|
||||||
use ExUnit.Case, async: true
|
use ExUnit.Case, async: true
|
||||||
|
|
||||||
|
alias Chesstrainer.Accounts.Scope
|
||||||
|
alias Chesstrainer.Accounts.User
|
||||||
alias Chesstrainer.Branding
|
alias Chesstrainer.Branding
|
||||||
alias ChesstrainerWeb.ErrorHTML
|
alias ChesstrainerWeb.ErrorHTML
|
||||||
|
|
||||||
defp render(template) do
|
defp render(template, scope \\ nil) do
|
||||||
Phoenix.Template.render_to_string(ErrorHTML, template, "html", %{current_scope: nil})
|
Phoenix.Template.render_to_string(ErrorHTML, template, "html", %{current_scope: scope})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "404 renders a complete document with the site chrome" do
|
test "404 renders a complete document with the site chrome" do
|
||||||
@@ -15,7 +17,6 @@ defmodule ChesstrainerWeb.ErrorHTMLTest do
|
|||||||
assert html =~ "<title>#{Branding.title("Page not found")}</title>"
|
assert html =~ "<title>#{Branding.title("Page not found")}</title>"
|
||||||
assert html =~ ~s(class="error-code">404</span>)
|
assert html =~ ~s(class="error-code">404</span>)
|
||||||
assert html =~ "The page you were looking for moved"
|
assert html =~ "The page you were looking for moved"
|
||||||
assert html =~ "Browse puzzles"
|
|
||||||
assert html =~ ~s(class="site-footer")
|
assert html =~ ~s(class="site-footer")
|
||||||
assert html =~ "/assets/js/marketing.js"
|
assert html =~ "/assets/js/marketing.js"
|
||||||
refute html =~ ~s(name="csrf-token")
|
refute html =~ ~s(name="csrf-token")
|
||||||
@@ -31,6 +32,18 @@ defmodule ChesstrainerWeb.ErrorHTMLTest do
|
|||||||
assert html =~ ~s(class="site-footer")
|
assert html =~ ~s(class="site-footer")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "hides the puzzles link from guests and free users" do
|
||||||
|
refute render("404") =~ "Browse puzzles"
|
||||||
|
refute render("404", Scope.for_user(%User{plan: :free})) =~ "Browse puzzles"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "shows the puzzles link to premium users" do
|
||||||
|
html = render("404", Scope.for_user(%User{plan: :premium}))
|
||||||
|
|
||||||
|
assert html =~ "Browse puzzles"
|
||||||
|
assert html =~ ~s(href="/endgames")
|
||||||
|
end
|
||||||
|
|
||||||
test "unknown statuses fall back to the plain status message" do
|
test "unknown statuses fall back to the plain status message" do
|
||||||
assert ErrorHTML.render("503.html", %{}) == "Service Unavailable"
|
assert ErrorHTML.render("503.html", %{}) == "Service Unavailable"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -271,9 +271,25 @@ defmodule ChesstrainerWeb.PageControllerTest do
|
|||||||
assert LazyHTML.text(LazyHTML.query(document, "title")) == Branding.title("Page not found")
|
assert LazyHTML.text(LazyHTML.query(document, "title")) == Branding.title("Page not found")
|
||||||
assert LazyHTML.text(LazyHTML.query(document, ".error-code")) == "404"
|
assert LazyHTML.text(LazyHTML.query(document, ".error-code")) == "404"
|
||||||
assert html =~ "The page you were looking for moved"
|
assert html =~ "The page you were looking for moved"
|
||||||
assert html =~ "Browse puzzles"
|
refute html =~ "Browse puzzles"
|
||||||
assert html =~ ~s(class="site-footer")
|
assert html =~ ~s(class="site-footer")
|
||||||
assert html =~ "/assets/js/marketing.js"
|
assert html =~ "/assets/js/marketing.js"
|
||||||
assert html =~ ~s(name="robots")
|
assert html =~ ~s(name="robots")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "premium users see the puzzles link on the 404 page", %{conn: conn} do
|
||||||
|
{:ok, user} =
|
||||||
|
user_fixture()
|
||||||
|
|> Ecto.Changeset.change(plan: :premium)
|
||||||
|
|> Chesstrainer.Repo.update()
|
||||||
|
|
||||||
|
html =
|
||||||
|
conn
|
||||||
|
|> log_in_user(user)
|
||||||
|
|> get("/this-page-does-not-exist")
|
||||||
|
|> html_response(404)
|
||||||
|
|
||||||
|
assert html =~ "Browse puzzles"
|
||||||
|
assert html =~ ~s(href="/endgames")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user