PROJECT COMPLETED!!!!!

README.md

@@ -1,14 +1,2 @@
 # CS307-Team24
-CS307 Team 24 Twistter website
+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>

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`);
+              reject({
-              e.code = 400,
+                code: 400,
-              e.message = `You already have a DM with that user`
+                message: `You already have a DM with that user`
-              reject(e);
+              });
               return;
             }
           });

twistter-frontend/package.json

@@ -20,7 +20,7 @@
     "react-modal": "^3.11.1",
     "react-redux": "^7.1.1",
     "react-router-dom": "^5.1.0",
-    "react-scripts": "5.0.1",
+    "react-scripts": "0.9.5",
     "redux": "^4.0.4",
     "redux-thunk": "^2.3.0",
     "typeface-roboto": "0.0.75",
@@ -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"
 }