diff --git a/.gitignore b/.gitignore index c2658d7..35e652f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules/ +leaderboard.json \ No newline at end of file diff --git a/output/.gitignore b/output/.gitignore new file mode 100644 index 0000000..1c471ba --- /dev/null +++ b/output/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# Ignore all files in this dir... +* + +# ... except for this one. +!.gitignore \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 6788833..4bee87a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,960 @@ { "name": "nodejs-express-multer-multipartfile-ajax-jquery-bootstrap", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "nodejs-express-multer-multipartfile-ajax-jquery-bootstrap", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^4.16.3", + "line-reader": "^0.4.0", + "multer": "^1.3.0", + "node-docker-api": "^1.1.22", + "readline-sync": "^1.4.10", + "socket.io": "^3.0.4", + "strip-ansi": "^6.0.0" + } + }, + "node_modules/@types/component-emitter": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", + "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==" + }, + "node_modules/@types/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==" + }, + "node_modules/@types/cors": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz", + "integrity": "sha512-zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg==" + }, + "node_modules/@types/node": { + "version": "14.14.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.14.tgz", + "integrity": "sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==" + }, + "node_modules/accepts": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "dependencies": { + "mime-types": "~2.1.18", + "negotiator": "0.6.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/append-field": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz", + "integrity": "sha1-bdxY+gg8e8VF08WZWygwzCNm1Eo=" + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/base64-arraybuffer": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", + "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=", + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/base64id": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", + "engines": { + "node": "^4.5.0 || >= 5.9" + } + }, + "node_modules/body-parser": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "dependencies": { + "bytes": "3.0.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.1", + "http-errors": "~1.6.2", + "iconv-lite": "0.4.19", + "on-finished": "~2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "~1.6.15" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==" + }, + "node_modules/busboy": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz", + "integrity": "sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=", + "dependencies": { + "dicer": "0.2.5", + "readable-stream": "1.1.x" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/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==" + }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "engines": [ + "node >= 0.8" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/concat-stream/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "node_modules/concat-stream/node_modules/readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/concat-stream/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/cors/node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/dicer": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", + "integrity": "sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=", + "dependencies": { + "readable-stream": "1.1.x", + "streamsearch": "0.1.2" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/docker-modem": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-0.3.7.tgz", + "integrity": "sha1-P1ENCfXTNNwhNCKPkr00RnEiffQ=", + "dependencies": { + "debug": "^2.6.0", + "JSONStream": "0.10.0", + "readable-stream": "~1.0.26-4", + "split-ca": "^1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/docker-modem/node_modules/readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/engine.io": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-4.0.5.tgz", + "integrity": "sha512-Ri+whTNr2PKklxQkfbGjwEo+kCBUM4Qxk4wtLqLrhH+b1up2NFL9g9pjYWiCV/oazwB0rArnvF/ZmZN2ab5Hpg==", + "dependencies": { + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.1.0", + "engine.io-parser": "~4.0.0", + "ws": "^7.1.2" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io-parser": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", + "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", + "dependencies": { + "base64-arraybuffer": "0.1.4" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/engine.io/node_modules/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/engine.io/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/engine.io/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", + "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "dependencies": { + "accepts": "~1.3.5", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "~1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.1.1", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.3", + "qs": "6.5.1", + "range-parser": "~1.2.0", + "safe-buffer": "5.1.1", + "send": "0.16.2", + "serve-static": "1.13.2", + "setprototypeof": "1.1.0", + "statuses": "~1.4.0", + "type-is": "~1.6.16", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/finalhandler": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.4.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ipaddr.js": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", + "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "node_modules/jsonparse": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", + "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=", + "engines": [ + "node >= 0.2.0" + ] + }, + "node_modules/JSONStream": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz", + "integrity": "sha1-dDSdDYlSK3HzDwoD/5vSDKbxKsA=", + "dependencies": { + "jsonparse": "0.0.5", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "index.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/line-reader": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/line-reader/-/line-reader-0.4.0.tgz", + "integrity": "sha1-F+RIGNoKwzVnW6MAlU+U72cOZv0=" + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "bin": { + "mime": "cli.js" + } + }, + "node_modules/mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "dependencies": { + "mime-db": "~1.33.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + }, + "node_modules/mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dependencies": { + "minimist": "0.0.8" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/multer": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz", + "integrity": "sha1-CSsmcPaEb6SRSWXvyM+Uwg/sbNI=", + "dependencies": { + "append-field": "^0.1.0", + "busboy": "^0.2.11", + "concat-stream": "^1.5.0", + "mkdirp": "^0.5.1", + "object-assign": "^3.0.0", + "on-finished": "^2.3.0", + "type-is": "^1.6.4", + "xtend": "^4.0.0" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/node-docker-api": { + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/node-docker-api/-/node-docker-api-1.1.22.tgz", + "integrity": "sha1-IwMn79MJpuxzAr8/QEq3YAQKWAY=", + "dependencies": { + "docker-modem": "^0.3.1", + "memorystream": "^0.3.1" + } + }, + "node_modules/object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "node_modules/process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" + }, + "node_modules/proxy-addr": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", + "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", + "dependencies": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.6.0" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "dependencies": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body/node_modules/http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dependencies": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": ">= 1.3.1 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body/node_modules/setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" + }, + "node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/readline-sync": { + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz", + "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "node_modules/send": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", + "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "~2.3.0", + "range-parser": "~1.2.0", + "statuses": "~1.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.2", + "send": "0.16.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + }, + "node_modules/socket.io": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-3.0.4.tgz", + "integrity": "sha512-Vj1jUoO75WGc9txWd311ZJJqS9Dr8QtNJJ7gk2r7dcM/yGe9sit7qOijQl3GAwhpBOz/W8CwkD7R6yob07nLbA==", + "dependencies": { + "@types/cookie": "^0.4.0", + "@types/cors": "^2.8.8", + "@types/node": "^14.14.7", + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "debug": "~4.1.0", + "engine.io": "~4.0.0", + "socket.io-adapter": "~2.0.3", + "socket.io-parser": "~4.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io-adapter": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz", + "integrity": "sha512-2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==" + }, + "node_modules/socket.io-parser": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz", + "integrity": "sha512-Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g==", + "dependencies": { + "@types/component-emitter": "^1.2.10", + "component-emitter": "~1.3.0", + "debug": "~4.1.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io-parser/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/socket.io-parser/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/socket.io/node_modules/debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/socket.io/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/split-ca": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz", + "integrity": "sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY=" + }, + "node_modules/statuses": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, + "node_modules/strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dependencies": { + "ansi-regex": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "node_modules/type-is": { + "version": "1.6.16", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", + "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.18" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/ws": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz", + "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==", + "engines": { + "node": ">=8.3.0" + } + }, + "node_modules/xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "engines": { + "node": ">=0.4" + } + } + }, "dependencies": { "@types/component-emitter": { "version": "1.2.10", @@ -24,15 +976,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.14.tgz", "integrity": "sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ==" }, - "JSONStream": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz", - "integrity": "sha1-dDSdDYlSK3HzDwoD/5vSDKbxKsA=", - "requires": { - "jsonparse": "0.0.5", - "through": ">=2.2.7 <3" - } - }, "accepts": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", @@ -42,6 +985,11 @@ "negotiator": "0.6.1" } }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, "append-field": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz", @@ -216,8 +1164,8 @@ "resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-0.3.7.tgz", "integrity": "sha1-P1ENCfXTNNwhNCKPkr00RnEiffQ=", "requires": { - "JSONStream": "0.10.0", "debug": "^2.6.0", + "JSONStream": "0.10.0", "readable-stream": "~1.0.26-4", "split-ca": "^1.0.0" }, @@ -394,6 +1342,20 @@ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=" }, + "JSONStream": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz", + "integrity": "sha1-dDSdDYlSK3HzDwoD/5vSDKbxKsA=", + "requires": { + "jsonparse": "0.0.5", + "through": ">=2.2.7 <3" + } + }, + "line-reader": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/line-reader/-/line-reader-0.4.0.tgz", + "integrity": "sha1-F+RIGNoKwzVnW6MAlU+U72cOZv0=" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -571,6 +1533,11 @@ "string_decoder": "~0.10.x" } }, + "readline-sync": { + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz", + "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==" + }, "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", @@ -693,6 +1660,14 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", diff --git a/package.json b/package.json index 090c2fb..ae03f5d 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,11 @@ "license": "ISC", "dependencies": { "express": "^4.16.3", + "line-reader": "^0.4.0", "multer": "^1.3.0", "node-docker-api": "^1.1.22", - "socket.io": "^3.0.4" + "readline-sync": "^1.4.10", + "socket.io": "^3.0.4", + "strip-ansi": "^6.0.0" } } diff --git a/resources/static/css/style.css b/resources/static/css/style.css index 2fa428c..43281fb 100644 --- a/resources/static/css/style.css +++ b/resources/static/css/style.css @@ -52,22 +52,61 @@ body::after { color: #000 !important; } +.project-tab #tabs{ + background: #007b5e; + border: 1px solid transparent; + color: #eee; +} + +.project-tab #tabs .nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active { + color: #000; + /* background-color: transparent; */ + /* border-color: transparent transparent #111; */ + border: 1px solid; + border-top-left-radius: .25rem; + border-top-right-radius: .25rem; + /* border-bottom: 3px solid !important; */ + font-weight: bold; +} + +.project-tab .nav-link:hover { + border-color: #111; + color: #888; +} + +.project-tab .nav-link { + border: 1px solid; + border-color: #bbb; + border-top-left-radius: .25rem; + border-top-right-radius: .25rem; + color: #BBB; + font-weight: 600; +} + + #console-box { height: 50%; } #console { list-style: none; - -webkit-padding-start: 0; - -webkit-margin-after: 0; - -webkit-margin-before: 1em; - border: 1px solid #000; overflow-y: auto; width: 100%; - background: #333; - color: #fff; height: 200px; max-height: 200px; + + font-family: "Ubuntu Mono", "Lucida Console"; + + padding-left: 15px; + padding-top: 15px; + + border-top-right-radius: 1%; + border-top-left-radius: 1%; + border: 1px solid #000; + box-shadow: 0 0 10px rgba(0,0,0,0.3); + + color: #AAA; + background: #333; } .box-shadow { diff --git a/resources/static/js/getrequest.js b/resources/static/js/getrequest.js index 8b7aac9..3ed2612 100644 --- a/resources/static/js/getrequest.js +++ b/resources/static/js/getrequest.js @@ -14,7 +14,7 @@ $( document ).ready( () => { } }); - $("a").on('click', function(event) { + $(".navbar a").on('click', function(event) { // Make sure this.hash has a value before overriding default behavior if (this.hash !== "") { // Prevent default anchor click behavior @@ -42,6 +42,56 @@ $( document ).ready( () => { } }); + $('#submission_info').hide(); + $('#ulysses16_submit').hide(); + $('#att48_submit').hide(); + $('#st70_submit').hide(); + $('#a280_submit').hide(); + $('#pcb442_submit').hide(); + $('#dsj1000_submit').hide(); + + $( "#ulysses16_submit" ).click(function() { + upload_loaderboard('ulysses16'); + $('#ulysses16_submit').removeClass('btn-primary'); + $('#ulysses16_submit').text('Submitted'); + $('#ulysses16_submit').prop('disabled', true); + }); + + $( "#att48_submit" ).click(function() { + upload_loaderboard('att48'); + $('#att48_submit').removeClass('btn-primary'); + $('#att48_submit').text('Submitted'); + $('#att48_submit').prop('disabled', true); + }); + + $( "#st70_submit" ).click(function() { + upload_loaderboard('st70'); + $('#st70_submit').removeClass('btn-primary'); + $('#st70_submit').text('Submitted'); + $('#st70_submit').prop('disabled', true); + }); + + $( "#a280_submit" ).click(function() { + upload_loaderboard('a280'); + $('#a280_submit').removeClass('btn-primary'); + $('#a280_submit').text('Submitted'); + $('#a280_submit').prop('disabled', true); + }); + + $( "#pcb442_submit" ).click(function() { + upload_loaderboard('pcb442'); + $('#pcb442_submit').removeClass('btn-primary'); + $('#pcb442_submit').text('Submitted'); + $('#pcb442_submit').prop('disabled', true); + }); + + $( "#dsj1000_submit" ).click(function() { + upload_loaderboard('dsj1000'); + $('#dsj1000_submit').removeClass('btn-primary'); + $('#dsj1000_submit').text('Submitted'); + $('#dsj1000_submit').prop('disabled', true); + }); + // initialize with defaults // $("#uploadfile").fileinput(); diff --git a/resources/static/js/postrequest.js b/resources/static/js/postrequest.js index bf9a068..81df53f 100644 --- a/resources/static/js/postrequest.js +++ b/resources/static/js/postrequest.js @@ -3,22 +3,122 @@ window.onbeforeunload = function(){ return "Make sure to save your graph locally before leaving"; }; +var my_res = {}; +my_res.ulysses16 = {} +my_res.att48 = {} +my_res.st70 = {} +my_res.a280 = {} +my_res.pcb442 = {} +my_res.dsj1000 = {} + +my_res.ulysses16.fitness = -1; +my_res.att48.fitness = -1; +my_res.st70.fitness = -1; +my_res.a280.fitness = -1; +my_res.pcb442.fitness = -1; +my_res.dsj1000.fitness = -1; + var socket = io(); socket.on('connect', () => { - $("#session_id").text(socket.id); + $("#status").removeClass('badge-secondary'); + $("#status").addClass('badge-primary'); window.id = socket.id console.log('Session Id: ', socket.id); // an alphanumeric id... }); +socket.on('disconnect', () => { + $("#status").removeClass('badge-primary'); + $("#status").addClass('badge-secondary'); + $("#status").text('offline'); +}); + + socket.on('users_count', (clients) => { - $("#user_counts").text(clients); + $("#status").text(clients + ' online'); }); socket.on('start', () => { console.log('Building start'); }); +socket.on('leaderboard', (obj) => { + console.log(obj); + $(".leaderboard-table").find("tr:not(:first):not(:last)").remove(); + obj.ulysses16.forEach(element => { + $('#ulysses16-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + obj.att48.forEach(element => { + $('#att48-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + obj.st70.forEach(element => { + $('#st70-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + obj.a280.forEach(element => { + $('#a280-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + obj.pcb442.forEach(element => { + $('#pcb442-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + obj.dsj1000.forEach(element => { + $('#dsj1000-last').before('' + element.name + '' + element.fitness + '' + element.desc + '') + }); + + $('#ulysses16_best').text(obj.ulysses16[0].fitness); + $('#att48_best').text(obj.att48[0].fitness); + $('#st70_best').text(obj.st70[0].fitness); + $('#a280_best').text(obj.a280[0].fitness); + $('#pcb442_best').text(obj.pcb442[0].fitness); + $('#dsj1000_best').text(obj.dsj1000[0].fitness); +}); + +socket.on('update', (msg) => { + // var msg = msg.replace(/\x1b[[0-9;]*[a-zA-Z]/g, ''); + msg = msg.replace(/[^\x20-\x7E]/g, '') + if(msg[1] == '[') { + msg = msg.substring(1); + } + console.log(msg); +}); + +socket.on('result', (res) => { + // console.log(res) + res = JSON.parse(res); + $('#submission_info').show(); + res.forEach(e => { + if(e.name === "ulysses16.txt") { + my_res.ulysses16.fitness = e.fitness + $("#ulysses16_your").text(e.fitness); + $('#ulysses16_submit').show(); + } + if(e.name === "att48.txt") { + my_res.att48.fitness = e.fitness + $("#att48_your").text(e.fitness); + $('#att48_submit').show(); + } + if(e.name === "st70.txt") { + my_res.st70.fitness = e.fitness + $("#st70_your").text(e.fitness) + $('#st70_submit').show(); + } + if(e.name === "a280.txt") { + my_res.a280.fitness = e.fitness + $("#a280_your").text(e.fitness) + $('#a280_submit').show(); + } + if(e.name === "pcb442.txt") { + my_res.pcb442.fitness = e.fitness + $("#pcb442_your").text(e.fitness) + $('#pcb442_submit').show(); + } + if(e.name === "dsj1000.txt") { + my_res.dsj1000.fitness = e.fitness + $("#dsj1000_your").text(e.fitness) + $('#dsj1000_submit').show(); + } + }); +}); + $(document).ready( () => { $("#btnSubmit").click((event) => { //stop submit the form, we will post it manually. @@ -42,7 +142,36 @@ $(document).ready( () => { } }); }); - + +function upload_loaderboard(name) { + obj = {} + obj.name = name; + data = {} + if(name === 'ulysses16') { + data.fitness = my_res.ulysses16.fitness; + } + else if (name === 'att48') { + data.fitness = my_res.att48.fitness; + } + else if (name === 'st70') { + data.fitness = my_res.st70.fitness; + } + else if (name === 'a280') { + data.fitness = my_res.a280.fitness; + } + else if (name === 'pcb442') { + data.fitness = my_res.pcb442.fitness; + } + else if (name === 'dsj1000') { + data.fitness = my_res.dsj1000.fitness; + } + data.name = $('#submit_name').val(); + data.desc = $('#submit_desc').val() + data.time = Date.now() + obj.data = data; + socket.emit('submit', obj); +} + function doAjax() { // Get form diff --git a/server.js b/server.js index e992efd..489ca7b 100644 --- a/server.js +++ b/server.js @@ -1,72 +1,311 @@ -const fs = require('fs'); -var express = require('express'); -var app = express(); -var router = express.Router(); -var upload = require('./app/config/multer.config.js'); +const fs = require('fs') +var express = require('express') +var app = express() +var router = express.Router() +var upload = require('./app/config/multer.config.js') -const {Docker} = require('node-docker-api'); - -const docker = new Docker({ socketPath: '/var/run/docker.sock' }); +const {Docker} = require('node-docker-api') +const { time } = require('console') +const lineReader = require('line-reader'); -global.__basedir = __dirname; +const docker = new Docker({ socketPath: '/var/run/docker.sock' }) +const stripAnsi = require('strip-ansi'); -app.use(express.static('resources')); +global.__basedir = __dirname -var http = require('http').createServer(app); -var io = require('socket.io')(http); +app.use(express.static('resources')) -var docker_build = (socket, sessionID) => { - console.log('[server][start]', sessionID); - socket.emit('start') - path = process.cwd() - fs.mkdir(path + '/output/' + sessionID.toString(), () => { - socket.emit('update', 'Output directort created.') - }) - docker.container.create({ - Image: 'python:3.8', - Cmd: [ '/bin/bash', '-c', 'cd /tsp && pip install -r requirements.txt && python main.py data/simple/ulysses16.tsp && cp output/* /output' ], - HostConfig: { - Binds: [ - path.toString() + '/com2014-template:/tsp', - path.toString() + "/output/" + sessionID.toString() + "/output" - ] - } - }) - .then(container => container.start()) - .then(container => container.logs({ - follow: true, - stdout: true, - stderr: true - })) - .then(stream => { - stream.on('data', info => socket.emit('update', new Buffer.from(info).toString('ascii'))) - stream.on('error', err => console.log(err)) - }) - .catch(error => console.log(error)); +var http = require('http').createServer(app) +var io = require('socket.io')(http) + +var readlineSync = require('readline-sync'); + +const path = require('path'); +current_path = process.cwd() + +var leaderboard = {} +leaderboard.ulysses16 = [] +leaderboard.att48 = [] +leaderboard.st70 = [] +leaderboard.a280 = [] +leaderboard.pcb442 = [] +leaderboard.dsj1000 = [] + +var update_leaderboard = (obj) => { + if(obj.name === 'ulysses16') { + leaderboard.ulysses16.push(obj.data) + } + else if (obj.name === 'att48') { + leaderboard.att48.push(obj.data) + } + else if (obj.name === 'st70') { + leaderboard.st70.push(obj.data) + } + else if (obj.name === 'a280') { + leaderboard.a280.push(obj.data) + } + else if (obj.name === 'pcb442') { + leaderboard.pcb442.push(obj.data) + } + else if (obj.name === 'dsj1000') { + leaderboard.dsj1000.push(obj.data) + } + leaderboard.ulysses16.sort(function(a, b){return a.fitness - b.fitness}) + leaderboard.ulysses16 = leaderboard.ulysses16.slice(0,10) + + leaderboard.att48.sort(function(a, b){return a.fitness - b.fitness}).slice(0,10) + leaderboard.att48 = leaderboard.att48.slice(0,10) + + leaderboard.st70.sort(function(a, b){return a.fitness - b.fitness}).slice(0,10) + leaderboard.st70 = leaderboard.st70.slice(0,10) + + leaderboard.a280.sort(function(a, b){return a.fitness - b.fitness}) + leaderboard.a280 = leaderboard.a280.slice(0,10) + + leaderboard.pcb442.sort(function(a, b){return a.fitness - b.fitness}) + leaderboard.pcb442 = leaderboard.pcb442.slice(0,10) + + leaderboard.dsj1000.sort(function(a, b){return a.fitness - b.fitness}) + leaderboard.dsj1000 = leaderboard.dsj1000.slice(0,10) + + write_leaderboard() +} + +var write_leaderboard = () => { + fs.writeFile('leaderboard.json', JSON.stringify(leaderboard), (err) => { + if (err) throw err; + console.log('Data written to file'); + }); +} + +try { + if (fs.existsSync('leaderboard.json')) { + //file exists + leaderboard = require('./leaderboard.json'); + console.log(leaderboard); + } + else { + write_leaderboard(); + } +} +catch(err) { + console.error(err) +} + +var res = []; + +var update_submission = (socket, sessionID) => { + console.log('check result') + var output_dir = current_path.toString() + '/output/' + sessionID + '/' + console.log(output_dir) + if (output_dir.length != 0) + { + res = [] + socket.emit('update', 'Got output') + fs.readdir(output_dir, (err, files) => { + if (err) { + console.log(err); + return; + } + console.log('iterate') + + files.forEach(file => { + console.log(file) + console.log(path.extname(file)) + if (path.extname(file) === '.txt') { + + var i = 0 + var obj = {} + obj.name = file + console.log(output_dir + file) + + try { + // read contents of the file + const data = fs.readFileSync(output_dir + file, 'UTF-8'); + + // split the contents by new line + const lines = data.split(/\r?\n/); + + // print all lines + lines.forEach((line) => { + console.log(line) + i = i + 1 + // console.log(line) + if(i == 1) { + var fitness = parseFloat(line) + if(fitness < 0) { + obj.fitness = parseInt(line) + } + else { + obj.fitness = fitness + } + } + else if (i == 2) { + if(obj.fitness > 0) { + solution_array = line.split(","); + for(var j = 0; j < solution_array.length; j++) { + solution_array[i] = parseInt(solution_array[i], 10); + } + obj.solution = solution_array + } + else { + obj.solution = [] + } + } + }); + } catch (err) { + console.error(err); + } + res.push(obj) + } + }); + // console.log(res) + socket.emit('result', JSON.stringify(res)) + }); + } + else { + console.log('no result') + } }; -var clients = 0; + +var docker_build = (socket, sessionID) => { + console.log('[server][start]', sessionID) + socket.emit('start') + + fs.mkdir(current_path + '/output/' + sessionID.toString(), () => { + socket.emit('update', 'Output directort created.') + socket.emit('update', 'Test started, this may take a while.') + }) + { + if (fs.existsSync(current_path.toString() + '/uploads/' + sessionID.toString() + '/requirements.txt')) + { + //file exists + docker.container.create({ + Image: 'com2014-tsp', + HostConfig: { + Binds: [ + current_path.toString() + '/uploads/' + sessionID.toString() + '/requirements.txt:/tsp/requirements.txt', + current_path.toString() + "/output/" + sessionID.toString() + ":/output" + ] + } + }) + .then( (container) => { + container_id = container.data.Id + socket.emit('update','Container Id: ' + container_id) + return container.start() + }) + .then(container => container.logs({ + follow: true, + stdout: true, + stderr: true + })) + .then(stream => { + stream.on('data', info => socket.emit('update', new Buffer.from(info).toString('ascii'))) + stream.on('error', err => console.log(err)) + }) + .catch(error => console.log(error)) + } + else + { + docker.container.create({ + Image: 'com2014-tsp', + HostConfig: { + Binds: [ + current_path.toString() + "/output/" + sessionID.toString() + ":/output" + ] + } + }) + .then( (container) => { + container_id = container.data.Id + socket.emit('update','Container Id: ' + container_id) + return container.start() + }) + .then(container => container.logs({ + follow: true, + stdout: true, + stderr: true + })) + .then(stream => { + stream.on('data', (info) => { + console.log(stripAnsi(new Buffer.from(info).toString())) + socket.emit('update', stripAnsi(new Buffer.from(info).toString('ascii'))) + }), + stream.on('error', err => console.log(err)) + }) + .catch(error => console.log(error)) + } + + var intervalObj; + var timeoutObj; + + intervalObj = setInterval(() => { + if(!finished) + { + docker.container.list({all:true}) + // Inspect + .then((containers) => { + containers.forEach(container => { + if(container.data.Id == container_id) { + socket.emit('update', 'Container Status: ' + container.data.State) + if(container.data.State === 'exited') + { + finished = true; + clearInterval(intervalObj); + clearTimeout(timeoutObj); + socket.emit('update', 'Test end') + update_submission(socket, sessionID); + } + } + }); + }) + .catch(error => console.log(error)) + } + }, 2000); + + var finished = false + // call the rest of the code and have it execute after 3 seconds + timeoutObj = setTimeout(() => { + console.log('end') + if(!finished) + { + clearInterval(intervalObj); + socket.emit('update', 'timeout') + } + }, 20000) + } +} + +var clients = 0 io.on('connection', (socket) => { - const sessionID = socket.id; - console.log('[client][connection]', sessionID); - clients = clients + 1; - io.sockets.emit('users_count', clients); + const sessionID = socket.id + console.log('[client][connection]', sessionID) + clients = clients + 1 + io.sockets.emit('users_count', clients) + console.log(leaderboard) + socket.emit('leaderboard', leaderboard) socket.on('disconnect', () => { - clients = clients - 1; + clients = clients - 1 console.log('[client][disconnect]', sessionID) - io.sockets.emit('users_count', clients); - }); + io.sockets.emit('users_count', clients) + }) socket.on('build', () => { - console.log('[client][build]', sessionID); - docker_build(socket, sessionID); - }); + console.log('[client][build]', sessionID) + docker_build(socket, sessionID) + }) -}); + socket.on('submit', (obj) => { + console.log('[client][submit]', sessionID) + update_leaderboard(obj) + io.emit('leaderboard', leaderboard) + }) -require('./app/routers/file.router.js')(app, router, upload); +}) + +require('./app/routers/file.router.js')(app, router, upload) // Create a Server var server = http.listen(8081, () => { @@ -74,5 +313,5 @@ var server = http.listen(8081, () => { var host = server.address().address var port = server.address().port - console.log("App listening at http://%s:%s", host, port); + console.log("App listening at http://%s:%s", host, port) }) diff --git a/views/index.html b/views/index.html index ea5d2d1..8ba59f2 100644 --- a/views/index.html +++ b/views/index.html @@ -29,6 +29,8 @@ + + @@ -39,7 +41,7 @@