From 38580b17b540bfe4de6016f1675fab749f69bdc5 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 27 Sep 2021 20:05:00 -0500 Subject: [PATCH 1/7] Install depencies Install node_modules --- .gitignore | 3 + package-lock.json | 860 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 863 insertions(+) create mode 100644 .gitignore create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f11afda9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +# Dependency directories +node_modules/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..f1131a35 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,860 @@ +{ + "name": "ping-pong-game", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "ping-pong-game", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "express": "^4.17.1" + }, + "devDependencies": {} + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "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.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "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": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "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/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ipaddr.js": { + "version": "1.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/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.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.49.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", + "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.32", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz", + "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", + "dependencies": { + "mime-db": "1.49.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.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": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "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/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "engines": { + "node": ">=0.6" + } + }, + "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.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "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/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "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/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + } + }, + "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + } + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } + }, + "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.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "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" + } + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + } + }, + "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": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "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" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "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==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" + }, + "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.49.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", + "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" + }, + "mime-types": { + "version": "2.1.32", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz", + "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", + "requires": { + "mime-db": "1.49.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "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": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "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" + } + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, + "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.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } + } + }, + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, + "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" + } + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + } + } +} From 75e695535f0cb38f6d75a18003753a346cd0391e Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 28 Sep 2021 14:00:40 -0500 Subject: [PATCH 2/7] Set fullscreen and add delta Make game fullscreen and add deltatime variable to update method --- public/index.html | 38 ++------------------------------------ public/js/modules/start.js | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 36 deletions(-) create mode 100644 public/js/modules/start.js diff --git a/public/index.html b/public/index.html index 4c6e1b2b..0563555f 100644 --- a/public/index.html +++ b/public/index.html @@ -6,41 +6,7 @@ - + + \ No newline at end of file diff --git a/public/js/modules/start.js b/public/js/modules/start.js new file mode 100644 index 00000000..ba060886 --- /dev/null +++ b/public/js/modules/start.js @@ -0,0 +1,16 @@ +var canvas = document.getElementById("canvas"); +// Set canvas and app full screen +canvas.width = window.innerWidth +canvas.height = window.innerHeight +app.width = window.innerWidth +app.height = window.innerHeight + +document.body.scrollTop = 0; // <-- pull the page back up to the top +document.body.style.overflow = 'hidden'; // <-- relevant addition + + +app.onInit = function(){}; + +app.onUpdate = function(time){ + let deltatime = time / (1000/60) //Run 60 frames per second (1000ms) +}; \ No newline at end of file From 8ad49a4bf5e885c8f6407ec561fc691fb5d20c9c Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 28 Sep 2021 14:52:25 -0500 Subject: [PATCH 3/7] moduel.js and Player class Create module.js and Player class inside to add movement for two players --- public/index.html | 1 + public/js/modules/module.js | 51 +++++++++++++++++++++++++++++++++++++ public/js/modules/start.js | 36 +++++++++++++++++++++++++- 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 public/js/modules/module.js diff --git a/public/index.html b/public/index.html index 0563555f..b60a0381 100644 --- a/public/index.html +++ b/public/index.html @@ -6,6 +6,7 @@ + diff --git a/public/js/modules/module.js b/public/js/modules/module.js new file mode 100644 index 00000000..49881be3 --- /dev/null +++ b/public/js/modules/module.js @@ -0,0 +1,51 @@ + +class Player { + constructor(id,app,color,playerNum) { + this.speed = 5 + this.move = { + up : false, + down : false + } + let x = 0 + if(playerNum == 1) { + x = app.width/20 - (app.width/20) // Player One position + } + if(playerNum == 2) { + x = (app.width) - (app.width/20) // Player Two position + } + this.initial = { + id : id, + width : app.width/20, + height : app.height/4, + x : x, + y : app.height/2, + color : color + } + app.nodes.push(this.initial) + this.node = app.getNode(this.initial.id) + } + + reset() { + this.node.y = this.initial.y + } + + moveUp(state) { + this.move.up = state + } + + moveDown(state) { + this.move.down = state + } + + update(delta) { + if(this.move.up) { + this.node.y -= this.speed * delta + } + + if(this.move.down) { + this.node.y += this.speed * delta + } + } + + getNode() { return this.node } +} \ No newline at end of file diff --git a/public/js/modules/start.js b/public/js/modules/start.js index ba060886..00f5da55 100644 --- a/public/js/modules/start.js +++ b/public/js/modules/start.js @@ -8,9 +8,43 @@ app.height = window.innerHeight document.body.scrollTop = 0; // <-- pull the page back up to the top document.body.style.overflow = 'hidden'; // <-- relevant addition +var PlayerOne = new Player('player-one',app,'blue',1) +var PlayerTwo = new Player('player-two',app,'red',2) -app.onInit = function(){}; +app.onInit = function(){ + + document.addEventListener('keydown', (event) => { + const keyName = event.key + if(keyName == 'w') + PlayerOne.moveUp(true) + if(keyName == 's') + PlayerOne.moveDown(true) + + + if(keyName == 'ArrowUp') + PlayerTwo.moveUp(true) + if(keyName == 'ArrowDown') + PlayerTwo.moveDown(true) + }) + + document.addEventListener('keyup', (event) => { + const keyName = event.key + if(keyName == 'w') + PlayerOne.moveUp(false) + if(keyName == 's') + PlayerOne.moveDown(false) + + if(keyName == 'ArrowUp') + PlayerTwo.moveUp(false) + if(keyName == 'ArrowDown') + PlayerTwo.moveDown(false) + + }) +}; app.onUpdate = function(time){ let deltatime = time / (1000/60) //Run 60 frames per second (1000ms) + + PlayerOne.update(deltatime) + PlayerTwo.update(deltatime) }; \ No newline at end of file From 6cb43c28f30417a63f260fb57c85710ad6f661a7 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 28 Sep 2021 15:27:37 -0500 Subject: [PATCH 4/7] Add Ball class Add Ball to the game and added top and bottom border collision to change ball direction --- public/js/modules/module.js | 40 +++++++++++++++++++++++++++++++++++++ public/js/modules/start.js | 5 +++++ 2 files changed, 45 insertions(+) diff --git a/public/js/modules/module.js b/public/js/modules/module.js index 49881be3..a2efeb65 100644 --- a/public/js/modules/module.js +++ b/public/js/modules/module.js @@ -47,5 +47,45 @@ class Player { } } + getNode() { return this.node } +} + + +class Ball { + constructor(id,app,color) { + this.ref = app + this.speed = 6 + this.velocityX = 6 + this.velocityY = 6 + this.initial = { + id : id, + width : app.width/30, + height : app.height/25, + x : app.width/2, + y : app.height/2, + color : color + } + app.nodes.push(this.initial) + this.node = app.getNode(this.initial.id) + } + + reset() { + this.node.x = this.app.width/2 + this.node.y = this.app.height/2 + this.speed = 6 + } + + update(deltatime) { + if(deltatime < 2){ + this.node.x += this.velocityX * deltatime + this.node.y += this.velocityY * deltatime + } + + // Change the ball direction when collide with top and botton border + if(this.node.y + (this.node.height/2) > this.ref.height || this.node.y - (this.node.height/2) < 0) { + this.velocityY = -this.velocityY + } + } + getNode() { return this.node } } \ No newline at end of file diff --git a/public/js/modules/start.js b/public/js/modules/start.js index 00f5da55..c0c5949d 100644 --- a/public/js/modules/start.js +++ b/public/js/modules/start.js @@ -11,6 +11,9 @@ document.body.style.overflow = 'hidden'; // <-- relevant addition var PlayerOne = new Player('player-one',app,'blue',1) var PlayerTwo = new Player('player-two',app,'red',2) +var ball = new Ball('ball',app,'black') + + app.onInit = function(){ document.addEventListener('keydown', (event) => { @@ -47,4 +50,6 @@ app.onUpdate = function(time){ PlayerOne.update(deltatime) PlayerTwo.update(deltatime) + + ball.update(deltatime) }; \ No newline at end of file From 41bb2c60aba1bc88efa54b6a1c259da6c1b0d685 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 28 Sep 2021 20:16:04 -0500 Subject: [PATCH 5/7] Check for ball collide Check when the ball collides with the left and right borders to reset. When the ball collides with the users it bounces back --- public/js/modules/module.js | 12 +++++++++-- public/js/modules/start.js | 41 ++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/public/js/modules/module.js b/public/js/modules/module.js index a2efeb65..d3f08a44 100644 --- a/public/js/modules/module.js +++ b/public/js/modules/module.js @@ -70,9 +70,10 @@ class Ball { } reset() { - this.node.x = this.app.width/2 - this.node.y = this.app.height/2 + this.node.x = this.ref.width/2 + this.node.y = this.ref.height/2 this.speed = 6 + this.velocityX = -this.velocityX } update(deltatime) { @@ -85,6 +86,13 @@ class Ball { if(this.node.y + (this.node.height/2) > this.ref.height || this.node.y - (this.node.height/2) < 0) { this.velocityY = -this.velocityY } + + // Reset Ball when collide with left and right border + if(this.node.x < 0) { + this.reset() + }else if(this.node.x > this.ref.width) { + this.reset() + } } getNode() { return this.node } diff --git a/public/js/modules/start.js b/public/js/modules/start.js index c0c5949d..fe395bd0 100644 --- a/public/js/modules/start.js +++ b/public/js/modules/start.js @@ -52,4 +52,43 @@ app.onUpdate = function(time){ PlayerTwo.update(deltatime) ball.update(deltatime) -}; \ No newline at end of file + + if(collision(ball.getNode(),PlayerOne.getNode())){ + changeDirection(ball,PlayerOne,app) + } + if(collision(ball.getNode(),PlayerTwo.getNode())){ + changeDirection(ball,PlayerTwo,app) + } +}; + +function collision(ball,player) { + // Check for collision between ball and player + let pTop = player.y + let pBottom = (player.y) + player.height + let pLeft = player.x + let pRight = (player.x) + player.width + + let bTop = ball.y + let bBottom = (ball.y) + ball.height + let bLeft = ball.x + let bRight = (ball.x) + ball.width + + // boolean for collision + return bRight > pLeft && bTop < pBottom && bLeft < pRight && bBottom > pTop +} + +// Change ball direction once it collides with player +function changeDirection(ball,player,app) { + let collideHit = ball.getNode().y - (player.getNode().y + player.getNode().height / 2) + collideHit = collideHit / (player.getNode().height / 2) + let angle = (Math.PI/4) * collideHit + + let direction = -1 + if(ball.getNode().x < app.width/2){ + direction = 1 + } + ball.velocityX = direction * ball.speed * Math.cos(angle) + ball.velocityY = direction * ball.speed * Math.sin(angle) + + ball.speed += 0.5 +} \ No newline at end of file From bb22c596778ef8112dc3b1b7cf94e436ea027c84 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 29 Sep 2021 12:03:40 -0500 Subject: [PATCH 6/7] Add TextNode in app.js Set TextNode for players score --- public/js/app.js | 10 ++++++-- public/js/modules/module.js | 46 +++++++++++++++++++++++++++++++++---- public/js/modules/start.js | 5 ++++ 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index d94dca91..0a631558 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -39,8 +39,14 @@ var app = { for(var index in this.nodes){ var node = this.nodes[index]; - this.context.fillStyle = node.color; - this.context.fillRect(node.x, node.y, node.width, node.height); + // Create new node for Text + if(node.istext) { + this.context.font = node.size+'px serif'; + this.context.fillText(node.text, node.x, node.y); + }else { + this.context.fillStyle = node.color; + this.context.fillRect(node.x, node.y, node.width, node.height); + } } this.lastUpdate = Date.now(); diff --git a/public/js/modules/module.js b/public/js/modules/module.js index d3f08a44..c919b274 100644 --- a/public/js/modules/module.js +++ b/public/js/modules/module.js @@ -1,4 +1,5 @@ +// Node Player class class Player { constructor(id,app,color,playerNum) { this.speed = 5 @@ -51,6 +52,7 @@ class Player { } +// Node ball class class Ball { constructor(id,app,color) { this.ref = app @@ -67,9 +69,20 @@ class Ball { } app.nodes.push(this.initial) this.node = app.getNode(this.initial.id) + + this.score = { + one: 0, + two: 0 + } } - reset() { + reset(resetGame) { + if(resetGame){ + this.score = { + one: 0, + two: 0 + } + } this.node.x = this.ref.width/2 this.node.y = this.ref.height/2 this.speed = 6 @@ -87,13 +100,38 @@ class Ball { this.velocityY = -this.velocityY } - // Reset Ball when collide with left and right border + // Reset Ball when collide with left or right border to set score if(this.node.x < 0) { - this.reset() + this.score.one ++ + this.reset(false) }else if(this.node.x > this.ref.width) { - this.reset() + this.score.two ++ + this.reset(false) } } getNode() { return this.node } +} + +// Node text class +class Text { + constructor(id,x,y,size,text,app) { + this.ref = app + this.initial = { + id : id, + size : size, + x : x, + y : y, + text : text, + istext : true + } + app.nodes.push(this.initial) + this.node = this.ref.getNode(this.initial.id) + } + + setText(text) { + this.node.text = text + } + + getText() { return this.node } // Return text node } \ No newline at end of file diff --git a/public/js/modules/start.js b/public/js/modules/start.js index fe395bd0..585b31ca 100644 --- a/public/js/modules/start.js +++ b/public/js/modules/start.js @@ -13,6 +13,9 @@ var PlayerTwo = new Player('player-two',app,'red',2) var ball = new Ball('ball',app,'black') +var player1Score = new Text('score-one',app.width / 4,100,50,"0",app) +var player2Score = new Text('score-two',(app.width/4) * 3,100,50,"0",app) + app.onInit = function(){ @@ -52,6 +55,8 @@ app.onUpdate = function(time){ PlayerTwo.update(deltatime) ball.update(deltatime) + player1Score.setText(ball.score.one) + player2Score.setText(ball.score.two) if(collision(ball.getNode(),PlayerOne.getNode())){ changeDirection(ball,PlayerOne,app) From edb111a5cb133a7db65d5562db83bb7006571362 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 29 Sep 2021 12:52:43 -0500 Subject: [PATCH 7/7] Add game states Add differente states like: START, PAUSE, GAME, also added app.reset() for start game all over --- public/js/app.js | 4 ++- public/js/modules/module.js | 5 +-- public/js/modules/start.js | 66 +++++++++++++++++++++++++++++++++++-- 3 files changed, 69 insertions(+), 6 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index 0a631558..b48d7f64 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -66,7 +66,9 @@ var app = { //events onInit : function(){}, - onUpdate : function(){} + onUpdate : function(){}, + pause : function() {}, + reset: function() {} }; window.onload = function(){ diff --git a/public/js/modules/module.js b/public/js/modules/module.js index c919b274..abc6bef4 100644 --- a/public/js/modules/module.js +++ b/public/js/modules/module.js @@ -2,6 +2,7 @@ // Node Player class class Player { constructor(id,app,color,playerNum) { + this.initialY = app.height/2 this.speed = 5 this.move = { up : false, @@ -19,7 +20,7 @@ class Player { width : app.width/20, height : app.height/4, x : x, - y : app.height/2, + y : this.initialY, color : color } app.nodes.push(this.initial) @@ -27,7 +28,7 @@ class Player { } reset() { - this.node.y = this.initial.y + this.node.y = this.initialY } moveUp(state) { diff --git a/public/js/modules/start.js b/public/js/modules/start.js index 585b31ca..2c911417 100644 --- a/public/js/modules/start.js +++ b/public/js/modules/start.js @@ -1,3 +1,4 @@ + var canvas = document.getElementById("canvas"); // Set canvas and app full screen canvas.width = window.innerWidth @@ -13,9 +14,13 @@ var PlayerTwo = new Player('player-two',app,'red',2) var ball = new Ball('ball',app,'black') -var player1Score = new Text('score-one',app.width / 4,100,50,"0",app) -var player2Score = new Text('score-two',(app.width/4) * 3,100,50,"0",app) +var player1Score = new Text('score-two',(app.width/4) * 3, app.height / 4,50,"0",app) +var player2Score = new Text('score-one',app.width / 4, app.height / 4,50,"0",app) +var startText = new Text('start',app.width/2, app.height - 50, 50,"Press 'Enter' to Start",app) +var pauseText = new Text('pause',app.width/2, app.height - 50,50,"",app) +var pauseInst = new Text('pauseInst',app.width/2, app.height - 25,25,"",app) +var state = 'START' app.onInit = function(){ @@ -45,12 +50,67 @@ app.onInit = function(){ if(keyName == 'ArrowDown') PlayerTwo.moveDown(false) + if(keyName == 'Enter'){ + if(state == 'START') + state = 'GAME' + } + + if(keyName == ' '){ + if(state == 'GAME' || state == 'PAUSE') + this.pause() + } + + if(keyName == 'r'){ + if(state == 'PAUSE') + this.reset() + } }) }; app.onUpdate = function(time){ let deltatime = time / (1000/60) //Run 60 frames per second (1000ms) + switch(state) { + case 'START': + break; + + case 'GAME': + startText.setText("") + gameRuning(deltatime) + break + + case 'PAUSE': + break + } + +}; + +app.pause = function(){ + if(state == 'GAME'){ + state = 'PAUSE' + pauseText.setText("Pause") + pauseInst.setText("press 'R' for reset") + } + else{ + state = 'GAME' + pauseText.setText("") + pauseInst.setText("") + } +} + +app.reset = function(){ + PlayerOne.reset() + PlayerTwo.reset() + player1Score.setText("0") + player2Score.setText("0") + ball.reset(true) + state = 'START' + pauseText.setText("") + pauseInst.setText("") + startText.setText("Press 'Enter' to Start") +} + +function gameRuning(deltatime) { PlayerOne.update(deltatime) PlayerTwo.update(deltatime) @@ -64,7 +124,7 @@ app.onUpdate = function(time){ if(collision(ball.getNode(),PlayerTwo.getNode())){ changeDirection(ball,PlayerTwo,app) } -}; +} function collision(ball,player) { // Check for collision between ball and player