diff --git a/frontend/src/Metamaps/Realtime/receivable.js b/frontend/src/Metamaps/Realtime/receivable.js index 3286a481..477736c5 100644 --- a/frontend/src/Metamaps/Realtime/receivable.js +++ b/frontend/src/Metamaps/Realtime/receivable.js @@ -1,4 +1,5 @@ -/* globals $ */ +/* global $ */ + /* everthing in this file happens as a result of websocket events */ @@ -17,7 +18,7 @@ import Visualize from '../Visualize' export const juntoUpdated = self => state => { self.juntoState = state - $(document).trigger(JUNTO_UPDATED) + $(document).trigger(JUNTO_UPDATED) } export const synapseRemoved = self => data => { diff --git a/frontend/src/Metamaps/Views/ChatView.js b/frontend/src/Metamaps/Views/ChatView.js index 7363db9b..8febe9e1 100644 --- a/frontend/src/Metamaps/Views/ChatView.js +++ b/frontend/src/Metamaps/Views/ChatView.js @@ -159,7 +159,7 @@ var Private = { var date = (m.timestamp.getMonth() + 1) + '/' + m.timestamp.getDate() date += ' ' + addZero(m.timestamp.getHours()) + ':' + addZero(m.timestamp.getMinutes()) m.timestamp = date - m.image = m.user_image + m.image = m.user_image m.message = linker.link(m.message) var $html = $(this.messageTemplate(m)) this.$messages.append($html) diff --git a/frontend/src/Metamaps/Views/ExploreMaps.js b/frontend/src/Metamaps/Views/ExploreMaps.js index c35877fb..421b3c22 100644 --- a/frontend/src/Metamaps/Views/ExploreMaps.js +++ b/frontend/src/Metamaps/Views/ExploreMaps.js @@ -3,7 +3,6 @@ import React from 'react' import ReactDOM from 'react-dom' // TODO ensure this isn't a double import -import { JUNTO_UPDATED } from '../Realtime/events' import Active from '../Active' import Realtime from '../Realtime' import Maps from '../../components/Maps' @@ -40,7 +39,7 @@ const ExploreMaps = { currentUser: Active.Mapper, section: self.collection.id, maps: self.collection, - juntoState: Realtime.juntoState, + juntoState: Realtime.juntoState, moreToLoad: self.collection.page != 'loadedAll', user: mapperObj, loadMore: self.loadMore diff --git a/frontend/src/Metamaps/Views/index.js b/frontend/src/Metamaps/Views/index.js index 0372efa4..39104b18 100644 --- a/frontend/src/Metamaps/Views/index.js +++ b/frontend/src/Metamaps/Views/index.js @@ -1,3 +1,5 @@ +/* global $ */ + import ExploreMaps from './ExploreMaps' import ChatView from './ChatView' import VideoView from './VideoView' diff --git a/realtime/global.js b/realtime/global.js index a8d4e89e..1df9d8ea 100644 --- a/realtime/global.js +++ b/realtime/global.js @@ -1,5 +1,4 @@ - -import { +const { // server sendable, client receivable TOPIC_UPDATED, TOPIC_DELETED, @@ -18,11 +17,9 @@ import { UPDATE_SYNAPSE, DELETE_SYNAPSE, UPDATE_MAP -} from '../frontend/src/Metamaps/Realtime/events' - +} = require('../frontend/src/Metamaps/Realtime/events') module.exports = function (io, store) { - store.subscribe(() => { console.log(store.getState()) io.sockets.emit(JUNTO_UPDATED, store.getState()) @@ -32,7 +29,7 @@ module.exports = function (io, store) { io.sockets.emit(JUNTO_UPDATED, store.getState()) - socket.on(JOIN_MAP, data => store.dispatch({ type: JOIN_MAP, payload: data})) + socket.on(JOIN_MAP, data => store.dispatch({ type: JOIN_MAP, payload: data })) socket.on(LEAVE_MAP, () => store.dispatch({ type: LEAVE_MAP, payload: socket })) socket.on(JOIN_CALL, data => store.dispatch({ type: JOIN_CALL, payload: data })) socket.on(LEAVE_CALL, () => store.dispatch({ type: LEAVE_CALL, payload: socket })) diff --git a/realtime/junto.js b/realtime/junto.js index 69836e22..f97efdbc 100644 --- a/realtime/junto.js +++ b/realtime/junto.js @@ -1,4 +1,4 @@ -import { +const { INVITED_TO_CALL, INVITED_TO_JOIN, CALL_ACCEPTED, @@ -17,7 +17,7 @@ import { INVITE_A_CALL, JOIN_CALL, LEAVE_CALL -} from '../frontend/src/Metamaps/Realtime/events' +} = require('../frontend/src/Metamaps/Realtime/events') const { mapRoom, userMapRoom } = require('./rooms') @@ -65,4 +65,3 @@ module.exports = function (io, store) { }) }) } - diff --git a/realtime/map.js b/realtime/map.js index 08bac1f1..5e153209 100644 --- a/realtime/map.js +++ b/realtime/map.js @@ -1,5 +1,4 @@ - -import { +const { MAPPER_LIST_UPDATED, NEW_MAPPER, LOST_MAPPER, @@ -21,7 +20,7 @@ import { REMOVE_TOPIC, CREATE_SYNAPSE, REMOVE_SYNAPSE -} from '../frontend/src/Metamaps/Realtime/events' +} = require('../frontend/src/Metamaps/Realtime/events') const { mapRoom, userMapRoom } = require('./rooms') diff --git a/realtime/realtime-server.js b/realtime/realtime-server.js index a0b3e896..c52b67ab 100644 --- a/realtime/realtime-server.js +++ b/realtime/realtime-server.js @@ -6,8 +6,8 @@ map = require('./map'), global = require('./global'), stunservers = [{"url": "stun:stun.l.google.com:19302"}] -import { createStore } from 'redux' -import { reducer } from './reducer' +const { createStore } = require('redux') +const { reducer } = require('./reducer') let store = createStore(reducer) @@ -15,5 +15,5 @@ global(io, store) signalling(io, stunservers, store) junto(io, store) map(io, store) -io.listen(5001) +io.listen(5001) diff --git a/realtime/reducer.js b/realtime/reducer.js index 6084facc..d492921a 100644 --- a/realtime/reducer.js +++ b/realtime/reducer.js @@ -1,18 +1,17 @@ - -import { omit, omitBy, isNil, mapValues } from 'lodash' -import { +const { omit, omitBy, isNil, mapValues } = require('lodash') +const { JOIN_MAP, LEAVE_MAP, JOIN_CALL, LEAVE_CALL -} from '../frontend/src/Metamaps/Realtime/events' +} = require('../frontend/src/Metamaps/Realtime/events') const NOT_IN_CONVERSATION = 0 const IN_CONVERSATION = 1 const addMapperToMap = (map, userId) => { return { ...map, [userId]: NOT_IN_CONVERSATION }} -export const reducer = (state = { connectedPeople: {}, liveMaps: {} }, action) => { +module.exports = { reducer: (state = { connectedPeople: {}, liveMaps: {} }, action) => { const { type, payload } = action const { connectedPeople, liveMaps } = state const map = payload && liveMaps[payload.mapid] @@ -85,4 +84,4 @@ export const reducer = (state = { connectedPeople: {}, liveMaps: {} }, action) = default: return state } -} +} } diff --git a/realtime/rooms.js b/realtime/rooms.js index 6276e3f9..30d56d1b 100644 --- a/realtime/rooms.js +++ b/realtime/rooms.js @@ -1,4 +1,3 @@ - module.exports = { mapRoom: mapId => `maps/${mapId}`, userMapRoom: (mapperId, mapId) => `mappers/${mapperId}/maps/${mapId}`, diff --git a/realtime/signal.js b/realtime/signal.js index c14ce392..39283709 100644 --- a/realtime/signal.js +++ b/realtime/signal.js @@ -1,4 +1,4 @@ -var uuid = require('node-uuid') +const uuid = require('node-uuid') // based off of https://github.com/andyet/signalmaster // since it was updated to socket.io 1.3.7 @@ -12,7 +12,6 @@ function safeCb(cb) { } module.exports = function(io, stunservers, state) { - io.on('connection', function (socket) { socket.resources = { screen: false,