From 25f2bb5837e1cade4912fff9a1fb22324728e9c7 Mon Sep 17 00:00:00 2001
From: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com>
Date: Fri, 26 Aug 2022 16:21:11 -0500
Subject: [PATCH] various ui improvements; card photo, row collapse support

---
 src/components/Card/Card.tsx           | 59 ++++++++++++++------------
 src/components/Card/CardRow.scss       | 53 ++++++++++++++++-------
 src/components/Card/CardRow.tsx        | 13 ++++--
 src/components/Gameboard/Gameboard.tsx |  5 ++-
 src/components/Player/AllPlayers.scss  | 10 +++++
 src/components/Player/Player.tsx       | 17 +++++---
 6 files changed, 103 insertions(+), 54 deletions(-)

diff --git a/src/components/Card/Card.tsx b/src/components/Card/Card.tsx
index f7b261d..3f7090d 100644
--- a/src/components/Card/Card.tsx
+++ b/src/components/Card/Card.tsx
@@ -11,35 +11,38 @@ export default function Card({ data, state, setState }: CardProps) {
     if (!data) return <div className="card"></div>;
 
     return (
-        <div className="card" key={v4()} style={{backgroundImage: `url(${data.image})`}}>
-            <p>Counts as: {data.gemValue}</p>
-            { (data.points && data.points > 0) ? <p>{data.points} points</p> : null }
-            <div className="total-card-cost">
-            {
-                Object.keys(data.resourceCost).map((key: keyof ResourceCost | string) => {
-                    // @ts-ignore
-                    return (data.resourceCost[key as keyof ResourceCost] > 0) && (
-                        <p key={v4()} className={`card-cost-${key}`}>
-                            {data.resourceCost[key as keyof ResourceCost]}
-                        </p>
-                    )
-                })
-            }
+        <div className="card" key={v4()}>
+            <img src={data.image} loading="lazy" />
+            <div className="foreground">
+                <p>{data.gemValue.toUpperCase()}</p>
+                { (data.points && data.points > 0) ? <p>{data.points} {data.points === 1 ? 'point' : 'points'}</p> : null }
+                <div className="total-card-cost">
+                {
+                    Object.keys(data.resourceCost).map((key: keyof ResourceCost | string) => {
+                        // @ts-ignore
+                        return (data.resourceCost[key as keyof ResourceCost] > 0) && (
+                            <p key={v4()} className={`card-cost-${key}`}>
+                                {data.resourceCost[key as keyof ResourceCost]}
+                            </p>
+                        )
+                    })
+                }
+                </div>
+                { state.actions.buyCard.active &&
+                    <button
+                        onClick={() => buyCard(state, setState, data)}
+                        disabled={tooExpensive(data, state)}>
+                        Buy This Card
+                    </button>
+                }
+                { state.actions.reserveCard.active &&
+                    <button
+                        onClick={() => reserveCard(state, setState, data)}
+                        disabled={hasMaxReserved(currentPlayer)}>
+                        Reserve This Card
+                    </button>
+                }
             </div>
-            { state.actions.buyCard.active &&
-                <button
-                    onClick={() => buyCard(state, setState, data)}
-                    disabled={tooExpensive(data, state)}>
-                    Buy This Card
-                </button>
-            }
-            { state.actions.reserveCard.active &&
-                <button
-                    onClick={() => reserveCard(state, setState, data)}
-                    disabled={hasMaxReserved(currentPlayer)}>
-                    Reserve This Card
-                </button>
-            }
         </div>
     )
 }
\ No newline at end of file
diff --git a/src/components/Card/CardRow.scss b/src/components/Card/CardRow.scss
index 6fcae54..3c8d1d6 100644
--- a/src/components/Card/CardRow.scss
+++ b/src/components/Card/CardRow.scss
@@ -4,9 +4,18 @@
 .card-row {
     display: flex;
     flex-flow: column nowrap;
-    margin: 2rem;
+    margin: 1rem;
     width: 80vw;
 
+    .card-row-top-bar {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        > * {
+            margin: 8px 16px;
+        }
+    }
+
     .card-row-cards-visible {
         display: flex;
         flex-flow: row nowrap;
@@ -15,25 +24,39 @@
 
         .card {
             width: 25%;
-            min-height: 24vh;
+            height: 40vh;
             border: 2px solid black;
 
-            .total-card-cost {
+            img {
+                width: 100%;
+                height: 100%;
+                object-fit: cover;
+                z-index: 1;
+            }
+
+            .foreground {
+                position: relative;
+                top: -100%;
                 display: flex;
-                justify-content: center;
-    
-                @include map-gem-values(".card-cost");
+                flex-direction: column;
+                align-items: center;
+                z-index: 6;
+
+                > * {
+                    margin: 1rem;
+                    padding: 6px;
+                    border-radius: 12px;
+                    background-color: rgb(39, 36, 36);
+                }
+                
+                .total-card-cost {
+                    display: flex;
+                    flex-flow: row wrap;
+                    justify-content: center;
+                    @include map-gem-values(".card-cost");
+                }
             }
 
-            > * {
-                margin: 1rem;
-            }
-
-            p {
-                background-color: black;
-            }
-
-            background-size: cover;
         }
     
         .card-count {
diff --git a/src/components/Card/CardRow.tsx b/src/components/Card/CardRow.tsx
index 9c31ab8..7e6a996 100644
--- a/src/components/Card/CardRow.tsx
+++ b/src/components/Card/CardRow.tsx
@@ -1,11 +1,13 @@
+import { useState } from 'react';
+import { v4 } from 'uuid';
+import cardTierToKey from '../../util/cardTierToKey';
 import { CardRowProps } from '../../util/propTypes';
 import { CardData } from "../../util/types"
 import Card from "../Card/Card"
-import { v4 } from 'uuid';
-import cardTierToKey from '../../util/cardTierToKey';
 import "./CardRow.scss";
 
 export default function CardRow({tier, state, setState}: CardRowProps) {
+    const [collapsed, setCollapsed] = useState(true);
     const typedTier = cardTierToKey(tier);
 
     let cards: Array<CardData>
@@ -26,8 +28,11 @@ export default function CardRow({tier, state, setState}: CardRowProps) {
 
     return (
         <div className={`card-row tier-${tier}`}>
-            <p>Tier: {tier}</p>
-            <div className="card-row-cards-visible">
+            <div className="card-row-top-bar">
+                <p>Tier: {tier}</p>
+                <button onClick={() => setCollapsed(!collapsed)}>{collapsed ? "Show" : "Hide"}</button>
+            </div>
+            <div className={`card-row-cards-visible ${collapsed && 'hidden'}`}>
                 <div className="card-count">
                     <p>Remaining: {state.gameboard.deck[typedTier].length}</p>
                 </div>
diff --git a/src/components/Gameboard/Gameboard.tsx b/src/components/Gameboard/Gameboard.tsx
index 073821e..d6c3e11 100644
--- a/src/components/Gameboard/Gameboard.tsx
+++ b/src/components/Gameboard/Gameboard.tsx
@@ -20,6 +20,7 @@ const { validateChips } = getChipsActions;
 export default function Gameboard({ state, setState }: StateProps) {
     const [view, setView] = useState(<p>Loading...</p>);
     const [endgame, setEndgame] = useState<PlayerData>();
+    const [winner, setWinner] = useState<PlayerData>();
 
     // callbacks for lifting state
     const liftSelection = useCallback((value: keyof ResourceCost) => {
@@ -63,12 +64,12 @@ export default function Gameboard({ state, setState }: StateProps) {
     useEffect(() => {
         if (endgame) {
             let winner: PlayerData;
+            const winnerData = state.players;
             const currentPlayer = useCurrentPlayer(state);
             if (!currentPlayer) return;
 
             if (currentPlayer.id <= endgame.id) {
-                const winnerData = state.players;
-                winner = winnerData.sort((x,y) => x.points - y.points)[0];
+                winner = winnerData.sort((x,y) => x.points + y.points)[0];
                 console.log(winner.name + ' wins!');
             }
         }
diff --git a/src/components/Player/AllPlayers.scss b/src/components/Player/AllPlayers.scss
index 4f3d8d2..cc8a204 100644
--- a/src/components/Player/AllPlayers.scss
+++ b/src/components/Player/AllPlayers.scss
@@ -20,5 +20,15 @@
                 @include map-gem-values(".player-chip");
             }
         }
+
+        .reserved-card-view {
+            background-color: rgb(232, 224, 200);
+            .reserved-card-cost {
+                display: flex;
+                flex-flow: row wrap;
+                justify-content: center;
+                @include map-gem-values(".reserve-cost");
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/components/Player/Player.tsx b/src/components/Player/Player.tsx
index c8b984b..5baeebb 100644
--- a/src/components/Player/Player.tsx
+++ b/src/components/Player/Player.tsx
@@ -27,14 +27,21 @@ export default function Player({ player, state, setState }: PlayerProps) {
         )
 
         dynamic && setReservedView(
-            <>
+            <div className="reserved-card-view">
             <p>Reserved cards:</p>
             {
-                dynamic.reservedCards?.map((data: CardData) => {
-                    return <Card key={v4()} data={data} state={state} setState={setState} />
-                })
+                dynamic.reservedCards?.map((data: CardData) => (
+                    <div className="reserved-card">
+                        <p className={`mini-card ${data.gemValue}`} key={v4()}>{data.gemValue} card: {data.points || 0} points</p>
+                        <div className="reserved-card-cost">
+                        {
+                            Object.entries(data.resourceCost).map(([key, value]) => value > 0 && <p className={`reserve-cost-${key}`} key={v4()}>{value}</p>)
+                        }
+                        </div>
+                    </div>
+                ))
             }
-            </>
+            </div>
         )
     }, [dynamic, setState])