merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 50 deletions

diff --git a/opendc-web/opendc-web-ui/src/api/socket.js b/opendc-web/opendc-web-ui/src/api/socket.js
deleted file mode 100644
index 87facda8..00000000
--- a/opendc-web/opendc-web-ui/src/api/socket.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import io from 'socket.io-client'
-import { getAuthToken } from '../auth/index'
-import config from '../config'
-
-let socket
-let requestIdCounter = 0
-const callbacks = {}
-
-export function setupSocketConnection(onConnect) {
-    const apiUrl =
-        config['API_BASE_URL'] || `${window.location.protocol}//${window.location.hostname}:${window.location.port}`
-
-    socket = io.connect(apiUrl)
-    socket.on('connect', onConnect)
-    socket.on('response', onSocketResponse)
-}
-
-export function sendSocketRequest(request, callback) {
-    if (!socket.connected) {
-        console.error('Attempted to send request over unconnected socket')
-        return
-    }
-
-    const newId = requestIdCounter++
-    callbacks[newId] = callback
-
-    request.id = newId
-    request.token = getAuthToken()
-
-    if (!request.isRootRoute) {
-        request.path = '/v2' + request.path
-    }
-
-    socket.emit('request', request)
-
-    if (process.env.NODE_ENV !== 'production') {
-        console.log('Sent socket request:', request)
-    }
-}
-
-function onSocketResponse(json) {
-    const response = JSON.parse(json)
-
-    if (process.env.NODE_ENV !== 'production') {
-        console.log('Received socket response:', response)
-    }
-
-    callbacks[response.id](response)
-    delete callbacks[response.id]
-}