From 581cb4910d0fd4720dfa33ec87ff12c4e3f49faa Mon Sep 17 00:00:00 2001 From: Gabriel Camacho Date: Wed, 28 Sep 2022 15:46:50 -0400 Subject: [PATCH 01/36] Our project proposal --- Proposal.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Proposal.txt diff --git a/Proposal.txt b/Proposal.txt new file mode 100644 index 000000000..7223ad575 --- /dev/null +++ b/Proposal.txt @@ -0,0 +1,23 @@ +Associates +Gabriel Camacho +Aidan Mulcahey +Jonathan Palmieri + + + + + +**Specifications** +We are going to create a game featuring a log in system and a leaderboard. +The highest game score per user will be stored on the user account and on a global leaderboard. +The game itself will be completely clientside, with the scores being sent to a mongDB instance at the end of the game. +We are going to create a 2D platforming game where the objective is for your player sprite to get from point A to point B +There will be collision obstacles. You get timed and score is based on time. + +Key technologies: +MongoDB - Store user info & leaderboard +Express - For backend +Authentication for login - An authentication library or with cookies +Mongoose for mongoDB - easier interaction with database +NodeJS - for obvious reasons +Game engine (in JS) to create game - experimenting with game engines and game design From f5f86b6e23a1bf7f50718409181bc00ce8e1d5ae Mon Sep 17 00:00:00 2001 From: jdpalmieri Date: Wed, 28 Sep 2022 15:58:07 -0400 Subject: [PATCH 02/36] nodemon --- .gitignore | 1 + package-lock.json | 587 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 22 ++ 3 files changed, 610 insertions(+) create mode 100644 .gitignore create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b512c09d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..7799a9ca4 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,587 @@ +{ + "name": "final_project", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "final_project", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "nodemon": "^2.0.20" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "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/nodemon": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", + "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", + "dependencies": { + "chokidar": "^3.5.2", + "debug": "^3.2.7", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^5.7.1", + "simple-update-notifier": "^1.0.7", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + }, + "bin": { + "nodemon": "bin/nodemon.js" + }, + "engines": { + "node": ">=8.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/nodemon" + } + }, + "node_modules/nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/simple-update-notifier": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", + "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "dependencies": { + "semver": "~7.0.0" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/simple-update-notifier/node_modules/semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dependencies": { + "nopt": "~1.0.10" + }, + "bin": { + "nodetouch": "bin/nodetouch.js" + } + }, + "node_modules/undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + } + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "requires": { + "ms": "^2.1.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + }, + "ignore-by-default": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "nodemon": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", + "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", + "requires": { + "chokidar": "^3.5.2", + "debug": "^3.2.7", + "ignore-by-default": "^1.0.1", + "minimatch": "^3.1.2", + "pstree.remy": "^1.1.8", + "semver": "^5.7.1", + "simple-update-notifier": "^1.0.7", + "supports-color": "^5.5.0", + "touch": "^3.1.0", + "undefsafe": "^2.0.5" + } + }, + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "requires": { + "abbrev": "1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + }, + "pstree.remy": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "requires": { + "picomatch": "^2.2.1" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "simple-update-notifier": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", + "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "requires": { + "semver": "~7.0.0" + }, + "dependencies": { + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + } + } + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "requires": { + "nopt": "~1.0.10" + } + }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 000000000..4ec36b270 --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "final_project", + "version": "1.0.0", + "description": "*Due before the start of class, October 13th (final day of the term)*", + "main": "s.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/gabestuf/final_project.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/gabestuf/final_project/issues" + }, + "homepage": "https://github.com/gabestuf/final_project#readme", + "dependencies": { + "nodemon": "^2.0.20" + } +} From 3eeda09f24a2c9ebe5c2a0643672a3fc6b8d69a2 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 30 Sep 2022 15:57:51 -0400 Subject: [PATCH 03/36] started working on model for REST api --- api.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 api.js diff --git a/api.js b/api.js new file mode 100644 index 000000000..595fef3f7 --- /dev/null +++ b/api.js @@ -0,0 +1,52 @@ +//Task for AIDAN: Research authentication + +const api = { + 'GET': [ + { + '/': 'home.html', + desc: 'serves home page to user, this page will have login/signup buttons' + }, + { + '/signup': 'signup.html', + desc: 'serves signup page' + }, + { + '/signin': 'signin.html', + desc: 'serves signin page' + }, + { + '/leaderboard': 'leaderboard.html', + desc: 'serves leaderboard page' + }, + { + '/profile/:user': 'profile.html', + desc: 'shows user profile, username, high score, option to change password' + }, + { + '/game': 'game.html', + desc: 'serves game page' + }, + { + '/getLeaderboard': { res: "array of scores" }, + desc: 'gets leaderboard info from mongoDB' + } + + ], + 'POST': [ + { + '/updateLeaderboard': { req: { username: username, authentication: authentication, score: score } }, + desc: 'Finds username, finds max score of that user, if this is higher, set user max score and replace users high score with this high score, resort list and send to mongo' + } + ] + +} + +//MONGODB Models +const User = { + username: String, + password: String, + highscore: int +} +const Leaderboard = { + leaderboard: String, // where String is array [{username: String, score: Int}, {username: String, score: Int}] +} \ No newline at end of file From 353b7104d27059f71c04fe8a514a388da9730dda Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Mon, 3 Oct 2022 01:31:35 -0400 Subject: [PATCH 04/36] init backend --- .gitignore | 3 +- api/User.js | 0 config/dbConn.js | 14 + models/User.js | 12 + package-lock.json | 1818 ++++++++++++++++++++++++++++++++++++- package.json | 4 + public/js/reactionGame.js | 3 + server.js | 20 + views/index.ejs | 16 + 9 files changed, 1879 insertions(+), 11 deletions(-) create mode 100644 api/User.js create mode 100644 config/dbConn.js create mode 100644 models/User.js create mode 100644 public/js/reactionGame.js create mode 100644 server.js create mode 100644 views/index.ejs diff --git a/.gitignore b/.gitignore index b512c09d4..1dcef2d9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -node_modules \ No newline at end of file +node_modules +.env \ No newline at end of file diff --git a/api/User.js b/api/User.js new file mode 100644 index 000000000..e69de29bb diff --git a/config/dbConn.js b/config/dbConn.js new file mode 100644 index 000000000..5fd96a6a3 --- /dev/null +++ b/config/dbConn.js @@ -0,0 +1,14 @@ +const mongoose = require('mongoose') + +const connectDB = async () => { + try { + await mongoose.connect(process.env.MONGODB_URI, { + useUnifiedTopology: true, + useNewUrlParser: true + }); + } catch (e) { + console.error(e) + } +} + +module.exports = connectDB \ No newline at end of file diff --git a/models/User.js b/models/User.js new file mode 100644 index 000000000..6e2513f8f --- /dev/null +++ b/models/User.js @@ -0,0 +1,12 @@ +const mongoose = require('mongoose') +const Schema = mongoose.Schema; + +const UserSchema = new Schema({ + username: String, + password: String, + userdata: String +}) + +const User = mongoose.model('User', UserSchema) + +module.exports = User; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7799a9ca4..f1c6640dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,18 +5,67 @@ "requires": true, "packages": { "": { - "name": "final_project", "version": "1.0.0", "license": "ISC", "dependencies": { + "dotenv": "^16.0.3", + "ejs": "^3.1.8", + "express": "^4.18.1", + "mime": "^1.6.0", + "mongoose": "^6.6.3", "nodemon": "^2.0.20" } }, + "node_modules/@types/node": { + "version": "18.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.0.tgz", + "integrity": "sha512-u+h43R6U8xXDt2vzUaVP3VwjjLyOJk6uEciZS8OSyziUQGOwmk+l+4drxcsDboHXwyTaqS1INebghmWMRxq3LA==" + }, + "node_modules/@types/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==" + }, + "node_modules/@types/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "dependencies": { + "@types/node": "*", + "@types/webidl-conversions": "*" + } + }, "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -29,11 +78,40 @@ "node": ">= 8" } }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -42,6 +120,42 @@ "node": ">=8" } }, + "node_modules/body-parser": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/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/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -62,6 +176,94 @@ "node": ">=8" } }, + "node_modules/bson": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz", + "integrity": "sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==", + "dependencies": { + "buffer": "^5.6.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -88,11 +290,59 @@ "fsevents": "~2.3.2" } }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "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.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "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": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, "node_modules/debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", @@ -101,6 +351,160 @@ "ms": "^2.1.1" } }, + "node_modules/denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/dotenv": { + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", + "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "node_modules/ejs": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz", + "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/express/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/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -112,6 +516,52 @@ "node": ">=8" } }, + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/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/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -125,6 +575,24 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/get-intrinsic": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -136,6 +604,17 @@ "node": ">= 6" } }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -144,11 +623,85 @@ "node": ">=4" } }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", + "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -187,6 +740,85 @@ "node": ">=0.12.0" } }, + "node_modules/jake": { + "version": "10.8.5", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", + "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/kareem": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", + "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -198,11 +830,106 @@ "node": "*" } }, + "node_modules/mongodb": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz", + "integrity": "sha512-ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ==", + "dependencies": { + "bson": "^4.7.0", + "denque": "^2.1.0", + "mongodb-connection-string-url": "^2.5.3", + "socks": "^2.7.0" + }, + "engines": { + "node": ">=12.9.0" + }, + "optionalDependencies": { + "saslprep": "^1.0.3" + } + }, + "node_modules/mongodb-connection-string-url": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz", + "integrity": "sha512-SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w==", + "dependencies": { + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^11.0.0" + } + }, + "node_modules/mongoose": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.6.3.tgz", + "integrity": "sha512-2Ye018PNBBXJd717qhfjBGo7k8HQb/pKziO9d5wY14iZSUI7hxqL7bwNDg+poeBwnlhBYLncZkips15Blfgxbw==", + "dependencies": { + "bson": "^4.6.5", + "kareem": "2.4.1", + "mongodb": "4.9.1", + "mpath": "0.9.0", + "mquery": "4.0.3", + "ms": "2.1.3", + "sift": "16.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mongoose" + } + }, + "node_modules/mpath": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", + "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/mquery": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-4.0.3.tgz", + "integrity": "sha512-J5heI+P08I6VJ2Ky3+33IpCdAvlYGTSUjwTPxkAr8i8EoduPMBX2OY/wa3IKZIQl7MU4SbFk8ndgSKyB/cl1zA==", + "dependencies": { + "debug": "4.x" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/mquery/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/mquery/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "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/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", @@ -252,6 +979,38 @@ "node": ">=0.10.0" } }, + "node_modules/object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "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": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -263,11 +1022,67 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/qs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -275,17 +1090,126 @@ "dependencies": { "picomatch": "^2.2.1" }, - "engines": { - "node": ">=8.10.0" + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/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/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "bin": { - "semver": "bin/semver" - } + "node_modules/sift": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.0.tgz", + "integrity": "sha512-ILTjdP2Mv9V1kIxWMXeMTIRbOBrqKc4JAXmFMnFq3fKeyQ2Qwa3Dw1ubcye3vR+Y6ofA0b9gNDr/y2t6eUeIzQ==" }, "node_modules/simple-update-notifier": { "version": "1.0.7", @@ -306,6 +1230,45 @@ "semver": "bin/semver.js" } }, + "node_modules/smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/socks": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", + "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "dependencies": { + "ip": "^2.0.0", + "smart-buffer": "^4.2.0" + }, + "engines": { + "node": ">= 10.13.0", + "npm": ">= 3.0.0" + } + }, + "node_modules/sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "optional": true, + "dependencies": { + "memory-pager": "^1.0.2" + } + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -328,6 +1291,14 @@ "node": ">=8.0" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", @@ -339,18 +1310,121 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "dependencies": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=12" + } } }, "dependencies": { + "@types/node": { + "version": "18.8.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.0.tgz", + "integrity": "sha512-u+h43R6U8xXDt2vzUaVP3VwjjLyOJk6uEciZS8OSyziUQGOwmk+l+4drxcsDboHXwyTaqS1INebghmWMRxq3LA==" + }, + "@types/webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==" + }, + "@types/whatwg-url": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz", + "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==", + "requires": { + "@types/node": "*", + "@types/webidl-conversions": "*" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -360,16 +1434,65 @@ "picomatch": "^2.0.4" } }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, + "body-parser": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -387,6 +1510,61 @@ "fill-range": "^7.0.1" } }, + "bson": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz", + "integrity": "sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==", + "requires": { + "buffer": "^5.6.0" + } + }, + "buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -402,11 +1580,47 @@ "readdirp": "~3.6.0" } }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "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==" + }, + "cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, "debug": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", @@ -415,6 +1629,133 @@ "ms": "^2.1.1" } }, + "denque": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", + "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==" + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, + "dotenv": { + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", + "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "ejs": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz", + "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==", + "requires": { + "jake": "^10.8.5" + } + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" + }, + "express": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "requires": { + "minimatch": "^5.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -423,12 +1764,66 @@ "to-regex-range": "^5.0.1" } }, + "finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, + "forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" + }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "get-intrinsic": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + } + }, "glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", @@ -437,16 +1832,69 @@ "is-glob": "^4.0.1" } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", + "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -473,6 +1921,61 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, + "jake": { + "version": "10.8.5", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", + "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", + "requires": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + } + }, + "kareem": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", + "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, + "memory-pager": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "optional": true + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } + }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -481,11 +1984,79 @@ "brace-expansion": "^1.1.7" } }, + "mongodb": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz", + "integrity": "sha512-ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ==", + "requires": { + "bson": "^4.7.0", + "denque": "^2.1.0", + "mongodb-connection-string-url": "^2.5.3", + "saslprep": "^1.0.3", + "socks": "^2.7.0" + } + }, + "mongodb-connection-string-url": { + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.4.tgz", + "integrity": "sha512-SeAxuWs0ez3iI3vvmLk/j2y+zHwigTDKQhtdxTgt5ZCOQQS5+HW4g45/Xw5vzzbn7oQXCNQ24Z40AkJsizEy7w==", + "requires": { + "@types/whatwg-url": "^8.2.1", + "whatwg-url": "^11.0.0" + } + }, + "mongoose": { + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.6.3.tgz", + "integrity": "sha512-2Ye018PNBBXJd717qhfjBGo7k8HQb/pKziO9d5wY14iZSUI7hxqL7bwNDg+poeBwnlhBYLncZkips15Blfgxbw==", + "requires": { + "bson": "^4.6.5", + "kareem": "2.4.1", + "mongodb": "4.9.1", + "mpath": "0.9.0", + "mquery": "4.0.3", + "ms": "2.1.3", + "sift": "16.0.0" + } + }, + "mpath": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz", + "integrity": "sha512-ikJRQTk8hw5DEoFVxHG1Gn9T/xcjtdnOKIU1JTmGjZZlg9LST2mBLmcX3/ICIbgJydT2GOc15RnNy5mHmzfSew==" + }, + "mquery": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-4.0.3.tgz", + "integrity": "sha512-J5heI+P08I6VJ2Ky3+33IpCdAvlYGTSUjwTPxkAr8i8EoduPMBX2OY/wa3IKZIQl7MU4SbFk8ndgSKyB/cl1zA==", + "requires": { + "debug": "4.x" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, "nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", @@ -516,16 +2087,77 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, + "object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + }, "picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" }, + "proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "requires": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + } + }, "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "qs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "requires": { + "side-channel": "^1.0.4" + } + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -534,11 +2166,98 @@ "picomatch": "^2.2.1" } }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "saslprep": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, + "send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + } + } + }, + "serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, + "sift": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.0.tgz", + "integrity": "sha512-ILTjdP2Mv9V1kIxWMXeMTIRbOBrqKc4JAXmFMnFq3fKeyQ2Qwa3Dw1ubcye3vR+Y6ofA0b9gNDr/y2t6eUeIzQ==" + }, "simple-update-notifier": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", @@ -554,6 +2273,34 @@ } } }, + "smart-buffer": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", + "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" + }, + "socks": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz", + "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "requires": { + "ip": "^2.0.0", + "smart-buffer": "^4.2.0" + } + }, + "sparse-bitfield": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "optional": true, + "requires": { + "memory-pager": "^1.0.2" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -570,6 +2317,11 @@ "is-number": "^7.0.0" } }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", @@ -578,10 +2330,56 @@ "nopt": "~1.0.10" } }, + "tr46": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", + "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==", + "requires": { + "punycode": "^2.1.1" + } + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, "undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" + }, + "webidl-conversions": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==" + }, + "whatwg-url": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz", + "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==", + "requires": { + "tr46": "^3.0.0", + "webidl-conversions": "^7.0.0" + } } } } diff --git a/package.json b/package.json index 4ec36b270..4a16cc8bb 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,10 @@ }, "homepage": "https://github.com/gabestuf/final_project#readme", "dependencies": { + "dotenv": "^16.0.3", + "ejs": "^3.1.8", + "express": "^4.18.1", + "mongoose": "^6.6.3", "nodemon": "^2.0.20" } } diff --git a/public/js/reactionGame.js b/public/js/reactionGame.js new file mode 100644 index 000000000..f2f74c992 --- /dev/null +++ b/public/js/reactionGame.js @@ -0,0 +1,3 @@ +const gameCanvas = document.getElementById('GameCanvas') + +console.log("Hello") \ No newline at end of file diff --git a/server.js b/server.js new file mode 100644 index 000000000..c2027d0f0 --- /dev/null +++ b/server.js @@ -0,0 +1,20 @@ +require('dotenv').config() +const express = require('express') +const app = express() +const mongoose = require('mongoose') +const path = require('path') + + +//use ejs +app.set('view engine', 'ejs') +app.use(express.static(path.join(__dirname, '/public'))) + + +app.get('/gamerTime', (req, res) => { + res.render('index') +}) + + + + +app.listen(3000) \ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs new file mode 100644 index 000000000..1d418e756 --- /dev/null +++ b/views/index.ejs @@ -0,0 +1,16 @@ + + + + + + + + Game + + + +

Hello

+ + + + \ No newline at end of file From 1604320feb4b944f9db4637cbb85fe5f0684fe66 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 6 Oct 2022 01:29:40 -0400 Subject: [PATCH 05/36] user routes --- .gitignore | 3 +- api.js | 2 +- api/User.js | 140 ++++++ config/dbConn.js | 2 +- package-lock.json | 1057 ++++++++++++++++++++++++++++++++++++++++++++- package.json | 11 +- server.js | 38 +- 7 files changed, 1226 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 1dcef2d9f..0fdc574b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -.env \ No newline at end of file +.env +request.rest \ No newline at end of file diff --git a/api.js b/api.js index 595fef3f7..eda3eed9f 100644 --- a/api.js +++ b/api.js @@ -1,4 +1,4 @@ -//Task for AIDAN: Research authentication + const api = { 'GET': [ diff --git a/api/User.js b/api/User.js index e69de29bb..fefe85b53 100644 --- a/api/User.js +++ b/api/User.js @@ -0,0 +1,140 @@ +const express = require('express') +const userRouter = express.Router() + +// Password handler +const argon2 = require('argon2') +//mongoDB User model +const User = require('./../models/User') + +//Routes +// Signup +userRouter.post('/signup', (req, res) => { + + let { username, password, userdata } = req.body; + username = username.trim() + password = password.trim() + // Checks for valid user/pass + if (username == "" || password == "") { //make sure fields aren't empty + res.json({ + status: "FAILED", + message: "One or more fields are empty" + }) + } else if (!/^[0-9a-zA-Z]+$/.test(username)) { //make sure only certain symbols allowed + res.json({ + status: "FAILED", + message: "No symbols or spaces allowed in username. Only characters A-Z & numbers" + }) + } else if (username.length > 32) { //make sure user isn't too long + res.json({ + status: "FAILED", + message: "Please keep username under 32 characters" + }) + } else if (password.length < 8) { //make sure password isn't too short + res.json({ + status: "FAILED", + message: "Password too short" + }) + } else { // User & Pass are ok!! + User.find({ username }).then(result => { //Check if user already exists + if (result.length) { // If a result is returned that isn't empty, it means it found the user ie they already exist + res.json({ + status: "FAILED", + message: "User already exists" + }) + } else { // Passed all checks, this is a new user + argon2.hash(password).then(hashedPassword => { // hash the password using argon2 + const newUser = new User({ //create a new user (mongoose.model) + username, + password: hashedPassword, + userdata + }) + + newUser.save().then(result => { //saves to database using mongoose + res.json({ + status: "SUCCESS", + message: "Signup successful", + data: result + }) + }).catch(e => { // error catching + res.json({ + status: "FAILED", + message: "Error saving user account" + }) + }) + }).catch(e => { // more error catching + res.json({ + status: "FAILED", + message: "Error while hashing password" + }) + }) + } + }).catch(e => { // even more error catching + console.error(e); + res.json({ + status: "FAILED", + message: "Error creating user" + }) + }) + } +}) + +// Signin +userRouter.post('/signin', (req, res) => { + // Getting username & password from the request + let { username, password } = req.body; + username = username.trim() + password = password.trim() + + if (username == "" || password == "") { // Check if username or password are blank + res.json({ + status: "FAILED", + message: "Empty user or password field" + }) + } else { // if both username & password and filled out + User.find({ username }) // Search database for matching username + .then(data => { // doing stuff with the data returned from database + if (data.length) { // checking if there is data + const hashedPassword = data[0].password; + argon2.verify(hashedPassword, password) + .then(result => { + if (result) { + + res.json({ + status: "SUCCESS", + message: "Logged in", + username: data[0].username, + //userpass: data[0].password, // if you wanted to return the hashed password + data: result + }) + } else { + console.error("invalid password") + res.json({ + status: "FAILED", + message: "Invalid password entered!" + }) + } + }).catch(e => { + console.error("error comparing password") + res.json({ + status: "FAILED", + message: "An error occured while comparing passwords" + }) + + }) + } else { + res.json({ + status: "FAILED", + message: "Invalid credentials entered" + }) + } + }) + .catch(e => { // could not find matching username in database + res.json({ + status: "FAILED", + message: "An error occured while checking for existing user" + }) + }) + } +}) + +module.exports = userRouter; \ No newline at end of file diff --git a/config/dbConn.js b/config/dbConn.js index 5fd96a6a3..ff41304d4 100644 --- a/config/dbConn.js +++ b/config/dbConn.js @@ -2,7 +2,7 @@ const mongoose = require('mongoose') const connectDB = async () => { try { - await mongoose.connect(process.env.MONGODB_URI, { + await mongoose.connect(process.env.DATABASE_URI, { useUnifiedTopology: true, useNewUrlParser: true }); diff --git a/package-lock.json b/package-lock.json index f1c6640dc..36dfff88b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,12 +8,73 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "argon2": "^0.29.1", + "bcrypt": "^5.0.1", "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", - "mime": "^1.6.0", - "mongoose": "^6.6.3", + "mongoose": "^6.6.3" + }, + "devDependencies": { "nodemon": "^2.0.20" + }, + "engines": { + "node": "14.16.0" + } + }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", + "engines": { + "node": ">=10" } }, "node_modules/@types/node": { @@ -52,6 +113,46 @@ "node": ">= 0.6" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -70,6 +171,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -78,6 +180,42 @@ "node": ">= 8" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/argon2": { + "version": "0.29.1", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.29.1.tgz", + "integrity": "sha512-bWXzAsQA0B6EFWZh5li+YBk+muoknAb8KacAi1h/bC6Gigy9p5ANbrPvpnjTIb7i9I11/8Df6FeSxpJDK3vy4g==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.9", + "@phc/format": "^1.0.0", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/argon2/node_modules/node-addon-api": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", + "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" + }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -112,10 +250,24 @@ } ] }, + "node_modules/bcrypt": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", + "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.0", + "node-addon-api": "^3.1.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, "engines": { "node": ">=8" } @@ -169,6 +321,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -268,6 +421,7 @@ "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, "funding": [ { "type": "individual", @@ -290,6 +444,14 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -306,11 +468,24 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -347,10 +522,16 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, "dependencies": { "ms": "^2.1.1" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "node_modules/denque": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", @@ -376,6 +557,14 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "engines": { + "node": ">=8" + } + }, "node_modules/dotenv": { "version": "16.0.3", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", @@ -403,6 +592,11 @@ "node": ">=0.10.0" } }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -509,6 +703,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -562,10 +757,27 @@ "node": ">= 0.6" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -580,6 +792,25 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/get-intrinsic": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", @@ -593,10 +824,30 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -619,6 +870,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, "engines": { "node": ">=4" } @@ -634,6 +886,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -649,6 +906,39 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -682,7 +972,17 @@ "node_modules/ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } }, "node_modules/inherits": { "version": "2.0.4", @@ -706,6 +1006,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -717,14 +1018,24 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -736,6 +1047,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -762,6 +1074,39 @@ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -830,6 +1175,40 @@ "node": "*" } }, + "node_modules/minipass": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", + "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mongodb": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz", @@ -930,10 +1309,54 @@ "node": ">= 0.6" } }, + "node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", + "dev": true, "dependencies": { "chokidar": "^3.5.2", "debug": "^3.2.7", @@ -961,6 +1384,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, "dependencies": { "abbrev": "1" }, @@ -975,6 +1399,26 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } @@ -998,6 +1442,14 @@ "node": ">= 0.8" } }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -1006,6 +1458,14 @@ "node": ">= 0.8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -1015,6 +1475,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -1037,7 +1498,8 @@ "node_modules/pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true }, "node_modules/punycode": { "version": "2.1.1", @@ -1083,10 +1545,24 @@ "node": ">= 0.8" } }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -1094,6 +1570,20 @@ "node": ">=8.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1134,6 +1624,7 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, "bin": { "semver": "bin/semver" } @@ -1188,6 +1679,11 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -1211,10 +1707,16 @@ "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.0.tgz", "integrity": "sha512-ILTjdP2Mv9V1kIxWMXeMTIRbOBrqKc4JAXmFMnFq3fKeyQ2Qwa3Dw1ubcye3vR+Y6ofA0b9gNDr/y2t6eUeIzQ==" }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, "node_modules/simple-update-notifier": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "dev": true, "dependencies": { "semver": "~7.0.0" }, @@ -1226,6 +1728,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true, "bin": { "semver": "bin/semver.js" } @@ -1269,10 +1772,43 @@ "node": ">= 0.8" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -1280,10 +1816,27 @@ "node": ">=4" } }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -1303,6 +1856,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, "dependencies": { "nopt": "~1.0.10" }, @@ -1336,7 +1890,8 @@ "node_modules/undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true }, "node_modules/unpipe": { "version": "1.0.0", @@ -1346,6 +1901,11 @@ "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": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -1381,9 +1941,66 @@ "engines": { "node": ">=12" } + }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } }, "dependencies": { + "@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "requires": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "dependencies": { + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==" + }, "@types/node": { "version": "18.8.0", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.0.tgz", @@ -1417,6 +2034,34 @@ "negotiator": "0.6.3" } }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -1429,11 +2074,43 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, + "aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + } + }, + "argon2": { + "version": "0.29.1", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.29.1.tgz", + "integrity": "sha512-bWXzAsQA0B6EFWZh5li+YBk+muoknAb8KacAi1h/bC6Gigy9p5ANbrPvpnjTIb7i9I11/8Df6FeSxpJDK3vy4g==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.9", + "@phc/format": "^1.0.0", + "node-addon-api": "^5.0.0" + }, + "dependencies": { + "node-addon-api": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", + "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" + } + } + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1454,10 +2131,20 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, + "bcrypt": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", + "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.0", + "node-addon-api": "^3.1.0" + } + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true }, "body-parser": { "version": "1.20.0", @@ -1506,6 +2193,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -1569,6 +2257,7 @@ "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1580,6 +2269,11 @@ "readdirp": "~3.6.0" } }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1593,11 +2287,21 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -1625,10 +2329,16 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, "requires": { "ms": "^2.1.1" } }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "denque": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz", @@ -1644,6 +2354,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, + "detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" + }, "dotenv": { "version": "16.0.3", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", @@ -1662,6 +2377,11 @@ "jake": "^10.8.5" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -1760,6 +2480,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -1803,10 +2524,24 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "optional": true }, "function-bind": { @@ -1814,6 +2549,22 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, "get-intrinsic": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", @@ -1824,10 +2575,24 @@ "has-symbols": "^1.0.3" } }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -1843,13 +2608,19 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==" + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -1862,6 +2633,30 @@ "toidentifier": "1.0.1" } }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -1878,7 +2673,17 @@ "ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==" + "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } }, "inherits": { "version": "2.0.4", @@ -1899,6 +2704,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -1906,12 +2712,19 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -1919,7 +2732,8 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "jake": { "version": "10.8.5", @@ -1937,6 +2751,29 @@ "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -1984,6 +2821,28 @@ "brace-expansion": "^1.1.7" } }, + "minipass": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz", + "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "mongodb": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.9.1.tgz", @@ -2057,10 +2916,45 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, + "node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" + }, + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + }, + "dependencies": { + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + } + } + }, "nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==", + "dev": true, "requires": { "chokidar": "^3.5.2", "debug": "^3.2.7", @@ -2078,6 +2972,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, "requires": { "abbrev": "1" } @@ -2085,7 +2980,24 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { "version": "1.12.2", @@ -2100,11 +3012,24 @@ "ee-first": "1.1.1" } }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "requires": { + "wrappy": "1" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -2113,7 +3038,8 @@ "picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true }, "proxy-addr": { "version": "2.0.7", @@ -2127,7 +3053,8 @@ "pstree.remy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==" + "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", + "dev": true }, "punycode": { "version": "2.1.1", @@ -2158,14 +3085,33 @@ "unpipe": "1.0.0" } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "requires": { "picomatch": "^2.2.1" } }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2188,7 +3134,8 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true }, "send": { "version": "0.18.0", @@ -2238,6 +3185,11 @@ "send": "0.18.0" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, "setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -2258,10 +3210,16 @@ "resolved": "https://registry.npmjs.org/sift/-/sift-16.0.0.tgz", "integrity": "sha512-ILTjdP2Mv9V1kIxWMXeMTIRbOBrqKc4JAXmFMnFq3fKeyQ2Qwa3Dw1ubcye3vR+Y6ofA0b9gNDr/y2t6eUeIzQ==" }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, "simple-update-notifier": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "dev": true, "requires": { "semver": "~7.0.0" }, @@ -2269,7 +3227,8 @@ "semver": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true } } }, @@ -2301,18 +3260,59 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + } + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "requires": { "has-flag": "^3.0.0" } }, + "tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "requires": { "is-number": "^7.0.0" } @@ -2326,6 +3326,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, "requires": { "nopt": "~1.0.10" } @@ -2350,13 +3351,19 @@ "undefsafe": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", + "dev": true }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -2380,6 +3387,24 @@ "tr46": "^3.0.0", "webidl-conversions": "^7.0.0" } + }, + "wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "requires": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } } diff --git a/package.json b/package.json index 4a16cc8bb..1d89f9d40 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "*Due before the start of class, October 13th (final day of the term)*", "main": "s.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "dev": "nodemon server.js" }, "repository": { "type": "git", @@ -17,10 +17,17 @@ }, "homepage": "https://github.com/gabestuf/final_project#readme", "dependencies": { + "argon2": "^0.29.1", + "bcrypt": "^5.0.1", "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", - "mongoose": "^6.6.3", + "mongoose": "^6.6.3" + }, + "devDependencies": { "nodemon": "^2.0.20" + }, + "engines": { + "node": "14.16.0" } } diff --git a/server.js b/server.js index c2027d0f0..eddc51ad0 100644 --- a/server.js +++ b/server.js @@ -3,18 +3,44 @@ const express = require('express') const app = express() const mongoose = require('mongoose') const path = require('path') +const UserRouter = require('./api/User') +const connectDB = require('./config/dbConn') +app.use(express.json()) //use ejs app.set('view engine', 'ejs') app.use(express.static(path.join(__dirname, '/public'))) - - -app.get('/gamerTime', (req, res) => { - res.render('index') +// bodyParser +const bodyParser = require('express').json; +app.use(bodyParser()) + +//Routes +// Home page +app.get('/', (req, res) => { + res.render('index') // will change when these pages exist }) +// Sign up +app.get('/signup', (req, res) => { + res.render('index') // will change when these pages exist +}) +// Sign in +app.get('/signin', (req, res) => { + res.render('index') // will change when these pages exist +}) +// leaderboard +app.get('/leaderboard', (req, res) => { + res.render('index') // will change when these pages exist +}) +// Users route +app.use('/user', UserRouter) +connectDB(); - -app.listen(3000) \ No newline at end of file +const db = mongoose.connection +db.on('error', (error) => { console.error(error) }) +db.once('open', () => { + console.log("Connected to database"); + app.listen(process.env.PORT || 3000, () => console.log(`Server Started on Port ${process.env.PORT || 3000}`)); +}) \ No newline at end of file From 65bb65d63b7e8ae4024147b95ffb05ab7d4fa661 Mon Sep 17 00:00:00 2001 From: AidanMulcahey Date: Thu, 6 Oct 2022 17:44:37 -0400 Subject: [PATCH 06/36] Home Page, Login, Sign up --- README.md | 40 +-------------------------- package-lock.json | 2 +- public/styles/login.css | 60 +++++++++++++++++++++++++++++++++++++++++ server.js | 16 +++++++++-- views/home.ejs | 32 ++++++++++++++++++++++ views/index.ejs | 16 ----------- views/login.ejs | 38 ++++++++++++++++++++++++++ views/signup.ejs | 44 ++++++++++++++++++++++++++++++ 8 files changed, 190 insertions(+), 58 deletions(-) create mode 100644 public/styles/login.css create mode 100644 views/home.ejs delete mode 100644 views/index.ejs create mode 100644 views/login.ejs create mode 100644 views/signup.ejs diff --git a/README.md b/README.md index e5b5ca55b..d757c0998 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,4 @@ -# Final Project -*Due before the start of class, October 13th (final day of the term)* - -For your final project, you'll implement a web application that exhibits understanding of the course materials. -This project should provide an opportunity to both be creative and to pursue individual research and learning goals. - -## General description -Your project should consist of a complete Web application, exhibiting facets of the three main sections of the course material: - -- Static web page content and design. You should have a project that is accessible, easily navigable, and features significant content. -- Dynamic behavior implemented with JavaScript (TypeScript is also allowed if your group wants to explore it). -- Server-side programming *using Node.js*. Typically this will take the form of some sort of persistent data (database), authentication, and possibly server-side computation. -- A video (less than five minutes) where each group member explains some aspect of the project. An easy way to produce this video is for you all the groups members to join a Zoom call that is recorded; each member can share their screen when they discuss the project or one member can "drive" the interface while other members narrate (this second option will probably work better.) The video should be posted on YouTube or some other accessible video hosting service. Make sure your video is less than five minutes, but long enough to successfully explain your project and show it in action. There is no minimum video length. - -## Project ideation -Excellent projects typically serve someone/some group; for this assignment you need to define your users and stakeholders. I encourage you to identify projects that will have impact, either artistically, politically, or in terms of productivity. - -### Deliverables - -#### Form Team (due 9/25) -Students are will work in teams of 3-5 students for the project; teams of two can be approved with the permission of the instructor. Working in teams should help enable you to build a good project in a limited amount of time. Use the `#project-logistics` channel in Discord to pitch ideas for final projects and/or find fellow team members as needed. - -Teams must be in place by end of day on Sunday, September 25th. If you have not identified a team at this point, you will be assigned a team. You will be given some class time on Monday to work on your proposal, but please plan on reserving additional time outside of class as needed. - -#### Proposal (due 9/27) -Provide an outline of your project direction and the names of associated team members. -The outline should have enough detail so that staff can determine if it meets the minimum expectations, or if it goes too far to be reasonable by the deadline. Please include a general description of a project, and list of key technologies/libraries you plan on using (e.g. React, Three.js, Svelte, TypeScript etc.). Two to four paragraps should provide enough level of detail. Name the file proposal.md and submit a pull request by Tuesday, September 27th at 11:59 PM (end of day). Only one pull request is required per team. - -There are no other scheduled checkpoints for your project. - -#### Turning in Your Project -Submit a second PR on the final project repo to turn in your app and code. Again, only one pull request per team. - -Deploy your app, in the form of a webpage, to Glitch/Heroku/Digital Ocean or some other service; it is critical that the application functions correctly wherever you post it. - -The README for your second pull request doesn’t need to be a formal report, but it should contain: +## Reaction Time Game 1. A brief description of what you created, and a link to the project itself (two paragraphs of text) 2. Any additional instructions that might be needed to fully use your project (login information etc.) @@ -44,6 +9,3 @@ The README for your second pull request doesn’t need to be a formal report, bu Think of 1,3, and 4 in particular in a similar vein to the design / tech achievements for A1—A4… make a case for why what you did was challenging and why your implementation deserves a grade of 100%. -## FAQs - -- **Can I use XYZ framework?** You can use any web-based frameworks or tools available, but for your server programming you need to use Node.js. Your client-side scripting language should be either JavaScript or TypeScript. diff --git a/package-lock.json b/package-lock.json index f1c6640dc..d33c34157 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,13 @@ "requires": true, "packages": { "": { + "name": "final_project", "version": "1.0.0", "license": "ISC", "dependencies": { "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", - "mime": "^1.6.0", "mongoose": "^6.6.3", "nodemon": "^2.0.20" } diff --git a/public/styles/login.css b/public/styles/login.css new file mode 100644 index 000000000..a6fd9285a --- /dev/null +++ b/public/styles/login.css @@ -0,0 +1,60 @@ +button { + background-color: #00FF41; + width: 100%; + color: black; + padding: 15px; + margin: 10px 0px; + border: none; + cursor: pointer; + } +form { + border: 3px solid #f1f1f1; + } +input[type=text], input[type=password] { + width: 100%; + margin: 8px 0; + padding: 12px 20px; + display: inline-block; + border: 2px solid #00FF41; + box-sizing: border-box; + } +button:hover { + opacity: 0.7; + } +.cancelbtn { + width: auto; + padding: 10px 18px; + margin: 10px 5px; + } + + +.container { + padding: 25px; + background: black; + } + /* Header/Logo Title */ +.header { + height: 2%; + + background: #00FF41; + color: black; + font-size: 20px; + } + + .hometext { + font-size: 30px; + font-weight: bold; + + width: 100%; + margin: 8px 0; + padding: 12px 20px; + display: inline-block; + border: 2px solid #00FF41; + background-color: black; + box-sizing: border-box; + + } + + span , a { + color :#00FF41 + } \ No newline at end of file diff --git a/server.js b/server.js index c2027d0f0..6db492584 100644 --- a/server.js +++ b/server.js @@ -10,8 +10,20 @@ app.set('view engine', 'ejs') app.use(express.static(path.join(__dirname, '/public'))) -app.get('/gamerTime', (req, res) => { - res.render('index') +app.get('/login', (req, res) => { + res.render('login') +}) + +app.get('/home', (req, res) => { + res.render('home') +}) + +app.get('/', (req, res) => { + res.render('home') +}) + +app.get('/createaccount', (req, res) => { + res.render('signup') }) diff --git a/views/home.ejs b/views/home.ejs new file mode 100644 index 000000000..32a20e680 --- /dev/null +++ b/views/home.ejs @@ -0,0 +1,32 @@ + + + + + + + + Game + +
+

Welcome to Reaction Game

+
+

Please log in to your account:

+ + +
+ + + Login + Sign Up + +
+ +
+ + + + + + + + \ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs deleted file mode 100644 index 1d418e756..000000000 --- a/views/index.ejs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - Game - - - -

Hello

- - - - \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs new file mode 100644 index 000000000..38307ce54 --- /dev/null +++ b/views/login.ejs @@ -0,0 +1,38 @@ + + + + + + + + Game + +
+

Welcome to Reaction Game

+
+
+

Please log in to your account:

+ + +
+
+ + + + + +
+ Forgot Password?

+ Sign Up +
+
+ +
+ + + + + + + + \ No newline at end of file diff --git a/views/signup.ejs b/views/signup.ejs new file mode 100644 index 000000000..65ae866e4 --- /dev/null +++ b/views/signup.ejs @@ -0,0 +1,44 @@ + + + + + + + + Game + +
+

Sign Up to Reaction Game

+
+
+

Please create an account:

+ + +
+
+ + + + + + + + + + + + +

+ Login +
+
+ +
+ + + + + + + + \ No newline at end of file From e2ada2cda96d023ae6f782b27cd5b46afa585b7e Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 6 Oct 2022 17:58:20 -0400 Subject: [PATCH 07/36] refactor server.js --- public/js/reactionGame.js | 2 +- server.js | 59 +++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/public/js/reactionGame.js b/public/js/reactionGame.js index f2f74c992..6261af414 100644 --- a/public/js/reactionGame.js +++ b/public/js/reactionGame.js @@ -1,3 +1,3 @@ -const gameCanvas = document.getElementById('GameCanvas') +//this is a test console.log("Hello") \ No newline at end of file diff --git a/server.js b/server.js index 7b22b9254..7c9f06b5c 100644 --- a/server.js +++ b/server.js @@ -6,56 +6,47 @@ const path = require('path') const UserRouter = require('./api/User') const connectDB = require('./config/dbConn') +// INIT app.use(express.json()) - -//use ejs +// bodyParser +const bodyParser = require('express').json; +app.use(bodyParser()) +// use ejs app.set('view engine', 'ejs') app.use(express.static(path.join(__dirname, '/public'))) -app.get('/login', (req, res) => { - res.render('login') +//Routes +// home page +app.get('/', (req, res) => { + res.render('home') }) - app.get('/home', (req, res) => { res.render('home') }) - -app.get('/', (req, res) => { - res.render('home') +// login page +app.get('/login', (req, res) => { + res.render('login') }) - -app.get('/createaccount', (req, res) => { +// signup page +app.get('/signup', (req, res) => { // changed createaccount to signup, cause shorter res.render('signup') }) - -// bodyParser -const bodyParser = require('express').json; -app.use(bodyParser()) - -//Routes -// Home page -app.get('/', (req, res) => { - res.render('index') // will change when these pages exist - -}) -// Sign up -app.get('/signup', (req, res) => { - res.render('index') // will change when these pages exist -}) -// Sign in -app.get('/signin', (req, res) => { - res.render('index') // will change when these pages exist -}) -// leaderboard +// leaderboard page app.get('/leaderboard', (req, res) => { - res.render('index') // will change when these pages exist + res.render('leaderboard') // will change when these pages exist +}) +// game page +app.get('/game', (req, res) => { + res.render('game') // will change when these pages exist }) // Users route app.use('/user', UserRouter) - +// connect to database, ASK ME FOR THE ENV VARIABLES OR THIS WILL NOT WORK!!, +// if you do not need to test w/ database then comment out this code +// uncomment last comment connectDB(); const db = mongoose.connection @@ -63,4 +54,6 @@ db.on('error', (error) => { console.error(error) }) db.once('open', () => { console.log("Connected to database"); app.listen(process.env.PORT || 3000, () => console.log(`Server Started on Port ${process.env.PORT || 3000}`)); -}) \ No newline at end of file +}) + +// app.listen(3000, () => console.log('Server Started on Port 3000')); From c7c8ffb766f8d95a77cda06defe90e706e8f5903 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 7 Oct 2022 00:27:47 -0400 Subject: [PATCH 08/36] experimenting with jwt for auth --- api/User.js | 17 +++- authServer.js | 43 +++++++++ middleware/authenticate.js | 20 +++++ package-lock.json | 180 +++++++++++++++++++++++++++++++++++-- package.json | 5 +- public/js/signup.js | 32 +++++++ server.js | 22 +++-- views/game.ejs | 15 ++++ views/home.ejs | 43 ++++----- views/leaderboard.ejs | 15 ++++ views/login.ejs | 33 +++---- views/signup.ejs | 44 +++++---- 12 files changed, 390 insertions(+), 79 deletions(-) create mode 100644 authServer.js create mode 100644 middleware/authenticate.js create mode 100644 public/js/signup.js create mode 100644 views/game.ejs create mode 100644 views/leaderboard.ejs diff --git a/api/User.js b/api/User.js index fefe85b53..5a1042b0d 100644 --- a/api/User.js +++ b/api/User.js @@ -1,6 +1,13 @@ const express = require('express') const userRouter = express.Router() +// INIT +require('dotenv').config() +userRouter.use(express.json()) + + +// authorization +const jwt = require('jsonwebtoken') // Password handler const argon2 = require('argon2') //mongoDB User model @@ -97,14 +104,18 @@ userRouter.post('/signin', (req, res) => { const hashedPassword = data[0].password; argon2.verify(hashedPassword, password) .then(result => { - if (result) { - + if (result) { // User authenticated + const user = { + name: username + } + const accessToken = jwt.sign(user, process.env.ACCESS_TOKEN_SECRET) res.json({ status: "SUCCESS", message: "Logged in", username: data[0].username, //userpass: data[0].password, // if you wanted to return the hashed password - data: result + data: result, + accessToken: accessToken }) } else { console.error("invalid password") diff --git a/authServer.js b/authServer.js new file mode 100644 index 000000000..cc385c98f --- /dev/null +++ b/authServer.js @@ -0,0 +1,43 @@ +require('dotenv').config() +const express = require('express') +const app = express() +const jwt = require('jsonwebtoken') +app.use(express.json()) + +// Ideally stored in a database +let refreshTokens = [] + +app.post('/login', (req, res) => { + const username = req.body.username + const user = { name: username } + + const accessToken = generateAccessToken(user) + const refreshToken = jwt.sign(user, process.env.REFRESH_TOKEN_SECRET) + refreshTokens.push(refreshToken) + res.json({ accessToken: accessToken, refreshToken: refreshToken }) +}) +app.post('/token', (req, res) => { + const refreshToken = req.body.token + if (refreshToken == null) { return res.status.sendStatus(401) } + if (!refreshTokens.includes(refreshToken)) { + return res.sendStatus(403) + } + jwt.verify(refreshToken, process.env.REFRESH_TOKEN_SECRET, (err, user) => { + if (err) { + return res.sendStatus(403) + } + const accessToken = generateAccessToken({ name: user.name }) + res.json({ accessToken: accessToken }) + }) +}) +app.delete('/logout', (req, res) => { + refreshTokens = refreshTokens.filter(token => token !== req.body.token) + res.sendStatus(204) +}) + +const generateAccessToken = (user) => { + return jwt.sign(user, process.env.ACCESS_TOKEN_SECRET, { expiresIn: '30m' }) + +} + +app.listen(4000) \ No newline at end of file diff --git a/middleware/authenticate.js b/middleware/authenticate.js new file mode 100644 index 000000000..ff7cc34c4 --- /dev/null +++ b/middleware/authenticate.js @@ -0,0 +1,20 @@ +// authorization +const jwt = require('jsonwebtoken') + +const auth = (req, res, next) => { + const authHeader = req.headers['authorization'] + const token = authHeader && authHeader.split(' ')[1] + if (token == null) { + return res.sendStatus(401) + } + + jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => { + if (err) { + return res.sendStatus(403) + } + req.user = user + next() + }) +} + +module.exports = auth \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index c7b472369..816106528 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "final_project", "version": "1.0.0", "license": "ISC", "dependencies": { @@ -14,11 +13,10 @@ "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", - + "jsonwebtoken": "^8.5.1", "mongoose": "^6.6.3" }, "devDependencies": { - "nodemon": "^2.0.20" }, "engines": { @@ -366,6 +364,11 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -576,6 +579,14 @@ "node": ">=12" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -1072,11 +1083,86 @@ "node": ">=10" } }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kareem": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -1627,7 +1713,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, "bin": { "semver": "bin/semver" } @@ -2218,6 +2303,11 @@ "ieee754": "^1.1.13" } }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2367,6 +2457,14 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==" }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -2749,11 +2847,82 @@ "minimatch": "^3.0.4" } }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + } + }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "kareem": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -3137,8 +3306,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "send": { "version": "0.18.0", diff --git a/package.json b/package.json index 1d89f9d40..c5f8ba574 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,9 @@ "description": "*Due before the start of class, October 13th (final day of the term)*", "main": "s.js", "scripts": { - "dev": "nodemon server.js" + "start": "node server.js", + "dev": "nodemon server.js", + "devStartAuth": "nodemon authServer.js" }, "repository": { "type": "git", @@ -22,6 +24,7 @@ "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", + "jsonwebtoken": "^8.5.1", "mongoose": "^6.6.3" }, "devDependencies": { diff --git a/public/js/signup.js b/public/js/signup.js new file mode 100644 index 000000000..ef3d4e686 --- /dev/null +++ b/public/js/signup.js @@ -0,0 +1,32 @@ +const signupForm = document.getElementById('signupForm') + +signupForm.addEventListener('submit', async e => { + e.preventDefault() + const statusMSG = document.getElementById('status-message') + + const signupData = { + "username": signupForm.elements['signupUsername'].value, + "password": signupForm.elements['signupPassword'].value, + "userdata": JSON.stringify([]) + } + + const response = await fetch('/user/signup', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(signupData) + }) + + const jsonResponse = await response.json() + + statusMSG.innerHTML = jsonResponse.message; + + if (jsonResponse.status == 'SUCCESS') { + + window.location.replace('/signin') + + } else { + console.error(jsonResponse.message) + } +}) diff --git a/server.js b/server.js index 7c9f06b5c..6f430d9f4 100644 --- a/server.js +++ b/server.js @@ -1,20 +1,22 @@ require('dotenv').config() const express = require('express') const app = express() -const mongoose = require('mongoose') const path = require('path') -const UserRouter = require('./api/User') +// middleware +const mongoose = require('mongoose') const connectDB = require('./config/dbConn') +const UserRouter = require('./api/User') +const auth = require('./middleware/authenticate') // INIT -app.use(express.json()) + // bodyParser const bodyParser = require('express').json; app.use(bodyParser()) // use ejs app.set('view engine', 'ejs') app.use(express.static(path.join(__dirname, '/public'))) - +app.use(express.json()) //Routes @@ -30,15 +32,17 @@ app.get('/login', (req, res) => { res.render('login') }) // signup page -app.get('/signup', (req, res) => { // changed createaccount to signup, cause shorter +app.get('/signup', (req, res) => { // changed createaccount to signup cause that's what file is called (less confusion) res.render('signup') }) // leaderboard page -app.get('/leaderboard', (req, res) => { +app.get('/leaderboard', auth, (req, res) => { + console.log(req.user) res.render('leaderboard') // will change when these pages exist }) // game page -app.get('/game', (req, res) => { +app.get('/game', auth, (req, res) => { + console.log(req.user) res.render('game') // will change when these pages exist }) // Users route @@ -46,7 +50,7 @@ app.use('/user', UserRouter) // connect to database, ASK ME FOR THE ENV VARIABLES OR THIS WILL NOT WORK!!, // if you do not need to test w/ database then comment out this code -// uncomment last comment +// uncomment last comment (app.listen) connectDB(); const db = mongoose.connection @@ -56,4 +60,4 @@ db.once('open', () => { app.listen(process.env.PORT || 3000, () => console.log(`Server Started on Port ${process.env.PORT || 3000}`)); }) -// app.listen(3000, () => console.log('Server Started on Port 3000')); +// app.listen(3000, () => console.log('Server Started on Port 3000')); diff --git a/views/game.ejs b/views/game.ejs new file mode 100644 index 000000000..ace58c4eb --- /dev/null +++ b/views/game.ejs @@ -0,0 +1,15 @@ + + + + + + + + Document + + + + Game + + + \ No newline at end of file diff --git a/views/home.ejs b/views/home.ejs index 32a20e680..6853a2345 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -2,31 +2,32 @@ - - - - Game + + + + Game
-

Welcome to Reaction Game

-
-

Please log in to your account:

- - -
- - - Login - Sign Up - -
- -
+

Welcome to Reaction Game

+ +
+

Please log in to your account:

+ + + +
+ + + Login + Sign Up + +
+ +
- - - + + \ No newline at end of file diff --git a/views/leaderboard.ejs b/views/leaderboard.ejs new file mode 100644 index 000000000..c8a8c101f --- /dev/null +++ b/views/leaderboard.ejs @@ -0,0 +1,15 @@ + + + + + + + + Document + + + + Leaderboard + + + \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index 38307ce54..2a3ca579b 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -9,28 +9,29 @@

Welcome to Reaction Game

-
+

Please log in to your account:

+ - -
-
- - - - - -
- Forgot Password?

- Sign Up -
-
+ +
+
+ + + + + +
+ Forgot Password?

+ Sign Up +
+
-
+ - + diff --git a/views/signup.ejs b/views/signup.ejs index 65ae866e4..3f3d843ef 100644 --- a/views/signup.ejs +++ b/views/signup.ejs @@ -9,35 +9,33 @@

Sign Up to Reaction Game

-
+

Please create an account:

+ - -
-
- - - - - - - - - - - - -

- Login -
-
+ +
+
+ + + + + + + + +

+ Login +
+
-
+ - - + + From ffeb524f08db9c9c7b1f6200ee50bbfa609b5077 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 7 Oct 2022 00:36:42 -0400 Subject: [PATCH 09/36] connected signup to DB, removed firstname & lastname fields, not needed --- public/js/signup.js | 56 ++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/public/js/signup.js b/public/js/signup.js index ef3d4e686..03639dffe 100644 --- a/public/js/signup.js +++ b/public/js/signup.js @@ -1,32 +1,42 @@ const signupForm = document.getElementById('signupForm') +const clearFormPassword = () => { + signupForm.elements['signupPassword'].value = "" + signupForm.elements['signupPasswordConfirm'].value = "" +} + signupForm.addEventListener('submit', async e => { e.preventDefault() const statusMSG = document.getElementById('status-message') - - const signupData = { - "username": signupForm.elements['signupUsername'].value, - "password": signupForm.elements['signupPassword'].value, - "userdata": JSON.stringify([]) - } - - const response = await fetch('/user/signup', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify(signupData) - }) - - const jsonResponse = await response.json() - - statusMSG.innerHTML = jsonResponse.message; - - if (jsonResponse.status == 'SUCCESS') { - - window.location.replace('/signin') + const username = signupForm.elements['signupUsername'].value + const password = signupForm.elements['signupPassword'].value + const passwordConfirm = signupForm.elements['signupPasswordConfirm'].value + + if (password == passwordConfirm) { + const signupData = { + "username": username, + "password": password, + "userdata": JSON.stringify([]) + } + + const response = await fetch('/user/signup', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(signupData) + }) + + const responseJSON = await response.json() + console.log(responseJSON) + if (responseJSON.status == "FAILED") { + alert(responseJSON.message) + clearFormPassword() + } } else { - console.error(jsonResponse.message) + alert("passwords Don't match!") + clearFormPassword() } + }) From 832c99850b2c01f87fe061fa65bb6e7b1f550bd7 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 7 Oct 2022 01:09:34 -0400 Subject: [PATCH 10/36] sleep --- public/js/game.js | 0 public/js/login.js | 0 public/js/signup.js | 3 +++ views/game.ejs | 1 + views/login.ejs | 6 +++--- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 public/js/game.js create mode 100644 public/js/login.js diff --git a/public/js/game.js b/public/js/game.js new file mode 100644 index 000000000..e69de29bb diff --git a/public/js/login.js b/public/js/login.js new file mode 100644 index 000000000..e69de29bb diff --git a/public/js/signup.js b/public/js/signup.js index 03639dffe..0f7b34147 100644 --- a/public/js/signup.js +++ b/public/js/signup.js @@ -33,6 +33,9 @@ signupForm.addEventListener('submit', async e => { alert(responseJSON.message) clearFormPassword() } + if (responseJSON.status == "SUCCESS") { + window.location.replace('/login') + } } else { alert("passwords Don't match!") diff --git a/views/game.ejs b/views/game.ejs index ace58c4eb..e2d4e8906 100644 --- a/views/game.ejs +++ b/views/game.ejs @@ -10,6 +10,7 @@ Game + \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index 2a3ca579b..9dd00dc38 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -6,6 +6,8 @@ Game + +

Welcome to Reaction Game

@@ -23,7 +25,6 @@
- Forgot Password?

Sign Up
@@ -32,8 +33,7 @@ - - + \ No newline at end of file From a475818090a1d2e0a5e699c760ea6b4b5e701e77 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 7 Oct 2022 14:07:29 -0400 Subject: [PATCH 11/36] changed /createaccount to /signup --- views/home.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.ejs b/views/home.ejs index 6853a2345..a61256aec 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -19,7 +19,7 @@ Login - Sign Up + Sign Up From 96156b8b9c56e89a1745b8aece637d514df56716 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Fri, 7 Oct 2022 14:18:21 -0400 Subject: [PATCH 12/36] updated api json --- api.js | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/api.js b/api.js index eda3eed9f..eeeaafd46 100644 --- a/api.js +++ b/api.js @@ -6,12 +6,16 @@ const api = { '/': 'home.html', desc: 'serves home page to user, this page will have login/signup buttons' }, + { + '/home': 'home.html', + desc: 'serves home page to user, this page will have login/signup buttons' + }, { '/signup': 'signup.html', desc: 'serves signup page' }, { - '/signin': 'signin.html', + '/login': 'signin.html', desc: 'serves signin page' }, { @@ -34,9 +38,42 @@ const api = { ], 'POST': [ { - '/updateLeaderboard': { req: { username: username, authentication: authentication, score: score } }, - desc: 'Finds username, finds max score of that user, if this is higher, set user max score and replace users high score with this high score, resort list and send to mongo' - } + '/user/signin': { + req: { + body: { + username: String, + password: String + } + }, + res: { + status: "SUCCESS / FAILED", + message: String, + username: String, // on success + data: String, // on success + accessToken: String // on success + } + }, + desc: 'used for logging in, authenticates user and creates an auth token' + }, + { + '/user/signup': { + req: { + body: { + username: String, + password: String, + userdata: String + } + }, + res: { + body: { + status: "SUCCESS / FAILED", + message: String, + data: String // on success + } + }, + }, + desc: 'used for logging in, authenticates user and creates an auth token' + }, ] } From cc3fb82e4226fa87d02064a81cbefa5bde4b043b Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Sun, 9 Oct 2022 17:50:32 -0400 Subject: [PATCH 13/36] login page done --- .gitignore | 3 ++- api.js | 44 +++++++++++++++++++++++++++++++++++++++++- api/Auth.js | 47 +++++++++++++++++++++++++++++++++++++++++++++ api/User.js | 3 +-- authServer.js | 1 - public/js/login.js | 33 +++++++++++++++++++++++++++++++ public/js/signup.js | 1 - server.js | 3 +++ views/login.ejs | 6 +++--- 9 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 api/Auth.js diff --git a/.gitignore b/.gitignore index 0fdc574b6..56b5ec6dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules .env -request.rest \ No newline at end of file +request.rest +authServer.js \ No newline at end of file diff --git a/api.js b/api.js index eeeaafd46..1b96fab48 100644 --- a/api.js +++ b/api.js @@ -74,8 +74,50 @@ const api = { }, desc: 'used for logging in, authenticates user and creates an auth token' }, + { + '/auth/login': { + req: { + body: { + username: String + } + }, + res: { + body: { + accessToken: String, + refreshToken: String + } + } + } + }, + { + '/auth/token': { + req: { + body: { + token: String + } + }, + res: { + body: { + accessToken: String + } + } + } + } + ], + 'DELETE': [ + { + '/auth/logout': { + req: { + body: { + token: String + } + }, + res: { + status: "SUCCESS/FAILED" + } + } + } ] - } //MONGODB Models diff --git a/api/Auth.js b/api/Auth.js new file mode 100644 index 000000000..3ae0799d6 --- /dev/null +++ b/api/Auth.js @@ -0,0 +1,47 @@ +const express = require('express') +const authRouter = express.Router() +// INIT +require('dotenv').config() +authRouter.use(express.json()) +// authorization +const jwt = require('jsonwebtoken') + + +// Ideally stored in a database +let refreshTokens = [] + +authRouter.post('/login', (req, res) => { + const username = req.body.username + const user = { name: username } + + const accessToken = generateAccessToken(user) + const refreshToken = jwt.sign(user, process.env.REFRESH_TOKEN_SECRET) + refreshTokens.push(refreshToken) + res.json({ accessToken: accessToken, refreshToken: refreshToken }) +}) + +authRouter.post('/token', (req, res) => { + const refreshToken = req.body.token + if (refreshToken == null) { return res.status.sendStatus(401) } + if (!refreshTokens.includes(refreshToken)) { + return res.sendStatus(403) + } + jwt.verify(refreshToken, process.env.REFRESH_TOKEN_SECRET, (err, user) => { + if (err) { + return res.sendStatus(403) + } + const accessToken = generateAccessToken({ name: user.name }) + res.json({ accessToken: accessToken }) + }) +}) + +authRouter.delete('/logout', (req, res) => { + refreshTokens = refreshTokens.filter(token => token !== req.body.token) + res.sendStatus(204) +}) + +const generateAccessToken = (user) => { + return jwt.sign(user, process.env.ACCESS_TOKEN_SECRET, { expiresIn: '30m' }) +} + +module.exports = authRouter; \ No newline at end of file diff --git a/api/User.js b/api/User.js index 5a1042b0d..96785f163 100644 --- a/api/User.js +++ b/api/User.js @@ -84,9 +84,8 @@ userRouter.post('/signup', (req, res) => { }) } }) - // Signin -userRouter.post('/signin', (req, res) => { +userRouter.post('/login', (req, res) => { // Getting username & password from the request let { username, password } = req.body; username = username.trim() diff --git a/authServer.js b/authServer.js index cc385c98f..c7f5f5057 100644 --- a/authServer.js +++ b/authServer.js @@ -37,7 +37,6 @@ app.delete('/logout', (req, res) => { const generateAccessToken = (user) => { return jwt.sign(user, process.env.ACCESS_TOKEN_SECRET, { expiresIn: '30m' }) - } app.listen(4000) \ No newline at end of file diff --git a/public/js/login.js b/public/js/login.js index e69de29bb..19798d356 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -0,0 +1,33 @@ +const loginForm = document.getElementById('loginForm') + +loginForm.addEventListener('submit', async e => { + e.preventDefault() + const username = loginForm.elements['loginUsername'].value + const password = loginForm.elements['loginPassword'].value + + + const loginData = { + "username": username, + "password": password, + "userdata": JSON.stringify([]) + } + + const response = await fetch('/user/login', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(loginData) + }) + + const responseJSON = await response.json() + console.log(responseJSON) + if (responseJSON.status == "FAILED") { + alert(responseJSON.message) + clearFormPassword() + } + if (responseJSON.status == "SUCCESS") { //TODO + window.location.replace('/game') + } + +}) diff --git a/public/js/signup.js b/public/js/signup.js index 0f7b34147..a269c3b44 100644 --- a/public/js/signup.js +++ b/public/js/signup.js @@ -7,7 +7,6 @@ const clearFormPassword = () => { signupForm.addEventListener('submit', async e => { e.preventDefault() - const statusMSG = document.getElementById('status-message') const username = signupForm.elements['signupUsername'].value const password = signupForm.elements['signupPassword'].value const passwordConfirm = signupForm.elements['signupPasswordConfirm'].value diff --git a/server.js b/server.js index 6f430d9f4..8cdbc7295 100644 --- a/server.js +++ b/server.js @@ -6,6 +6,7 @@ const path = require('path') const mongoose = require('mongoose') const connectDB = require('./config/dbConn') const UserRouter = require('./api/User') +const AuthRouter = require('./api/Auth') const auth = require('./middleware/authenticate') // INIT @@ -47,6 +48,8 @@ app.get('/game', auth, (req, res) => { }) // Users route app.use('/user', UserRouter) +// Auth route +app.use('/auth', AuthRouter) // connect to database, ASK ME FOR THE ENV VARIABLES OR THIS WILL NOT WORK!!, // if you do not need to test w/ database then comment out this code diff --git a/views/login.ejs b/views/login.ejs index 9dd00dc38..063b2b5ff 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -17,12 +17,12 @@ -
+
- + - +
Sign Up From 912f44b2378c2fb269360abe21ff62af62293285 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Sun, 9 Oct 2022 23:58:24 -0400 Subject: [PATCH 14/36] leaderboard api and mongo integration --- api.js | 19 +++- api/Auth.js | 12 +- api/Leaderboard.js | 104 ++++++++++++++++++ api/User.js | 13 ++- .../{authenticate.js => Authorization.js} | 13 ++- models/User.js | 2 +- public/js/game.js | 6 + public/js/leaderboard.js | 7 ++ public/js/login.js | 9 +- public/js/signup.js | 3 +- server.js | 14 ++- views/home.ejs | 1 - views/leaderboard.ejs | 1 + 13 files changed, 183 insertions(+), 21 deletions(-) create mode 100644 api/Leaderboard.js rename middleware/{authenticate.js => Authorization.js} (50%) create mode 100644 public/js/leaderboard.js diff --git a/api.js b/api.js index 1b96fab48..51208bf10 100644 --- a/api.js +++ b/api.js @@ -31,7 +31,11 @@ const api = { desc: 'serves game page' }, { - '/getLeaderboard': { res: "array of scores" }, + '/leaderboard/getLeaderboard': { + res: { + body: ["array of {username: String, score: Number}"] + } + }, desc: 'gets leaderboard info from mongoDB' } @@ -102,6 +106,17 @@ const api = { } } } + }, + { + '/leaderboard/submitScore': { + req: { + body: { + username: String, + accessToken: String, + score: Number + } + } + } } ], 'DELETE': [ @@ -124,7 +139,7 @@ const api = { const User = { username: String, password: String, - highscore: int + highscore: Number } const Leaderboard = { leaderboard: String, // where String is array [{username: String, score: Int}, {username: String, score: Int}] diff --git a/api/Auth.js b/api/Auth.js index 3ae0799d6..64fe00e49 100644 --- a/api/Auth.js +++ b/api/Auth.js @@ -5,11 +5,22 @@ require('dotenv').config() authRouter.use(express.json()) // authorization const jwt = require('jsonwebtoken') +const auth = require('../middleware/Authorization') // Ideally stored in a database let refreshTokens = [] +authRouter.get('/game/:authToken', (req, res, next) => { + req.headers['authorization'] = req.params.authToken + auth(req, res, next) + if (req.user) { + res.redirect('/game') + } else { + res.redirect('/login') + } +}) + authRouter.post('/login', (req, res) => { const username = req.body.username const user = { name: username } @@ -34,7 +45,6 @@ authRouter.post('/token', (req, res) => { res.json({ accessToken: accessToken }) }) }) - authRouter.delete('/logout', (req, res) => { refreshTokens = refreshTokens.filter(token => token !== req.body.token) res.sendStatus(204) diff --git a/api/Leaderboard.js b/api/Leaderboard.js new file mode 100644 index 000000000..a6b803bd9 --- /dev/null +++ b/api/Leaderboard.js @@ -0,0 +1,104 @@ +const express = require('express') +const leaderboardRouter = express.Router() + +require('dotenv').config() +leaderboardRouter.use(express.json()) + + +//mongoDB Leaderboard model +const User = require('./../models/User') + +leaderboardRouter.get('/getLeaderboard', (req, res) => { + + + + User.find() + .then(data => { + if (data.length) { + let arr = [] + for (const key in data) { + let s = { + 'username': data[key].username, + 'highscore': data[key].highscore + } + + arr.push(s) + } + res.json({ + status: "SUCCESS", + message: "got leaderboard list", + data: JSON.stringify(arr) + }) + } else { + res.json({ + status: "FAILED", + message: "No data found", + data: JSON.stringify([]) + }) + } + + }) + .catch(e => { + res.json({ + status: "FAILED", + message: e.toString() + }) + }) +}) + +leaderboardRouter.post('/submitScore', (req, res) => { //add auth eventually + const { username, score } = req.body + + User.findOne({ 'username': username }, (err, foundObject) => { + if (err) { + console.error(err) + res.json({ + status: "FAILED", + message: "Error finding user" + }) + } else { + if (!foundObject) { + res.json({ + status: "FAILED", + message: "User not found" + }) + } else { + if (req.body.username) { + let highscore = JSON.parse(foundObject.highscore) + if (score > highscore) { + foundObject.highscore = score; + foundObject.save((err, updatedObject) => { + if (err) { + res.json({ + status: "FAILED", + message: "Error=1" + }) + } else { + console.log(updatedObject) + res.json({ + status: "SUCCESS", + message: "Edited highscore", + updatedObject: { username: updatedObject.username, highscore: updatedObject.highscore } + }) + } + }) + } else { + res.json({ + status: "FAILED", + message: `Your previous score of ${highscore} was better` + }) + } + + + } else { + res.json({ + status: "FAILED", + message: "Error=2" + }) + } + } + } + }) +}) + +module.exports = leaderboardRouter \ No newline at end of file diff --git a/api/User.js b/api/User.js index 96785f163..3baf7e41c 100644 --- a/api/User.js +++ b/api/User.js @@ -8,6 +8,7 @@ userRouter.use(express.json()) // authorization const jwt = require('jsonwebtoken') +const auth = require('./../middleware/Authorization') // Password handler const argon2 = require('argon2') //mongoDB User model @@ -53,7 +54,7 @@ userRouter.post('/signup', (req, res) => { const newUser = new User({ //create a new user (mongoose.model) username, password: hashedPassword, - userdata + highscore: 0 }) newUser.save().then(result => { //saves to database using mongoose @@ -84,7 +85,7 @@ userRouter.post('/signup', (req, res) => { }) } }) -// Signin +// Login userRouter.post('/login', (req, res) => { // Getting username & password from the request let { username, password } = req.body; @@ -129,7 +130,6 @@ userRouter.post('/login', (req, res) => { status: "FAILED", message: "An error occured while comparing passwords" }) - }) } else { res.json({ @@ -146,5 +146,12 @@ userRouter.post('/login', (req, res) => { }) } }) +// set highscore +userRouter.post('/setHighscore', (req, res) => { + const { username, accessToken, score } = req.body + + +}) + module.exports = userRouter; \ No newline at end of file diff --git a/middleware/authenticate.js b/middleware/Authorization.js similarity index 50% rename from middleware/authenticate.js rename to middleware/Authorization.js index ff7cc34c4..9fb781417 100644 --- a/middleware/authenticate.js +++ b/middleware/Authorization.js @@ -3,14 +3,21 @@ const jwt = require('jsonwebtoken') const auth = (req, res, next) => { const authHeader = req.headers['authorization'] - const token = authHeader && authHeader.split(' ')[1] + const token = authHeader //&& authHeader.split(' ')[1] if (token == null) { - return res.sendStatus(401) + console.log('token == null') + return res.json({ + status: "FAILED", + message: "accessToken == null" + }) } jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => { if (err) { - return res.sendStatus(403) + return res.json({ + status: "FAILED", + message: "Error verifying accessToken" + }) } req.user = user next() diff --git a/models/User.js b/models/User.js index 6e2513f8f..189bc6827 100644 --- a/models/User.js +++ b/models/User.js @@ -4,7 +4,7 @@ const Schema = mongoose.Schema; const UserSchema = new Schema({ username: String, password: String, - userdata: String + highscore: Number }) const User = mongoose.model('User', UserSchema) diff --git a/public/js/game.js b/public/js/game.js index e69de29bb..15d157193 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -0,0 +1,6 @@ +let auth = "" +window.onload = () => { + auth = JSON.parse(localStorage.getItem('auth')) + console.log(auth) +} + diff --git a/public/js/leaderboard.js b/public/js/leaderboard.js new file mode 100644 index 000000000..14045f29e --- /dev/null +++ b/public/js/leaderboard.js @@ -0,0 +1,7 @@ + + +window.onload = async () => { + const response = await fetch('/leaderboard/getLeaderboard') + const responseJSON = await response.json() + console.log(JSON.parse(responseJSON.data)) +} \ No newline at end of file diff --git a/public/js/login.js b/public/js/login.js index 19798d356..5b50a02a0 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -24,10 +24,13 @@ loginForm.addEventListener('submit', async e => { console.log(responseJSON) if (responseJSON.status == "FAILED") { alert(responseJSON.message) - clearFormPassword() } - if (responseJSON.status == "SUCCESS") { //TODO - window.location.replace('/game') + + if (responseJSON.status == "SUCCESS") { + localStorage.setItem('auth', JSON.stringify({ username: responseJSON.username, accessToken: responseJSON.accessToken })) + + //TODO + window.location = `/auth/game/${responseJSON.accessToken}` } }) diff --git a/public/js/signup.js b/public/js/signup.js index a269c3b44..c7be713fd 100644 --- a/public/js/signup.js +++ b/public/js/signup.js @@ -15,7 +15,7 @@ signupForm.addEventListener('submit', async e => { const signupData = { "username": username, "password": password, - "userdata": JSON.stringify([]) + "highscore": 0 } const response = await fetch('/user/signup', { @@ -40,5 +40,4 @@ signupForm.addEventListener('submit', async e => { alert("passwords Don't match!") clearFormPassword() } - }) diff --git a/server.js b/server.js index 8cdbc7295..dcac08e29 100644 --- a/server.js +++ b/server.js @@ -7,7 +7,8 @@ const mongoose = require('mongoose') const connectDB = require('./config/dbConn') const UserRouter = require('./api/User') const AuthRouter = require('./api/Auth') -const auth = require('./middleware/authenticate') +const LeaderboardRouter = require('./api/Leaderboard') +const auth = require('./middleware/Authorization') // INIT @@ -20,6 +21,7 @@ app.use(express.static(path.join(__dirname, '/public'))) app.use(express.json()) + //Routes // home page app.get('/', (req, res) => { @@ -37,19 +39,21 @@ app.get('/signup', (req, res) => { // changed createaccount to signup cause that res.render('signup') }) // leaderboard page -app.get('/leaderboard', auth, (req, res) => { +app.get('/leaderboard', (req, res) => { console.log(req.user) res.render('leaderboard') // will change when these pages exist }) // game page -app.get('/game', auth, (req, res) => { - console.log(req.user) - res.render('game') // will change when these pages exist +app.get('/game', (req, res) => { + res.render('game') }) // Users route app.use('/user', UserRouter) // Auth route app.use('/auth', AuthRouter) +// Leaderboard route +app.use('/leaderboard', LeaderboardRouter) + // connect to database, ASK ME FOR THE ENV VARIABLES OR THIS WILL NOT WORK!!, // if you do not need to test w/ database then comment out this code diff --git a/views/home.ejs b/views/home.ejs index a61256aec..6e0efd205 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,7 +17,6 @@ - Login Sign Up diff --git a/views/leaderboard.ejs b/views/leaderboard.ejs index c8a8c101f..0fd188492 100644 --- a/views/leaderboard.ejs +++ b/views/leaderboard.ejs @@ -10,6 +10,7 @@ Leaderboard + \ No newline at end of file From a5abe218e11b188dc762293bc9ae45ea0ab4a2bb Mon Sep 17 00:00:00 2001 From: AidanMulcahey Date: Mon, 10 Oct 2022 23:49:09 -0400 Subject: [PATCH 15/36] Leaderboard, home buttons --- package-lock.json | 1 + public/js/leaderboard.js | 17 +++++++++++++++++ public/styles/login.css | 36 +++++++++++++++++++++++++++++++++++- views/header.ejs | 4 ++++ views/home.ejs | 5 ++--- views/leaderboard.ejs | 28 +++++++++++++++++++++------- views/login.ejs | 4 +--- views/signup.ejs | 4 +--- 8 files changed, 82 insertions(+), 17 deletions(-) create mode 100644 views/header.ejs diff --git a/package-lock.json b/package-lock.json index 816106528..2d712ece5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "final_project", "version": "1.0.0", "license": "ISC", "dependencies": { diff --git a/public/js/leaderboard.js b/public/js/leaderboard.js index 14045f29e..106e698bc 100644 --- a/public/js/leaderboard.js +++ b/public/js/leaderboard.js @@ -4,4 +4,21 @@ window.onload = async () => { const response = await fetch('/leaderboard/getLeaderboard') const responseJSON = await response.json() console.log(JSON.parse(responseJSON.data)) + + let playersData = JSON.parse(responseJSON.data); + + let table = document.getElementById("scoretable"); + + for(let i=0; i< playersData.length; i++) { + + let eachPlayer = playersData[i]; + let row = table.insertRow(i+1); + + let nameCell = row.insertCell(0); + let scoreCell = row.insertCell(1); + + nameCell.innerHTML = eachPlayer.username; + scoreCell.innerHTML = eachPlayer.highscore; + + } } \ No newline at end of file diff --git a/public/styles/login.css b/public/styles/login.css index a6fd9285a..ce4b46757 100644 --- a/public/styles/login.css +++ b/public/styles/login.css @@ -57,4 +57,38 @@ button:hover { span , a { color :#00FF41 - } \ No newline at end of file + } + + #scoretable td,th{ + text-align: center; + border: 1px black solid; + width: 500px; + height: 50px; + font-size: large; +} + +#scoretable th{ + border: 1px black solid; + background-color: #00FF41; +} + +#scoretable td{ + border: 1px #00FF41 solid; + background-color: black; + color: white; +} +.homelink a{ + color: black; +} + +.homelink{ + float: right; +} + +.header h1 { + width: 80%; + display: contents; +} + + + \ No newline at end of file diff --git a/views/header.ejs b/views/header.ejs new file mode 100644 index 000000000..c9f85a249 --- /dev/null +++ b/views/header.ejs @@ -0,0 +1,4 @@ +
+

Welcome to Reaction Game

+ Home +
\ No newline at end of file diff --git a/views/home.ejs b/views/home.ejs index 6e0efd205..741e63d46 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -7,9 +7,7 @@ Game -
-

Welcome to Reaction Game

-
+<%- include('header') %>

Please log in to your account:

@@ -19,6 +17,7 @@ Login Sign Up + Leader Board diff --git a/views/leaderboard.ejs b/views/leaderboard.ejs index 0fd188492..e888fa60c 100644 --- a/views/leaderboard.ejs +++ b/views/leaderboard.ejs @@ -2,15 +2,29 @@ - - - - Document + + + + Game +<%- include('header') %> +
+

Below is the leader board:

- - Leaderboard + + + + + + + + +
Player NameScore
+ - + +
+ + \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index 063b2b5ff..33d3766ac 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -9,9 +9,7 @@ -
-

Welcome to Reaction Game

-
+<%- include('header') %>

Please log in to your account:

diff --git a/views/signup.ejs b/views/signup.ejs index 3f3d843ef..0c431cae5 100644 --- a/views/signup.ejs +++ b/views/signup.ejs @@ -7,9 +7,7 @@ Game -
-

Sign Up to Reaction Game

-
+<%- include('header') %>

Please create an account:

From c965c68f4d6dd1f67fc5e39b76438d639386eca5 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Tue, 11 Oct 2022 00:08:42 -0400 Subject: [PATCH 16/36] s --- server.js | 2 -- views/login.ejs | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/server.js b/server.js index dcac08e29..1d93bfa07 100644 --- a/server.js +++ b/server.js @@ -20,8 +20,6 @@ app.set('view engine', 'ejs') app.use(express.static(path.join(__dirname, '/public'))) app.use(express.json()) - - //Routes // home page app.get('/', (req, res) => { diff --git a/views/login.ejs b/views/login.ejs index 063b2b5ff..4ea74d824 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -34,6 +34,4 @@ - - - \ No newline at end of file + \ No newline at end of file From 67ccb45e91062bcb89674f4e28efaae42d912959 Mon Sep 17 00:00:00 2001 From: AidanMulcahey Date: Tue, 11 Oct 2022 13:27:51 -0400 Subject: [PATCH 17/36] spell fixes --- views/home.ejs | 2 +- views/leaderboard.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/home.ejs b/views/home.ejs index 741e63d46..0ad1f838e 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,7 +17,7 @@ Login Sign Up - Leader Board + Leaderboard diff --git a/views/leaderboard.ejs b/views/leaderboard.ejs index e888fa60c..66860dcf8 100644 --- a/views/leaderboard.ejs +++ b/views/leaderboard.ejs @@ -9,7 +9,7 @@ <%- include('header') %>
-

Below is the leader board:

+

Below is the leaderboard:

From 97bd3491454d70c151631f838ec4dcbe551851d9 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Tue, 11 Oct 2022 13:32:16 -0400 Subject: [PATCH 18/36] s --- api/Auth.js | 4 +--- api/User.js | 6 ++++-- middleware/Authorization.js | 2 +- public/js/login.js | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/Auth.js b/api/Auth.js index 64fe00e49..88e0cf864 100644 --- a/api/Auth.js +++ b/api/Auth.js @@ -11,9 +11,7 @@ const auth = require('../middleware/Authorization') // Ideally stored in a database let refreshTokens = [] -authRouter.get('/game/:authToken', (req, res, next) => { - req.headers['authorization'] = req.params.authToken - auth(req, res, next) +authRouter.get('/game/:authToken', auth, (req, res, next) => { if (req.user) { res.redirect('/game') } else { diff --git a/api/User.js b/api/User.js index 3baf7e41c..5e5bba46a 100644 --- a/api/User.js +++ b/api/User.js @@ -117,14 +117,16 @@ userRouter.post('/login', (req, res) => { data: result, accessToken: accessToken }) - } else { + } + else { console.error("invalid password") res.json({ status: "FAILED", message: "Invalid password entered!" }) } - }).catch(e => { + }) + .catch(e => { console.error("error comparing password") res.json({ status: "FAILED", diff --git a/middleware/Authorization.js b/middleware/Authorization.js index 9fb781417..074ef683c 100644 --- a/middleware/Authorization.js +++ b/middleware/Authorization.js @@ -2,7 +2,7 @@ const jwt = require('jsonwebtoken') const auth = (req, res, next) => { - const authHeader = req.headers['authorization'] + const authHeader = req.params.authToken const token = authHeader //&& authHeader.split(' ')[1] if (token == null) { console.log('token == null') diff --git a/public/js/login.js b/public/js/login.js index 5b50a02a0..6f11f1378 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -21,14 +21,16 @@ loginForm.addEventListener('submit', async e => { }) const responseJSON = await response.json() - console.log(responseJSON) + //console.log("ASDDDSADDSD ", responseJSON) if (responseJSON.status == "FAILED") { alert(responseJSON.message) + loginForm.elements['loginPassword'].value = "" } if (responseJSON.status == "SUCCESS") { localStorage.setItem('auth', JSON.stringify({ username: responseJSON.username, accessToken: responseJSON.accessToken })) + console.log("success") //TODO window.location = `/auth/game/${responseJSON.accessToken}` } From ce6aa455e177cd1e5d719cb7b530b7528ceba54b Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Wed, 12 Oct 2022 00:11:53 -0400 Subject: [PATCH 19/36] help me --- authServer.js | 42 ------------------------------------- middleware/Authorization.js | 1 - public/js/game.js | 3 +++ public/js/login.js | 1 - server.js | 1 - views/game.ejs | 14 ++++++++++++- 6 files changed, 16 insertions(+), 46 deletions(-) delete mode 100644 authServer.js diff --git a/authServer.js b/authServer.js deleted file mode 100644 index c7f5f5057..000000000 --- a/authServer.js +++ /dev/null @@ -1,42 +0,0 @@ -require('dotenv').config() -const express = require('express') -const app = express() -const jwt = require('jsonwebtoken') -app.use(express.json()) - -// Ideally stored in a database -let refreshTokens = [] - -app.post('/login', (req, res) => { - const username = req.body.username - const user = { name: username } - - const accessToken = generateAccessToken(user) - const refreshToken = jwt.sign(user, process.env.REFRESH_TOKEN_SECRET) - refreshTokens.push(refreshToken) - res.json({ accessToken: accessToken, refreshToken: refreshToken }) -}) -app.post('/token', (req, res) => { - const refreshToken = req.body.token - if (refreshToken == null) { return res.status.sendStatus(401) } - if (!refreshTokens.includes(refreshToken)) { - return res.sendStatus(403) - } - jwt.verify(refreshToken, process.env.REFRESH_TOKEN_SECRET, (err, user) => { - if (err) { - return res.sendStatus(403) - } - const accessToken = generateAccessToken({ name: user.name }) - res.json({ accessToken: accessToken }) - }) -}) -app.delete('/logout', (req, res) => { - refreshTokens = refreshTokens.filter(token => token !== req.body.token) - res.sendStatus(204) -}) - -const generateAccessToken = (user) => { - return jwt.sign(user, process.env.ACCESS_TOKEN_SECRET, { expiresIn: '30m' }) -} - -app.listen(4000) \ No newline at end of file diff --git a/middleware/Authorization.js b/middleware/Authorization.js index 074ef683c..55b1aa6b4 100644 --- a/middleware/Authorization.js +++ b/middleware/Authorization.js @@ -5,7 +5,6 @@ const auth = (req, res, next) => { const authHeader = req.params.authToken const token = authHeader //&& authHeader.split(' ')[1] if (token == null) { - console.log('token == null') return res.json({ status: "FAILED", message: "accessToken == null" diff --git a/public/js/game.js b/public/js/game.js index 15d157193..09a75d148 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -4,3 +4,6 @@ window.onload = () => { console.log(auth) } +document.querySelectorAll('target').forEach(target => { + +}) \ No newline at end of file diff --git a/public/js/login.js b/public/js/login.js index 6f11f1378..ba757bf21 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -21,7 +21,6 @@ loginForm.addEventListener('submit', async e => { }) const responseJSON = await response.json() - //console.log("ASDDDSADDSD ", responseJSON) if (responseJSON.status == "FAILED") { alert(responseJSON.message) loginForm.elements['loginPassword'].value = "" diff --git a/server.js b/server.js index 1d93bfa07..76e52603c 100644 --- a/server.js +++ b/server.js @@ -38,7 +38,6 @@ app.get('/signup', (req, res) => { // changed createaccount to signup cause that }) // leaderboard page app.get('/leaderboard', (req, res) => { - console.log(req.user) res.render('leaderboard') // will change when these pages exist }) // game page diff --git a/views/game.ejs b/views/game.ejs index e2d4e8906..a6edfdc40 100644 --- a/views/game.ejs +++ b/views/game.ejs @@ -9,7 +9,19 @@ - Game +
Player's Accuracy Test
+
+ + +
+
+
+
+
+
+ + + From 888ed61f23e37f0ef24f2bd4687b338e3575ca88 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Wed, 12 Oct 2022 14:39:23 -0400 Subject: [PATCH 20/36] game --- api/Auth.js | 1 + api/Leaderboard.js | 2 - api/User.js | 31 +++++++- public/js/game.js | 174 +++++++++++++++++++++++++++++++++++++++-- public/styles/game.css | 42 ++++++++++ views/game.ejs | 18 +++-- 6 files changed, 253 insertions(+), 15 deletions(-) create mode 100644 public/styles/game.css diff --git a/api/Auth.js b/api/Auth.js index 88e0cf864..f41795c5f 100644 --- a/api/Auth.js +++ b/api/Auth.js @@ -14,6 +14,7 @@ let refreshTokens = [] authRouter.get('/game/:authToken', auth, (req, res, next) => { if (req.user) { res.redirect('/game') + next() } else { res.redirect('/login') } diff --git a/api/Leaderboard.js b/api/Leaderboard.js index a6b803bd9..81d988272 100644 --- a/api/Leaderboard.js +++ b/api/Leaderboard.js @@ -10,8 +10,6 @@ const User = require('./../models/User') leaderboardRouter.get('/getLeaderboard', (req, res) => { - - User.find() .then(data => { if (data.length) { diff --git a/api/User.js b/api/User.js index 5e5bba46a..5d9570ed4 100644 --- a/api/User.js +++ b/api/User.js @@ -148,10 +148,35 @@ userRouter.post('/login', (req, res) => { }) } }) -// set highscore -userRouter.post('/setHighscore', (req, res) => { - const { username, accessToken, score } = req.body +// get highscore +userRouter.get('/getHighscore/:username', (req, res) => { + const username = req.params.username + User.find({ username }) + .then(data => { // doing stuff with the data returned from database + if (data.length) { // checking if there is data + const resJson = { + username: data[0].username, + highscore: data[0].highscore + } + res.json({ + status: "SUCCESS", + message: "Got user highscore", + data: JSON.stringify(resJson) + }) + } else { + res.json({ + status: "FAILED", + message: "Invalid credentials entered" + }) + } + }) + .catch(e => { // could not find matching username in database + res.json({ + status: "FAILED", + message: "An error occured while checking for existing user" + }) + }) }) diff --git a/public/js/game.js b/public/js/game.js index 09a75d148..2df405944 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -1,9 +1,173 @@ -let auth = "" -window.onload = () => { +let score = 0 +let gameActive = false +let auth = {} +let currentHighScore = 0 + +const statusText = document.querySelector('.status') +const btnStart = document.querySelector(".btnStart") +const backgroundContainer = document.querySelector(".backgroundContainer") +const scoreText = document.querySelector(".score") +const welcomeMsg = document.querySelector(".welcome") +const highscoreMsg = document.querySelector(".highscore") +const clickhandler = (e, config) => { + if (e.target !== this) { + score = Math.round((score - config.scorePenalty) * 100) / 100 + scoreText.innerHTML = "Score: " + score.toString() + } +} +const deactivateTargets = () => { + backgroundContainer.classList.add('hide') + + document.querySelectorAll('.target').forEach(item => { + item.classList.add('hide') + + item.removeEventListener('click', () => { + score++; + item.classList.add('hide') + setTimeout(() => { + if (gameActive) { + placeTarget() + } + }, config.timeBetweenTargets) + }) + }) +} + +const startGame = (config) => { + score = 0 + scoreText.innerHTML = "Score: " + score.toString() + gameActive = true + activateTargets(config) + gameCountDown(config) + backgroundContainer.classList.remove('hide') +} + +const endGame = (config) => { + gameActive = false + deactivateTargets(config) + scoreText.innerHTML = "Score: " + score.toString() + btnStart.classList.remove('hide') + + backgroundContainer.classList.add('hide') + //TODO send score to server + updateHighscore(score) +} + +const updateHighscore = async (highScore) => { + + if (currentHighScore < highScore) { + const response = await fetch('/leaderboard/submitScore', { + method: "POST", + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ username: auth.username, score: highScore }) + }) + const responseJSON = await response.json(); + + if (responseJSON.status == "SUCCESS") { + highscoreMsg.innerHTML = "Your Highscore: " + highScore + statusText.innerHTML = `Congrats! New Highscore of ${highScore}` + } else { + console.log(responseJSON) + } + + } + +} + +const startCountDown = (config) => { + let count = 3 + let downloadTimer = setInterval(() => { + if (count == 0) { + statusText.innerHTML = "" + startGame(config) + clearInterval(downloadTimer) + } + statusText.innerHTML = count.toString(); + count-- + }, 1000) +} + +const gameCountDown = (config) => { + let count = config.gameTime + let downloadTimer = setInterval(() => { + if (count <= 0) { + statusText.innerHTML = "Game Over" + clearInterval(downloadTimer) + endGame(config) + } + if (count > 0) { + statusText.innerHTML = count.toString() + "s remaining!"; + } + count-- + }, 1000) +} + +const placeTarget = (item) => { + item.classList.remove('hide') + let x = Math.floor(Math.random() * 91) + let y = Math.floor(Math.random() * 90) + item.style['top'] = `${x}%` + item.style['left'] = `${y}%` +} +const activateTargets = (config) => { + + document.querySelectorAll('.target').forEach(item => { + item.classList.add('hide') + + // init position + setTimeout(() => { + placeTarget(item) + }, Math.round(Math.random() * 2500, 2)) + }) +} + +window.onload = async () => { auth = JSON.parse(localStorage.getItem('auth')) - console.log(auth) + + const response = await fetch(`/user/getHighscore/${auth.username}`, { + method: "GET", + headers: { + 'Content-Type': 'application/json', + } + }) + const responseJSON = await response.json() + const data = JSON.parse(responseJSON.data) + + currentHighScore = data.highscore + welcomeMsg.innerHTML = "Welcome, " + data.username + highscoreMsg.innerHTML = "Your Highscore: " + currentHighScore } -document.querySelectorAll('target').forEach(target => { +const init = () => { + const config = { + gameTime: 15, //seconds + timeBetweenTargets: 250, //milliseconds + scorePenalty: .4 + } + deactivateTargets() + + + btnStart.addEventListener('click', () => { + btnStart.classList.add('hide') + startCountDown(config) + }) + + backgroundContainer.addEventListener('click', e => clickhandler(e, config)) + + document.querySelectorAll('.target').forEach(item => { + item.addEventListener('click', () => { + score = Math.round((score + 1) * 100) / 100 + scoreText.innerHTML = "Score: " + score.toString() + item.classList.add('hide') + setTimeout(() => { + if (gameActive) { + placeTarget(item) + } + }, config.timeBetweenTargets) + }) + }) +} -}) \ No newline at end of file +init() diff --git a/public/styles/game.css b/public/styles/game.css new file mode 100644 index 000000000..9a8ed0e3c --- /dev/null +++ b/public/styles/game.css @@ -0,0 +1,42 @@ + +.container { + display: flex; + flex-direction: column; + align-items: center; +} +.gameContainer { + border: 2px solid black; + width: 75vw; + height: 75vh; + position: relative; + background-color:aqua; + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Safari */ + -khtml-user-select: none; /* Konqueror HTML */ + -moz-user-select: none; /* Old versions of Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; +} +.backgroundContainer { + width: 100%; + height: 100%; + z-index: 1 +} +.target { + width: 5vw; + height: 5vw; + min-width: 50px; + min-height: 50px; + max-width: 100px; + max-height: 100px; + border-radius: 50%; + background-color: red; + position:absolute; + z-index: 2; + border:none; +} + +.hide { + visibility: hidden; +} + diff --git a/views/game.ejs b/views/game.ejs index a6edfdc40..c51a9d0d9 100644 --- a/views/game.ejs +++ b/views/game.ejs @@ -6,18 +6,26 @@ Document + -
Player's Accuracy Test
+
+

Welcome Player

+

Your High Score: 0

+ leaderboard +
- + +

-
-
-
+
+ + +
+

From 473917ab30dc96a69a1c4878e8e2512864437749 Mon Sep 17 00:00:00 2001 From: AidanMulcahey Date: Wed, 12 Oct 2022 23:28:40 -0400 Subject: [PATCH 21/36] design for leaderboard, bug fixes --- public/js/game.js | 10 +++++----- public/js/leaderboard.js | 8 ++++++-- public/styles/game.css | 24 +++++++++++++++++++++--- views/game.ejs | 18 +++++++++++------- views/leaderboard.ejs | 2 ++ 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/public/js/game.js b/public/js/game.js index 2df405944..6fb01cc1d 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -12,7 +12,7 @@ const highscoreMsg = document.querySelector(".highscore") const clickhandler = (e, config) => { if (e.target !== this) { score = Math.round((score - config.scorePenalty) * 100) / 100 - scoreText.innerHTML = "Score: " + score.toString() + scoreText.innerHTML = "Current Game Score: " + score.toString() } } const deactivateTargets = () => { @@ -35,7 +35,7 @@ const deactivateTargets = () => { const startGame = (config) => { score = 0 - scoreText.innerHTML = "Score: " + score.toString() + scoreText.innerHTML = "Current Game Score: " + score.toString() gameActive = true activateTargets(config) gameCountDown(config) @@ -45,7 +45,7 @@ const startGame = (config) => { const endGame = (config) => { gameActive = false deactivateTargets(config) - scoreText.innerHTML = "Score: " + score.toString() + scoreText.innerHTML = "Current Game Score: " + score.toString() btnStart.classList.remove('hide') backgroundContainer.classList.add('hide') @@ -98,7 +98,7 @@ const gameCountDown = (config) => { endGame(config) } if (count > 0) { - statusText.innerHTML = count.toString() + "s remaining!"; + statusText.innerHTML = count.toString() + "s remaining! click the dots as fast as you can!"; } count-- }, 1000) @@ -159,7 +159,7 @@ const init = () => { document.querySelectorAll('.target').forEach(item => { item.addEventListener('click', () => { score = Math.round((score + 1) * 100) / 100 - scoreText.innerHTML = "Score: " + score.toString() + scoreText.innerHTML = "Current Game Score: " + score.toString() item.classList.add('hide') setTimeout(() => { if (gameActive) { diff --git a/public/js/leaderboard.js b/public/js/leaderboard.js index 106e698bc..928af282d 100644 --- a/public/js/leaderboard.js +++ b/public/js/leaderboard.js @@ -9,14 +9,18 @@ window.onload = async () => { let table = document.getElementById("scoretable"); + playersData.sort((a,b) => a.highscore < b.highscore ? 1 : -1 ); + for(let i=0; i< playersData.length; i++) { let eachPlayer = playersData[i]; let row = table.insertRow(i+1); - let nameCell = row.insertCell(0); - let scoreCell = row.insertCell(1); + let rankCell = row.insertCell(0); + let nameCell = row.insertCell(1); + let scoreCell = row.insertCell(2); + rankCell.innerHTML = i+1; nameCell.innerHTML = eachPlayer.username; scoreCell.innerHTML = eachPlayer.highscore; diff --git a/public/styles/game.css b/public/styles/game.css index 9a8ed0e3c..cf041dab9 100644 --- a/public/styles/game.css +++ b/public/styles/game.css @@ -1,5 +1,5 @@ -.container { +.container_game { display: flex; flex-direction: column; align-items: center; @@ -9,7 +9,7 @@ width: 75vw; height: 75vh; position: relative; - background-color:aqua; + background-color: black; -webkit-touch-callout: none; /* iOS Safari */ -webkit-user-select: none; /* Safari */ -khtml-user-select: none; /* Konqueror HTML */ @@ -30,7 +30,7 @@ max-width: 100px; max-height: 100px; border-radius: 50%; - background-color: red; + background-color: #00FF41; position:absolute; z-index: 2; border:none; @@ -39,4 +39,22 @@ .hide { visibility: hidden; } +.status, .btnStart { + color: #00FF41; + background: black; + font-size: 37px; + display: inline; + +} +.status { + width: 70%; +} +.startgamestatus { + width: 70%; +} + +.leaderboard { + float: right; + font-size: 20px; +} diff --git a/views/game.ejs b/views/game.ejs index c51a9d0d9..3788ce312 100644 --- a/views/game.ejs +++ b/views/game.ejs @@ -7,25 +7,29 @@ Document +
-

Welcome Player

-

Your High Score: 0

- leaderboard + +

Welcome Player Home
Your High Score: 0 Leaderboard

+ +
-
- -

+
+
+ + +
-

+
diff --git a/views/leaderboard.ejs b/views/leaderboard.ejs index 66860dcf8..0c66764e8 100644 --- a/views/leaderboard.ejs +++ b/views/leaderboard.ejs @@ -15,8 +15,10 @@ + +
Rank Player Name Score
From eb4d8c6454db19bc5c2e9228eceafe9e5d6930ec Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Wed, 12 Oct 2022 23:42:04 -0400 Subject: [PATCH 22/36] edit style a little --- README.md | 3 +-- package.json | 1 - public/styles/game.css | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d757c0998..d2becc483 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Reaction Time Game +## Reaction Time Game 1. A brief description of what you created, and a link to the project itself (two paragraphs of text) 2. Any additional instructions that might be needed to fully use your project (login information etc.) @@ -8,4 +8,3 @@ 6. A link to your project video. Think of 1,3, and 4 in particular in a similar vein to the design / tech achievements for A1—A4… make a case for why what you did was challenging and why your implementation deserves a grade of 100%. - diff --git a/package.json b/package.json index c5f8ba574..bbb075727 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "homepage": "https://github.com/gabestuf/final_project#readme", "dependencies": { "argon2": "^0.29.1", - "bcrypt": "^5.0.1", "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", diff --git a/public/styles/game.css b/public/styles/game.css index cf041dab9..31c7b8d35 100644 --- a/public/styles/game.css +++ b/public/styles/game.css @@ -35,6 +35,10 @@ z-index: 2; border:none; } +.target:hover { + background-color: #00FF41; + cursor:default; +} .hide { visibility: hidden; @@ -44,7 +48,6 @@ background: black; font-size: 37px; display: inline; - } .status { width: 70%; From c0623400b31f21e4097ca76280f8d427e625eb47 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Wed, 12 Oct 2022 23:54:02 -0400 Subject: [PATCH 23/36] final --- README.md | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d2becc483..62ecc844e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -## Reaction Time Game +## Reaction Time Game, Heroku: -1. A brief description of what you created, and a link to the project itself (two paragraphs of text) -2. Any additional instructions that might be needed to fully use your project (login information etc.) -3. An outline of the technologies you used and how you used them. -4. What challenges you faced in completing the project. -5. What each group member was responsible for designing / developing. -6. A link to your project video. +## Aidan Mulcahey, Gabriel Camacho, Jonathan Palmieri -Think of 1,3, and 4 in particular in a similar vein to the design / tech achievements for A1—A4… make a case for why what you did was challenging and why your implementation deserves a grade of 100%. +1. Reactime Time Game with a Login Page, Create an Account Page, and a Leaderboard Page. The goal of the game + is to click the green buttons that appear on the screen as fast as you can. The results will then be displayed on a + leaderboard. +2. Instructions are to make a user, login, and then press Start Game +3. Express, MongoDB, argon2, dotenv, ejs, jsonwebtoken, mongoose +4. Challenges included programming the game +5. Aidan Mulcahey - Login, Create an Account, Leaderboard Page, & Design, Gabriel Camacho - created game and set up routes for backend, Jonathan Palmieri - connected server to database +6. Link to Video: https://www.youtube.com/watch?v=QydoE20bjdE From ee2b63f5ac4accf8a4afb571f5ea3983540f1568 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 13 Oct 2022 00:14:57 -0400 Subject: [PATCH 24/36] Fasdsdsdasd --- .gitignore | 3 +-- README.md | 2 ++ package-lock.json | 34 ---------------------------------- public/js/game.js | 1 + public/styles/game.css | 7 +++++++ 5 files changed, 11 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 56b5ec6dc..0fdc574b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ node_modules .env -request.rest -authServer.js \ No newline at end of file +request.rest \ No newline at end of file diff --git a/README.md b/README.md index 62ecc844e..b68eee7eb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## Reaction Time Game, Heroku: +https://aimtrainer-webware.herokuapp.com/ + ## Aidan Mulcahey, Gabriel Camacho, Jonathan Palmieri 1. Reactime Time Game with a Login Page, Create an Account Page, and a Leaderboard Page. The goal of the game diff --git a/package-lock.json b/package-lock.json index 2d712ece5..8377ae359 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,10 @@ "requires": true, "packages": { "": { - "name": "final_project", "version": "1.0.0", "license": "ISC", "dependencies": { "argon2": "^0.29.1", - "bcrypt": "^5.0.1", "dotenv": "^16.0.3", "ejs": "^3.1.8", "express": "^4.18.1", @@ -252,19 +250,6 @@ } ] }, - "node_modules/bcrypt": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", - "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", - "hasInstallScript": true, - "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.0", - "node-addon-api": "^3.1.0" - }, - "engines": { - "node": ">= 10.0.0" - } - }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -1399,11 +1384,6 @@ "node": ">= 0.6" } }, - "node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" - }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -2220,15 +2200,6 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, - "bcrypt": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.1.tgz", - "integrity": "sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==", - "requires": { - "@mapbox/node-pre-gyp": "^1.0.0", - "node-addon-api": "^3.1.0" - } - }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -3089,11 +3060,6 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, - "node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==" - }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", diff --git a/public/js/game.js b/public/js/game.js index 6fb01cc1d..046451301 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -146,6 +146,7 @@ const init = () => { timeBetweenTargets: 250, //milliseconds scorePenalty: .4 } + deactivateTargets() diff --git a/public/styles/game.css b/public/styles/game.css index 31c7b8d35..a7902bc5f 100644 --- a/public/styles/game.css +++ b/public/styles/game.css @@ -16,6 +16,7 @@ -moz-user-select: none; /* Old versions of Firefox */ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; + border: 5px solid #00FF41; } .backgroundContainer { width: 100%; @@ -51,9 +52,15 @@ } .status { width: 70%; + text-align: center; } .startgamestatus { width: 70%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } .leaderboard { From 8d2a6304457375b7b12547ea19d8628699cc5b6d Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 13 Oct 2022 01:51:19 -0400 Subject: [PATCH 25/36] small optimizations and user experience improvements --- api/Leaderboard.js | 1 - public/js/game.js | 23 ++++++++++++++------ public/js/login.js | 1 - public/js/reactionGame.js | 3 --- public/styles/game.css | 43 +++++++++++++++++++++++++++++++----- public/styles/login.css | 37 ++++++++++++++++++++++--------- views/game.ejs | 24 +++++++++++--------- views/header.ejs | 6 ++--- views/home.ejs | 26 +++++++++++----------- views/login.ejs | 38 ++++++++++++++++---------------- views/signup.ejs | 46 +++++++++++++++++++-------------------- 11 files changed, 153 insertions(+), 95 deletions(-) delete mode 100644 public/js/reactionGame.js diff --git a/api/Leaderboard.js b/api/Leaderboard.js index 81d988272..e39153d4e 100644 --- a/api/Leaderboard.js +++ b/api/Leaderboard.js @@ -72,7 +72,6 @@ leaderboardRouter.post('/submitScore', (req, res) => { //add auth eventually message: "Error=1" }) } else { - console.log(updatedObject) res.json({ status: "SUCCESS", message: "Edited highscore", diff --git a/public/js/game.js b/public/js/game.js index 046451301..f9750a5f0 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -9,6 +9,7 @@ const backgroundContainer = document.querySelector(".backgroundContainer") const scoreText = document.querySelector(".score") const welcomeMsg = document.querySelector(".welcome") const highscoreMsg = document.querySelector(".highscore") + const clickhandler = (e, config) => { if (e.target !== this) { score = Math.round((score - config.scorePenalty) * 100) / 100 @@ -67,7 +68,7 @@ const updateHighscore = async (highScore) => { if (responseJSON.status == "SUCCESS") { highscoreMsg.innerHTML = "Your Highscore: " + highScore - statusText.innerHTML = `Congrats! New Highscore of ${highScore}` + statusText.innerHTML = `

Congrats! New Highscore of ${highScore}

You should play again

` } else { console.log(responseJSON) } @@ -80,11 +81,11 @@ const startCountDown = (config) => { let count = 3 let downloadTimer = setInterval(() => { if (count == 0) { - statusText.innerHTML = "" + statusText.innerHTML = '

Get Ready!

GO!

' startGame(config) clearInterval(downloadTimer) } - statusText.innerHTML = count.toString(); + statusText.innerHTML = `

Get Ready!

${count.toString()}

`; count-- }, 1000) } @@ -93,12 +94,12 @@ const gameCountDown = (config) => { let count = config.gameTime let downloadTimer = setInterval(() => { if (count <= 0) { - statusText.innerHTML = "Game Over" + statusText.innerHTML = `

Game Over!

You Should Play Again!!

`; clearInterval(downloadTimer) endGame(config) } if (count > 0) { - statusText.innerHTML = count.toString() + "s remaining! click the dots as fast as you can!"; + statusText.innerHTML = `

click the dots as fast as you can!"

${count.toString()}s remaining!

`; } count-- }, 1000) @@ -106,8 +107,13 @@ const gameCountDown = (config) => { const placeTarget = (item) => { item.classList.remove('hide') - let x = Math.floor(Math.random() * 91) - let y = Math.floor(Math.random() * 90) + const targetDiameter = item.offsetWidth + const viewWidth = backgroundContainer.offsetWidth + const viewHeight = backgroundContainer.offsetHeight + const percentX = Math.round(targetDiameter / viewWidth * 100) + const percentY = Math.round(targetDiameter / viewHeight * 100) - 3 + let x = Math.floor(Math.random() * (100 - percentX)) + let y = Math.floor(Math.random() * (100 - percentY)) item.style['top'] = `${x}%` item.style['left'] = `${y}%` } @@ -169,6 +175,9 @@ const init = () => { }, config.timeBetweenTargets) }) }) + + scoreText.innerHTML = "Current Game Score:" + statusText.innerHTML = `

AIM TRAINER!

press start to begin

`; } init() diff --git a/public/js/login.js b/public/js/login.js index ba757bf21..1eb462e1e 100644 --- a/public/js/login.js +++ b/public/js/login.js @@ -29,7 +29,6 @@ loginForm.addEventListener('submit', async e => { if (responseJSON.status == "SUCCESS") { localStorage.setItem('auth', JSON.stringify({ username: responseJSON.username, accessToken: responseJSON.accessToken })) - console.log("success") //TODO window.location = `/auth/game/${responseJSON.accessToken}` } diff --git a/public/js/reactionGame.js b/public/js/reactionGame.js deleted file mode 100644 index 6261af414..000000000 --- a/public/js/reactionGame.js +++ /dev/null @@ -1,3 +0,0 @@ - -//this is a test -console.log("Hello") \ No newline at end of file diff --git a/public/styles/game.css b/public/styles/game.css index a7902bc5f..fbd2b1e08 100644 --- a/public/styles/game.css +++ b/public/styles/game.css @@ -1,3 +1,6 @@ +body { + background-color: rgb(59, 59, 59); +} .container_game { display: flex; @@ -5,9 +8,10 @@ align-items: center; } .gameContainer { - border: 2px solid black; width: 75vw; height: 75vh; + min-width: 350px; + min-height: 500px; position: relative; background-color: black; -webkit-touch-callout: none; /* iOS Safari */ @@ -16,7 +20,8 @@ -moz-user-select: none; /* Old versions of Firefox */ -ms-user-select: none; /* Internet Explorer/Edge */ user-select: none; - border: 5px solid #00FF41; + border: 1px #00FF41 solid; + margin-bottom: 20vh; } .backgroundContainer { width: 100%; @@ -26,8 +31,8 @@ .target { width: 5vw; height: 5vw; - min-width: 50px; - min-height: 50px; + min-width: 40px; + min-height: 40px; max-width: 100px; max-height: 100px; border-radius: 50%; @@ -54,17 +59,45 @@ width: 70%; text-align: center; } +.btnStart:hover { + background-color: rgb(17, 17, 17); + box-shadow: 0 0 5px 5px #00FF41; +} .startgamestatus { width: 70%; display: flex; flex-direction: column; justify-content: center; align-items: center; - + margin-bottom: 1ch; } .leaderboard { float: right; font-size: 20px; } +.hometext.noHover:hover { + box-shadow: none; + background-color: black; + cursor: default; +} +.leaderboard:hover { + color:rgb(221, 241, 38); +} +.sp { + margin: 0; + overflow: hidden; + white-space: nowrap; + text-overflow:ellipsis; +} +@media screen and (max-width: 1060px) { + .sp { + font-size: 3.5vw; + } + } + @media screen and (max-width: 500px) { + .sp { + font-size: 5vw; + } + } \ No newline at end of file diff --git a/public/styles/login.css b/public/styles/login.css index ce4b46757..f962e74d0 100644 --- a/public/styles/login.css +++ b/public/styles/login.css @@ -1,3 +1,7 @@ +body { + background-color: rgb(59, 59, 59); +} + button { background-color: #00FF41; width: 100%; @@ -7,9 +11,7 @@ button { border: none; cursor: pointer; } -form { - border: 3px solid #f1f1f1; - } + input[type=text], input[type=password] { width: 100%; margin: 8px 0; @@ -34,18 +36,22 @@ button:hover { } /* Header/Logo Title */ .header { - height: 2%; - + display: flex; + justify-content: space-between; + align-items: center; background: #00FF41; color: black; font-size: 20px; + padding: 0 2ch; } - - .hometext { + h2 { + color: #00FF41; + } + .hometext, + .header a { font-size: 30px; font-weight: bold; - width: 100%; margin: 8px 0; padding: 12px 20px; display: inline-block; @@ -54,6 +60,13 @@ button:hover { box-sizing: border-box; } + .hometext { + width: 100%; + } + .hometext:hover { + box-shadow: 0 0 5px 5px #00FF41; + cursor: pointer; + } span , a { color :#00FF41 @@ -89,6 +102,10 @@ button:hover { width: 80%; display: contents; } +.header a:hover { + background-color: rgb(49, 49, 49); +} - - \ No newline at end of file +.lbl { + color: white; +} \ No newline at end of file diff --git a/views/game.ejs b/views/game.ejs index 3788ce312..cb5ff10c1 100644 --- a/views/game.ejs +++ b/views/game.ejs @@ -12,24 +12,28 @@
- -

Welcome Player Home
Your High Score: 0 Leaderboard

- - + +

Welcome Player + Home
+ Your High Score: 0 + Leaderboard
+

+ +
- - + +
- - - + + +
- +
diff --git a/views/header.ejs b/views/header.ejs index c9f85a249..8bec174d0 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -1,4 +1,4 @@
-

Welcome to Reaction Game

- Home -
\ No newline at end of file +

Welcome to Aim Trainer

+ Home +
\ No newline at end of file diff --git a/views/home.ejs b/views/home.ejs index 0ad1f838e..35516cd9d 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -8,24 +8,24 @@ Game <%- include('header') %> -
-

Please log in to your account:

+
+

Please log in:

- + -
+ - Login - Sign Up - Leaderboard + Login + Sign Up + Leaderboard -
- -
+ + +
- + - - + + \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index cf9ca46b5..9074ce638 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -10,26 +10,26 @@ <%- include('header') %> -
-

Please log in to your account:

+
+

Please log in to your account:

- + -
-
- - - - - -
- Sign Up -
-
- -
+
+
+ + + + + +
+ Sign Up +
+
+ +
- + - - \ No newline at end of file + + \ No newline at end of file diff --git a/views/signup.ejs b/views/signup.ejs index 0c431cae5..5127391bf 100644 --- a/views/signup.ejs +++ b/views/signup.ejs @@ -8,33 +8,33 @@ Game <%- include('header') %> -
-

Please create an account:

+
+

Please create an account:

- + -
-
- - - - - - - + +
+ + + + + + + -

- Login -
- - -
+

+ Login +
+ + + - + - - - + + + \ No newline at end of file From 969eccf27d1e11e5373e564e23c0add41d5dd069 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 13 Oct 2022 01:58:15 -0400 Subject: [PATCH 26/36] edited README --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b68eee7eb..95e3d1c47 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ https://aimtrainer-webware.herokuapp.com/ ## Aidan Mulcahey, Gabriel Camacho, Jonathan Palmieri -1. Reactime Time Game with a Login Page, Create an Account Page, and a Leaderboard Page. The goal of the game - is to click the green buttons that appear on the screen as fast as you can. The results will then be displayed on a - leaderboard. -2. Instructions are to make a user, login, and then press Start Game +1. Aim Trainer Game with a Login Page, Create an Account Page, Leaderboard Page and Game page. The goal of the game + is to click the green buttons that appear on the screen as fast as you can. Each user's high score will automatically + be entered on the leaderboard. Users will be notified when they beat their own high score. +2. Instructions: Create an account and/or proceed to log in. This will take you to the game page, where you can attempt to get a good score on the Aim Trainer. Initiate the game by pressing the Start Game button. At any point, check the leaderboard to see how you are doing versus the other users. 3. Express, MongoDB, argon2, dotenv, ejs, jsonwebtoken, mongoose -4. Challenges included programming the game -5. Aidan Mulcahey - Login, Create an Account, Leaderboard Page, & Design, Gabriel Camacho - created game and set up routes for backend, Jonathan Palmieri - connected server to database +4. Challenges included using timeout and time based events in the game including starting and stopping the game. Another challenge included getting the targets to appear randomly in the container, which is 95% functional, but targets clip once in a while. User authentication was much easier this time after practice in hw3 & 4 +5. Aidan Mulcahey - Login, Create an Account, Leaderboard Page, & Design, Gabriel Camacho - created game and set up routes for backend, Jonathan Palmieri - wrote server code to connect and communicate with database 6. Link to Video: https://www.youtube.com/watch?v=QydoE20bjdE From 1d3b4fd777ae43e7ec1233f1206113319b24f7d4 Mon Sep 17 00:00:00 2001 From: Gabe Camacho <79332351+gabestuf@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:21:34 -0500 Subject: [PATCH 27/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 95e3d1c47..a172ca6f9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Reaction Time Game, Heroku: +## Aim Trainer / Reaction Time Game, Heroku: https://aimtrainer-webware.herokuapp.com/ From e7854ee06868f1767cc9a0d5c056c4e877e52be6 Mon Sep 17 00:00:00 2001 From: Gabe Camacho <79332351+gabestuf@users.noreply.github.com> Date: Thu, 12 Jan 2023 01:48:32 -0500 Subject: [PATCH 28/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a172ca6f9..fef4e239e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Aim Trainer / Reaction Time Game, Heroku: -https://aimtrainer-webware.herokuapp.com/ +(No longer working) https://aimtrainer-webware.herokuapp.com/ ## Aidan Mulcahey, Gabriel Camacho, Jonathan Palmieri From 9b4ce4f8049ceb7a44ef4b79e3f63d82373d9f54 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 01:58:27 -0500 Subject: [PATCH 29/36] deploy w/ vercel --- api/User.js | 1 - api/index.js | 16 ++++++++++++++++ server.js | 1 - vercel.json | 3 +++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 api/index.js create mode 100644 vercel.json diff --git a/api/User.js b/api/User.js index 5d9570ed4..0c85e66a7 100644 --- a/api/User.js +++ b/api/User.js @@ -8,7 +8,6 @@ userRouter.use(express.json()) // authorization const jwt = require('jsonwebtoken') -const auth = require('./../middleware/Authorization') // Password handler const argon2 = require('argon2') //mongoDB User model diff --git a/api/index.js b/api/index.js new file mode 100644 index 000000000..364b6d2dd --- /dev/null +++ b/api/index.js @@ -0,0 +1,16 @@ +const app = require('express')(); +const { v4 } = require('uuid'); + +app.get('/api', (req, res) => { + const path = `/api/item/${v4()}`; + res.setHeader('Content-Type', 'text/html'); + res.setHeader('Cache-Control', 's-max-age=1, stale-while-revalidate'); + res.end(`Hello! Go to item: ${path}`); +}); + +app.get('/api/item/:slug', (req, res) => { + const { slug } = req.params; + res.end(`Item: ${slug}`); +}); + +module.exports = app; \ No newline at end of file diff --git a/server.js b/server.js index 76e52603c..339861d6a 100644 --- a/server.js +++ b/server.js @@ -8,7 +8,6 @@ const connectDB = require('./config/dbConn') const UserRouter = require('./api/User') const AuthRouter = require('./api/Auth') const LeaderboardRouter = require('./api/Leaderboard') -const auth = require('./middleware/Authorization') // INIT diff --git a/vercel.json b/vercel.json new file mode 100644 index 000000000..6a60ec9d5 --- /dev/null +++ b/vercel.json @@ -0,0 +1,3 @@ +{ + "rewrites": [{ "source": "/api/(.*)", "destination": "/api" }] +} From 8e9ab816d09eb08d56d797bbe6c23bdc6c8c24c5 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:03:04 -0500 Subject: [PATCH 30/36] server.js to index.js --- api/index.js | 16 ---------------- server.js => index.js | 0 package.json | 2 +- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 api/index.js rename server.js => index.js (100%) diff --git a/api/index.js b/api/index.js deleted file mode 100644 index 364b6d2dd..000000000 --- a/api/index.js +++ /dev/null @@ -1,16 +0,0 @@ -const app = require('express')(); -const { v4 } = require('uuid'); - -app.get('/api', (req, res) => { - const path = `/api/item/${v4()}`; - res.setHeader('Content-Type', 'text/html'); - res.setHeader('Cache-Control', 's-max-age=1, stale-while-revalidate'); - res.end(`Hello! Go to item: ${path}`); -}); - -app.get('/api/item/:slug', (req, res) => { - const { slug } = req.params; - res.end(`Item: ${slug}`); -}); - -module.exports = app; \ No newline at end of file diff --git a/server.js b/index.js similarity index 100% rename from server.js rename to index.js diff --git a/package.json b/package.json index bbb075727..61f975b74 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "*Due before the start of class, October 13th (final day of the term)*", "main": "s.js", "scripts": { - "start": "node server.js", + "start": "node index.js", "dev": "nodemon server.js", "devStartAuth": "nodemon authServer.js" }, From 3bb3e8444e994bdcc0c7d50a041e065241d39a65 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:06:13 -0500 Subject: [PATCH 31/36] updated vercel.json --- vercel.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vercel.json b/vercel.json index 6a60ec9d5..e93bda0c4 100644 --- a/vercel.json +++ b/vercel.json @@ -1,3 +1,16 @@ { + "version": 2, + "builds": [ + { + "src": "./index.js", + "use": "@vercel/node" + } + ], + "routes": [ + { + "src": "/(.*)", + "dest": "/" + } + ], "rewrites": [{ "source": "/api/(.*)", "destination": "/api" }] } From 615d7d6108adc822bda805bf910a2c243a70af69 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:08:36 -0500 Subject: [PATCH 32/36] updated vercel.json --- package.json | 3 --- vercel.json | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 61f975b74..598879b11 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,5 @@ }, "devDependencies": { "nodemon": "^2.0.20" - }, - "engines": { - "node": "14.16.0" } } diff --git a/vercel.json b/vercel.json index e93bda0c4..e8eaad7b7 100644 --- a/vercel.json +++ b/vercel.json @@ -11,6 +11,5 @@ "src": "/(.*)", "dest": "/" } - ], - "rewrites": [{ "source": "/api/(.*)", "destination": "/api" }] + ] } From 5f7d48ed0ac8cf6dd996137380665c5374bca4cb Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:16:33 -0500 Subject: [PATCH 33/36] v --- .gitignore | 3 +-- index.js | 2 +- package.json | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0fdc574b6..1dcef2d9f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ node_modules -.env -request.rest \ No newline at end of file +.env \ No newline at end of file diff --git a/index.js b/index.js index 339861d6a..27bf18537 100644 --- a/index.js +++ b/index.js @@ -60,7 +60,7 @@ const db = mongoose.connection db.on('error', (error) => { console.error(error) }) db.once('open', () => { console.log("Connected to database"); - app.listen(process.env.PORT || 3000, () => console.log(`Server Started on Port ${process.env.PORT || 3000}`)); + app.listen(3000 || process.env.PORT, () => console.log(`Server Started on Port ${process.env.PORT || 3000}`)); }) // app.listen(3000, () => console.log('Server Started on Port 3000')); diff --git a/package.json b/package.json index 598879b11..61f975b74 100644 --- a/package.json +++ b/package.json @@ -28,5 +28,8 @@ }, "devDependencies": { "nodemon": "^2.0.20" + }, + "engines": { + "node": "14.16.0" } } From 54174e9a6ad7fa37bea55393dd2c2a3450302dea Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:29:39 -0500 Subject: [PATCH 34/36] V --- .gitignore | 3 ++- package.json | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1dcef2d9f..400bedc94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -.env \ No newline at end of file +.env +.vercel diff --git a/package.json b/package.json index 61f975b74..a5927cb75 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "main": "s.js", "scripts": { "start": "node index.js", - "dev": "nodemon server.js", - "devStartAuth": "nodemon authServer.js" + "dev": "nodemon server.js" }, "repository": { "type": "git", @@ -30,6 +29,6 @@ "nodemon": "^2.0.20" }, "engines": { - "node": "14.16.0" + "node": "14.x" } } From fba445f9403e78633bb1966da623ec7c5a5d525d Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:32:11 -0500 Subject: [PATCH 35/36] deleted a comment --- index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/index.js b/index.js index 27bf18537..2ee655672 100644 --- a/index.js +++ b/index.js @@ -9,7 +9,6 @@ const UserRouter = require('./api/User') const AuthRouter = require('./api/Auth') const LeaderboardRouter = require('./api/Leaderboard') -// INIT // bodyParser const bodyParser = require('express').json; From 03c209efee92243a25b84af7020bda17bd4d0861 Mon Sep 17 00:00:00 2001 From: Gabe Camacho Date: Thu, 12 Jan 2023 02:39:37 -0500 Subject: [PATCH 36/36] edited vercel.json --- package.json | 2 +- vercel.json | 7 +------ views/home.ejs | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a5927cb75..182fe9c97 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "s.js", "scripts": { "start": "node index.js", - "dev": "nodemon server.js" + "dev": "nodemon index.js" }, "repository": { "type": "git", diff --git a/vercel.json b/vercel.json index e8eaad7b7..40986cb97 100644 --- a/vercel.json +++ b/vercel.json @@ -1,11 +1,6 @@ { "version": 2, - "builds": [ - { - "src": "./index.js", - "use": "@vercel/node" - } - ], + "routes": [ { "src": "/(.*)", diff --git a/views/home.ejs b/views/home.ejs index 35516cd9d..fdc36dd0c 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -18,6 +18,7 @@ Login Sign Up Leaderboard + github