From 268ace9f3431d53de1b9fac69ca8df5578ffd52b Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Wed, 11 Mar 2020 15:43:17 +0000
Subject: [PATCH] updated OtherNodes
small update to take account of emojis / connections being present now
---
SCHEMA.md | 27 +++++++++++++++------------
app/src/store/index.js | 4 +++-
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/SCHEMA.md b/SCHEMA.md
index 9d4681d..a0896cf 100644
--- a/SCHEMA.md
+++ b/SCHEMA.md
@@ -7,9 +7,9 @@ This is version 1 of the API documents to be created. For now this document outl
```
"nodes": [
{
- "nodeid": "wanxtrk54ulhl0k8bd5mqd",
- "nodetext": "#\nhello",
- "nodeowner": "iPhoneX",
+ "node_id": "wanxtrk54ulhl0k8bd5mqd",
+ "node_text": "#\nhello",
+ "node_owner": "iPhoneX",
"content_type": "sheet",
"deleted": true,
"attachment_name": ""
@@ -23,9 +23,9 @@ This is version 1 of the API documents to be created. For now this document outl
"connections": [
{
- "connectid": "xboi6bducmngjv0yrgdhpf",
- "startid": "7nltu5jdotbeb6t9hgm9dd",
- "endid": "z67hbvdxr8nrsixn5nt6b9",
+ "connect_id": "xboi6bducmngjv0yrgdhpf",
+ "start_id": "7nltu5jdotbeb6t9hgm9dd",
+ "end_id": "z67hbvdxr8nrsixn5nt6b9",
"connected": "true"
}
@@ -39,9 +39,12 @@ This is version 1 of the API documents to be created. For now this document outl
"positions": [
{
-"nodeid": "xwio4e5etcevxag3lzyj4",
-"xpos": 831,
-"ypos": 293
+"node_id": "xwio4e5etcevxag3lzyj4",
+"x_pos": 831,
+"y_pos": 293,
+"width": 386,
+"height": 417,
+"z_index":1
}
]
@@ -53,9 +56,9 @@ This is version 1 of the API documents to be created. For now this document outl
"emojis": [
{
-"emojiid": "nxs9836kgelncf4bg61w7",
-"nodeid": "cejt3ul3b7awnh5gin8b2c",
-"emojitext": "ðŸ‘"
+"emoji_id": "nxs9836kgelncf4bg61w7",
+"node_id": "cejt3ul3b7awnh5gin8b2c",
+"emoji_text": "ðŸ‘"
}
]
diff --git a/app/src/store/index.js b/app/src/store/index.js
index 81fa567..db1038d 100644
--- a/app/src/store/index.js
+++ b/app/src/store/index.js
@@ -115,7 +115,9 @@ const store = new Vuex.Store({
for (i = 0; i < Object.keys(state.allNodes).length; i++) {
if (
state.allNodes[i].id != state.myclient &&
- state.allNodes[i].id != state.global_pos_name
+ state.allNodes[i].id != state.global_pos_name &&
+ state.allNodes[i].id != state.global_emoji_name &&
+ state.allNodes[i].id != state.global_con_name
) {
for (
j = 0;
--
GitLab