diff --git a/app/WatchParty_Source.zip b/app/WatchParty_Source.zip new file mode 100644 index 0000000..0ed95e8 Binary files /dev/null and b/app/WatchParty_Source.zip differ diff --git a/assets/Webstore.psd b/assets/Webstore.psd index c968b39..8415e26 100644 Binary files a/assets/Webstore.psd and b/assets/Webstore.psd differ diff --git a/assets/images/1.jpg b/assets/images/1.jpg index 2660525..ecd1ec7 100644 Binary files a/assets/images/1.jpg and b/assets/images/1.jpg differ diff --git a/assets/images/IG_02.jpg b/assets/images/IG_02.jpg index 23e8fbd..542ea57 100644 Binary files a/assets/images/IG_02.jpg and b/assets/images/IG_02.jpg differ diff --git a/assets/images/Webstore_08.jpg b/assets/images/Webstore_08.jpg index e77764a..dfea3db 100644 Binary files a/assets/images/Webstore_08.jpg and b/assets/images/Webstore_08.jpg differ diff --git a/assets/images/Webstore_17.jpg b/assets/images/Webstore_17.jpg deleted file mode 100644 index 6f1f589..0000000 Binary files a/assets/images/Webstore_17.jpg and /dev/null differ diff --git a/functions/modules/createRoom.js b/functions/modules/createRoom.js index 36a6ff1..e7e1626 100644 --- a/functions/modules/createRoom.js +++ b/functions/modules/createRoom.js @@ -10,76 +10,76 @@ module.exports = async (req, res) => { console.log('Requested Create - UID - ', bodydata.uid); if (!bodydata.userName) { return res.status(400).send({ message: 'Missing user name' }); - } - if (!bodydata.partyName) { + } else if (!bodydata.partyName) { return res.status(400).send({ message: 'Missing party name' }); - } - if (!bodydata.partyPin) { + } else if (!bodydata.partyPin) { return res.status(400).send({ message: 'Missing party pin' }); - } - if (partyNameHasInvalidChar(bodydata.partyName)) { + } else if (partyNameHasInvalidChar(bodydata.partyName)) { res.status(400).send({ message: 'Party name can not have "\\" or "/" or "."' }); - } - if (!isValidPin(bodydata.partyPin)) { + } else if (!isValidPin(bodydata.partyPin)) { return res .status(400) .send({ message: 'Party pin can only have digits and must be atleast 3 digits' }); + } else { + const roomNameTaken = await admin + .firestore() + .collection('rooms') + .doc(bodydata.partyName.replace('/', '\\')) + .get() + .then((docSnap) => docSnap.exists); + if (roomNameTaken) { + return res.status(409).send({ message: 'That party name is already taken' }); + } else { + await admin + .firestore() + .collection('rooms') + .doc(bodydata.partyName) + .set({ + name: bodydata.partyName, + pin: bodydata.partyPin, + player: bodydata.player, + createdAt: new Date(), + adminUid: bodydata.uid, + adminOnly: bodydata.adminOnly, + }) + .catch((err) => { + res.status(500).send({ message: 'Unable to start party.' }); + console.error(err); + }); + await admin + .firestore() + .collection('rooms') + .doc(bodydata.partyName) + .collection('messages') + .add({ + uid: '', + name: '', + text: `${bodydata.userName} started the party.`, + time: new Date(), + }) + .catch((err) => { + console.error( + `Failed to add system create party message : \n\t Room: ${bodydata.partyName}`, + err + ); + }); + await admin + .firestore() + .collection('rooms') + .doc(bodydata.partyName) + .collection('users') + .doc(bodydata.uid) + .set({ + admin: true, + name: bodydata.userName, + }) + .catch((err) => { + console.error( + `Failed to set admin when creating party : \n\t Room: ${bodydata.partyName} \n\t User: ${bodydata.uid}`, + err + ); + }); + return res.status(201).send({ roomId: bodydata.partyName, message: 'Started a party!' }); + } } - const roomNameTaken = await admin - .firestore() - .collection('rooms') - .doc(bodydata.partyName.replace('/', '\\')) - .get() - .then((docSnap) => docSnap.exists); - if (roomNameTaken) return res.status(409).send({ message: 'That party name is already taken' }); - await admin - .firestore() - .collection('rooms') - .doc(bodydata.partyName) - .set({ - name: bodydata.partyName, - pin: bodydata.partyPin, - player: bodydata.player, - createdAt: new Date(), - adminUid: bodydata.uid, - adminOnly: bodydata.adminOnly, - }) - .catch((err) => { - res.status(500).send({ message: 'Unable to start party.' }); - console.error(err); - }); - await admin - .firestore() - .collection('rooms') - .doc(bodydata.partyName) - .collection('messages') - .add({ - uid: '', - name: '', - text: `${bodydata.userName} started the party.`, - time: new Date(), - }) - .catch((err) => { - console.error( - `Failed to add system create party message : \n\t Room: ${bodydata.partyName}`, - err - ); - }); - await admin - .firestore() - .collection('rooms') - .doc(bodydata.partyName) - .collection('users') - .doc(bodydata.uid) - .set({ - admin: true, - name: bodydata.userName, - }) - .catch((err) => { - console.error( - `Failed to set admin when creating party : \n\t Room: ${bodydata.partyName} \n\t User: ${bodydata.uid}`, - err - ); - }); - res.status(201).send({ roomId: bodydata.partyName, message: 'Started a party!' }); }; diff --git a/functions/modules/leaveRoom.js b/functions/modules/leaveRoom.js index aaec588..21cc456 100644 --- a/functions/modules/leaveRoom.js +++ b/functions/modules/leaveRoom.js @@ -2,39 +2,43 @@ const admin = require('firebase-admin'); module.exports = async (req, res) => { console.log('Requested Leave - UID - ', req.params.uid, '\n\tRoom - ', req.params.rid); - if (req.params.uid === 'undefined') return res.status(400).send({ message: 'No UID' }); - if (req.params.rid === 'undefined') return res.status(400).send({ message: 'No Party Name' }); - const userName = await admin - .firestore() - .collection('rooms') - .doc(req.params.rid) - .collection('users') - .doc(req.params.uid) - .get() - .then((userSnap) => userSnap.data().name); - await admin - .firestore() - .collection('rooms') - .doc(req.params.rid) - .collection('users') - .doc(req.params.uid) - .delete() - .catch((err) => - console.error( - `Failed to remove user from party : \n\t Room: ${req.params.rid} \n\t User: ${req.params.uid}`, - err - ) - ); - admin - .firestore() - .collection('rooms') - .doc(req.params.rid) - .collection('messages') - .add({ - uid: '', - time: new Date(), - name: '', - text: `${userName} left the party.`, - }); - res.status(200).send({ message: 'Left the party' }); + if (req.params.uid === 'undefined') { + return res.status(400).send({ message: 'No UID' }); + } else if (req.params.rid === 'undefined') { + return res.status(400).send({ message: 'No Party Name' }); + } else { + const userName = await admin + .firestore() + .collection('rooms') + .doc(req.params.rid) + .collection('users') + .doc(req.params.uid) + .get() + .then((userSnap) => userSnap.data().name); + await admin + .firestore() + .collection('rooms') + .doc(req.params.rid) + .collection('users') + .doc(req.params.uid) + .delete() + .catch((err) => + console.error( + `Failed to remove user from party : \n\t Room: ${req.params.rid} \n\t User: ${req.params.uid}`, + err + ) + ); + admin + .firestore() + .collection('rooms') + .doc(req.params.rid) + .collection('messages') + .add({ + uid: '', + time: new Date(), + name: '', + text: `${userName} left the party.`, + }); + return res.status(200).send({ message: 'Left the party' }); + } }; diff --git a/website/404.html b/website/404.html index aa9a926..d4f2a1b 100644 --- a/website/404.html +++ b/website/404.html @@ -12,7 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> - + + diff --git a/website/changes/index.html b/website/changes/index.html index 6b5551a..5d551c5 100644 --- a/website/changes/index.html +++ b/website/changes/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.5.2/index.html b/website/changes/v1.5.2/index.html index 9b20972..b0bb9ad 100644 --- a/website/changes/v1.5.2/index.html +++ b/website/changes/v1.5.2/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.0/index.html b/website/changes/v1.6.0/index.html index 3ec8137..ff38264 100644 --- a/website/changes/v1.6.0/index.html +++ b/website/changes/v1.6.0/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.1/index.html b/website/changes/v1.6.1/index.html index 3f789ed..10719fe 100644 --- a/website/changes/v1.6.1/index.html +++ b/website/changes/v1.6.1/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.2/index.html b/website/changes/v1.6.2/index.html index 6f10142..422b300 100644 --- a/website/changes/v1.6.2/index.html +++ b/website/changes/v1.6.2/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.3/index.html b/website/changes/v1.6.3/index.html index 7d109a8..d0901ef 100644 --- a/website/changes/v1.6.3/index.html +++ b/website/changes/v1.6.3/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.4/index.html b/website/changes/v1.6.4/index.html index d2ab9e1..eb0ae0c 100644 --- a/website/changes/v1.6.4/index.html +++ b/website/changes/v1.6.4/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.5/index.html b/website/changes/v1.6.5/index.html index bc59005..c9e258f 100644 --- a/website/changes/v1.6.5/index.html +++ b/website/changes/v1.6.5/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.6/index.html b/website/changes/v1.6.6/index.html index d7f3b25..a602bdc 100644 --- a/website/changes/v1.6.6/index.html +++ b/website/changes/v1.6.6/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.6.7/index.html b/website/changes/v1.6.7/index.html index 1a8cb3f..1510ee8 100644 --- a/website/changes/v1.6.7/index.html +++ b/website/changes/v1.6.7/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.0/index.html b/website/changes/v1.7.0/index.html index 9ba3ea8..5c8fed2 100644 --- a/website/changes/v1.7.0/index.html +++ b/website/changes/v1.7.0/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.1/index.html b/website/changes/v1.7.1/index.html index 8909bce..b1c0c53 100644 --- a/website/changes/v1.7.1/index.html +++ b/website/changes/v1.7.1/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.2/index.html b/website/changes/v1.7.2/index.html index 215cf99..368525d 100644 --- a/website/changes/v1.7.2/index.html +++ b/website/changes/v1.7.2/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.3/index.html b/website/changes/v1.7.3/index.html index f18b2af..5727447 100644 --- a/website/changes/v1.7.3/index.html +++ b/website/changes/v1.7.3/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.4/index.html b/website/changes/v1.7.4/index.html index 0b78ddc..0fc7ab4 100644 --- a/website/changes/v1.7.4/index.html +++ b/website/changes/v1.7.4/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.5/index.html b/website/changes/v1.7.5/index.html index c2a8f04..5187896 100644 --- a/website/changes/v1.7.5/index.html +++ b/website/changes/v1.7.5/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/changes/v1.7.6/index.html b/website/changes/v1.7.6/index.html index df5e310..27e1326 100644 --- a/website/changes/v1.7.6/index.html +++ b/website/changes/v1.7.6/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/copyright/index.html b/website/copyright/index.html index d0846b3..f5708d8 100644 --- a/website/copyright/index.html +++ b/website/copyright/index.html @@ -12,6 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/donate/index.html b/website/donate/index.html index 6c590ea..1265b20 100644 --- a/website/donate/index.html +++ b/website/donate/index.html @@ -12,6 +12,8 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> + + diff --git a/website/index.html b/website/index.html index 902ea52..bc0c60e 100644 --- a/website/index.html +++ b/website/index.html @@ -10,8 +10,16 @@ ALL CONTENT ON WATCH PARTY'S WEBSITE OR IN WATCH PARTY'S CHROME EXTENSION APP, U CITED ARE THE SOLE INTELLECTUAL PROPERTY OF AYUSHYA AMITABH, AND MAY NOT BE COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> - + + + @@ -123,7 +131,7 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
- +

STAY IN SYNC.

@@ -138,7 +146,7 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
- +

FEATURE RICH.

@@ -323,10 +331,15 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
- + Built with ♥ for Google Chrome by Ayushya Amitabh - + - + - + + + diff --git a/website/styles/extrasmall.css b/website/styles/extrasmall.css index 05041bc..523059e 100644 --- a/website/styles/extrasmall.css +++ b/website/styles/extrasmall.css @@ -63,7 +63,7 @@ a[href]::after { } a:hover::after { - transform: rotate(49deg); + transform: rotate(45deg); margin-left: 2rem; } @@ -295,6 +295,7 @@ a.big-button::after { background-size: 75%; background-repeat: no-repeat; background-position: center; + z-index: 0; } .card-grid a.support-card::after { @@ -379,17 +380,16 @@ footer { font-size: 2.2rem; padding-bottom: 1.5rem; border-bottom: 1px solid var(--color-secondary); - margin-bottom: 2.5rem; + margin-bottom: 3.5rem; } .link-list .underlink { display: block; - opacity: 0.5; - margin: 2.5rem 0; + margin: 3.5rem 0; } .link-list .underlink:hover { - opacity: 0.8; + opacity: 0.5; } footer .end-line .underlink::after { diff --git a/website/styles/large.css b/website/styles/large.css index d9951e7..0dd49bc 100644 --- a/website/styles/large.css +++ b/website/styles/large.css @@ -44,6 +44,10 @@ body { margin-right: 2.5rem; } +.link-list .underlink { + margin: 2.5rem 0; +} + .card-grid .support-card { position: relative; overflow: hidden; diff --git a/website/welcome/index.html b/website/welcome/index.html index 1931fd8..29ad070 100644 --- a/website/welcome/index.html +++ b/website/welcome/index.html @@ -12,7 +12,14 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION. -------------------------------------------------------------------------> - + + @@ -147,7 +154,7 @@ COPIED, EDITED, OR REPRODUCED WITHOUT PERMISSION.
-

Get Going With Watch Party

+

GET GOING WITH WATCH PARTY

Getting started with Watch Party is simple, Watch Party comes with a built in tutorial