From 5a16cb45478c5c8ea2d71ed592face75be53e4e7 Mon Sep 17 00:00:00 2001 From: Kyle Lim Date: Wed, 25 Dec 2019 14:51:45 -0500 Subject: [PATCH 1/2] FB/GH icons + Dependency Fixes Added facebook page and github page icons as hyperlinks. In addition, fixed a few dependency vulnerbilities. --- index.html | 9 ++++++- js/sync.js | 9 ++++--- package-lock.json | 60 +++++++++++++++++++++++++++++++++-------------- package.json | 3 ++- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/index.html b/index.html index 64e920c..03ab84c 100644 --- a/index.html +++ b/index.html @@ -73,7 +73,14 @@ Contact
  • - Source Code + + + +
    • +
  • + + +
    • diff --git a/js/sync.js b/js/sync.js index 9749c1c..f05ee07 100644 --- a/js/sync.js +++ b/js/sync.js @@ -328,6 +328,7 @@ function loveLive(roomnum) { // Travel, blow your mind, pop/stars, BBIBBI, gotta go, galaxy, my trouble, blue // love scenario, dance the night away, solo, some, yes or yes, when the wind blows, hi high, don't forget, // Uh Oh!, Workaholic, 25, through the night, four seasons, bom, runaway, don't + // psycho, fancy, feel special, leave (park bo young), blueming, var video_roulette = [ '97uviVyw0_o', 'tIWpr3tHzII', 'WkdtmT8A2iY', 'U7mPqycQ0tQ', 'i0p1bmr0EmE', 'FzVR_fymZw4', 'eNmL4JiGxZQ', 'J_CFBjAyPWE', @@ -344,11 +345,13 @@ function loveLive(roomnum) { 'vecSVX1QYbQ', 'Fm5iP0S1z9w', 'b73BI9eUkjM', 'hZmoMyFXDoI', 'mAKsZ26SabQ', 'o3pOzegB-7w', '846cjX0ZTrk', 'TcytstV1_XE', 'ycYLPbtxU1Q', 'mrAIqeULUL0', 'SNS2tOGGGRk', 'BzYnNdJhZQw', - '4HG_CJzyX6A', 'AsXxuIdpkWM', 'rloIUIKLFfY', 'IB6kViGA3rY' + '4HG_CJzyX6A', 'AsXxuIdpkWM', 'rloIUIKLFfY', 'IB6kViGA3rY', + 'uR8Mrt1IpXg', 'kOHB85vDuow', '3ymwOvzhwHs', 'NmY6wo3rEso', + 'D1PvIWdJ8xo' ] - // Random number between 0 and 56 inclusive - var random = Math.floor(Math.random() * (64)) + // Random number between 0 and 68 inclusive + var random = Math.floor(Math.random() * (69)) // Only for YouTube testing socket.emit('change video', { room: roomnum, diff --git a/package-lock.json b/package-lock.json index d7d0b46..14efacb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -238,6 +238,11 @@ "domelementtype": "1" } }, + "dotenv": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz", + "integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==" + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -270,6 +275,20 @@ "mime-types": "~2.1.11", "negotiator": "0.6.1" } + }, + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" + }, + "ws": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", + "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", + "requires": { + "safe-buffer": "~5.0.1", + "ultron": "~1.1.0" + } } } }, @@ -289,6 +308,22 @@ "ws": "~2.3.1", "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" + }, + "ws": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", + "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", + "requires": { + "safe-buffer": "~5.0.1", + "ultron": "~1.1.0" + } + } } }, "engine.io-parser": { @@ -503,7 +538,7 @@ "dependencies": { "lodash": { "version": "3.7.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", + "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=", "dev": true } @@ -803,9 +838,9 @@ } }, "ultron": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz", - "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" }, "unpipe": { "version": "1.0.0", @@ -835,20 +870,9 @@ "dev": true }, "ws": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz", - "integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=", - "requires": { - "safe-buffer": "~5.0.1", - "ultron": "~1.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", - "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=" - } - } + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", + "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==" }, "xmlhttprequest-ssl": { "version": "1.5.4", diff --git a/package.json b/package.json index 712fbc3..eae341b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "dotenv": "8.1.0", "express": "*", "lodash": "^4.17.13", - "socket.io": "*" + "socket.io": "*", + "ws": ">=3.3.1" }, "bugs": { "url": "https://github.com/kyle8998/Vynchronize/issues" From 4de69c8ad935f13c5d86e5a38f54eebfa8a4a69e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Dec 2019 19:52:56 +0000 Subject: [PATCH 2/2] Bump lodash from 4.17.13 to 4.17.15 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.15) Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14efacb..be83e20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -538,16 +538,16 @@ "dependencies": { "lodash": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=", "dev": true } } }, "lodash": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "media-typer": { "version": "0.3.0", diff --git a/package.json b/package.json index eae341b..9749a60 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "dotenv": "8.1.0", "express": "*", - "lodash": "^4.17.13", + "lodash": "^4.17.15", "socket.io": "*", "ws": ">=3.3.1" },