diff --git a/spawnclients.html b/public/spawnclients.html
similarity index 100%
rename from spawnclients.html
rename to public/spawnclients.html
diff --git a/test_client.html b/public/test_client.html
similarity index 100%
rename from test_client.html
rename to public/test_client.html
diff --git a/src/api.rs b/src/api.rs
index 83a1487..c30b24f 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -31,7 +31,7 @@ pub async fn websocket(stream: WebSocket, state: Arc, who: SocketAddr)
let mut rx = state.tx.subscribe();
// ANNOUNCE THY PRESENCE
- let msg = format!("{who} is here, bitches!");
+ let msg = format!("{who} joined.");
tracing::debug!("{msg}");
let _ = state.tx.send(msg);
diff --git a/src/api/message_handler.rs b/src/api/message_handler.rs
index a03e234..240afca 100644
--- a/src/api/message_handler.rs
+++ b/src/api/message_handler.rs
@@ -31,12 +31,11 @@ pub async fn message_handler(message: Message, state: &Arc, who: Socke
match message {
Message::Text(text) => {
- tracing::debug!("{who}: {}", text);
-
if let Ok(new_game) = serde_json::from_str::(&text) {
tracing::debug!("{:#?}", &new_game);
// create game
if let Ok(new_game_object) = CAHGame::new(new_game) {
+ let _ = tx.send(format!("{:#?}", &new_game_object.players[0].white));
state.games.lock().unwrap().push(new_game_object);
let _update = tx.send(greeting(&state));
} else {
diff --git a/src/main.rs b/src/main.rs
index 8e1e704..b0a7600 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,12 +17,13 @@ use crate::message_handler::*;
/// Parse json for card data
fn load_json(path: &str) -> Result, Box> {
- let data: String = fs::read_to_string(path).expect("Error reading file");
+ let data: String = fs::read_to_string(path)?;
let jayson: Vec = serde_json::from_str(&data)?;
Ok(jayson)
}
+// this is still around just for reference
#[allow(dead_code)]
fn test() -> Result<(), Box> {
// choose decks
@@ -88,10 +89,10 @@ pub struct AppState {
// Include utf-8 files at **compile** time.
async fn index() -> Html<&'static str> {
- Html(std::include_str!("../test_client.html"))
+ Html(std::include_str!("../public/test_client.html"))
}
async fn spawnclients() -> Html<&'static str> {
- Html(std::include_str!("../spawnclients.html"))
+ Html(std::include_str!("../public/spawnclients.html"))
}
#[tokio::main]