PROJECT COMPLETED!!!!!

README.md

@@ -1,14 +1,2 @@
 # CS307-Team24
-CS307 Team 24 Twistter website
-
-### Images
-<p>
-  <img alt="00.png" src="./screenshots/00.png" width="1000">
-  <img alt="01.png" src="./screenshots/01.png" width="1000">
-  <img alt="02.png" src="./screenshots/02.png" width="1000">
-  <img alt="03.png" src="./screenshots/03.png" width="1000">
-  <img alt="04.png" src="./screenshots/04.png" width="1000">
-  <img alt="05.png" src="./screenshots/05.png" width="1000">
-  <img alt="06.png" src="./screenshots/06.png" width="1000">
-  <img alt="07.png" src="./screenshots/07.png" width="1000">
-</p>
+CS307 Team 24 Twistter website.

functions/handlers/users.js

@@ -1,6 +1,5 @@
 /* eslint-disable promise/catch-or-return */
 /* eslint-disable promise/always-return */
-/* eslint-disable prefer-promise-reject-error */
 
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
@@ -867,10 +866,10 @@ oneWayCheck = (userA, userB) => {
             if (dmRecipient === userB) {
               console.log(`You already have a DM with ${userB}`);
               // reject(new Error(`You already have a DM with ${userB}`));
-              let e = new Error(`You already have a DM with that user`);
-              e.code = 400,
-              e.message = `You already have a DM with that user`
-              reject(e);
+              reject({
+                code: 400,
+                message: `You already have a DM with that user`
+              });
               return;
             }
           });

functions/package-lock.json

@@ -596,7 +596,8 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
     },
     "base64-js": {
       "version": "1.3.1",
@@ -646,6 +647,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -671,14 +673,6 @@
         "readable-stream": "~1.0.32"
       }
     },
-    "busboy": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
-      "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==",
-      "requires": {
-        "dicer": "0.3.0"
-      }
-    },
     "bytebuffer": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
@@ -822,7 +816,8 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "concat-stream": {
       "version": "2.0.0",
@@ -1908,6 +1903,13 @@
           "version": "1.0.0",
           "bundled": true
         },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
         "minimist": {
           "version": "1.2.0",
           "bundled": true
@@ -2724,9 +2726,10 @@
       "optional": true
     },
     "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }

twistter-frontend/package.json

@@ -45,5 +45,5 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
+  "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
 }