From 70fd40aedf741813e437e7536a765ec171651767 Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Mon, 7 Dec 2020 22:36:31 +0000
Subject: [PATCH] more fixes !

---
 .DS_Store                         | Bin 10244 -> 10244 bytes
 app/src/components/CardsLayer.vue |  33 ++++++++++++++++++++++++++----
 app/src/components/ListLayer.vue  |  33 +++++++++++++++++++++++++++---
 app/src/views/Cards.vue           |  10 +++------
 app/src/views/Collect.vue         |  10 +++------
 5 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a60aef9a74828569b9d446436c2f527514292dbd..25365651516be58a6fc23d97d43d9c8cf0391fbb 100644
GIT binary patch
delta 19
acmZn(XbISGMu5%2NJqiYZ1W`nBXIyk$Obk5

delta 19
acmZn(XbISGMu5%KTt~sgX!9ijBXIyk)&@5K

diff --git a/app/src/components/CardsLayer.vue b/app/src/components/CardsLayer.vue
index 3bb166b..a14b488 100644
--- a/app/src/components/CardsLayer.vue
+++ b/app/src/components/CardsLayer.vue
@@ -23,11 +23,13 @@
         <div class="btn-row">
           <SvgButton
             buttonClass="nodes"
-            @click.prevent="deleteFlag(nodes.node_id)"
+            @click.prevent="deleteFlag(nodes.node_id), updateNodes()"
           />
           <SvgButton2
             buttonClass="nodes"
-            @click.prevent="readFlag(nodes.node_id, nodes.read_mode)"
+            @click.prevent="
+              readFlag(nodes.node_id, nodes.read_mode), updateNodes()
+            "
           />
         </div>
 
@@ -57,10 +59,14 @@ var readmode
 export default {
   name: 'CardsLayer',
 
+  props: {
+    added: Boolean,
+  },
   data: function () {
     return {
       localreadmode: false,
       myArray: null,
+      update: false,
     }
   },
 
@@ -90,10 +96,30 @@ export default {
   },
 
   updated() {
-    setTimeout(this.loadData, 300)
+    // setTimeout(this.loadData, 300)
+  },
+
+  watch: {
+    added: {
+      deep: true,
+
+      handler() {
+        setTimeout(this.loadData, 200)
+      },
+    },
+    update: {
+      deep: true,
+
+      handler() {
+        setTimeout(this.loadData, 200)
+      },
+    },
   },
 
   methods: {
+    updateNodes() {
+      this.update = !this.update
+    },
     loadData() {
       this.$options.myArray = this.nodes_filtered
       this.$forceUpdate()
@@ -109,7 +135,6 @@ export default {
     },
 
     deleteFlag(e) {
-      e = this.nodeid
       if (confirm('Confirm discard?')) {
         this.$store.dispatch('deleteFlag', { e })
       } else {
diff --git a/app/src/components/ListLayer.vue b/app/src/components/ListLayer.vue
index 7ddea2a..6202ddb 100644
--- a/app/src/components/ListLayer.vue
+++ b/app/src/components/ListLayer.vue
@@ -24,11 +24,13 @@
         <div class="btn-row">
           <SvgButton
             buttonClass="nodes"
-            @click.prevent="deleteFlag(nodes.node_id)"
+            @click.prevent="deleteFlag(nodes.node_id), updateNodes()"
           />
           <SvgButton2
             buttonClass="nodes"
-            @click.prevent="readFlag(nodes.node_id, nodes.read_mode)"
+            @click.prevent="
+              readFlag(nodes.node_id, nodes.read_mode), updateNodes()
+            "
           />
         </div>
 
@@ -58,10 +60,15 @@ var readmode
 export default {
   name: 'ListLayer',
 
+  props: {
+    added: Boolean,
+  },
+
   data: function () {
     return {
       localreadmode: false,
       myArray: null,
+      update: false,
     }
   },
 
@@ -90,10 +97,30 @@ export default {
   },
 
   updated() {
-    setTimeout(this.loadData, 300)
+    // setTimeout(this.loadData, 300)
+  },
+
+  watch: {
+    added: {
+      deep: true,
+
+      handler() {
+        setTimeout(this.loadData, 200)
+      },
+    },
+    update: {
+      deep: true,
+
+      handler() {
+        setTimeout(this.loadData, 200)
+      },
+    },
   },
 
   methods: {
+    updateNodes() {
+      this.update = !this.update
+    },
     loadData() {
       this.$options.myArray = this.nodes_filtered
       this.$forceUpdate()
diff --git a/app/src/views/Cards.vue b/app/src/views/Cards.vue
index 13ad2ae..758c232 100644
--- a/app/src/views/Cards.vue
+++ b/app/src/views/Cards.vue
@@ -3,7 +3,7 @@
     <div v-if="clientset">
       <h1 class="mobile">All nodes - card view</h1>
 
-      <CardsLayer @editTrue="(e) => editTrue(e)" />
+      <CardsLayer @edit-true="(e) => editTrue(e)" :added="added" />
 
       <OtherCardslayer />
 
@@ -72,15 +72,10 @@ export default {
       clientset: false,
       uploadready: false,
       copyready: false,
+      added: true,
     }
   },
 
-  props: {
-    nodeid: String,
-    nodetext: String,
-    deleted: Boolean,
-  },
-
   computed: {
     ...mapState({
       myNodes: (state) => state.myNodes,
@@ -114,6 +109,7 @@ export default {
 
     addNode() {
       this.$store.dispatch('addNode')
+      this.added = !this.added
     },
 
     editTrue(e) {
diff --git a/app/src/views/Collect.vue b/app/src/views/Collect.vue
index c204970..08ba13c 100644
--- a/app/src/views/Collect.vue
+++ b/app/src/views/Collect.vue
@@ -3,7 +3,7 @@
     <div v-if="clientset">
       <div id="listwrapper">
         <ModesCard />
-        <ListLayer @edit-true="(e) => editTrue(e)" />
+        <ListLayer @edit-true="(e) => editTrue(e)" :added="added" />
         <div class="btn-row">
           <!-- <BaseButton class="new" buttonClass="action" @click="addNode()"
             >Create Node</BaseButton
@@ -78,15 +78,10 @@ export default {
       clientset: false,
       uploadready: false,
       copyready: false,
+      added: true,
     }
   },
 
-  props: {
-    nodeid: String,
-    nodetext: String,
-    deleted: Boolean,
-  },
-
   computed: {
     ...mapState({
       myNodes: (state) => state.myNodes,
@@ -120,6 +115,7 @@ export default {
 
     addNode() {
       this.$store.dispatch('addNode')
+      this.added = !this.added
     },
 
     editTrue(e) {
-- 
GitLab