diff --git a/package-lock.json b/package-lock.json
index b87fa304de5687e38c4ad39605ed52736d1e29e7..b30a2953ce38964d40d02a5982511ed55bccf0b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1315,20 +1315,6 @@
"@babel/types": "^7.3.0"
}
},
- "@types/cookie": {
- "version": "0.3.3",
- "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
- "integrity": "sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow=="
- },
- "@types/hoist-non-react-statics": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
- "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
- "requires": {
- "@types/react": "*",
- "hoist-non-react-statics": "^3.3.0"
- }
- },
"@types/istanbul-lib-coverage": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
@@ -1356,30 +1342,11 @@
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.3.tgz",
"integrity": "sha512-zkOxCS/fA+3SsdA+9Yun0iANxzhQRiNwTvJSr6N95JhuJ/x27z9G2URx1Jpt3zYFfCGUXZGL5UDxt5eyLE7wgw=="
},
- "@types/object-assign": {
- "version": "4.0.30",
- "resolved": "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz",
- "integrity": "sha1-iUk3HVqZ9Dge4PHfCpt6GH4H5lI="
- },
- "@types/prop-types": {
- "version": "15.7.1",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
- "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg=="
- },
"@types/q": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
"integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="
},
- "@types/react": {
- "version": "16.8.19",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.19.tgz",
- "integrity": "sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==",
- "requires": {
- "@types/prop-types": "*",
- "csstype": "^2.2.0"
- }
- },
"@types/stack-utils": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -1667,6 +1634,11 @@
"resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
"integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="
},
+ "after": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+ "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
+ },
"ajv": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
@@ -1819,6 +1791,11 @@
"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
},
+ "arraybuffer.slice": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+ "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
+ },
"arrify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -2278,6 +2255,11 @@
"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
"integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
},
+ "backo2": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+ "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
+ },
"bail": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.4.tgz",
@@ -2343,11 +2325,21 @@
}
}
},
+ "base64-arraybuffer": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+ "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
+ },
"base64-js": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
},
+ "base64id": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+ "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY="
+ },
"batch": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -2361,6 +2353,14 @@
"tweetnacl": "^0.14.3"
}
},
+ "better-assert": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+ "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+ "requires": {
+ "callsite": "1.0.0"
+ }
+ },
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -2371,6 +2371,11 @@
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
},
+ "blob": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+ "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
+ },
"bluebird": {
"version": "3.5.5",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
@@ -2678,6 +2683,11 @@
"caller-callsite": "^2.0.0"
}
},
+ "callsite": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+ "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
+ },
"callsites": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
@@ -3444,11 +3454,21 @@
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
},
+ "component-bind": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+ "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
+ },
"component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
},
+ "component-inherit": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+ "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
+ },
"compressible": {
"version": "2.0.17",
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
@@ -3927,11 +3947,6 @@
"cssom": "0.3.x"
}
},
- "csstype": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.5.tgz",
- "integrity": "sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA=="
- },
"cyclist": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
@@ -4352,6 +4367,105 @@
"once": "^1.4.0"
}
},
+ "engine.io": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz",
+ "integrity": "sha512-AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==",
+ "requires": {
+ "accepts": "~1.3.4",
+ "base64id": "1.0.0",
+ "cookie": "0.3.1",
+ "debug": "~3.1.0",
+ "engine.io-parser": "~2.1.0",
+ "ws": "~6.1.0"
+ },
+ "dependencies": {
+ "cookie": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+ "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ },
+ "ws": {
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
+ "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ }
+ }
+ },
+ "engine.io-client": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz",
+ "integrity": "sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==",
+ "requires": {
+ "component-emitter": "1.2.1",
+ "component-inherit": "0.0.3",
+ "debug": "~3.1.0",
+ "engine.io-parser": "~2.1.1",
+ "has-cors": "1.1.0",
+ "indexof": "0.0.1",
+ "parseqs": "0.0.5",
+ "parseuri": "0.0.5",
+ "ws": "~6.1.0",
+ "xmlhttprequest-ssl": "~1.5.4",
+ "yeast": "0.1.2"
+ },
+ "dependencies": {
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ },
+ "ws": {
+ "version": "6.1.4",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
+ "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
+ "requires": {
+ "async-limiter": "~1.0.0"
+ }
+ }
+ }
+ },
+ "engine.io-parser": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+ "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+ "requires": {
+ "after": "0.8.2",
+ "arraybuffer.slice": "~0.0.7",
+ "base64-arraybuffer": "0.1.5",
+ "blob": "0.0.5",
+ "has-binary2": "~1.0.2"
+ }
+ },
"enhanced-resolve": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
@@ -5661,6 +5775,26 @@
}
}
},
+ "has-binary2": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+ "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+ "requires": {
+ "isarray": "2.0.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+ "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+ }
+ }
+ },
+ "has-cors": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+ "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
+ },
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -8444,6 +8578,11 @@
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
},
+ "object-component": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+ "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
+ },
"object-copy": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@@ -8764,6 +8903,22 @@
"resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
"integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="
},
+ "parseqs": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+ "requires": {
+ "better-assert": "~1.0.0"
+ }
+ },
+ "parseuri": {
+ "version": "0.0.5",
+ "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+ "requires": {
+ "better-assert": "~1.0.0"
+ }
+ },
"parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -11167,6 +11322,100 @@
"kind-of": "^3.2.0"
}
},
+ "socket.io": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz",
+ "integrity": "sha512-wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==",
+ "requires": {
+ "debug": "~4.1.0",
+ "engine.io": "~3.3.1",
+ "has-binary2": "~1.0.2",
+ "socket.io-adapter": "~1.1.0",
+ "socket.io-client": "2.2.0",
+ "socket.io-parser": "~3.3.0"
+ }
+ },
+ "socket.io-adapter": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+ "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
+ },
+ "socket.io-client": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz",
+ "integrity": "sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==",
+ "requires": {
+ "backo2": "1.0.2",
+ "base64-arraybuffer": "0.1.5",
+ "component-bind": "1.0.0",
+ "component-emitter": "1.2.1",
+ "debug": "~3.1.0",
+ "engine.io-client": "~3.3.1",
+ "has-binary2": "~1.0.2",
+ "has-cors": "1.1.0",
+ "indexof": "0.0.1",
+ "object-component": "0.0.3",
+ "parseqs": "0.0.5",
+ "parseuri": "0.0.5",
+ "socket.io-parser": "~3.3.0",
+ "to-array": "0.1.4"
+ },
+ "dependencies": {
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
+ "socket.io-parser": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
+ "integrity": "sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==",
+ "requires": {
+ "component-emitter": "1.2.1",
+ "debug": "~3.1.0",
+ "isarray": "2.0.1"
+ },
+ "dependencies": {
+ "component-emitter": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+ "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+ },
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "isarray": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+ "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
"sockjs": {
"version": "0.3.19",
"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
@@ -11717,6 +11966,11 @@
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
},
+ "to-array": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+ "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
+ },
"to-arraybuffer": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -11981,24 +12235,6 @@
"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz",
"integrity": "sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="
},
- "universal-cookie": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.0.tgz",
- "integrity": "sha512-6JVx+3oGPjslGqFhQ8YSIBHmYTx8HbyAEH++2/b6SKNXsbsdQ7lU7wRG2bYcRB5JVCz8GYgQ+Ixew91hn3Dy9w==",
- "requires": {
- "@types/cookie": "^0.3.1",
- "@types/object-assign": "^4.0.30",
- "cookie": "^0.3.1",
- "object-assign": "^4.1.0"
- },
- "dependencies": {
- "cookie": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
- "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
- }
- }
- },
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -12807,6 +13043,11 @@
"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz",
"integrity": "sha512-tGkGJkN8XqCod7OT+EvGYK5Z4SfDQGD30zAa58OcnAa0RRWgzUEK72tkXhsX1FZd+rgnhRxFtmO+ihkp8LHSkw=="
},
+ "xmlhttprequest-ssl": {
+ "version": "1.5.5",
+ "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+ "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4="
+ },
"xregexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
@@ -12861,6 +13102,11 @@
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
+ },
+ "yeast": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+ "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
}
}
}
diff --git a/package.json b/package.json
index 88fddfbef5a2435db648728f1b4e4d9e4d127730..f1ae9df1c88c4b64dcbc03f7f700cb9a6e613233 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
"react-leaflet": "^2.3.0",
"react-leaflet-draw": "0.19.0",
"react-scripts": "3.0.1",
- "universal-cookie": "^4.0.0"
+ "universal-cookie": "^4.0.0",
+ "socket.io": "^2.2.0",
+ "socket.io-client": "^2.2.0"
},
"scripts": {
"start": "react-scripts start",
diff --git a/src/App.js b/src/App.js
index b2d8e87008ca309f10a6c6f85a8211ea6b313321..013fe4216ec2016aaee09be3ca6be530c5c1b3a9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -3,6 +3,7 @@ import "../node_modules/leaflet-draw/dist/leaflet.draw.css";
import "./App.css";
import UserMap from "./components/UserMap";
import Header from "./components/Header";
+import ClientSocket from "./components/Socket";
class App extends Component {
constructor() {
@@ -14,11 +15,9 @@ class App extends Component {
lng: 25.7597186,
zoom: 13,
mapUrl: "https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg",
- currentGameId: null
+ currentGameId: null,
+ socketSignal: null
};
-
- this.handleLayerChange = this.handleLayerChange.bind(this);
- this.handleGameChange = this.handleGameChange.bind(this);
}
// Toggles through the list and changes the mapUrl state
handleLayerChange = () => {
@@ -42,6 +41,22 @@ class App extends Component {
});
};
+ // setting the socket signal automatically fires shouldComponentUpdate function where socketSignal prop is present
+ // setting socketSignal to null immediately after to avoid multiple database fetches
+ getSocketSignal = type => {
+ console.log(type);
+ this.setState(
+ {
+ socketSignal: type
+ },
+ () => {
+ this.setState({
+ socketSignal: null
+ });
+ }
+ );
+ };
+
render() {
const initialPosition = [this.state.lat, this.state.lng];
return (
@@ -51,12 +66,18 @@ class App extends Component {
zoom={this.state.zoom}
mapUrl={this.state.mapUrl}
currentGameId={this.state.currentGameId}
+ socketSignal={this.state.socketSignal}
/>
- ,
<Header
handleLayerChange={this.handleLayerChange}
handleGameChange={this.handleGameChange}
/>
+ {this.state.currentGameId && (
+ <ClientSocket
+ gameId={this.state.currentGameId}
+ getSocketSignal={this.getSocketSignal}
+ />
+ )}
</div>
);
}
diff --git a/src/components/DrawTools.js b/src/components/DrawTools.js
index 3de6eddbc6bd7478d33e7b8c49daeb2885646aca..be1b7b35dedab72665c5c3221072c5781656b027 100644
--- a/src/components/DrawTools.js
+++ b/src/components/DrawTools.js
@@ -152,6 +152,7 @@ class DrawTools extends Component {
} // end if (e.layerType === "textbox")
this.makeGeoJSON(e.layerType, e.layer);
+ e.layer.remove();
}; // end _onCreated
// turn layer to GeoJSON data
@@ -159,7 +160,8 @@ class DrawTools extends Component {
// setting the format in which the data will be sent
let geoJSON = {
data: layer.toGeoJSON(),
- mapDrawingId: layer.options.id
+ mapDrawingId: layer.options.id,
+ drawingIsActive: true
};
// setting properties
@@ -179,7 +181,7 @@ class DrawTools extends Component {
geoJSON.data.properties.color = layer.options.color;
// send item to database, and receive an ID for the layer
- this.props.sendGeoJSON(geoJSON, false);
+ this.props.sendGeoJSON(geoJSON);
};
_onEditDeleteStart = () => {
@@ -209,6 +211,7 @@ class DrawTools extends Component {
} else {
this.makeGeoJSON(null, layer);
}
+ return true;
});
};
@@ -223,14 +226,16 @@ class DrawTools extends Component {
idsToDelete.map(layer => {
let geoJSON = {
data: layer.toGeoJSON(),
- mapDrawingId: layer.options.id
+ mapDrawingId: layer.options.id,
+ drawingIsActive: false
};
- this.props.sendGeoJSON(geoJSON, true);
+ this.props.sendGeoJSON(geoJSON);
+ return true;
});
};
- shouldComponentUpdate() {
+ shouldComponentUpdate(nextProps, nextState) {
// disable re-rendering when edit mode is active
return !this.state.editModeActive;
}
@@ -326,9 +331,9 @@ class DrawTools extends Component {
className="editable"
interactive={true}
>
- <div class="editable">
+ <div className="editable">
<div
- contenteditable="true"
+ contentEditable="true"
placeholder="Click out to save"
>
{text}
@@ -388,6 +393,7 @@ class DrawTools extends Component {
/>
);
}
+ return null;
})}
</FeatureGroup>
);
diff --git a/src/components/GameList.js b/src/components/GameList.js
index aa8d330e37d218f20bba5598deb772e862abd96f..9a56d3626985c58608d92bbcde2b28720829a536 100644
--- a/src/components/GameList.js
+++ b/src/components/GameList.js
@@ -36,7 +36,7 @@ class GameList extends React.Component {
? games[0].id
: undefined
});
- // taking the initialized gameID to UserMap.js (GameList.js -> Header.js -> App.js -> UserMap.js)
+ // taking the initialized gameID to App.js (GameList.js -> GameSidebar.js -> Header.js -> App.js)
this.props.handleGameChange(games[0].id);
})
.catch(error => {
@@ -45,15 +45,11 @@ class GameList extends React.Component {
}
handleChange = e => {
- this.setState(
- {
- selectedGame: e.target.value
- },
- () => {
- // taking the changed gameID to UserMap.js (GameList.js -> Header.js -> App.js -> UserMap.js)
- //this.props.handleGameChange(this.state.selectedGame);
- }
- );
+ this.setState({
+ selectedGame: e.target.value
+ });
+ // taking the changed gameID to App.js (GameList.js -> GameSidebar.js -> Header.js -> App.js)
+ this.props.handleGameChange(e.target.value);
};
handleEditClick = e => {
diff --git a/src/components/GameSidebar.js b/src/components/GameSidebar.js
index 0511cdc3e9762a1e027a7f180ff8112289e5d311..5d4bad34caef03d5895ceb3d62167a553d6676b4 100644
--- a/src/components/GameSidebar.js
+++ b/src/components/GameSidebar.js
@@ -16,7 +16,7 @@ export default class GameSidebar extends React.Component {
render() {
return (
<div className="game-sidebar">
- <GameList />
+ <GameList handleGameChange={this.props.handleGameChange} />
{this.props.loggedIn && (
<button id="newGameButton" onClick={() => this.toggleView("newgame")}>
New Game
diff --git a/src/components/Header.js b/src/components/Header.js
index d83e7aad5577a9a9a8537e8b11a2c8a4a93b929c..1faedbbcd01873cc0179bfe91c29e38d3ab50b0f 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -100,7 +100,10 @@ class Header extends React.Component {
Tools
</button>
{this.state.sidebar && (
- <GameSidebar loggedIn={this.state.username ? true : false} />
+ <GameSidebar
+ loggedIn={this.state.username ? true : false}
+ handleGameChange={this.props.handleGameChange}
+ />
)}
</div>
{this.state.form === "register" && (
diff --git a/src/components/Player.js b/src/components/Player.js
index 195cc40acbdc959c08b58da9b290bf44577f9e9f..078614209e63df32a8b4bc13340cfd7fa8a65c8f 100644
--- a/src/components/Player.js
+++ b/src/components/Player.js
@@ -5,11 +5,12 @@ class Player extends Component {
constructor(props) {
super(props);
this.state = {
- players: null
+ players: null,
+ timer: null
};
}
- getPlayers() {
+ getPlayers = () => {
fetch(
`${process.env.REACT_APP_API_URL}/tracking/players/${
this.props.currentGameId
@@ -26,45 +27,51 @@ class Player extends Component {
// don't do anything if data is not an array, as it breaks the map function at render
if (Array.isArray(data)) {
this.setState({
- players: data
+ players: data,
+ timer: null // state for updating player positions every minute
});
}
})
.catch(error => {
console.log(error);
});
- }
-
- componentDidMount() {
- // update components every 10 seconds
- this.interval = setInterval(() => this.setState(this.getPlayers()), 5000);
- }
+ };
shouldComponentUpdate(nextProps, nextState) {
// do not update component until players have been fetched and game ID is available
- if (this.state.players === null) {
- this.getPlayers();
+ if (this.props.currentGameId === null) {
return false;
- } else if (this.props.currentGameId === null) {
+ }
+ /*
+ if (this.props.socketSignal !== "tracking-update") {
+ return false;
+ }
+ */
+ return true;
+ /*
+ if (nextProps.currentGameId === null) {
+ return false;
+ } else if (this.state.players === null) {
+ this.getPlayers();
return false;
} else {
return true;
}
+ */
}
- componentDidUpdate() {
- // check if game ID has changed
- if (this.state.currentGameId !== this.props.currentGameId) {
- this.setState({
- currentGameId: this.props.currentGameId
- });
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.socketSignal === "tracking-update") {
+ // start updating interval
+ if (prevState.timer === null) {
+ this.getPlayers();
+ this.setState({
+ timer: setInterval(this.getPlayers, 60000)
+ });
+ }
}
}
- componentWillUnmount() {
- clearInterval(this.interval);
- }
-
render() {
return (
<div>
diff --git a/src/components/Socket.js b/src/components/Socket.js
new file mode 100644
index 0000000000000000000000000000000000000000..06cc2fd899f90ce897e5bbecdd598410aca02cb1
--- /dev/null
+++ b/src/components/Socket.js
@@ -0,0 +1,62 @@
+import React from "react";
+import io from "socket.io-client";
+
+const socketUrl = process.env.REACT_APP_API_URL;
+
+export default class ClientSocket extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ // stores the socket object for notifications
+ sock: null,
+ // stores updates sent by socket
+ update: null
+ };
+ }
+
+ // initiate the socket on component mount
+ async componentWillMount() {
+ console.log("hi socket");
+ // need to explicitly update drawings and trackings when gameID first becomes available
+ if (this.props.gameId !== null) {
+ await this.props.getSocketSignal("drawing-update");
+ await this.props.getSocketSignal("tracking-update");
+ }
+ this.initSocket();
+ }
+
+ shouldComponentUpdate(nextProps, nextState) {
+ // re-initialize socket when gameId has changed
+ if (nextProps.gameId !== this.props.gameId) {
+ this.initSocket();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ // disconnect the socket on component dismount
+ componentWillUnmount() {
+ console.log("bye socket");
+ this.state.sock.disconnect();
+ }
+
+ initSocket = () => {
+ const socket = io(socketUrl);
+
+ // set the socket to listen gameId-thread
+ socket.on(this.props.gameId, data => {
+ console.log(data);
+ this.props.getSocketSignal(data.type);
+ // check socket update type
+ this.setState({ update: data.type });
+ });
+
+ this.setState({ sock: socket });
+ };
+
+ render() {
+ return this.state.update;
+ }
+}
diff --git a/src/components/UserMap.js b/src/components/UserMap.js
index d1e3f86927e264a3e337574b29597eaa0941b744..c5347fa78df07b4092296702fae1e70ee1704f8f 100644
--- a/src/components/UserMap.js
+++ b/src/components/UserMap.js
@@ -19,6 +19,7 @@ class UserMap extends Component {
};
this.sendGeoJSON = this.sendGeoJSON.bind(this);
+ this.fetchGeoJSON = this.fetchGeoJSON.bind(this);
this.setCurrentPosition = this.setCurrentPosition.bind(this);
this.watchPositionId = null;
}
@@ -29,64 +30,41 @@ class UserMap extends Component {
});
}
- componentDidUpdate() {
- // check if game ID has changed and fetch that game's drawings
- if (this.state.currentGameId !== this.props.currentGameId) {
- this.setState({
- currentGameId: this.props.currentGameId
- });
- this.fetchGeoJSON();
+ shouldComponentUpdate(nextProps, nextState) {
+ if (nextProps.currentGameId === null) {
+ return false;
}
+
+ return true;
}
- // Sends the players drawings to the backend (and database)
- sendGeoJSON(layerToDatabase, isDeleted) {
- // isDeleted is used to determine the drawing's drawingIsActive status
- // otherwise the fetch functions are the same in both if and else. any smarter way to do this?
- if (isDeleted === true) {
- fetch(
- `${process.env.REACT_APP_API_URL}/draw/mapdrawing/${
- this.props.currentGameId
- }`,
- {
- method: "PUT",
- headers: {
- Authorization: "Bearer " + sessionStorage.getItem("token"),
- Accept: "application/json",
- "Content-Type": "application/json"
- },
- body: JSON.stringify({
- type: "FeatureCollection",
- drawingIsActive: false,
- mapDrawingId: layerToDatabase.mapDrawingId,
- data: layerToDatabase.data
- })
- }
- );
- } else {
- fetch(
- `${process.env.REACT_APP_API_URL}/draw/mapdrawing/${
- this.props.currentGameId
- }`,
- {
- method: "PUT",
- headers: {
- Authorization: "Bearer " + sessionStorage.getItem("token"),
- Accept: "application/json",
- "Content-Type": "application/json"
- },
- body: JSON.stringify({
- type: "FeatureCollection",
- drawingIsActive: true,
- mapDrawingId: layerToDatabase.mapDrawingId,
- data: layerToDatabase.data
- })
- }
- );
+ componentDidUpdate(prevProps, prevState) {
+ if (prevProps.socketSignal === "drawing-update") {
+ this.fetchGeoJSON();
}
+ }
- // get the layers again to stop updating with old objects
- this.fetchGeoJSON();
+ // Sends the players drawings to the backend (and database)
+ sendGeoJSON(layerToDatabase) {
+ fetch(
+ `${process.env.REACT_APP_API_URL}/draw/mapdrawing/${
+ this.props.currentGameId
+ }`,
+ {
+ method: "PUT",
+ headers: {
+ Authorization: "Bearer " + sessionStorage.getItem("token"),
+ Accept: "application/json",
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify({
+ type: "FeatureCollection",
+ drawingIsActive: layerToDatabase.drawingIsActive,
+ mapDrawingId: layerToDatabase.mapDrawingId,
+ data: layerToDatabase.data
+ })
+ }
+ );
}
// Get the drawings from the backend and add them to the state, so they can be drawn
@@ -107,6 +85,7 @@ class UserMap extends Component {
let newFeatures = [];
data.map(item => {
newFeatures.push(item);
+ return true;
});
this.setState({
@@ -197,7 +176,10 @@ class UserMap extends Component {
</Popup>
</Marker>
)}
- <Player currentGameId={this.state.currentGameId} />
+ <Player
+ currentGameId={this.props.currentGameId}
+ socketSignal={this.props.socketSignal}
+ />
</Map>
);
}