From 41a5b0986d0090e999349d34246cd7357898adf7 Mon Sep 17 00:00:00 2001
From: Artyom <yom@artyom.me>
Date: Sun, 21 Feb 2016 13:51:49 +0300
Subject: [PATCH] Allow deleting traits

---
 src/Main.hs  | 23 ++++++++++++++++++++++-
 static/x.svg |  3 +++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 static/x.svg

diff --git a/src/Main.hs b/src/Main.hs
index f4aaa9f..4a2b4a5 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -276,6 +276,14 @@ main = runSpock 8080 $ spockT id $ do
         itemById itemId . pros %= move ((== traitId) . view uid)
         itemById itemId . cons %= move ((== traitId) . view uid)
 
+  -- Deleting things
+  Spock.subcomponent "delete" $ do
+    -- Delete trait
+    Spock.post (itemVar <//> traitVar) $ \itemId traitId -> do
+      withGlobal $ do
+        itemById itemId . pros %= filter ((/= traitId) . view uid)
+        itemById itemId . cons %= filter ((/= traitId) . view uid)
+
 renderRoot :: GlobalState -> HtmlT IO ()
 renderRoot globalState = do
   includeJS "https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"
@@ -426,6 +434,11 @@ renderTrait Editable itemId trait = li_ $ do
     js_moveTraitUp (itemId, trait^.uid, this)
   imgButton "/arrow-thick-bottom.svg" [width_ "12px"] $
     js_moveTraitDown (itemId, trait^.uid, this)
+  -- TODO: these 3 icons in a row don't look nice
+  -- TODO: it's too easy to delete something accidentally – there should be
+  -- some way to revert everything
+  imgButton "/x.svg" [width_ "12px"] $
+    js_deleteTrait (itemId, trait^.uid, this)
   textButton "edit" $
     js_setTraitMode (this, itemId, trait^.uid, InEdit)
 renderTrait InEdit itemId trait = li_ $ do
@@ -495,7 +508,7 @@ allJSFunctions = JS . T.unlines . map fromJS $ [
   js_submitTrait,
   js_submitItemInfo,
   -- Other things
-  js_moveTraitUp, js_moveTraitDown ]
+  js_moveTraitUp, js_moveTraitDown, js_deleteTrait ]
 
 js_replaceWithData :: JSFunction a => a
 js_replaceWithData =
@@ -666,6 +679,14 @@ js_moveTraitDown =
     moveNodeDown(traitNode);
   |]
 
+js_deleteTrait :: JSFunction a => a
+js_deleteTrait =
+  makeJSFunction "deleteTrait" ["itemId", "traitId", "traitNode"]
+  [text|
+    $.post("/delete/item/"+itemId+"/trait/"+traitId);
+    $(traitNode).remove();
+  |]
+
 -- When adding a function, don't forget to add it to 'allJSFunctions'!
 
 newtype JS = JS {fromJS :: Text}
diff --git a/static/x.svg b/static/x.svg
new file mode 100644
index 0000000..fc7251c
--- /dev/null
+++ b/static/x.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
+  <path d="M1.41 0l-1.41 1.41.72.72 1.78 1.81-1.78 1.78-.72.69 1.41 1.44.72-.72 1.81-1.81 1.78 1.81.69.72 1.44-1.44-.72-.69-1.81-1.78 1.81-1.81.72-.72-1.44-1.41-.69.72-1.78 1.78-1.81-1.78-.72-.72z" />
+</svg>
\ No newline at end of file