From 16b04fcc1e07a4fc779e2ace3ec773d912b03295 Mon Sep 17 00:00:00 2001
From: Ryan Mwangi <ryannganga13325@gmail.com>
Date: Fri, 20 Dec 2024 18:24:20 +0300
Subject: [PATCH 1/3] feat(cells): make cells editable (debugging)

---
 src/app.rs                        |  33 ++---
 src/components/editable_cell.rs   |  23 +++
 src/components/items_list.rs      | 238 +++++++++++++++++-------------
 src/components/mod.rs             |   4 +-
 src/components/tag_editor.rs      |  45 ++++++
 src/components/wikidata_lookup.rs |  48 ++++++
 6 files changed, 272 insertions(+), 119 deletions(-)
 create mode 100644 src/components/editable_cell.rs
 create mode 100644 src/components/tag_editor.rs
 create mode 100644 src/components/wikidata_lookup.rs

diff --git a/src/app.rs b/src/app.rs
index 56c4c2a..5ca104e 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,7 +1,7 @@
 use leptos::*;
 use leptos_meta::*;
 use crate::components::items_list::ItemsList;
-use crate::models::item::Item;
+use crate::models::item::{Item, ReviewWithRating};
 use crate::nostr::NostrClient;
 use tokio::sync::mpsc;
 use uuid::Uuid;
@@ -28,28 +28,25 @@ pub fn App() -> impl IntoView {
         }
     });
 
-    // Function to add a new item from the grid
-    let add_item_from_grid = move || {
-        let new_id = Uuid::new_v4().to_string();
-    
-        set_items.update(|items| {
-            let item = Item {
-                id: new_id.clone(),
-                name: String::new(),
-                description: String::new(),
-                tags: vec![],
-                reviews: vec![],
-                wikidata_id: None,
-            };
-            items.push(item);
-        });
+    // Handle adding a new item
+    let add_item = move || {
+        let new_item = Item {
+            id: Uuid::new_v4().to_string(),
+            name: "New Item".to_string(),
+            description: String::new(),
+            tags: vec![],
+            reviews: vec![],
+            wikidata_id: None,
+        };
+        set_items.update(|items| items.push(new_item));
     };
-    
+
     view! {
         <Stylesheet href="/assets/style.css" />
         <div>
             <h1>{ "CompareWare" }</h1>
-            <ItemsList items=items_signal set_items=set_items on_add_item=add_item_from_grid />
+            <button on:click=move |_| add_item()>{ "Add New Item" }</button>
+            <ItemsList items=items_signal set_items=set_items />
         </div>
     }
 }
diff --git a/src/components/editable_cell.rs b/src/components/editable_cell.rs
new file mode 100644
index 0000000..a8f43ca
--- /dev/null
+++ b/src/components/editable_cell.rs
@@ -0,0 +1,23 @@
+use leptos::*;
+
+#[component]
+pub fn EditableCell(
+    value: String,
+    on_input: impl Fn(String) + 'static,
+) -> impl IntoView {
+    let (input_value, set_input_value) = create_signal(value.clone());
+
+    let handle_input = move |e: web_sys::Event| {
+        let new_value = event_target_value(&e);
+        set_input_value(new_value.clone());
+        on_input(new_value);
+    };
+
+    view! {
+        <input
+            type="text"
+            value={input_value.get()}
+            on:input=handle_input
+        />
+    }
+}
diff --git a/src/components/items_list.rs b/src/components/items_list.rs
index 53940a6..c2a5da2 100644
--- a/src/components/items_list.rs
+++ b/src/components/items_list.rs
@@ -1,144 +1,182 @@
-use crate::models::item::Item;
-use gloo_net::http::Request;
-use leptos::logging::log;
+use crate::components::editable_cell::EditableCell;
+use crate::components::tag_editor::TagEditor;
 use leptos::*;
 use serde::Deserialize;
-use std::collections::HashMap;
-use wasm_bindgen_futures::spawn_local;
+use uuid::Uuid;
 
 #[derive(Deserialize, Clone, Debug)]
-struct WikidataResponse {
-    entities: HashMap<String, WikidataEntity>,
+struct WikidataSuggestion {
+    id: String,
+    label: String,
+    description: Option<String>,
 }
 
-#[derive(Deserialize, Clone, Debug)]
-struct WikidataEntity {
-    labels: Option<HashMap<String, WikidataLabel>>,
-    descriptions: Option<HashMap<String, WikidataLabel>>,
-}
-
-#[derive(Deserialize, Clone, Debug)]
-struct WikidataLabel {
-    value: String,
+#[derive(Clone, Debug)]
+struct Item {
+    id: String,
+    name: String,
+    description: String,
+    tags: Vec<(String, String)>,
+    wikidata_id: Option<String>,
 }
 
 #[component]
-pub fn ItemsList(items: ReadSignal<Vec<Item>>, set_items: WriteSignal<Vec<Item>>, on_add_item: impl Fn() + 'static, ) -> impl IntoView {
-    let (wikidata_data, set_wikidata_data) = create_signal(Vec::<Option<WikidataEntity>>::new());
+pub fn ItemsList(
+    items: ReadSignal<Vec<Item>>,
+    set_items: WriteSignal<Vec<Item>>,
+) -> impl IntoView {
+    let (wikidata_suggestions, set_wikidata_suggestions) =
+        create_signal(Vec::<WikidataSuggestion>::new());
 
-    // Fetch data from Wikidata for a given item name
-    let fetch_wikidata = move |item_name: String| {
+    // Fetch Wikidata suggestions
+    let fetch_wikidata_suggestions = move |query: String| {
         spawn_local(async move {
-            let url = format!("https://www.wikidata.org/w/api.php?action=wbsearchentities&search={}&language=en&limit=1&format=json", item_name);
-            match Request::get(&url).send().await {
-                Ok(response) => match response.json::<WikidataResponse>().await {
-                    Ok(parsed_data) => {
-                        if let Some(entity) = parsed_data.entities.values().next() {
-                            set_wikidata_data.update(|current_data| {
-                                current_data.push(Some(entity.clone()));
-                            });
-                        }
+            if query.is_empty() {
+                set_wikidata_suggestions(Vec::new());
+                return;
+            }
+
+            let url = format!(
+                "https://www.wikidata.org/w/api.php?action=wbsearchentities&search={}&language=en&limit=5&format=json&origin=*",
+                query
+            );
+
+            match gloo_net::http::Request::get(&url).send().await {
+                Ok(response) => {
+                    if let Ok(data) = response.json::<WikidataResponse>().await {
+                        set_wikidata_suggestions(data.search);
                     }
-                    Err(_) => log!("Failed to parse response from Wikidata"),
-                },
-                Err(_) => log!("Failed to make request to Wikidata"),
+                }
+                Err(_) => log!("Failed to fetch Wikidata suggestions"),
             }
         });
     };
 
-    // Handle updating grid cells
-    let update_item = move |index: usize, column: &str, value: String| {
+    // Update item fields
+    let update_item = move |index: usize, field: &str, value: String| {
         set_items.update(|items| {
             if let Some(item) = items.get_mut(index) {
-                match column {
-                    "name" => item.name = value,
-                    "description" => item.description = value,
-                    "tags" => item.tags.push((value.clone(), value)), // For simplicity, adding the same value as key and value.
-                    "review" => item.reviews.push(crate::models::item::ReviewWithRating {
-                        content: value.clone(),
-                        rating: 5, // Assuming a default rating of 5
-                    }),
-                    "rating" => {
-                        if let Ok(rating) = value.parse::<u8>() {
-                            item.reviews.last_mut().map(|r| r.rating = rating);
-                        }
+                match field {
+                    "name" => {
+                        item.name = value.clone();
+                        fetch_wikidata_suggestions(value);
                     }
+                    "description" => item.description = value,
                     _ => (),
                 }
             }
         });
     };
 
-    // Trigger add item event
-    let add_item = move |_| {
-        on_add_item(); // Call the passed closure from App to add a new item
+    // Add a new tag to an item
+    let add_tag = move |index: usize, key: String, value: String| {
+        set_items.update(|items| {
+            if let Some(item) = items.get_mut(index) {
+                item.tags.push((key, value));
+            }
+        });
+    };
+
+    // Remove a tag from an item
+    let remove_tag = move |item_index: usize, tag_index: usize| {
+        set_items.update(|items| {
+            if let Some(item) = items.get_mut(item_index) {
+                item.tags.remove(tag_index);
+            }
+        });
+    };
+
+    // Add a new item
+    let add_item = move || {
+        set_items.update(|items| {
+            items.push(Item {
+                id: Uuid::new_v4().to_string(),
+                name: String::new(),
+                description: String::new(),
+                tags: vec![],
+                wikidata_id: None,
+            });
+        });
+    };
+
+    // Remove an item
+    let remove_item = move |index: usize| {
+        set_items.update(|items| {
+            items.remove(index);
+        });
     };
 
     view! {
         <div>
-            <h1>{ "CompareWare" }</h1>
-
+            <h1>{ "Items List" }</h1>
             <button on:click=add_item>{ "Add New Item" }</button>
-
             <table>
                 <thead>
                     <tr>
                         <th>{ "Name" }</th>
                         <th>{ "Description" }</th>
                         <th>{ "Tags" }</th>
-                        <th>{ "Review" }</th>
-                        <th>{ "Rating" }</th>
+                        <th>{ "Actions" }</th>
                     </tr>
                 </thead>
                 <tbody>
-                    {move || {
-                        items.get().iter().enumerate().map(|(index, item)| {
-                            view! {
-                                <tr>
-                                    <td>
-                                        <input
-                                            type="text"
-                                            value={item.name.clone()}
-                                            on:input=move |e| {
-                                                update_item(index, "name", event_target_value(&e));
-                                                fetch_wikidata(event_target_value(&e)); // Fetch Wikidata when name is entered
-                                            }
-                                        />
-                                    </td>
-                                    <td>
-                                        <input
-                                            type="text"
-                                            value={item.description.clone()}
-                                            on:input=move |e| update_item(index, "description", event_target_value(&e))
-                                        />
-                                    </td>
-                                    <td>
-                                        <input
-                                            type="text"
-                                            placeholder="Add tags"
-                                            on:input=move |e| update_item(index, "tags", event_target_value(&e))
-                                        />
-                                    </td>
-                                    <td>
-                                        <textarea
-                                            value={item.reviews.iter().map(|review| format!("{}: {}", review.rating, review.content)).collect::<Vec<_>>().join("\n")}
-                                            on:input=move |e| update_item(index, "review", event_target_value(&e))
-                                        />
-                                    </td>
-                                    <td>
-                                        <input
-                                            type="number"
-                                            value={item.reviews.last().map(|r| r.rating).unwrap_or(5)}
-                                            min="1" max="5"
-                                            on:input=move |e| update_item(index, "rating", event_target_value(&e))
-                                        />
-                                    </td>
-                                </tr>
-                            }
-                        }).collect::<Vec<_>>()
-                    }}
+                    {move || items.get().iter().enumerate().map(|(index, item)| {
+                        view! {
+                            <tr>
+                                // Editable Name Field with Wikidata Integration
+                                <td>
+                                    <EditableCell
+                                        value=item.name.clone()
+                                        on_input=move |value| update_item(index, "name", value)
+                                    />
+                                    <ul>
+                                        {move || {
+                                            wikidata_suggestions.get().iter().map(|suggestion| {
+                                                view! {
+                                                    <li on:click=move |_| {
+                                                        set_items.update(|items| {
+                                                            if let Some(item) = items.get_mut(index) {
+                                                                item.wikidata_id = Some(suggestion.id.clone());
+                                                                item.name = suggestion.label.clone();
+                                                            }
+                                                        });
+                                                    }}>
+                                                        { format!("{} - {}", suggestion.label, suggestion.description.clone().unwrap_or_default()) }
+                                                    </li>
+                                                }
+                                            }).collect::<Vec<_>>()
+                                        }}
+                                    </ul>
+                                </td>
+                                // Editable Description Field
+                                <td>
+                                    <EditableCell
+                                        value=item.description.clone()
+                                        on_input=move |value| update_item(index, "description", value)
+                                    />
+                                </td>
+                                // Tag Editor
+                                <td>
+                                    <TagEditor
+                                        tags=item.tags.clone()
+                                        on_add=move |key, value| add_tag(index, key, value)
+                                        on_remove=move |tag_index| remove_tag(index, tag_index)
+                                    />
+                                </td>
+                                // Actions
+                                <td>
+                                    <button on:click=move |_| remove_item(index)>{ "Delete" }</button>
+                                </td>
+                            </tr>
+                        }
+                    }).collect::<Vec<_>>()}
                 </tbody>
             </table>
         </div>
     }
 }
+
+#[derive(Deserialize, Clone, Debug)]
+struct WikidataResponse {
+    search: Vec<WikidataSuggestion>,
+}
diff --git a/src/components/mod.rs b/src/components/mod.rs
index a357578..2236103 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -1,2 +1,4 @@
 pub mod item_form;
-pub mod items_list;
\ No newline at end of file
+pub mod items_list;
+pub mod editable_cell;
+pub mod tag_editor;
\ No newline at end of file
diff --git a/src/components/tag_editor.rs b/src/components/tag_editor.rs
new file mode 100644
index 0000000..20e1447
--- /dev/null
+++ b/src/components/tag_editor.rs
@@ -0,0 +1,45 @@
+use leptos::*;
+
+#[component]
+pub fn TagEditor(
+    tags: Vec<(String, String)>,
+    on_add: impl Fn(String, String) + 'static,
+    on_remove: impl Fn(usize) + 'static,
+) -> impl IntoView {
+    let (key, set_key) = create_signal(String::new());
+    let (value, set_value) = create_signal(String::new());
+
+    let add_tag = move || {
+        if !key.get().is_empty() && !value.get().is_empty() {
+            on_add(key.get(), value.get());
+            set_key(String::new());
+            set_value(String::new());
+        }
+    };
+
+    view! {
+        <div>
+            <ul>
+                {tags.iter().enumerate().map(|(index, (k, v))| {
+                    view! {
+                        <li>
+                            {format!("{}: {}", k, v)}
+                            <button on:click=move |_| on_remove(index)>{ "Remove" }</button>
+                        </li>
+                    }
+                }).collect::<Vec<_>>()}
+            </ul>
+            <input
+                placeholder="Key"
+                value={key.get()}
+                on:input=move |e| set_key(event_target_value(&e))
+            />
+            <input
+                placeholder="Value"
+                value={value.get()}
+                on:input=move |e| set_value(event_target_value(&e))
+            />
+            <button on:click=add_tag>{ "Add Tag" }</button>
+        </div>
+    }
+}
diff --git a/src/components/wikidata_lookup.rs b/src/components/wikidata_lookup.rs
new file mode 100644
index 0000000..4700c2f
--- /dev/null
+++ b/src/components/wikidata_lookup.rs
@@ -0,0 +1,48 @@
+use leptos::*;
+use serde::Deserialize;
+
+#[derive(Deserialize, Clone, Debug)]
+struct WikidataResult {
+    id: String,
+    label: String,
+    description: Option<String>,
+}
+
+#[component]
+pub fn WikidataLookup(
+    query: String,
+    on_select: impl Fn(WikidataResult) + 'static,
+) -> impl IntoView {
+    let (suggestions, set_suggestions) = create_signal(Vec::new());
+
+    let fetch_suggestions = move |query: String| {
+        spawn_local(async move {
+            if query.is_empty() {
+                set_suggestions(Vec::new());
+                return;
+            }
+            let url = format!("https://www.wikidata.org/w/api.php?action=wbsearchentities&search={}&language=en&limit=5&format=json&origin=*", query);
+            if let Ok(response) = reqwest::get(&url).await {
+                if let Ok(data) = response.json::<WikidataResponse>().await {
+                    set_suggestions(data.search);
+                }
+            }
+        });
+    };
+
+    create_effect(move || {
+        fetch_suggestions(query.clone());
+    });
+
+    view! {
+        <ul>
+            {suggestions.get().iter().map(|suggestion| {
+                view! {
+                    <li on:click=move |_| on_select(suggestion.clone())>
+                        {format!("{} - {}", suggestion.label, suggestion.description.clone().unwrap_or_default())}
+                    </li>
+                }
+            }).collect::<Vec<_>>()}
+        </ul>
+    }
+}

From 22e6ae38d4b1897db8d7de6649ee6b153661ef34 Mon Sep 17 00:00:00 2001
From: ryan <ryannganga13325@gmail.com>
Date: Mon, 23 Dec 2024 14:49:12 +0300
Subject: [PATCH 2/3] fix(form_list): fix mismatched parenthesis on
 lift_form.rs

---
 Cargo.lock                   | 58 +++++++++++++++++++++++++-----------
 Cargo.toml                   |  2 ++
 src/components/items_list.rs |  7 +++--
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b389be..9ef3255 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -593,7 +593,7 @@ dependencies = [
  "hashbrown 0.13.2",
  "instant",
  "once_cell",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -731,11 +731,13 @@ dependencies = [
  "nostr-sdk",
  "serde",
  "serde_json",
+ "thiserror 2.0.9",
  "tokio",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "zerofrom",
 ]
 
 [[package]]
@@ -1142,7 +1144,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1163,7 +1165,7 @@ dependencies = [
  "pin-project",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -1621,7 +1623,7 @@ dependencies = [
  "config",
  "regex",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
  "typed-builder",
 ]
 
@@ -1744,7 +1746,7 @@ dependencies = [
  "serde-wasm-bindgen",
  "serde_json",
  "slotmap",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "wasm-bindgen",
@@ -1776,7 +1778,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_qs 0.13.0",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "url",
  "wasm-bindgen",
@@ -1796,7 +1798,7 @@ dependencies = [
  "leptos_reactive",
  "serde",
  "server_fn",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
@@ -2002,7 +2004,7 @@ dependencies = [
  "async-trait",
  "lru 0.12.5",
  "nostr",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -2020,7 +2022,7 @@ dependencies = [
  "negentropy 0.4.3",
  "nostr",
  "nostr-database",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -2037,7 +2039,7 @@ dependencies = [
  "nostr",
  "nostr-database",
  "nostr-relay-pool",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -2064,7 +2066,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c51ebcefb2f0b9a5e0bea115532c8ae4215d1b01eff176d0f4ba4192895c2708"
 dependencies = [
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2440,7 +2442,7 @@ dependencies = [
  "quote",
  "syn 2.0.90",
  "syn_derive",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2631,7 +2633,7 @@ checksum = "0431a35568651e363364210c91983c1da5eb29404d9f0928b67d4ebcfa7d330c"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2642,7 +2644,7 @@ checksum = "cd34f36fe4c5ba9654417139a9b3a20d2e1de6012ee678ad14d240c22c78d8d6"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2697,7 +2699,7 @@ dependencies = [
  "serde_json",
  "serde_qs 0.12.0",
  "server_fn_macro_default",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -2877,7 +2879,16 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+dependencies = [
+ "thiserror-impl 2.0.9",
 ]
 
 [[package]]
@@ -2891,6 +2902,17 @@ dependencies = [
  "syn 2.0.90",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "time"
 version = "0.3.37"
@@ -2994,7 +3016,7 @@ checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
 dependencies = [
  "either",
  "futures-util",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -3120,7 +3142,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "sha1",
- "thiserror",
+ "thiserror 1.0.69",
  "utf-8",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index b809cf5..f58b996 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,8 @@ gloo-net = "0.5"
 futures = "0.3"
 wasm-bindgen-futures = "0.4"
 serde_json="1.0.133"
+thiserror = "2.0.9"
+zerofrom = "0.1"
 
 [features]
 csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
diff --git a/src/components/items_list.rs b/src/components/items_list.rs
index c2a5da2..e18fb78 100644
--- a/src/components/items_list.rs
+++ b/src/components/items_list.rs
@@ -140,11 +140,12 @@ pub fn ItemsList(
                                                                 item.name = suggestion.label.clone();
                                                             }
                                                         });
-                                                    }}>
+                                                    }>
                                                         { format!("{} - {}", suggestion.label, suggestion.description.clone().unwrap_or_default()) }
                                                     </li>
-                                                }
-                                            }).collect::<Vec<_>>()
+                                                    }
+                                                    
+                                                }).collect::<Vec<_>>()
                                         }}
                                     </ul>
                                 </td>

From e9b4c12a6dd502293d30d18c95f18b8cdc4e3e72 Mon Sep 17 00:00:00 2001
From: ryan <ryannganga13325@gmail.com>
Date: Mon, 23 Dec 2024 17:56:34 +0300
Subject: [PATCH 3/3] feat(autocomplete name): autofill name with wikidata
 suggestions

---
 .idea/Compware.iml              | 11 ++++++++
 .idea/modules.xml               |  8 ++++++
 .idea/vcs.xml                   |  6 +++++
 .idea/workspace.xml             | 45 ++++++++++++++++++++-------------
 src/app.rs                      |  2 +-
 src/components/editable_cell.rs |  2 +-
 src/components/items_list.rs    | 35 +++++++++++++------------
 src/components/tag_editor.rs    | 23 ++++++++++++-----
 8 files changed, 90 insertions(+), 42 deletions(-)
 create mode 100644 .idea/Compware.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/Compware.iml b/.idea/Compware.iml
new file mode 100644
index 0000000..cf84ae4
--- /dev/null
+++ b/.idea/Compware.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="EMPTY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6b84ce6
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Compware.iml" filepath="$PROJECT_DIR$/.idea/Compware.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fc59556..0543bb0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,12 @@
     <cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="eb7658c0-6daa-4def-a5ad-3d491e9b76c8" name="Changes" comment="" />
+    <list default="true" id="eb7658c0-6daa-4def-a5ad-3d491e9b76c8" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/app.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/app.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/editable_cell.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/editable_cell.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/components/items_list.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/items_list.rs" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -28,26 +33,31 @@
 }</component>
   <component name="ProjectId" id="2pngw94pMiCvlaySWR2RUofHfwc" />
   <component name="ProjectViewState">
+    <option name="autoscrollToSource" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="openDirectoriesWithSingleClick" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.rust.reset.selective.auto.import&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;org.rust.cargo.project.model.PROJECT_DISCOVERY&quot;: &quot;true&quot;,
-    &quot;org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon&quot;: &quot;&quot;,
-    &quot;org.rust.first.attach.projects&quot;: &quot;true&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Cargo.Run compareware.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.rust.reset.selective.auto.import": "true",
+    "git-widget-placeholder": "editable-cells-wiki",
+    "last_opened_file_path": "/home/noah/Desktop/Internship_tasks/Compware",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
+    "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "",
+    "org.rust.first.attach.projects": "true",
+    "settings.editor.selected.configurable": "settings.sync",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="Cargo.Run compareware">
     <configuration name="Run compareware" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
       <option name="buildProfileId" value="dev" />
@@ -97,6 +107,7 @@
       <option name="presentableId" value="Default" />
       <updated>1733407491778</updated>
       <workItem from="1733407498746" duration="5306000" />
+      <workItem from="1734955316600" duration="1248000" />
     </task>
     <servers />
   </component>
diff --git a/src/app.rs b/src/app.rs
index 5ca104e..57153ae 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,7 +1,7 @@
 use leptos::*;
 use leptos_meta::*;
 use crate::components::items_list::ItemsList;
-use crate::models::item::{Item, ReviewWithRating};
+use crate::models::item::Item;
 use crate::nostr::NostrClient;
 use tokio::sync::mpsc;
 use uuid::Uuid;
diff --git a/src/components/editable_cell.rs b/src/components/editable_cell.rs
index a8f43ca..72d6c1e 100644
--- a/src/components/editable_cell.rs
+++ b/src/components/editable_cell.rs
@@ -9,7 +9,7 @@ pub fn EditableCell(
 
     let handle_input = move |e: web_sys::Event| {
         let new_value = event_target_value(&e);
-        set_input_value(new_value.clone());
+        set_input_value.set(new_value.clone());
         on_input(new_value);
     };
 
diff --git a/src/components/items_list.rs b/src/components/items_list.rs
index e18fb78..ab09bc2 100644
--- a/src/components/items_list.rs
+++ b/src/components/items_list.rs
@@ -3,6 +3,9 @@ use crate::components::tag_editor::TagEditor;
 use leptos::*;
 use serde::Deserialize;
 use uuid::Uuid;
+use leptos::logging::log;
+use crate::models::item::Item;
+use std::sync::{Arc, Mutex};
 
 #[derive(Deserialize, Clone, Debug)]
 struct WikidataSuggestion {
@@ -11,14 +14,6 @@ struct WikidataSuggestion {
     description: Option<String>,
 }
 
-#[derive(Clone, Debug)]
-struct Item {
-    id: String,
-    name: String,
-    description: String,
-    tags: Vec<(String, String)>,
-    wikidata_id: Option<String>,
-}
 
 #[component]
 pub fn ItemsList(
@@ -32,7 +27,7 @@ pub fn ItemsList(
     let fetch_wikidata_suggestions = move |query: String| {
         spawn_local(async move {
             if query.is_empty() {
-                set_wikidata_suggestions(Vec::new());
+                set_wikidata_suggestions.set(Vec::new());
                 return;
             }
 
@@ -44,7 +39,7 @@ pub fn ItemsList(
             match gloo_net::http::Request::get(&url).send().await {
                 Ok(response) => {
                     if let Ok(data) = response.json::<WikidataResponse>().await {
-                        set_wikidata_suggestions(data.search);
+                        set_wikidata_suggestions.set(data.search);
                     }
                 }
                 Err(_) => log!("Failed to fetch Wikidata suggestions"),
@@ -87,13 +82,14 @@ pub fn ItemsList(
     };
 
     // Add a new item
-    let add_item = move || {
+    let add_item = move |_: web_sys::MouseEvent|{
         set_items.update(|items| {
             items.push(Item {
                 id: Uuid::new_v4().to_string(),
                 name: String::new(),
                 description: String::new(),
                 tags: vec![],
+                reviews:vec![],
                 wikidata_id: None,
             });
         });
@@ -131,17 +127,24 @@ pub fn ItemsList(
                                     />
                                     <ul>
                                         {move || {
-                                            wikidata_suggestions.get().iter().map(|suggestion| {
+                                            let suggestions = wikidata_suggestions.get().to_vec();
+                                            suggestions.into_iter().map(|suggestion| {
+                                                // Clone all necessary fields upfront
+                                                let label_for_click = suggestion.label.clone();
+                                                let label_for_display = suggestion.label.clone();
+                                                let description = suggestion.description.clone().unwrap_or_default();
+                                                let id = suggestion.id.clone();
+                                                                            
                                                 view! {
                                                     <li on:click=move |_| {
                                                         set_items.update(|items| {
                                                             if let Some(item) = items.get_mut(index) {
-                                                                item.wikidata_id = Some(suggestion.id.clone());
-                                                                item.name = suggestion.label.clone();
+                                                                item.wikidata_id = Some(id.clone());
+                                                                item.name = label_for_click.clone(); // Use the cloned version for updating
                                                             }
                                                         });
                                                     }>
-                                                        { format!("{} - {}", suggestion.label, suggestion.description.clone().unwrap_or_default()) }
+                                                        { format!("{} - {}", label_for_display, description) } // Use the cloned version for display
                                                     </li>
                                                     }
                                                     
@@ -161,7 +164,7 @@ pub fn ItemsList(
                                     <TagEditor
                                         tags=item.tags.clone()
                                         on_add=move |key, value| add_tag(index, key, value)
-                                        on_remove=move |tag_index| remove_tag(index, tag_index)
+                                        on_remove=Arc::new (Mutex:: new (move |tag_index:usize| remove_tag(index, tag_index)))
                                     />
                                 </td>
                                 // Actions
diff --git a/src/components/tag_editor.rs b/src/components/tag_editor.rs
index 20e1447..e38e436 100644
--- a/src/components/tag_editor.rs
+++ b/src/components/tag_editor.rs
@@ -1,19 +1,22 @@
 use leptos::*;
+use std::sync::{Arc, Mutex};
+
+
 
 #[component]
 pub fn TagEditor(
     tags: Vec<(String, String)>,
     on_add: impl Fn(String, String) + 'static,
-    on_remove: impl Fn(usize) + 'static,
+    on_remove: Arc<Mutex<dyn FnMut(usize) + Send + Sync>>,
 ) -> impl IntoView {
     let (key, set_key) = create_signal(String::new());
     let (value, set_value) = create_signal(String::new());
 
-    let add_tag = move || {
+    let add_tag = move |_| {
         if !key.get().is_empty() && !value.get().is_empty() {
             on_add(key.get(), value.get());
-            set_key(String::new());
-            set_value(String::new());
+            set_key.set(String::new());
+            set_value.set(String::new());
         }
     };
 
@@ -21,10 +24,16 @@ pub fn TagEditor(
         <div>
             <ul>
                 {tags.iter().enumerate().map(|(index, (k, v))| {
+                    let on_remove = on_remove.clone();
                     view! {
                         <li>
                             {format!("{}: {}", k, v)}
-                            <button on:click=move |_| on_remove(index)>{ "Remove" }</button>
+                            <button on:click=move |_| {
+                                let mut on_remove = on_remove.lock().unwrap();
+                                on_remove(index);
+                            }>
+                            { "Remove" }
+                            </button>
                         </li>
                     }
                 }).collect::<Vec<_>>()}
@@ -32,12 +41,12 @@ pub fn TagEditor(
             <input
                 placeholder="Key"
                 value={key.get()}
-                on:input=move |e| set_key(event_target_value(&e))
+                on:input=move |e| set_key.set(event_target_value(&e))
             />
             <input
                 placeholder="Value"
                 value={value.get()}
-                on:input=move |e| set_value(event_target_value(&e))
+                on:input=move |e| set_value.set(event_target_value(&e))
             />
             <button on:click=add_tag>{ "Add Tag" }</button>
         </div>