From 3cac865e0bf1e5d7b6a5b37ff64fa08e66880eb8 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Mon, 26 Dec 2022 22:19:34 -0500
Subject: Display game context info in sidebar during play

---
 webapp/src/components/table.rs | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'webapp/src/components')

diff --git a/webapp/src/components/table.rs b/webapp/src/components/table.rs
index 3bc52a3..403ee8d 100644
--- a/webapp/src/components/table.rs
+++ b/webapp/src/components/table.rs
@@ -178,6 +178,10 @@ pub fn bidding_view(
 ) -> Html {
     html! {
         <>
+            <div class="sidebar">
+              <h2>{ "Table view" }</h2>
+              <pre>{ format!("{:#?}", bidding) }</pre>
+            </div>
             <div class="center">
                 <BiddingTable bidding={bidding.bidding.clone()} />
                 <BiddingBox current_bid={bidding.bidding.highest_bid().clone()} on_bid={ on_bid } />
@@ -186,8 +190,6 @@ pub fn bidding_view(
             <div class="hand south">
             <Hand cards={ bidding.hand.clone() } on_card_clicked={ Callback::from(|_| {}) } />
             </div>
-            <h2>{ "Table view" }</h2>
-            <pre>{ format!("{:#?}", bidding) }</pre>
         </>
     }
 }
@@ -209,17 +211,31 @@ pub fn playing_view(
 
     html! {
         <>
+            <div class="sidebar">
+              <div>
+                <h2>{"Contract"}</h2>
+                <p>{format!("{}", playing.contract)}</p>
+              </div>
+              <div>
+                <h2>{"Bidding"}</h2>
+                <BiddingTable bidding={playing.bidding.clone()} />
+              </div>
+              <div>
+                <h2>{"Trick Count"}</h2>
+                <p>{format!("Declarer: {}", playing.declarer_tricks)}</p>
+              </div>
+              if let Some(previous_trick) = &playing.previous_trick {
+              <div>
+                <h2>{"Previous Trick"}</h2>
+                    <TrickInPlay trick={previous_trick.clone()}/>
+              </div>
+              }
+            </div>
             <div class="center">
               <div class="playing-center-layout">
                 <div class="current-trick">
                   <TrickInPlay  trick={playing.current_trick.trick.clone()}/>
                 </div>
-                <div class="previous-trick">
-                  <p>{"Last trick"}</p>
-                  if let Some(previous_trick) = &playing.previous_trick {
-                    <TrickInPlay trick={previous_trick.clone()}/>
-                  }
-                </div>
               </div>
             </div>
             <div class="hand north">
-- 
cgit v1.2.3