- <.flash_group flash={@flash} />
- {@inner_content}
-
-
<.flash kind={:info} title={gettext("Success!")} flash={@flash} />
<.flash kind={:error} title={gettext("Error!")} flash={@flash} />
<.flash
@@ -597,6 +609,24 @@ defmodule LoraWeb.CoreComponents do
"""
end
+ # @doc """
+ # Game player information, renders score, name and presence. Also containes the flag if it is player turn.
+ # """
+ # attr :name, :string, required: true
+ # attr :score, :integer, default: 0
+ # attr :is_turn, :boolean, default: false
+ # attr :is_online, :boolean, default: false
+ # def player_plate(%{is_turn: is_turn} = assigns) do
+ # assigns = assign(assigns, turn_class: if(not is_turn, do: "text-white", else: "text-yellow-400"))
+ # ~H"""
+ #
+
![]({~p"/images/logo.svg"})
-
+ <.flash_group flash={@flash} />
-
-
+{@inner_content}
diff --git a/apps/lora_web/lib/lora_web/components/layouts/root.html.heex b/apps/lora_web/lib/lora_web/components/layouts/root.html.heex
index 85e73c6..81c2b7e 100644
--- a/apps/lora_web/lib/lora_web/components/layouts/root.html.heex
+++ b/apps/lora_web/lib/lora_web/components/layouts/root.html.heex
@@ -1,5 +1,5 @@
-
+
@@ -11,7 +11,7 @@
-
+
{@inner_content}
diff --git a/apps/lora_web/lib/lora_web/components/player_components.ex b/apps/lora_web/lib/lora_web/components/player_components.ex
new file mode 100644
index 0000000..4ec2543
--- /dev/null
+++ b/apps/lora_web/lib/lora_web/components/player_components.ex
@@ -0,0 +1,194 @@
+defmodule LoraWeb.PlayerComponents do
+ use Phoenix.Component
+ import LoraWeb.GameUtils
+
+ attr :player, :map, required: true
+ attr :game, :map, required: true
+ attr :presences, :map, required: true
+ attr :player_seat, :integer, required: true
+ attr :is_current_player, :boolean, default: false
+ # "small", "medium", or "large"
+ attr :size, :string, default: "medium"
+
+ def player_plate(assigns) do
+ # Check if this seat is the current user's seat (the person viewing the game)
+ is_current_user = assigns.player && assigns.player.seat == assigns.player_seat
+
+ # Only show opponent plates (not the current user, as they're shown at the bottom)
+ player =
+ if is_current_user do
+ # Return nil if this is the current user's seat
+ nil
+ else
+ # Otherwise find the player for this seat
+ Enum.find(assigns.game.players, &(&1.seat == assigns.player_seat))
+ end
+
+ assigns =
+ assigns
+ |> assign(:player_name, find_player_name(assigns.game, assigns.player_seat))
+ # Use seated_player to avoid conflicts with assigns.player
+ |> assign(:seated_player, player)
+ |> assign(:is_online, player && Map.has_key?(assigns.presences, player && player.id))
+ |> assign(:current_player, assigns.game.current_player == assigns.player_seat)
+ |> assign(:score, Map.get(assigns.game.scores, assigns.player_seat, 0))
+ |> assign(:is_current_user, is_current_user)
+
+ # Determine classes based on size
+ assigns =
+ assign(
+ assigns,
+ :outer_class,
+ case assigns.size do
+ "small" ->
+ "bg-white/90 rounded-lg px-4 py-3 mb-4 shadow-xl backdrop-blur-md border border-white/30 w-full"
+
+ "medium" ->
+ "bg-white/90 rounded-lg px-5 py-3 mb-4 shadow-xl backdrop-blur-md border border-white/30 w-80"
+
+ "large" ->
+ "bg-white/90 rounded-lg px-5 py-4 mb-4 shadow-xl backdrop-blur-md border border-white/30 w-full"
+ end
+ )
+
+ assigns =
+ assign(
+ assigns,
+ :name_class,
+ case assigns.size do
+ "small" -> "text-base font-bold text-gray-800"
+ "medium" -> "text-lg font-bold text-gray-800"
+ "large" -> "text-xl font-bold text-gray-800"
+ end
+ )
+
+ assigns =
+ assign(
+ assigns,
+ :score_box_class,
+ case assigns.size do
+ "small" -> "bg-indigo-100 px-2 py-1.5 rounded-lg border border-indigo-200"
+ "medium" -> "bg-indigo-100 px-3 py-2 rounded-lg border border-indigo-200"
+ "large" -> "bg-indigo-100 px-4 py-2.5 rounded-lg border border-indigo-200"
+ end
+ )
+
+ assigns =
+ assign(
+ assigns,
+ :score_text_class,
+ case assigns.size do
+ "small" -> "text-base font-bold text-indigo-700"
+ "medium" -> "text-xl font-bold text-indigo-700"
+ "large" -> "text-2xl font-bold text-indigo-700"
+ end
+ )
+
+ assigns =
+ assign(
+ assigns,
+ :status_size,
+ case assigns.size do
+ "small" -> "w-2.5 h-2.5"
+ "medium" -> "w-3 h-3"
+ "large" -> "w-3.5 h-3.5"
+ end
+ )
+
+ ~H"""
+
@turn_class}>
+ # {@score}
+ # @turn_class}>{@name}
+ #
+ #
+ # """
+ # end
+
## JS Commands
def show(js \\ %JS{}, selector) do
diff --git a/apps/lora_web/lib/lora_web/components/current_player_components.ex b/apps/lora_web/lib/lora_web/components/current_player_components.ex
new file mode 100644
index 0000000..3e9f758
--- /dev/null
+++ b/apps/lora_web/lib/lora_web/components/current_player_components.ex
@@ -0,0 +1,118 @@
+defmodule LoraWeb.CurrentPlayerComponents do
+ use Phoenix.Component
+ import LoraWeb.CardUtils
+
+ attr :player, :map, required: true
+ attr :game, :map, required: true
+ attr :legal_moves, :list, required: true
+ attr :current_contract, :atom, required: true
+
+ def player_hand(assigns) do
+ assigns = assign(assigns, :hand, Map.get(assigns.game.hands, assigns.player.seat, []))
+
+ ~H"""
+
+
+
+ """
+ end
+end
diff --git a/apps/lora_web/lib/lora_web/components/game_utils.ex b/apps/lora_web/lib/lora_web/components/game_utils.ex
new file mode 100644
index 0000000..7bb68fe
--- /dev/null
+++ b/apps/lora_web/lib/lora_web/components/game_utils.ex
@@ -0,0 +1,59 @@
+defmodule LoraWeb.GameUtils do
+ @moduledoc """
+ Utility functions for game mechanics and seating arrangements.
+ """
+
+ @doc """
+ Calculate the opponent seat positions in a 4-player game based on the current player's seat.
+
+ Returns a map with :top, :left, and :right keys containing the seat numbers.
+ For a 4-player card game, the player opposite to you is top, the one on your left is left,
+ and the one on your right is right.
+ """
+ def calculate_opponent_seats(player_seat) do
+ # Ensure player_seat is 1, 2, 3, or 4
+ seat = if is_integer(player_seat) and player_seat in 1..4, do: player_seat, else: 1
+
+ # Seat calculation for a 4-player card game:
+ # For a circular table with players in clockwise order 1,2,3,4
+ # If you're player 1, then:
+ # - Player 3 is opposite (top)
+ # - Player 4 is to your left
+ # - Player 2 is to your right
+
+ # Calculate offsets based on player rotation
+ # For player in seat 1: top=3, left=4, right=2
+ top_offset = 2
+ left_offset = 3
+ right_offset = 1
+
+ # Calculate the opponent seats with proper modular arithmetic for 1-based indexing
+ top = rem(seat - 1 + top_offset, 4) + 1
+ left = rem(seat - 1 + left_offset, 4) + 1
+ right = rem(seat - 1 + right_offset, 4) + 1
+
+ # Verification of calculations:
+ # Player 1: top=3, left=4, right=2
+ # Player 2: top=4, left=1, right=3
+ # Player 3: top=1, left=2, right=4
+ # Player 4: top=2, left=3, right=1
+
+ %{
+ top: top,
+ left: left,
+ right: right
+ }
+ end
+
+ @doc """
+ Find a player's name by seat number.
+ """
+ def find_player_name(game, seat) do
+ game.players
+ |> Enum.find(fn p -> p.seat == seat end)
+ |> case do
+ nil -> "Empty Seat #{seat}"
+ player -> player.name
+ end
+ end
+end
diff --git a/apps/lora_web/lib/lora_web/components/layouts/app.html.heex b/apps/lora_web/lib/lora_web/components/layouts/app.html.heex
index 3b3b607..d416c89 100644
--- a/apps/lora_web/lib/lora_web/components/layouts/app.html.heex
+++ b/apps/lora_web/lib/lora_web/components/layouts/app.html.heex
@@ -1,32 +1,43 @@
-
+
+
+
+
+
+
+
+ {@player.name}
+
+
+ (Seat {String.trim("#{@player.seat}")})
+ <%= if @game.dealer_seat == @player.seat do %>
+
+
+ Dealer
+
+ <% end %>
+
+
+ <%= if @game.phase == :playing && @game.current_player == @player.seat do %>
+
+
+ Your Turn
+
+ <% end %>
+
+
+
+
+ {Map.get(@game.scores, @player.seat, 0)}
+
+
+ Your Hand
+
+
+
+ <%= if @current_contract == :lora && @game.current_player == @player.seat && Enum.empty?(@legal_moves) && length(@hand) > 0 do %>
+
+ <%= for {suit, rank} <- @hand do %>
+
+ <% end %>
+
+
+
+
+ <% end %>
+
- v{Application.spec(:phoenix, :vsn)} + Lora
+
+ """
+ end
+
+ attr :player_seat, :integer, required: true
+ attr :game, :map, required: true
+ # "small", "medium", or "large"
+ attr :size, :string, default: "medium"
+
+ def card_stack(assigns) do
+ assigns =
+ assigns
+ |> assign(:hand_size, length(Map.get(assigns.game.hands, assigns.player_seat, [])))
+ |> assign_stack_styles()
+
+ ~H"""
+ <%= if assigns.game.phase == :playing do %>
+
+
+
+ " flex items-center gap-2"}>
+ {@player_name}
+ <%= if @is_online do %>
+
+
+ <% else %>
+
+
+ <% end %>
+
+ <%= if @current_player do %>
+
+
+ Current turn
+
+ <% end %>
+
+
+ {@score}
+
+
+
+ <% end %>
+ """
+ end
+
+ defp assign_stack_styles(assigns) do
+ case assigns.size do
+ "small" ->
+ assigns
+ |> assign(:width, "w-24")
+ |> assign(:height, "h-24")
+ |> assign(:card_width, "w-16")
+ |> assign(:card_height, "h-24")
+ |> assign(:text_size, "text-lg")
+ |> assign(:spacing, "left-3")
+
+ "medium" ->
+ assigns
+ |> assign(:width, "w-32")
+ |> assign(:height, "h-28")
+ |> assign(:card_width, "w-20")
+ |> assign(:card_height, "h-28")
+ |> assign(:text_size, "text-2xl")
+ |> assign(:spacing, "left-6")
+
+ "large" ->
+ assigns
+ |> assign(:width, "w-36")
+ |> assign(:height, "h-32")
+ |> assign(:card_width, "w-24")
+ |> assign(:card_height, "h-32")
+ |> assign(:text_size, "text-3xl")
+ |> assign(:spacing, "left-8")
+ end
+ end
+end
diff --git a/apps/lora_web/lib/lora_web/live/game_live.ex b/apps/lora_web/lib/lora_web/live/game_live.ex
index 7c123e8..c9dceb6 100644
--- a/apps/lora_web/lib/lora_web/live/game_live.ex
+++ b/apps/lora_web/lib/lora_web/live/game_live.ex
@@ -1,9 +1,15 @@
+# filepath: /home/mjaric/prj/tmp/lora/apps/lora_web/lib/lora_web/live/game_live.ex
defmodule LoraWeb.GameLive do
use LoraWeb, :live_view
require Logger
alias Phoenix.PubSub
alias Lora.{Contract}
+ alias LoraWeb.Presence
+ import LoraWeb.PlayerComponents
+ import LoraWeb.CurrentPlayerComponents
+ import LoraWeb.CardUtils
+ import LoraWeb.GameUtils
@impl true
def mount(%{"id" => game_id}, session, socket) do
@@ -18,6 +24,21 @@ defmodule LoraWeb.GameLive do
# Subscribe to game updates
PubSub.subscribe(Lora.PubSub, "game:#{game_id}")
+ # Subscribe to presence updates for this game
+ presence_topic = Presence.game_topic(game_id)
+ PubSub.subscribe(Lora.PubSub, presence_topic)
+
+ # Track this player's presence
+ Presence.track(
+ self(),
+ presence_topic,
+ player_id,
+ %{
+ name: player_name,
+ online_at: System.system_time(:second)
+ }
+ )
+
case Lora.get_game_state(game_id) do
{:ok, game} ->
# For reconnection, inform the server of the new pid
@@ -112,7 +133,14 @@ defmodule LoraWeb.GameLive do
end
if player_id do
- socket = assign_game_state(socket, game, player_id)
+ # Get current presence information
+ presences = Presence.list(Presence.game_topic(game.id))
+
+ socket =
+ socket
+ |> assign_game_state(game, player_id)
+ |> assign(:presences, presences)
+
{:noreply, socket}
else
Logger.error("Player ID not found in socket assigns during game update")
@@ -120,6 +148,18 @@ defmodule LoraWeb.GameLive do
end
end
+ @impl true
+ def handle_info(%{event: "presence_diff"}, socket) do
+ # When presence changes, update the presences assign
+ if Map.has_key?(socket.assigns, :game) && is_map(socket.assigns.game) do
+ game_id = socket.assigns.game.id
+ presences = Presence.list(Presence.game_topic(game_id))
+ {:noreply, assign(socket, :presences, presences)}
+ else
+ {:noreply, socket}
+ end
+ end
+
@impl true
def handle_info({event_type, _payload}, socket)
when event_type in [
@@ -144,12 +184,20 @@ defmodule LoraWeb.GameLive do
# First check if we have game and player directly in the assigns structure
connected?(socket) and Map.has_key?(socket.assigns, :game) and is_map(socket.assigns.game) and
Map.has_key?(socket.assigns, :player) and is_map(socket.assigns.player) ->
- Lora.player_disconnect(socket.assigns.game.id, socket.assigns.player.id)
+ game_id = socket.assigns.game.id
+ player_id = socket.assigns.player.id
+ # Untrack from presence and tell the game server
+ Presence.untrack(self(), Presence.game_topic(game_id), player_id)
+ Lora.player_disconnect(game_id, player_id)
# Fallback to the original approach for backward compatibility
connected?(socket) and Map.has_key?(socket.assigns, :game_id) and
Map.has_key?(socket.assigns, :player_id) ->
- Lora.player_disconnect(socket.assigns.game_id, socket.assigns.player_id)
+ game_id = socket.assigns.game_id
+ player_id = socket.assigns.player_id
+ # Untrack from presence and tell the game server
+ Presence.untrack(self(), Presence.game_topic(game_id), player_id)
+ Lora.player_disconnect(game_id, player_id)
true ->
:ok
@@ -163,6 +211,8 @@ defmodule LoraWeb.GameLive do
defp assign_game_state(socket, game, player_id) do
# Find the player's seat
player = Enum.find(game.players, fn p -> p.id == player_id end)
+ # Get current presence information
+ presences = Presence.list(Presence.game_topic(game.id))
socket
|> assign(:game, game)
@@ -170,6 +220,7 @@ defmodule LoraWeb.GameLive do
|> assign(:player, player)
|> assign(:current_contract, Contract.at(game.contract_index))
|> assign(:legal_moves, get_legal_moves(game, player))
+ |> assign(:presences, presences)
end
defp get_legal_moves(_game, nil), do: []
@@ -201,39 +252,11 @@ defmodule LoraWeb.GameLive do
# View helper functions
- def find_player_name(game, seat) do
- game.players
- |> Enum.find(fn p -> p.seat == seat end)
- |> case do
- nil -> "Unknown"
- player -> player.name
- end
- end
-
- def format_suit(suit) do
- case suit do
- :hearts -> "♥"
- :diamonds -> "♦"
- :clubs -> "♣"
- :spades -> "♠"
- _ -> suit
- end
- end
+ # Player name finding moved to LoraWeb.GameUtils
- def format_rank(rank) do
- case rank do
- :ace -> "A"
- :king -> "K"
- :queen -> "Q"
- :jack -> "J"
- num -> num
- end
- end
+ # Card formatting moved to LoraWeb.CardUtils
- # red
- def suit_color(suit) when suit in [:hearts, :diamonds], do: "hearts"
- # black
- def suit_color(suit) when suit in [:clubs, :spades], do: "clubs"
+ # Card coloring moved to LoraWeb.CardUtils
def find_winner(scores) do
{winning_seat, _} = Enum.max_by(scores, fn {_seat, score} -> score end)
diff --git a/apps/lora_web/lib/lora_web/live/game_live.html.heex b/apps/lora_web/lib/lora_web/live/game_live.html.heex
index a993253..b5a3625 100644
--- a/apps/lora_web/lib/lora_web/live/game_live.html.heex
+++ b/apps/lora_web/lib/lora_web/live/game_live.html.heex
@@ -1,250 +1,311 @@
-
+
+
+
+
+ {@hand_size}
+
+
-
- <%= if @loading do %>
-
-
Loading game...
+
+ <%= if @loading do %>
+
+
+
+ Loading game...
- <% else %>
-
-
-
-
- <%= if !@player do %>
-
-
-
-
- - Game: {@game.id} -
-- {Contract.name(@current_contract)}: {Contract.description(@current_contract)} -
-
-
- Dealer: {find_player_name(@game, @game.dealer_seat)}
-
-
- Current Player: {find_player_name(@game, @game.current_player)}
-
-
-
-
- <% else %>
- Waiting for game to start...
-
-
-
-
-
-
+ <% else %>
+
+
- {find_player_name(@game, rem(@player.seat + 1, 4) + 1)}
- <%= if @game.current_player == rem(@player.seat + 1, 4) + 1 do %>
-
- <% end %>
-
-
- <%= if @game.phase == :playing do %>
- <%= for _card <- 1..length(Map.get(@game.hands, rem(@player.seat + 1, 4) + 1, [])) do %>
-
- <% end %>
- <% end %>
-
+
+
+
+
+ <%= if !@player do %>
+
+
+
+
-
-
- Waiting for game to start...
-
-
-
- {find_player_name(@game, rem(@player.seat + 2, 4) + 1)}
- <%= if @game.current_player == rem(@player.seat + 2, 4) + 1 do %>
-
- <% end %>
-
-
- <%= if @game.phase == :playing do %>
- <%= for _card <- 1..length(Map.get(@game.hands, rem(@player.seat + 2, 4) + 1, [])) do %>
-
- <% end %>
- <% end %>
+
+ <% else %>
+
+
+
+
+ <% opponent_seats = LoraWeb.GameUtils.calculate_opponent_seats(@player.seat) %>
+
+
+ <% opponent_seat_top = opponent_seats.top %>
+
+
-
-
+ <.player_plate
+ player={@player}
+ game={@game}
+ presences={@presences}
+ player_seat={opponent_seat_top}
+ size="medium"
+ />
+
+
+ <.card_stack player_seat={opponent_seat_top} game={@game} size="medium" />
+
- <%= if @current_contract == :lora do %>
-
Lora Layout
-
- <%= for suit <- [:clubs, :diamonds, :hearts, :spades] do %>
-
-
diff --git a/apps/lora_web/lib/lora_web/presence.ex b/apps/lora_web/lib/lora_web/presence.ex
new file mode 100644
index 0000000..6a718dc
--- /dev/null
+++ b/apps/lora_web/lib/lora_web/presence.ex
@@ -0,0 +1,12 @@
+defmodule LoraWeb.Presence do
+ use Phoenix.Presence,
+ otp_app: :lora_web,
+ pubsub_server: Lora.PubSub
+
+ @doc """
+ Returns a topic string for tracking game-specific presence.
+ """
+ def game_topic(game_id) when is_binary(game_id) do
+ "presence:game:#{game_id}"
+ end
+end
diff --git a/apps/lora_web/mix.exs b/apps/lora_web/mix.exs
index fb22e61..989c16c 100644
--- a/apps/lora_web/mix.exs
+++ b/apps/lora_web/mix.exs
@@ -13,7 +13,9 @@ defmodule LoraWeb.MixProject do
elixirc_paths: elixirc_paths(Mix.env()),
start_permanent: Mix.env() == :prod,
aliases: aliases(),
- deps: deps()
+ deps: deps(),
+ # test_coverage: [tool: ExCoveralls]
+ test_coverage: [tool: ExCoveralls, summary: [threshold: 90]]
]
end
diff --git a/apps/lora_web/test/lora_web/live/game_live_test.exs b/apps/lora_web/test/lora_web/live/game_live_test.exs
index adc0afd..4a04687 100644
--- a/apps/lora_web/test/lora_web/live/game_live_test.exs
+++ b/apps/lora_web/test/lora_web/live/game_live_test.exs
@@ -37,9 +37,16 @@ defmodule LoraWeb.GameLiveTest do
# Connect to the game
{:ok, _view, html} = live(conn, "/game/#{game_id}")
- # Instead of expecting a redirect, verify the game initializes with default values
- assert html =~ "Player: Unknown"
- assert html =~ "Game: #{game_id}"
+ # Verify game shows waiting state
+ assert html =~ "Waiting for game to start"
+ # Verify that we've successfully loaded the game with dealer info
+ assert html =~ "Dealer: Empty Seat 1"
+ # Verify contract info is displayed
+ assert html =~ "Minimum"
+ assert html =~ "Plus one point per trick taken"
+ # Verify game phase is displayed
+ assert html =~ "Phase"
+ assert html =~ "lobby"
end
end
end
diff --git a/apps/lora_web/test/support/test_helpers.ex b/apps/lora_web/test/support/test_helpers.ex
index 0f03679..059d8c7 100644
--- a/apps/lora_web/test/support/test_helpers.ex
+++ b/apps/lora_web/test/support/test_helpers.ex
@@ -16,71 +16,4 @@ defmodule LoraWeb.Test do
session: %{"player_id" => player_id, "player_name" => "Test Player"}
}
end
-
- @doc """
- Mock implementations for Lora API functions used in tests.
- These functions will be used with the Mock library.
- """
- def mock_lora_api do
- [
- generate_player_id: fn -> "test-player-id" end,
- create_game: fn _player_name -> {:ok, "TESTID"} end,
- join_game: fn game_id, player_name, player_id ->
- case game_id do
- "INVALID" ->
- {:error, :not_found}
-
- _ ->
- {:ok,
- %{
- id: game_id,
- players: [%{id: player_id, name: player_name, seat: 1}],
- phase: :lobby
- }}
- end
- end,
- get_game_state: fn game_id ->
- case game_id do
- "NOTFOUND" ->
- {:error, :not_found}
-
- _ ->
- {:ok,
- %{
- id: game_id,
- phase: :lobby,
- taken: %{},
- players: [%{id: "test-player-id", name: "TestPlayer", seat: 1}],
- dealer_seat: 1,
- contract_index: 0,
- hands: %{},
- trick: [],
- lora_layout: %{},
- scores: %{1 => 0, 2 => 0, 3 => 0, 4 => 0},
- current_player: nil,
- dealt_count: 0
- }}
- end
- end,
- add_player: fn game_id, player_id, player_name ->
- {:ok,
- %{
- id: game_id,
- phase: :lobby,
- taken: %{},
- players: [%{id: player_id, name: player_name, seat: 1}],
- dealer_seat: 1,
- contract_index: 0,
- hands: %{},
- trick: [],
- lora_layout: %{},
- scores: %{1 => 0, 2 => 0, 3 => 0, 4 => 0},
- current_player: nil,
- dealt_count: 0
- }}
- end,
- player_reconnect: fn _game_id, _player_id, _pid -> :ok end,
- legal_moves: fn _game_id, _player_id -> {:ok, []} end
- ]
- end
end
diff --git a/mix.exs b/mix.exs
index 889d7eb..7e17518 100644
--- a/mix.exs
+++ b/mix.exs
@@ -8,7 +8,20 @@ defmodule Lora.Umbrella.MixProject do
start_permanent: Mix.env() == :prod,
deps: deps(),
aliases: aliases(),
- extra_applications: [:logger]
+ extra_applications: [:logger],
+ preferred_cli_env: [
+ "test.with_coverage": :test
+ ],
+ test_coverage: [
+ tool: ExCoveralls,
+ summary: [threshold: 68],
+ ignore_modules: [
+ # Skip web modules for now - they're not part of the current unit testing phase
+ Lora.DataCase,
+ Lora.Contract,
+ Lora
+ ]
+ ]
]
end
@@ -27,7 +40,9 @@ defmodule Lora.Umbrella.MixProject do
defp deps do
[
# Required to run "mix format" on ~H/.heex files from the umbrella root
- {:phoenix_live_view, ">= 0.0.0"}
+ {:phoenix_live_view, ">= 0.0.0"},
+ {:excoveralls, "~> 0.18", only: :test},
+ {:dialyxir, "~> 1.4", only: [:dev, :test], runtime: false}
]
end
@@ -43,7 +58,9 @@ defmodule Lora.Umbrella.MixProject do
defp aliases do
[
# run `mix setup` in all child apps
- setup: ["cmd mix setup"]
+ setup: ["cmd mix setup"],
+ # convenience alias for running tests with coverage
+ "test.with_coverage": ["test --cover --export-coverage default", "test.coverage"]
]
end
end
diff --git a/mix.lock b/mix.lock
index 49e9258..02af0f2 100644
--- a/mix.lock
+++ b/mix.lock
@@ -4,10 +4,13 @@
"circular_buffer": {:hex, :circular_buffer, "0.4.1", "477f370fd8cfe1787b0a1bade6208bbd274b34f1610e41f1180ba756a7679839", [:mix], [], "hexpm", "633ef2e059dde0d7b89bbab13b1da9d04c6685e80e68fbdf41282d4fae746b72"},
"db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"},
"decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"},
+ "dialyxir": {:hex, :dialyxir, "1.4.5", "ca1571ac18e0f88d4ab245f0b60fa31ff1b12cbae2b11bd25d207f865e8ae78a", [:mix], [{:erlex, ">= 0.2.7", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "b0fb08bb8107c750db5c0b324fa2df5ceaa0f9307690ee3c1f6ba5b9eb5d35c3"},
"dns_cluster": {:hex, :dns_cluster, "0.1.3", "0bc20a2c88ed6cc494f2964075c359f8c2d00e1bf25518a6a6c7fd277c9b0c66", [:mix], [], "hexpm", "46cb7c4a1b3e52c7ad4cbe33ca5079fbde4840dedeafca2baf77996c2da1bc33"},
"ecto": {:hex, :ecto, "3.12.5", "4a312960ce612e17337e7cefcf9be45b95a3be6b36b6f94dfb3d8c361d631866", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6eb18e80bef8bb57e17f5a7f068a1719fbda384d40fc37acb8eb8aeca493b6ea"},
"ecto_sql": {:hex, :ecto_sql, "3.12.1", "c0d0d60e85d9ff4631f12bafa454bc392ce8b9ec83531a412c12a0d415a3a4d0", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aff5b958a899762c5f09028c847569f7dfb9cc9d63bdb8133bff8a5546de6bf5"},
+ "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
"esbuild": {:hex, :esbuild, "0.9.0", "f043eeaca4932ca8e16e5429aebd90f7766f31ac160a25cbd9befe84f2bc068f", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b415027f71d5ab57ef2be844b2a10d0c1b5a492d431727f43937adce22ba45ae"},
+ "excoveralls": {:hex, :excoveralls, "0.18.5", "e229d0a65982613332ec30f07940038fe451a2e5b29bce2a5022165f0c9b157e", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "523fe8a15603f86d64852aab2abe8ddbd78e68579c8525ae765facc5eae01562"},
"expo": {:hex, :expo, "1.1.0", "f7b9ed7fb5745ebe1eeedf3d6f29226c5dd52897ac67c0f8af62a07e661e5c75", [:mix], [], "hexpm", "fbadf93f4700fb44c331362177bdca9eeb8097e8b0ef525c9cc501cb9917c960"},
"file_system": {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"},
"finch": {:hex, :finch, "0.19.0", "c644641491ea854fc5c1bbaef36bfc764e3f08e7185e1f084e35e0672241b76d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.6.2 or ~> 1.7", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 1.1", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "fc5324ce209125d1e2fa0fcd2634601c52a787aff1cd33ee833664a5af4ea2b6"},
{format_suit(suit)}
-
- <%= for {card_suit, rank} <- @game.lora_layout[suit] || [] do %>
-
-
-
-
- {format_rank(rank)}
+
+
-
-
+
+
-
-
-
+ <% opponent_seat_left = opponent_seats.left %>
+
+
+
+
+
+ <.player_plate
+ player={@player}
+ game={@game}
+ presences={@presences}
+ player_seat={opponent_seat_left}
+ size="small"
+ />
+
+ <.card_stack player_seat={opponent_seat_left} game={@game} size="small" />
+
+
+ <%= if @current_contract == :lora do %>
+
- <% else %>
- Lora Layout
+
+ <%= for suit <- [:clubs, :diamonds, :hearts, :spades] do %>
+
+ <% else %>
+
+
+ <% end %>
+ {format_suit(suit)}
+
+ <%= for {card_suit, rank} <- @game.lora_layout[suit] || [] do %>
+
+
+ {format_rank(rank)}
+
+ <% end %>
+ Current Trick
+
+ <%= for seat <- 1..4 do %>
+
- <% end %>
-
+ <% trick_card = Enum.find(@game.trick, fn {s, _} -> s == seat end) %>
+ <%= if trick_card do %>
+ <% {_, {suit, rank}} = trick_card %>
+
-
+ {format_rank(rank)}
+
+ {format_suit(suit)}
+
+
+ {format_suit(suit)}
+
<% end %>
Current Trick
-
- <%= for seat <- 1..4 do %>
-
- <% end %>
-
- <% trick_card = Enum.find(@game.trick, fn {s, _} -> s == seat end) %>
- <%= if trick_card do %>
- <% {_, {suit, rank}} = trick_card %>
-
- <% end %>
-
-
- <% end %>
-
- {format_rank(rank)}{format_suit(suit)}
-
-
-
-
- {find_player_name(@game, rem(@player.seat, 4) + 1)}
- <%= if @game.current_player == rem(@player.seat, 4) + 1 do %>
-
+ <% end %>
+
<% end %>
- <%= if @game.phase == :playing do %>
- <%= for _card <- 1..length(Map.get(@game.hands, rem(@player.seat, 4) + 1, [])) do %>
-
- <% end %>
- <% end %>
+
+
+
+ <% opponent_seat_right = opponent_seats.right %>
+
+
+ <.player_plate
+ player={@player}
+ game={@game}
+ presences={@presences}
+ player_seat={opponent_seat_right}
+ size="small"
+ />
+
+ <.card_stack player_seat={opponent_seat_right} game={@game} size="small" />
+
-
+
+ <.player_hand
+ player={@player}
+ game={@game}
+ legal_moves={@legal_moves}
+ current_contract={@current_contract}
+ />
-
- Scoreboard
-
-
-
-
-
- | - Player - | -- Score - | -
|---|---|
| - {find_player_name(@game, seat)} - | -- {Map.get(@game.scores, seat, 0)} - | -
-
-
+ <% end %>
-
-
-
-
-
-
-
- <%= if @game.phase == :playing && @game.current_player == @player.seat do %>
-
- Your Turn
-
- <% end %>
- {@player.name}
-- Seat: {@player.seat} -
-
-
+ Your Hand
-
- <%= for {suit, rank} <- Map.get(@game.hands, @player.seat, []) do %>
-
+ <% end %>
+
+
+
+
+
+
+
+
+
+
+
+
+ + {Lora.Contract.name(@current_contract)} +
++ {Lora.Contract.description(@current_contract)} +
+
+
+
+ Dealer: {find_player_name(@game, @game.dealer_seat)}
+
+
+
+ Current Player: {find_player_name(@game, @game.current_player)}
+
+
+
+
- <% end %>
- <% end %>
-
+
+ Scoreboard
+
+
+
+
| + Player + | ++ Score + | +
|---|---|
| + {p.name} + {if p.seat == @player.seat, do: "👤"} + {if p.seat == @game.dealer_seat, do: "🎲"} + | ++ {Map.get(@game.scores, p.seat, 0)} + | +
+
+
+
+ Game Info
+
+
+ -
+
- Contract +
- + {Contract.name(@current_contract)} + +
- Dealer +
- + {find_player_name(@game, @game.dealer_seat)} + +
- Phase +
- + {to_string(@game.phase)} + +
- Deal +
- {@game.dealt_count} / 28 +