diff --git a/SCHEMA.md b/SCHEMA.md index 9d4681d574700c9f2f0b23c55ce8930465648567..a0896cf989575a51869944e00c3cd2bb9e4cf2aa 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 81fa567733394c3744e037da594cb5d9ed58cb34..db1038dd3851fe775de63926f23ac4853d2212f8 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;