From 83dd4cc4a3c4a0a6bc2a7fd25505fd396bfcba11 Mon Sep 17 00:00:00 2001
From: Lucas Morgan <hauth@live.com>
Date: Tue, 26 Nov 2024 15:26:47 -0600
Subject: [PATCH] Group pieces in the hand.

---
 .../GameBoard/GameBoardPresentation.razor     | 38 +++++++++++++++----
 .../GameBoard/GameboardPresentation.razor.css |  5 ++-
 Shogi.UI/Pages/Play/GamePiece.razor           | 20 +++++-----
 Shogi.UI/Pages/Play/GamePiece.razor.css       | 20 ++++++++--
 4 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/Shogi.UI/Pages/Play/GameBoard/GameBoardPresentation.razor b/Shogi.UI/Pages/Play/GameBoard/GameBoardPresentation.razor
index ad69a4a..21679ab 100644
--- a/Shogi.UI/Pages/Play/GameBoard/GameBoardPresentation.razor
+++ b/Shogi.UI/Pages/Play/GameBoard/GameBoardPresentation.razor
@@ -11,13 +11,15 @@
 				var position = $"{file}{rank}";
 				var piece = Session?.BoardState.Board[position];
 				var isSelected = piece != null && SelectedPosition == position;
-				<div class="tile" @onclick="OnClickTileInternal(position)"
+				<div class="tile"
+						 @onclick="OnClickTileInternal(position)"
 						 data-position="@(position)"
 						 data-selected="@(isSelected)"
+						 data-upsidedown="@(piece?.Owner != Perspective)"
 						 style="grid-area: @position">
 					@if (piece != null)
 					{
-						<GamePiece Piece="piece" Perspective="Perspective" />
+						<GamePiece Piece="piece.WhichPiece" IsPromoted="piece.IsPromoted" />
 					}
 				</div>
 			}
@@ -49,13 +51,27 @@
 	<!-- Side board -->
 	@if (Session != null && UseSideboard == true)
 	{
+		@* <aside class="side-board PrimaryTheme ThemeVariant--Contrast" style="grid-area: opponent-side-board"> *@
+		@* 	@if (opponentHand.Any()) *@
+		@* 	{ *@
+		@* 		@foreach (var piece in opponentHand) *@
+		@* 		{ *@
+		@* 			<div class="tile" *@
+		@* 					 data-upsidedown="@(piece.Owner != Perspective)"> *@
+		@* 				<GamePiece Piece="piece.WhichPiece" IsPromoted="false" /> *@
+		@* 			</div> *@
+		@* 		} *@
+		@* 	} *@
+		@* </aside> *@
+
 		<aside class="side-board PrimaryTheme ThemeVariant--Contrast" style="grid-area: opponent-side-board">
-			@if (opponentHand.Any())
+			@if (OpponentHandGrouped.Any())
 			{
-				@foreach (var piece in opponentHand)
+				@foreach (var (whichPiece, count) in OpponentHandGrouped)
 				{
-					<div class="tile">
-						<GamePiece Piece="piece" Perspective="Perspective" />
+					<div class="tile"
+							 data-upsidedown>
+						<GamePiece Piece="whichPiece" IsPromoted="false" Count="count"/>
 					</div>
 				}
 			}
@@ -90,7 +106,7 @@
 							<div @onclick="OnClickHandInternal(piece)"
 									 class="tile"
 									 data-selected="@(piece.WhichPiece == SelectedPieceFromHand)">
-								<GamePiece Piece="piece" Perspective="Perspective" />
+								<GamePiece Piece="piece.WhichPiece" IsPromoted="false" />
 							</div>
 						}
 					}
@@ -109,6 +125,7 @@
 </article>
 
 @code {
+
 	static readonly string[] Files = new[] { "A", "B", "C", "D", "E", "F", "G", "H", "I" };
 
 	/// <summary>
@@ -164,11 +181,17 @@
 		}
 	}
 
+
+
+	private Dictionary<WhichPiece, int> OpponentHandGrouped => opponentHand.GroupBy(piece => piece.WhichPiece).ToDictionary(grouping => grouping.Key, grouping => grouping.Count());
+	private Dictionary<WhichPiece, int> PlayerHandGrouped => userHand.GroupBy(piece => piece.WhichPiece).ToDictionary(grouping => grouping.Key, grouping => grouping.Count());
+
 	private bool IsMyTurn => Session?.BoardState.WhoseTurn == Perspective;
 	private bool IsPlayerInCheck => Session?.BoardState.PlayerInCheck == Perspective;
 	private bool IsOpponentInCheck => Session?.BoardState.PlayerInCheck != null && Session.BoardState.PlayerInCheck != Perspective;
 	private bool IsPlayerVictor => Session?.BoardState.Victor == Perspective;
 	private bool IsOpponentVictor => Session?.BoardState.Victor != null && Session.BoardState.Victor != Perspective;
+
 	private Func<Task> OnClickTileInternal(string position) => () =>
 	{
 		if (IsMyTurn)
@@ -177,6 +200,7 @@
 		}
 		return Task.CompletedTask;
 	};
+
 	private Func<Task> OnClickHandInternal(Piece piece) => () =>
 	{
 		if (IsMyTurn)
diff --git a/Shogi.UI/Pages/Play/GameBoard/GameboardPresentation.razor.css b/Shogi.UI/Pages/Play/GameBoard/GameboardPresentation.razor.css
index 7a389ae..bf9f217 100644
--- a/Shogi.UI/Pages/Play/GameBoard/GameboardPresentation.razor.css
+++ b/Shogi.UI/Pages/Play/GameBoard/GameboardPresentation.razor.css
@@ -15,6 +15,10 @@
 	color: beige;
 }
 
+	.game-board [data-upsidedown] {
+		transform: rotateZ(180deg);
+	}
+
 .board {
 	display: grid;
 	grid-template-areas:
@@ -48,7 +52,6 @@
 			"I9 H9 G9 F9 E9 D9 C9 B9 A9";
 	}
 
-
 .tile {
 	display: grid;
 	place-content: center;
diff --git a/Shogi.UI/Pages/Play/GamePiece.razor b/Shogi.UI/Pages/Play/GamePiece.razor
index eedd33f..b4ce0ae 100644
--- a/Shogi.UI/Pages/Play/GamePiece.razor
+++ b/Shogi.UI/Pages/Play/GamePiece.razor
@@ -1,7 +1,7 @@
 @using Shogi.Contracts.Types
 
-<div class="game-piece" title="@HtmlTitle" data-upsidedown="@(Piece?.Owner != Perspective)" data-owner="@Piece?.Owner.ToString()">
-	@switch (Piece?.WhichPiece)
+<div class="game-piece" title="@HtmlTitle">
+	@switch (Piece)
 	{
 		case WhichPiece.Bishop:
 			<Bishop IsPromoted="@IsPromoted" />
@@ -31,18 +31,18 @@
 			@*render nothing*@
 			break;
 	}
+	@if (Count > 0)
+	{
+		<span class="counter">@Count</span>
+	}
 </div>
 
 @code {
-	[Parameter]
-	public Contracts.Types.Piece? Piece { get; set; }
+	[Parameter] public WhichPiece? Piece { get; set; }
+	[Parameter] public bool IsPromoted { get; set; }
+	[Parameter] public int Count { get; set; }
 
-	[Parameter]
-	public WhichPlayer Perspective { get; set; }
-
-	private bool IsPromoted => Piece != null && Piece.IsPromoted;
-
-	private string HtmlTitle => Piece?.WhichPiece switch
+	private string HtmlTitle => Piece switch
 	{
 		WhichPiece.Bishop => "Bishop",
 		WhichPiece.GoldGeneral => "Gold General",
diff --git a/Shogi.UI/Pages/Play/GamePiece.razor.css b/Shogi.UI/Pages/Play/GamePiece.razor.css
index 1d814cb..fc28434 100644
--- a/Shogi.UI/Pages/Play/GamePiece.razor.css
+++ b/Shogi.UI/Pages/Play/GamePiece.razor.css
@@ -3,9 +3,23 @@
 	height: auto;
 }
 
-[data-upsidedown] {
-	transform: rotateZ(180deg);
-}
 .game-piece {
 	overflow: hidden; /* Because SVGs have weird sizes. */
+	position: relative;
+}
+
+.game-piece .counter {
+	display: grid;
+	place-content: center;
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: 2px;
+	z-index: 100;
+	background-color: white;
+	border-radius: 9px;
+	border: 1px solid #444;
+	aspect-ratio: 1 / 1;
+	width: 15px;
+	height: 15px;
 }
\ No newline at end of file