Remove NodeRef for getter, improve turn indicator

All NodeRefs have been removed in favor of "getElementById".

Turn indicator is now much more obvious to see.

diff --git a/front_end/Cargo.toml b/front_end/Cargo.toml
index 19f0c97287935c7fd2889d975a2541e9b67ccfce..6a6b1cd3902137aa1825dc76c45f9c0825503e29 100644 (file)
--- a/front_end/Cargo.toml
+++ b/front_end/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 yew = "0.19"
 log = "0.4.6"
 wasm-logger = "0.2.0"
-web-sys = { version = "0.3.56", features = ["HtmlDivElement", "HtmlButtonElement"] }
+web-sys = { version = "0.3.56", features = ["Window", "Document", "Element"] }

diff --git a/front_end/index.html b/front_end/index.html
index dcb914a93287d13e6c46176453efcaef999c70f9..b59827ba61554183503e813b645cf2d659fcf27e 100644 (file)
--- a/front_end/index.html
+++ b/front_end/index.html
@@ -15,8 +15,8 @@
         grid-row: 9;
         grid-column: 1 / 8;
       }
-      div.info_text_side_wrapper {
-        grid-row: 1 / 9;
+      div.info_text_turn_wrapper {
+        grid-row: 1;
         grid-column: 8;
       }
       div.info_text0 {
@@ -30,15 +30,21 @@
         flex-direction: column-reverse;
       }
       div.info_text1 {
-        background-color: #DDD;
+        background-color: #333;
         width: 100%;
         height: 100%;
         overflow-x: hidden;
-        overflow-y: auto;
+        overflow-y: hidden;
         word-wrap: break-word;
         display: flex;
         flex-direction: column-reverse;
       }
+      b.cyan {
+        color: #0FF;
+      }
+      b.magenta {
+        color: #F0F;
+      }
       button.slot {
         width: 50px;
         height: 50px;

diff --git a/front_end/src/state.rs b/front_end/src/state.rs
index 9ec04d281e73c2a330decdc7bb17d5831c2a47b1..5c4feee81b63911729419fca019b9d2bc95473a9 100644 (file)
--- a/front_end/src/state.rs
+++ b/front_end/src/state.rs
@@ -1,7 +1,6 @@
 use std::cell::Cell;
 use std::fmt::Display;
 use std::rc::Rc;
-use yew::prelude::*;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum BoardState {
@@ -41,11 +40,19 @@ impl Display for Turn {
     }
 }
 
+impl Turn {
+    pub fn get_color(&self) -> &str {
+        match *self {
+            Turn::CyanPlayer => "cyan",
+            Turn::MagentaPlayer => "magenta",
+        }
+    }
+}
+
 #[derive(Clone, Debug, PartialEq)]
 pub struct SharedState {
     pub board: [Rc<Cell<BoardState>>; 56],
     pub turn: Rc<Cell<Turn>>,
-    pub info_text_ref: [NodeRef; 2],
 }
 
 impl Default for SharedState {
@@ -111,8 +118,6 @@ impl Default for SharedState {
                 Rc::new(Cell::new(BoardState::default())),
             ],
             turn: Rc::new(Cell::new(Turn::CyanPlayer)),
-            // NodeRef array needs to have unique values
-            info_text_ref: [NodeRef::default(), NodeRef::default()],
         }
     }
 }

diff --git a/front_end/src/yew_components.rs b/front_end/src/yew_components.rs
index 06ff311e9f2f0f52f9f6b0817c9a7ad2de84c853..d5d264a0f0d285c1bfd5e1f2aa0ca159b512e0d1 100644 (file)
--- a/front_end/src/yew_components.rs
+++ b/front_end/src/yew_components.rs
@@ -133,7 +133,7 @@ impl Component for Wrapper {
                 <div class="info_text_wrapper">
                     <InfoText id=0 />
                 </div>
-                <div class="info_text_side_wrapper">
+                <div class="info_text_turn_wrapper">
                     <InfoText id=1 />
                 </div>
             </div> // wrapper
@@ -197,7 +197,7 @@ impl Component for Wrapper {
                 //log::info!("{}", &output_str);
 
                 // info text below the grid
-                if let Some(info_text) = shared.info_text_ref[0].cast::<web_sys::HtmlDivElement>() {
+                if let Some(info_text) = document.get_element_by_id("info_text0") {
                     let height = info_text.client_height();
 
                     // create the new text to be appended in the output
@@ -249,14 +249,19 @@ impl Component for Wrapper {
                 }
 
                 // info text right of the grid
-                if let Some(info_text) = shared.info_text_ref[1].cast::<web_sys::HtmlDivElement>() {
+                if let Some(info_text) = document.get_element_by_id("info_text1") {
                     let height = info_text.client_height();
 
                     // create the new text to be appended in the output
                     let p = document
                         .create_element("p")
                         .expect("document should be able to create <p>");
-                    p.set_text_content(Some(&format!("It is {}'s turn", shared.turn.get())));
+                    let turn = shared.turn.get();
+                    p.set_inner_html(&format!(
+                        "<b class=\"{}\">It is {}'s turn</b>",
+                        turn.get_color(),
+                        turn
+                    ));
 
                     // check if scrolled to top
                     let at_top: bool = info_text.scroll_top() <= height - info_text.scroll_height();
@@ -265,7 +270,7 @@ impl Component for Wrapper {
                     info_text
                         .append_with_node_1(&p)
                         .expect("should be able to append to info_text");
-                    while info_text.child_element_count() > INFO_TEXT_MAX_ITEMS {
+                    while info_text.child_element_count() > 1 {
                         info_text
                             .remove_child(&info_text.first_child().unwrap())
                             .expect("should be able to limit items in info_text");
@@ -302,14 +307,28 @@ impl Component for InfoText {
     }
 
     fn view(&self, ctx: &Context<Self>) -> Html {
-        let (shared, _) = ctx
-            .link()
-            .context::<SharedState>(Callback::noop())
-            .expect("state to be set");
-        html! {
-            <div ref={shared.info_text_ref[ctx.props().id].clone()} class={format!("info_text{}", ctx.props().id)}>
-            { if ctx.props().id == 1 { "It is CyanPlayer's turn" } else { "Hello" } }
-            </div>
+        match ctx.props().id {
+            0 => {
+                html! {
+                    <div id={format!("info_text{}", ctx.props().id)} class={format!("info_text{}", ctx.props().id)}>
+                        {"Hello"}
+                    </div>
+                }
+            }
+            1 => {
+                html! {
+                    <div id={format!("info_text{}", ctx.props().id)} class={format!("info_text{}", ctx.props().id)}>
+                        <p>
+                            <b class={"cyan"}>
+                                {"It is CyanPlayer's turn"}
+                            </b>
+                        </p>
+                    </div>
+                }
+            }
+            _ => {
+                unreachable!();
+            }
         }
     }
 }