PROJECT COMPLETED!!!!!

functions/handlers/post.js

@@ -178,10 +178,10 @@ exports.getOtherUsersPosts = (req, res) => {
     .collection("posts")
     .where("userHandle", "==", req.body.handle);
     
-    post_query += admin
-    .firestore()
-    .collection("posts")
-    .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
+    // post_query += admin
+    // .firestore()
+    // .collection("posts")
+    // .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
 
   post_query
     .get()

functions/handlers/users.js

@@ -1212,7 +1212,10 @@ exports.addSubscription = (req, res) => {
         return res.status(500).json({ err });
       });
     // return res.status(200).json({ message: "ok" });
-  });
+  })
+  .catch((error) => {
+    return res.status(400).json({message: "That user doesn't exist", error});
+  })
 };
 
 exports.getSubs = (req, res) => {

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"
 }

twistter-frontend/src/pages/Home.js

@@ -57,14 +57,28 @@ class Home extends Component {
       })
       .catch(err => console.log(err));
 
+    let allPosts;
     let postPromise = axios
       .get("/getallPosts")
       .then(res => {
         // console.log(res.data);
+        // this.setState({
+        //   posts: res.data
+        // });
+        allPosts = res.data;
+        // console.log(allPosts)
+        return axios.get("/getAlert")
+      })
+      .then((res) => {
+        // console.log(res.data)
+        // res.data.forEach((adminAlert) => {
+        //   allPosts.push(adminAlert);
+        // })
         this.setState({
-          posts: res.data
+          posts: allPosts
         });
       })
+
       .catch(err => console.log(err));
 
     Promise.all([userPromise, postPromise])
@@ -141,7 +155,7 @@ class Home extends Component {
 
     console.log(hiddenBool);
     let postMarkup = this.state.posts ? ( this.state.following === undefined || this.state.following === null ? <Typography>You aren't following anybody right now</Typography> :
-      this.state.posts.map(post => !post.hidden && this.state.following && this.state.following.includes(post.userHandle) ? (
+      this.state.posts.map(post => !post.hidden && this.state.following && (this.state.following.includes(post.userHandle) || post.userHandle === "Admin") ? (
             <Card className={classes.card} key={post.postId}>
               <CardContent>
                 <Typography>
@@ -190,7 +204,7 @@ class Home extends Component {
 
                 {/* <button>Quote</button> */}
 
-                <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
+                {/* <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography> */}
                 
               </CardContent>
             </Card>