From e660f1372c5149f73a989bced738562a2d8f5c0d Mon Sep 17 00:00:00 2001
From: Sebastian Moser <sewi.moser@gmail.com>
Date: Mon, 27 Feb 2023 17:53:24 +0100
Subject: [PATCH] forgot change to mr instead of modules-renders somewhere, and
 made Deserialize for MizeId work

---
 js-client               | 2 +-
 src/server.rs           | 3 ++-
 src/server/itemstore.rs | 4 ++--
 src/server/proto.rs     | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js-client b/js-client
index 37f117e..4bc7cc8 160000
--- a/js-client
+++ b/js-client
@@ -1 +1 @@
-Subproject commit 37f117e8e0aebb37fdf95534565f1f03558aa563
+Subproject commit 4bc7cc8fa0885a94b8bb8142e6f67e1928910a98
diff --git a/src/server.rs b/src/server.rs
index f774f4b..20b7620 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -326,7 +326,8 @@ async fn get_render_main(extract::Path(id): extract::Path<String>, State(mutexes
     let render = renders.iter().filter(|&render| render.id == id).nth(0)
         .unwrap_or(renders.iter().filter(|&render| render.id == "first").nth(0).expect("there is no first render"));
 
-    let file_name = mutexes.mize_folder.clone() + "/modules-renders/" + &render.folder + "/" + &render.main;
+    let file_name = mutexes.mize_folder.clone() + "/mr/" + &render.folder + "/" + &render.main;
+    println!("filenamd: {}", file_name);
 
     Response::builder()
         .header("content-type", "application/javascript")
diff --git a/src/server/itemstore.rs b/src/server/itemstore.rs
index c88f2b0..0c4144e 100644
--- a/src/server/itemstore.rs
+++ b/src/server/itemstore.rs
@@ -78,8 +78,8 @@ impl Itemstore {
             Ok(Some(val)) => println!("item 0 already created"),
             Ok(None) => {
                 let data = serde_json::json!({
-                        "num_of_items": 0,
-                        "next_free_id": 0,
+                        "num_of_items": 1,
+                        "next_free_id": 1,
                         "_commit": 0,
                         "mize-type": "mize-main",
                         "mize-id": "0"
diff --git a/src/server/proto.rs b/src/server/proto.rs
index 1e48cca..a70bf9f 100644
--- a/src/server/proto.rs
+++ b/src/server/proto.rs
@@ -243,13 +243,13 @@ impl<'de> Deserialize<'de> for MizeId {
     where
         D: serde::Deserializer<'de>,
     {
-        struct MizeIdVisitor {}
+        struct MizeIdVisitor;
 
         impl<'de> Visitor<'de> for MizeIdVisitor {
             type Value = MizeId;
 
             fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str("Could not deserialize element")
+                formatter.write_str("a MizeId id, which is a string that my start with @ or # ")
             }
 
             fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
@@ -291,7 +291,7 @@ impl<'de> Deserialize<'de> for MizeId {
 //            }
         }
 
-        deserializer.deserialize_map(MizeIdVisitor {})
+        deserializer.deserialize_str(MizeIdVisitor {})
     }
 }