From 829e3ad29bbb498f2d1c73fe98fc1cbf77929125 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 28 Dec 2016 16:22:34 +0000 Subject: [PATCH] remove the old way --- frontend/src/Metamaps/JIT.js | 6 -- frontend/src/Metamaps/Realtime/events.js | 18 ++--- frontend/src/Metamaps/Realtime/index.js | 54 ++------------- frontend/src/Metamaps/Realtime/sendable.js | 81 +--------------------- frontend/src/Metamaps/Views/ChatView.js | 2 - realtime/global.js | 32 +-------- realtime/map.js | 39 ----------- 7 files changed, 13 insertions(+), 219 deletions(-) diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js index 903cc11d..d91a2a93 100644 --- a/frontend/src/Metamaps/JIT.js +++ b/frontend/src/Metamaps/JIT.js @@ -36,12 +36,6 @@ const JIT = { events: { topicDrag: 'Metamaps:JIT:events:topicDrag', - newTopic: 'Metamaps:JIT:events:newTopic', - deleteTopic: 'Metamaps:JIT:events:deleteTopic', - removeTopic: 'Metamaps:JIT:events:removeTopic', - newSynapse: 'Metamaps:JIT:events:newSynapse', - deleteSynapse: 'Metamaps:JIT:events:deleteSynapse', - removeSynapse: 'Metamaps:JIT:events:removeSynapse', pan: 'Metamaps:JIT:events:pan', zoom: 'Metamaps:JIT:events:zoom', animationDone: 'Metamaps:JIT:events:animationDone' diff --git a/frontend/src/Metamaps/Realtime/events.js b/frontend/src/Metamaps/Realtime/events.js index a1fabf04..8121a626 100644 --- a/frontend/src/Metamaps/Realtime/events.js +++ b/frontend/src/Metamaps/Realtime/events.js @@ -12,19 +12,9 @@ module.exports = { LEAVE_CALL: 'LEAVE_CALL', SEND_MAPPER_INFO: 'SEND_MAPPER_INFO', SEND_COORDS: 'SEND_COORDS', - CREATE_MESSAGE: 'CREATE_MESSAGE', DRAG_TOPIC: 'DRAG_TOPIC', - CREATE_TOPIC: 'CREATE_TOPIC', - UPDATE_TOPIC: 'UPDATE_TOPIC', - REMOVE_TOPIC: 'REMOVE_TOPIC', - DELETE_TOPIC: 'DELETE_TOPIC', - CREATE_SYNAPSE: 'CREATE_SYNAPSE', - UPDATE_SYNAPSE: 'UPDATE_SYNAPSE', - REMOVE_SYNAPSE: 'REMOVE_SYNAPSE', - DELETE_SYNAPSE: 'DELETE_SYNAPSE', - UPDATE_MAP: 'UPDATE_MAP', - /* EVENTS RECEIVABLE */ + /* EVENTS RECEIVABLE FROM NODE SERVER*/ JUNTO_UPDATED: 'JUNTO_UPDATED', INVITED_TO_CALL: 'INVITED_TO_CALL', INVITED_TO_JOIN: 'INVITED_TO_JOIN', @@ -38,8 +28,11 @@ module.exports = { MAPPER_LIST_UPDATED: 'MAPPER_LIST_UPDATED', NEW_MAPPER: 'NEW_MAPPER', LOST_MAPPER: 'LOST_MAPPER', - MESSAGE_CREATED: 'MESSAGE_CREATED', TOPIC_DRAGGED: 'TOPIC_DRAGGED', + PEER_COORDS_UPDATED: 'PEER_COORDS_UPDATED', + + /* EVENTS RECEIVABLE FROM RAILS SERVER THROUGH ACTIONCABLE */ + MESSAGE_CREATED: 'MESSAGE_CREATED', TOPIC_CREATED: 'TOPIC_CREATED', TOPIC_UPDATED: 'TOPIC_UPDATED', TOPIC_REMOVED: 'TOPIC_REMOVED', @@ -48,6 +41,5 @@ module.exports = { SYNAPSE_UPDATED: 'SYNAPSE_UPDATED', SYNAPSE_REMOVED: 'SYNAPSE_REMOVED', SYNAPSE_DELETED: 'SYNAPSE_DELETED', - PEER_COORDS_UPDATED: 'PEER_COORDS_UPDATED', MAP_UPDATED: 'MAP_UPDATED' } diff --git a/frontend/src/Metamaps/Realtime/index.js b/frontend/src/Metamaps/Realtime/index.js index bbb28c30..dcf44852 100644 --- a/frontend/src/Metamaps/Realtime/index.js +++ b/frontend/src/Metamaps/Realtime/index.js @@ -25,6 +25,7 @@ import { MAPPER_LEFT_CALL, NEW_MAPPER, LOST_MAPPER, + PEER_COORDS_UPDATED, MESSAGE_CREATED, TOPIC_DRAGGED, TOPIC_CREATED, @@ -35,7 +36,6 @@ import { SYNAPSE_UPDATED, SYNAPSE_REMOVED, SYNAPSE_DELETED, - PEER_COORDS_UPDATED, MAP_UPDATED } from './events' @@ -80,17 +80,7 @@ import { leaveCall, sendCoords, sendMapperInfo, - createMessage, - dragTopic, - createTopic, - updateTopic, - removeTopic, - deleteTopic, - createSynapse, - updateSynapse, - removeSynapse, - deleteSynapse, - updateMap + dragTopic } from './sendable' let Realtime = { @@ -292,41 +282,6 @@ let Realtime = { self.dragTopic(positions) } $(document).on(JIT.events.topicDrag + '.map', dragTopic) - - var createTopic = function(event, data) { - self.createTopic(data) - } - $(document).on(JIT.events.newTopic + '.map', createTopic) - - var deleteTopic = function(event, data) { - self.deleteTopic(data) - } - $(document).on(JIT.events.deleteTopic + '.map', deleteTopic) - - var removeTopic = function(event, data) { - self.removeTopic(data) - } - $(document).on(JIT.events.removeTopic + '.map', removeTopic) - - var createSynapse = function(event, data) { - self.createSynapse(data) - } - $(document).on(JIT.events.newSynapse + '.map', createSynapse) - - var deleteSynapse = function(event, data) { - self.deleteSynapse(data) - } - $(document).on(JIT.events.deleteSynapse + '.map', deleteSynapse) - - var removeSynapse = function(event, data) { - self.removeSynapse(data) - } - $(document).on(JIT.events.removeSynapse + '.map', removeSynapse) - - var createMessage = function(event, data) { - self.createMessage(data) - } - $(document).on(ChatView.events.newMessage + '.map', createMessage) }, countOthersInConversation: function() { var self = Realtime @@ -520,8 +475,10 @@ const subscribeToEvents = (Realtime, socket) => { socket.on(PEER_COORDS_UPDATED, peerCoordsUpdated(Realtime)) socket.on(NEW_MAPPER, newMapper(Realtime)) socket.on(LOST_MAPPER, lostMapper(Realtime)) - socket.on(MESSAGE_CREATED, messageCreated(Realtime)) socket.on(TOPIC_DRAGGED, topicDragged(Realtime)) + +/* + socket.on(MESSAGE_CREATED, messageCreated(Realtime)) socket.on(TOPIC_CREATED, topicCreated(Realtime)) socket.on(TOPIC_UPDATED, topicUpdated(Realtime)) socket.on(TOPIC_REMOVED, topicRemoved(Realtime)) @@ -531,6 +488,7 @@ const subscribeToEvents = (Realtime, socket) => { socket.on(SYNAPSE_REMOVED, synapseRemoved(Realtime)) socket.on(SYNAPSE_DELETED, synapseDeleted(Realtime)) socket.on(MAP_UPDATED, mapUpdated(Realtime)) +*/ } export default Realtime diff --git a/frontend/src/Metamaps/Realtime/sendable.js b/frontend/src/Metamaps/Realtime/sendable.js index 9a45d94b..42663987 100644 --- a/frontend/src/Metamaps/Realtime/sendable.js +++ b/frontend/src/Metamaps/Realtime/sendable.js @@ -17,17 +17,7 @@ import { LEAVE_CALL, SEND_MAPPER_INFO, SEND_COORDS, - CREATE_MESSAGE, - DRAG_TOPIC, - CREATE_TOPIC, - UPDATE_TOPIC, - REMOVE_TOPIC, - DELETE_TOPIC, - CREATE_SYNAPSE, - UPDATE_SYNAPSE, - REMOVE_SYNAPSE, - DELETE_SYNAPSE, - UPDATE_MAP + DRAG_TOPIC } from './events' export const joinMap = self => () => { @@ -175,72 +165,3 @@ export const dragTopic = self => positions => { } } -export const updateTopic = self => topic => { - var data = { - topicId: topic.id - } - self.socket.emit(UPDATE_TOPIC, data) -} - -export const updateSynapse = self => synapse => { - var data = { - synapseId: synapse.id - } - self.socket.emit(UPDATE_SYNAPSE, data) -} - -export const updateMap = self => map => { - var data = { - mapId: map.id - } - self.socket.emit(UPDATE_MAP, data) -} - -export const createMessage = self => data => { - var message = data.attributes - message.mapid = Active.Map.id - self.socket.emit(CREATE_MESSAGE, message) -} - -export const createTopic = self => data => { - if (Active.Map) { - data.mapperid = Active.Mapper.id - data.mapid = Active.Map.id - self.socket.emit(CREATE_TOPIC, data) - } -} - -export const deleteTopic = self => data => { - if (Active.Map) { - self.socket.emit(DELETE_TOPIC, data) - } -} - -export const removeTopic = self => data => { - if (Active.Map) { - data.mapid = Active.Map.id - self.socket.emit(REMOVE_TOPIC, data) - } -} - -export const createSynapse = self => data => { - if (Active.Map) { - data.mapperid = Active.Mapper.id - data.mapid = Active.Map.id - self.socket.emit(CREATE_SYNAPSE, data) - } -} - -export const deleteSynapse = self => data => { - if (Active.Map) { - data.mapid = Active.Map.id - self.socket.emit(DELETE_SYNAPSE, data) - } -} - -export const removeSynapse = self => data => { - if (Active.Map) { - data.mapid = Active.Map.id - self.socket.emit(REMOVE_SYNAPSE, data) - } -} diff --git a/frontend/src/Metamaps/Views/ChatView.js b/frontend/src/Metamaps/Views/ChatView.js index 55a7b076..027206e4 100644 --- a/frontend/src/Metamaps/Views/ChatView.js +++ b/frontend/src/Metamaps/Views/ChatView.js @@ -161,7 +161,6 @@ const ChatView = { m.save(null, { success: function(model, response) { self.addMessages(new DataModel.MessageCollection(model), false, true) - $(document).trigger(ChatView.events.newMessage, [model]) }, error: function(model, response) { console.log('error!', response) @@ -197,7 +196,6 @@ const ChatView = { * @static */ ChatView.events = { - newMessage: 'ChatView:newMessage', openTray: 'ChatView:openTray', closeTray: 'ChatView:closeTray', inputFocus: 'ChatView:inputFocus', diff --git a/realtime/global.js b/realtime/global.js index 485085a6..f7d372e6 100644 --- a/realtime/global.js +++ b/realtime/global.js @@ -1,22 +1,12 @@ const { // server sendable, client receivable - TOPIC_UPDATED, - TOPIC_DELETED, - SYNAPSE_UPDATED, - SYNAPSE_DELETED, - MAP_UPDATED, JUNTO_UPDATED, // server receivable, client sendable JOIN_CALL, LEAVE_CALL, JOIN_MAP, - LEAVE_MAP, - UPDATE_TOPIC, - DELETE_TOPIC, - UPDATE_SYNAPSE, - DELETE_SYNAPSE, - UPDATE_MAP + LEAVE_MAP } = require('../frontend/src/Metamaps/Realtime/events') module.exports = function(io, store) { @@ -33,25 +23,5 @@ module.exports = function(io, store) { socket.on(JOIN_CALL, data => store.dispatch({ type: JOIN_CALL, payload: data })) socket.on(LEAVE_CALL, () => store.dispatch({ type: LEAVE_CALL, payload: socket })) socket.on('disconnect', () => store.dispatch({ type: 'DISCONNECT', payload: socket })) - - socket.on(UPDATE_TOPIC, function(data) { - socket.broadcast.emit(TOPIC_UPDATED, data) - }) - - socket.on(DELETE_TOPIC, function(data) { - socket.broadcast.emit(TOPIC_DELETED, data) - }) - - socket.on(UPDATE_SYNAPSE, function(data) { - socket.broadcast.emit(SYNAPSE_UPDATED, data) - }) - - socket.on(DELETE_SYNAPSE, function(data) { - socket.broadcast.emit(SYNAPSE_DELETED, data) - }) - - socket.on(UPDATE_MAP, function(data) { - socket.broadcast.emit(MAP_UPDATED, data) - }) }) } diff --git a/realtime/map.js b/realtime/map.js index fb3f078a..cbebce82 100644 --- a/realtime/map.js +++ b/realtime/map.js @@ -2,24 +2,14 @@ const { MAPPER_LIST_UPDATED, NEW_MAPPER, LOST_MAPPER, - MESSAGE_CREATED, TOPIC_DRAGGED, - TOPIC_CREATED, - TOPIC_REMOVED, - SYNAPSE_CREATED, - SYNAPSE_REMOVED, PEER_COORDS_UPDATED, JOIN_MAP, LEAVE_MAP, SEND_COORDS, SEND_MAPPER_INFO, - CREATE_MESSAGE, DRAG_TOPIC, - CREATE_TOPIC, - REMOVE_TOPIC, - CREATE_SYNAPSE, - REMOVE_SYNAPSE } = require('../frontend/src/Metamaps/Realtime/events') const { mapRoom, userMapRoom } = require('./rooms') @@ -74,40 +64,11 @@ module.exports = function(io, store) { socket.broadcast.in(mapRoom(data.mapid)).emit(PEER_COORDS_UPDATED, peer) }) - socket.on(CREATE_MESSAGE, function(data) { - var mapId = data.mapid - delete data.mapid - socket.broadcast.in(mapRoom(mapId)).emit(MESSAGE_CREATED, data) - }) socket.on(DRAG_TOPIC, function(data) { var mapId = data.mapid delete data.mapid socket.broadcast.in(mapRoom(mapId)).emit(TOPIC_DRAGGED, data) }) - - socket.on(CREATE_TOPIC, function(data) { - var mapId = data.mapid - delete data.mapid - socket.broadcast.in(mapRoom(mapId)).emit(TOPIC_CREATED, data) - }) - - socket.on(REMOVE_TOPIC, function(data) { - var mapId = data.mapid - delete data.mapid - socket.broadcast.in(mapRoom(mapId)).emit(TOPIC_REMOVED, data) - }) - - socket.on(CREATE_SYNAPSE, function(data) { - var mapId = data.mapid - delete data.mapid - socket.broadcast.in(mapRoom(mapId)).emit(SYNAPSE_CREATED, data) - }) - - socket.on(REMOVE_SYNAPSE, function(data) { - var mapId = data.mapid - delete data.mapid - socket.broadcast.in(mapRoom(mapId)).emit(SYNAPSE_REMOVED, data) - }) }) }