Merge bee64895d2 into b9cbd610a9

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.3.1 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.3.1...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -1,2 +1,2 @@
 # CS307-Team24
-CS307 Team 24 Twistter website.
+CS307 Team 24 Twistter website

functions/handlers/post.js

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
-const admin = require("firebase-admin");
-const { db } = require("../util/admin");
+const { admin, db } = require("../util/admin");
+
 
 exports.putPost = (req, res) => {
   const newPost = {
@@ -33,6 +33,18 @@ exports.putPost = (req, res) => {
     });
 };
 
+exports.deletePost = (req, res) => {
+    let posts = db.collection("posts")
+    .where("userHandle", "==", req.user.handle)
+    .get()
+    .then((query) => {
+      query.forEach((snap) => {
+        snap.ref.delete();
+      });
+      return;
+    })
+};
+
 exports.getallPostsforUser = (req, res) => {
   var post_query = admin
     .firestore()
@@ -46,6 +58,106 @@ exports.getallPostsforUser = (req, res) => {
       myPosts.forEach(function(doc) {
         posts.push(doc.data());
       });
+      posts.sort((a, b) => -a.createdAt.localeCompare(b.createdAt));
+      return res.status(200).json(posts);
+    })
+    
+    .then(function() {
+      return res
+        .status(200)
+        .json("Successfully retrieved all user's posts from database.");
+    })
+    .catch(function(err) {
+      return res
+        .status(500)
+        .json({message: "Failed to retrieve user's posts from database.", error: err});
+    });
+};
+
+exports.hidePost = (req, res) => {
+    /* db
+      .collection("posts")
+      .doc(${req.params.postId}) */
+      const postId = req.body.postId;
+      db.doc(`/posts/${postId}`)
+      .update({
+        hidden: true
+      })
+      .then(() => {
+        return res.status(200).json({message: "ok"});
+      })
+      .catch((error) => {
+        return res.status(500).json(error);
+      })
+};
+
+exports.getallPosts = (req, res) => {
+  let posts = [];
+  let users = {};
+
+  // Get all the posts
+  var postsPromise = new Promise((resolve, reject) => {
+    db.collection("posts")
+      .get()
+      .then(allPosts => {
+        allPosts.forEach(post => {
+          posts.push(post.data());
+        });
+        posts.sort((a, b) => -a.createdAt.localeCompare(b.createdAt));
+        resolve();
+      })
+      .catch(error => {
+        reject(error);
+      });
+  });
+
+  // Get all users
+  var usersPromise = new Promise((resolve, reject) => {
+    db.collection("users")
+      .get()
+      .then(allUsers => {
+        allUsers.forEach(user => {
+          users[user.data().handle] = user.data();
+        });
+        resolve();
+      })
+      .catch(error => {
+        reject(error);
+      });
+  });
+
+  // Wait for the two promises
+  Promise.all([postsPromise, usersPromise])
+    .then(() => {
+      let newPosts = [];
+      // Add the image url of the person who made the post to all of the post objects
+      posts.forEach(post => {
+        post.profileImage = users[post.userHandle].imageUrl
+          ? users[post.userHandle].imageUrl
+          : null;
+        newPosts.push(post);
+      });
+      return res.status(200).json(newPosts);
+    })
+    .catch(error => {
+      return res.status(500).json({ error });
+    });
+};
+
+exports.getAlert = (req, res) => {
+  var post_query = admin
+    .firestore()
+    .collection("posts")
+    .where("microBlogTitle", "==", "Alert");
+
+  post_query
+    .get()
+    .then(function(myPosts) {
+      let posts = [];
+      myPosts.forEach(function(doc) {
+        posts.push(doc.data());
+      });
+      posts.sort((a, b) => -a.createdAt.localeCompare(b.createdAt));
       return res.status(200).json(posts);
     })
     .then(function() {
@@ -60,60 +172,17 @@ exports.getallPostsforUser = (req, res) => {
     });
 };
 
-exports.getallPosts = (req, res) => {
-  let posts = [];
-  let users = {};
-
-  // Get all the posts
-  var postsPromise = new Promise((resolve, reject) => {
-    db.collection("posts").get()
-      .then((allPosts) => {
-        allPosts.forEach((post) => {
-          posts.push(post.data());
-        });
-        resolve();
-      })
-      .catch((error) => {
-        reject(error);
-      })
-  });
-
-  // Get all users
-  var usersPromise = new Promise((resolve, reject) => {
-    db.collection("users").get()
-      .then((allUsers) => {
-        allUsers.forEach((user) => {
-          users[user.data().handle] = user.data();
-        })
-        resolve();
-      })
-      .catch((error) => {
-        reject(error);
-      })
-  });
-
-  // Wait for the two promises
-  Promise.all([postsPromise, usersPromise])
-    .then(() => {
-      let newPosts = []
-      // Add the image url of the person who made the post to all of the post objects
-      posts.forEach((post) => {
-        post.profileImage = users[post.userHandle].imageUrl ? users[post.userHandle].imageUrl : null;
-        newPosts.push(post);
-      });
-      return res.status(200).json(newPosts);
-    })
-    .catch((error) => {
-      return res.status(500).json({error});
-    })
-};
-
 exports.getOtherUsersPosts = (req, res) => {
   var post_query = admin
     .firestore()
     .collection("posts")
     .where("userHandle", "==", req.body.handle);
     
+    // post_query += admin
+    // .firestore()
+    // .collection("posts")
+    // .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
+
   post_query
     .get()
     .then(function(myPosts) {
@@ -121,6 +190,7 @@ exports.getOtherUsersPosts = (req, res) => {
       myPosts.forEach(function(doc) {
         posts.push(doc.data());
       });
+      posts.sort((a, b) => -a.createdAt.localeCompare(b.createdAt));
       return res.status(200).json(posts);
     })
     .then(function() {
@@ -137,21 +207,23 @@ exports.getOtherUsersPosts = (req, res) => {
 
 exports.quoteWithPost = (req, res) => {
   let quoteData;
-    const quoteDoc = admin.firestore().collection('quote').
-    where('userHandle', '==', req.user.handle).
-    where('quoteId', '==', req.params.postId).limit(1);
+  const quoteDoc = admin
+    .firestore()
+    .collection("quote")
+    .where("userHandle", "==", req.user.handle)
+    .where("quoteId", "==", req.params.postId)
+    .limit(1);
 
   const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    postDoc.get()
-    .then((doc) => {
-        if(doc.exists) {
+  postDoc
+    .get()
+    .then(doc => {
+      if (doc.exists) {
         quoteData = doc.data();
         return quoteDoc.get();
-        }
-        else
-        {
-            return res.status(404).json({error: 'Post not found'});
+      } else {
+        return res.status(404).json({ error: "Post not found" });
       }
     })
     .then(data => {
@@ -201,21 +273,23 @@ exports.quoteWithPost = (req, res) => {
 
 exports.quoteWithoutPost = (req, res) => {
   let quoteData;
-    const quoteDoc = admin.firestore().collection('quote').
-    where('userHandle', '==', req.user.handle).
-    where('quoteId', '==', req.params.postId).limit(1);
+  const quoteDoc = admin
+    .firestore()
+    .collection("quote")
+    .where("userHandle", "==", req.user.handle)
+    .where("quoteId", "==", req.params.postId)
+    .limit(1);
 
   const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    postDoc.get()
-    .then((doc) => {
-        if(doc.exists) {
+  postDoc
+    .get()
+    .then(doc => {
+      if (doc.exists) {
         quoteData = doc.data();
         return quoteDoc.get();
-        }
-        else
-        {
-            return res.status(404).json({error: 'Post not found'});
+      } else {
+        return res.status(404).json({ error: "Post not found" });
       }
     })
     .then(data => {
@@ -272,7 +346,9 @@ exports.checkforLikePost = (req, res) => {
     .limit(1);
   let result;
 
-  likedPostDoc.get().then(data => {
+  likedPostDoc
+    .get()
+    .then(data => {
       if (data.empty) {
         result = false;
         return res.status(200).json(result);
@@ -281,49 +357,49 @@ exports.checkforLikePost = (req, res) => {
         return res.status(200).json(result);
       }
     })
-  .catch((err) => {
+    .catch(err => {
       console.log(err);
-      return res.status(500).json({error: err});
-  })
+      return res.status(500).json({ error: err });
+    });
 };
 
 exports.likePost = (req, res) => {
-
   const postId = req.params.postId;
   let likedPostDoc;
   db.doc(`/users/${req.userData.handle}`)
     .get()
-        .then((userDoc) => {
+    .then(userDoc => {
       let likes = userDoc.data().likes;
       if (likes === undefined || likes === null) {
         likes = [];
       }
 
       if (likes.includes(postId)) {
-                return res.status(400).json({error: "This user has already liked this post"});
+        return res
+          .status(400)
+          .json({ error: "This user has already liked this post" });
       }
 
       likes.push(postId);
 
-            return userDoc.ref.update({likes})
+      return userDoc.ref.update({ likes });
     })
     .then(() => {
-            return db.doc(`/posts/${postId}`).get()
-                
+      return db.doc(`/posts/${postId}`).get();
     })
-        .then((postDoc) => {
+    .then(postDoc => {
       let postData = postDoc.data();
       postData.likeCount++;
       likedPostDoc = postData;
-            return postDoc.ref.update({likeCount : postData.likeCount})
+      return postDoc.ref.update({ likeCount: postData.likeCount });
     })
     .then(() => {
       return res.status(201).json(likedPostDoc);
     })
-        .catch((err) => {
+    .catch(err => {
       console.log(err);
-            return res.status(500).json({error: err});
-        })
+      return res.status(500).json({ error: err });
+    });
 
   // let postData;
   // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
@@ -361,24 +437,23 @@ exports.likePost = (req, res) => {
   // .catch((err) => {
   //     return res.status(500).json({error: 'Something is wrong'});
   // })
-
-}
-
+};
 
 exports.unlikePost = (req, res) => {
-
   const postId = req.params.postId;
   let likedPostDoc;
   db.doc(`/users/${req.userData.handle}`)
     .get()
-        .then((userDoc) => {
+    .then(userDoc => {
       let likes = userDoc.data().likes;
       if (likes === undefined || likes === null) {
         likes = [];
       }
 
       if (!likes.includes(postId)) {
-                return res.status(400).json({error: "This user hasn't liked this post yet"});
+        return res
+          .status(400)
+          .json({ error: "This user hasn't liked this post yet" });
       }
 
       let i;
@@ -388,25 +463,24 @@ exports.unlikePost = (req, res) => {
         }
       }
 
-            return userDoc.ref.update({likes})
+      return userDoc.ref.update({ likes });
     })
     .then(() => {
-            return db.doc(`/posts/${postId}`).get()
-                
+      return db.doc(`/posts/${postId}`).get();
     })
-        .then((postDoc) => {
+    .then(postDoc => {
       let postData = postDoc.data();
       postData.likeCount--;
       likedPostDoc = postData;
-            return postDoc.ref.update({likeCount : postData.likeCount})
+      return postDoc.ref.update({ likeCount: postData.likeCount });
     })
     .then(() => {
       return res.status(201).json(likedPostDoc);
     })
-        .catch((err) => {
+    .catch(err => {
       console.log(err);
-            return res.status(500).json({error: err});
-        })
+      return res.status(500).json({ error: err });
+    });
 
   // let postData;
   // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
@@ -442,32 +516,28 @@ exports.unlikePost = (req, res) => {
   //     console.error(err);
   //     return res.status(500).json({error: 'Something is wrong'});
   // })
-
-}
-
+};
 
 exports.getLikes = (req, res) => {
   db.doc(`/users/${req.userData.handle}`)
     .get()
-        .then((doc) => {
+    .then(doc => {
       let likes = doc.data().likes;
       if (likes === undefined || likes === null) {
         likes = [];
       }
-            return res.status(200).json({likes});
+      return res.status(200).json({ likes });
     })
-        .catch((err) => {
+    .catch(err => {
       console.log(err);
-            return res.status(500).json({error: err});
-        })
-}
+      return res.status(500).json({ error: err });
+    });
+};
 
 exports.getFilteredPosts = (req, res) => {
-
   admin
     .firestore()
     .collection("posts")
     .where("userHandle", "==", "new user")
     .where("microBlogTopics", "==");
 };
-

functions/handlers/topic.js

@@ -26,6 +26,41 @@ exports.putTopic = (req, res) => {
     });
 };
 
+exports.putNewTopic = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef
+    .get()
+    .then(doc => {
+      let topics = [];
+      new_following = doc.data().following;
+      // new_following.push(req.body.following);
+      new_following.forEach(follow => {
+        if (follow.handle === req.body.handle) {
+          // topics = follow.topics;
+          follow.topics.push(req.body.topic);
+        }
+      });
+      // return res.status(201).json({ new_following });
+
+      // add stuff
+      userRef
+        .set({ following: new_following }, { merge: true })
+        .then(doc => {
+          return res
+            .status(201)
+            .json({ message: `Following ${req.body.topic}` });
+        })
+        .catch(err => {
+          return res.status(500).json({ err });
+        });
+      return res.status(200).json({ message: "OK" });
+    })
+    .catch(err => {
+      return res.status(500).json({ err });
+    });
+};
+
 exports.getAllTopics = (req, res) => {
   admin
     .firestore()

functions/handlers/users.js

@@ -1,5 +1,6 @@
 /* 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");
@@ -226,7 +227,7 @@ exports.deleteUser = (req, res) => {
       const deleteUsername = req.userData.handle;
       db.doc(`/users/${deleteUsername}`)
         .get()
-      .then((deleteUserDocSnap) => {
+        .then(deleteUserDocSnap => {
           const dms = deleteUserDocSnap.data().dms;
           const dmRecipients = deleteUserDocSnap.data().dmRecipients;
 
@@ -239,25 +240,32 @@ exports.deleteUser = (req, res) => {
           let otherUsersPromises = [];
 
           // Resolve if they don't have a dmRecipients list
-        if (dmRecipients === undefined || dmRecipients === null || dmRecipients.length === 0) {
+          if (
+            dmRecipients === undefined ||
+            dmRecipients === null ||
+            dmRecipients.length === 0
+          ) {
             resolve();
             return;
           }
-        dmRecipients.forEach((dmRecipient) => {
+          dmRecipients.forEach(dmRecipient => {
             otherUsersPromises.push(
               // Get each users data
-            db.doc(`/users/${dmRecipient}`).get()
-              .then((otherUserDocSnap) => {
+              db
+                .doc(`/users/${dmRecipient}`)
+                .get()
+                .then(otherUserDocSnap => {
                   // Get the index of deleteUsername so that we can remove the dangling
                   // reference to the DM document
-                let otherUserDMRecipients = otherUserDocSnap.data().dmRecipients;
+                  let otherUserDMRecipients = otherUserDocSnap.data()
+                    .dmRecipients;
                   let otherUserDMs = otherUserDocSnap.data().dms;
                   let index = -1;
                   otherUserDMRecipients.forEach((dmRecip, i) => {
                     if (dmRecip === deleteUsername) {
                       index = i;
                     }
-                })
+                  });
 
                   if (index !== -1) {
                     // Remove deleteUsername from their dmRecipients list
@@ -272,28 +280,29 @@ exports.deleteUser = (req, res) => {
                       dms: otherUserDMs
                     });
                   }
-                
-              })
-          )
                 })
+            );
+          });
 
           // Wait for the removal of DM data stored on other users to be deleted
           Promise.all(otherUsersPromises)
             .then(() => {
               // Iterate through DM references and delete them from the dm collection
               let dmRefsPromises = [];
-            dms.forEach((dmRef) => {
+              dms.forEach(dmRef => {
                 // Create a delete queue
                 let batch = db.batch();
                 dmRefsPromises.push(
                   // Add the messages to the delete queue
-                db.collection(`/dm/${dmRef.id}/messages`).listDocuments()
-                  .then((docs) => {
-                    console.log("second")
+                  db
+                    .collection(`/dm/${dmRef.id}/messages`)
+                    .listDocuments()
+                    .then(docs => {
+                      console.log("second");
                       console.log(docs);
-                    docs.map((doc) => {
+                      docs.map(doc => {
                         batch.delete(doc);
-                    })
+                      });
 
                       // Add the doc that the DM is stored in to the delete queue
                       batch.delete(dmRef);
@@ -301,8 +310,8 @@ exports.deleteUser = (req, res) => {
                       // Commit the writes
                       return batch.commit();
                     })
-              )
-            })
+                );
+              });
 
               return Promise.all(dmRefsPromises);
             })
@@ -310,18 +319,17 @@ exports.deleteUser = (req, res) => {
               resolve();
               return;
             })
-          .catch((err) => {
+            .catch(err => {
               console.log("error " + err);
               reject(err);
               return;
+            });
         })
-      })
-      .catch((err) => {
+        .catch(err => {
           console.log(err);
-        return res.status(500).json({error: err});
-      })
-
-    })
+          return res.status(500).json({ error: err });
+        });
+    });
   }
 
   // Deletes user from authentication
@@ -334,18 +342,18 @@ exports.deleteUser = (req, res) => {
         return db
           .collection("users")
           .doc(`${req.user.handle}`)
-          .delete()
+          .delete();
       })
       .then(() => {
         resolve();
         return;
       })
-      .catch((err) => {
+      .catch(err => {
         console.log(err);
         reject(err);
         return;
-      })
-  })
+      });
+  });
 
   // Deletes any custom profile image
   let image;
@@ -454,17 +462,18 @@ exports.getUserDetails = (req, res) => {
 
 exports.getAllHandles = (req, res) => {
   var user_query = admin.firestore().collection("users");
-  user_query.get()
-  .then((allUsers) => {
+  user_query
+    .get()
+    .then(allUsers => {
       let users = [];
-      allUsers.forEach((user) => {
+      allUsers.forEach(user => {
         users.push(user.data().handle);
       });
       return res.status(200).json(users);
     })
-  .catch((err) => {
+    .catch(err => {
       return res.status(500).json({
-      message:"Failed to retrieve posts from database.", 
+        message: "Failed to retrieve posts from database.",
         error: err
       });
     });
@@ -557,7 +566,7 @@ exports.unverifyUser = (req, res) => {
 
 // Returns all the DMs that the user is currently participating in
 exports.getDirectMessages = (req, res) => {
-/* Return value
+  /* Return value
    * data: [DMs]
    *   dm : {
    *     dmId: str
@@ -569,6 +578,7 @@ exports.getDirectMessages = (req, res) => {
    *         messageId: str
    *       }
    *     recipient: str
+   *     hasDirectMessagesEnabled: bool
    *     recentMessage: str
    *     recentMessageTimestamp: ISOString
    *   }
@@ -577,9 +587,9 @@ exports.getDirectMessages = (req, res) => {
   // Returns all the messages in a dm documentSnapshot
   function getMessages(dm) {
     let promise = new Promise((resolve, reject) => {
-      let messagesCollection = dm.collection('messages');
+      let messagesCollection = dm.collection("messages");
 
-      // If the messagesCollection is missing, that mean that there aren't any messages
+      // If the messagesCollection is missing, that means that there aren't any messages
       if (messagesCollection === null || messagesCollection === undefined) {
         return;
       }
@@ -588,90 +598,106 @@ exports.getDirectMessages = (req, res) => {
       let promises = [];
 
       // Get all of the messages in the DM
-      messagesCollection.get()
-        .then((dmQuerySnap) => {
-          dmQuerySnap.forEach((dmQueryDocSnap) => {
+      messagesCollection.get().then(dmQuerySnap => {
+        dmQuerySnap.forEach(dmQueryDocSnap => {
           promises.push(
-              dmQueryDocSnap.ref.get()
-                .then((messageData) => {
+            dmQueryDocSnap.ref.get().then(messageData => {
               msgs.push(messageData.data());
               return;
             })
-            )
-          })
+          );
+        });
 
         let waitPromise = Promise.all(promises);
         waitPromise.then(() => {
           // Sort the messages in reverse order by date
           // Newest should be at the bottom, because that's how they will be displayed on the front-end
           msgs.sort((a, b) => {
-              return (b.createdAt > a.createdAt) ? -1 : ((b.createdAt < a.createdAt) ? 1 : 0);
-            })
+            return b.createdAt > a.createdAt
+              ? -1
+              : b.createdAt < a.createdAt
+              ? 1
+              : 0;
+          });
           resolve(msgs);
         });
-        })
+      });
     });
     return promise;
   }
 
-
   const dms = req.userData.dms;
+  const dmRecipients = req.userData.dmRecipients;
 
   // Return null if this user has no DMs
-  if (dms === undefined || dms === null || dms.length === 0) return res.status(200).json({data: null});
+  if (dms === undefined || dms === null || dms.length === 0)
+    return res.status(200).json({ data: null });
 
   let dmsData = [];
   let dmPromises = [];
 
-  dms.forEach((dm) => {
+  dms.forEach(dm => {
     let dmData = {};
     // Make a new promise for each DM document
-    dmPromises.push(new Promise((resolve, reject) => {
-      dm  // DM document reference
-      .get()
-      .then((doc) => {
+    dmPromises.push(
+      new Promise((resolve, reject) => {
+        dm.get() // DM document reference
+          .then(doc => {
             let docData = doc.data();
 
             // Recipient is the person you are messaging
-        docData.authors[0] === req.userData.handle ?
-          dmData.recipient = docData.authors[1] :
-          dmData.recipient = docData.authors[0]
+            docData.authors[0] === req.userData.handle
+              ? (dmData.recipient = docData.authors[1])
+              : (dmData.recipient = docData.authors[0]);
 
             // Save the createdAt time
             dmData.createdAt = docData.createdAt;
 
             // Get all the messages from this dm document
-        getMessages(dm)
-          .then((msgs) => {
+            getMessages(dm).then(msgs => {
               dmData.messages = msgs;
-            dmData.recentMessage = msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
-            dmData.recentMessageTimestamp = msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : null;
+              dmData.recentMessage =
+                msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
+              dmData.recentMessageTimestamp =
+                msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : null;
               dmData.dmId = doc.id;
               resolve(dmData);
+            });
           })
-        
-        
-      
-      }).catch((err) => {
+          .catch(err => {
             console.err(err);
-        return res.status(400).json({error: {
-          message: "An error occurred when reading the DM document reference",
+            return res.status(400).json({
+              error: {
+                message:
+                  "An error occurred when reading the DM document reference",
                 error: err
-        }});
-      })
-    }).then((dmData) => {
+              }
+            });
+          });
+      }).then(dmData => {
         dmsData.push(dmData);
       })
-    )
+    );
+  });
 
-  })
+  // Get all the data from the users to get the data on whether they have DMs enabled or not
+  let userPromises = [];
+  dmRecipients.forEach(recipient => {
+    userPromises.push(db.doc(`/users/${recipient}`).get());
+  });
 
   // Wait for all DM document promises to resolve before returning data
-  dmWaitPromise = Promise.all(dmPromises)
+  Promise.all(dmPromises)
     .then(() => {
+      return Promise.all(userPromises);
+    })
+    .then(userData => {
       // Sort the DMs so that the ones with the newest messages are at the top
       dmsData.sort((a, b) => {
-        if (a.recentMessageTimestamp === null && b.recentMessageTimestamp === null) {
+        if (
+          a.recentMessageTimestamp === null &&
+          b.recentMessageTimestamp === null
+        ) {
           if (b.createdAt < a.createdAt) {
             return -1;
           } else if (b.createdAt > a.createdAt) {
@@ -691,15 +717,32 @@ exports.getDirectMessages = (req, res) => {
           return 0;
         }
       });
-      return res.status(200).json({data: dmsData})
+
+      dmsData.forEach(dm => {
+        dm.hasDirectMessagesEnabled =
+          userData
+            .find(user => {
+              if (dm.recipient === user.data().handle) {
+                return true;
+              } else {
+                return false;
+              }
             })
-    .catch((err) => {
-      return res.status(500).json({error:{
+            .data().dmEnabled === false
+            ? false
+            : true;
+      });
+      return res.status(200).json({ data: dmsData });
+    })
+    .catch(err => {
+      return res.status(500).json({
+        error: {
           message: "An error occurred while sorting",
           error: err
-      }});
+        }
       });
-}
+    });
+};
 
 // Toggles direct messages on or off depending on the requese
 /* Request Parameters
@@ -708,38 +751,44 @@ exports.getDirectMessages = (req, res) => {
 exports.toggleDirectMessages = (req, res) => {
   const enable = req.body.enable;
   const user = req.userData.handle;
-  db.doc(`/users/${user}`).update({dmEnabled: enable})
+  db.doc(`/users/${user}`)
+    .update({ dmEnabled: enable })
     .then(() => {
-      return res.status(201).json({message: "Success"});
+      return res.status(201).json({ message: "Success" });
     })
-    .catch((err) => {
-      return res.status(500).json({error: err});
-    })
-}
+    .catch(err => {
+      return res.status(500).json({ error: err });
+    });
+};
 
 // Returns a promise that resolves if user has DMs enabled
 // and rejects if there is an error or DMs are disabled
-isDirectMessageEnabled = (username) => {
+isDirectMessageEnabled = username => {
   return new Promise((resolve, reject) => {
     let result = {};
     result.code = null;
     result.message = null;
     if (username === null || username === undefined || username === "") {
       result.code = 400;
-      result.message = "No user was sent in the request. The request should have a non-empty 'user' key.";
+      result.message =
+        "No user was sent in the request. The request should have a non-empty 'user' key.";
       reject(result);
     }
 
     db.doc(`/users/${username}`)
       .get()
-      .then((doc) => {
+      .then(doc => {
         if (doc.exists) {
           // console.log(doc.data())
-          if (doc.data().dmEnabled === true || doc.data().dmEnabled === null || doc.data().dmEnabled === undefined) {
+          if (
+            doc.data().dmEnabled === true ||
+            doc.data().dmEnabled === null ||
+            doc.data().dmEnabled === undefined
+          ) {
             // Assume DMs are enabled if they don't have a dmEnabled key
             resolve(result);
           } else {
-            result.code = 200;
+            result.code = 400;
             result.message = `${username} has DMs disabled`;
             reject(result);
           }
@@ -750,42 +799,46 @@ isDirectMessageEnabled = (username) => {
           reject(result);
         }
       })
-      .catch((err) => {
-        console.log("HI")
+      .catch(err => {
+        console.log("HI");
         console.error(err);
         result.code = 500;
         result.message = err;
         reject(result);
-      })
       });
-}
+  });
+};
 
 // Returns a promise that resolves if the data in the DM is valid and
 // rejects if there are any error. Errors are returned in the promise
-verifyDirectMessageIntegrity = (dmRef) => {
+verifyDirectMessageIntegrity = dmRef => {
   return new Promise((resolve, reject) => {
     resolve("Not implemented yet");
-  })
-}
-
+  });
+};
 
 // Checks if there are any DM channels open with userB on userA's side
 oneWayCheck = (userA, userB) => {
   return new Promise((resolve, reject) => {
-
     db.doc(`/users/${userA}`)
       .get()
-      .then((userASnapshot) => {
+      .then(userASnapshot => {
         const dmList = userASnapshot.data().dms;
         const dmRecipients = userASnapshot.data().dmRecipients;
 
-        if (dmList === null || dmList === undefined || dmRecipients === null || dmRecipients === undefined) {
+        if (
+          dmList === null ||
+          dmList === undefined ||
+          dmRecipients === null ||
+          dmRecipients === undefined
+        ) {
           // They don't have any DMs yet
           console.log("No DMs array");
-          userASnapshot.ref.set({dms:[], dmRecipients:[]}, {merge: true})
+          userASnapshot.ref
+            .set({ dms: [], dmRecipients: [] }, { merge: true })
             .then(() => {
               resolve();
-            })
+            });
         } else if (dmList.length === 0) {
           // Their DMs are empty
           console.log("DMs array is empty");
@@ -810,17 +863,20 @@ oneWayCheck = (userA, userB) => {
           //   )
           // })
 
-          dmRecipients.forEach((dmRecipient) => {
+          dmRecipients.forEach(dmRecipient => {
             if (dmRecipient === userB) {
               console.log(`You already have a DM with ${userB}`);
-              reject(new Error(`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);
               return;
             }
-          })
+          });
 
           resolve();
 
-
           // Promise.all(forEachPromises)
           //   .then((dmDocs) => {
           //     // Check if any of the DMs have for userA have userA and userB as the authors.
@@ -866,15 +922,10 @@ oneWayCheck = (userA, userB) => {
           //       }
           //     })
           //   })
-
-
-
         }
-    })
-  })
-  
-}
-
+      });
+  });
+};
 
 // Returns a promise that resolves if there is not already a DM channel
 // between the creator and recipient usernames. It rejects if one already
@@ -885,36 +936,39 @@ checkNoDirectMessageExists = (creator, recipient) => {
     let recipientPromise = oneWayCheck(recipient, creator);
     let temp_array = [];
     temp_array.push(creatorPromise);
-    temp_array.push(recipientPromise)
+    temp_array.push(recipientPromise);
 
     Promise.all(temp_array)
       .then(() => {
         resolve();
       })
-        .catch((err) => {
+      .catch(err => {
         reject(err);
-        })
-    })
-}
+      });
+  });
+};
 
 addDirectMessageToUser = (username, recipient, dmRef) => {
   return new Promise((resolve, reject) => {
-    db.doc(`/users/${username}`).get()
-      .then((docSnap) => {
+    db.doc(`/users/${username}`)
+      .get()
+      .then(docSnap => {
         let dmList = docSnap.data().dms;
         let dmRecipients = docSnap.data().dmRecipients;
         dmList.push(dmRef);
         dmRecipients.push(recipient);
-        return db.doc(`/users/${username}`).update({dms: dmList, dmRecipients});
+        return db
+          .doc(`/users/${username}`)
+          .update({ dms: dmList, dmRecipients });
       })
       .then(() => {
         resolve();
       })
-      .catch((err) => {
+      .catch(err => {
         reject(err);
-      })
-  })
-}
+      });
+  });
+};
 
 // Sends a DM from the caller to the requested DM document
 /* Request Parameters
@@ -932,66 +986,92 @@ exports.sendDirectMessage = (req, res) => {
     createdAt: new Date().toISOString(),
     message,
     messageId: null
-  }
+  };
 
-  db.doc(`/users/${creator}`).get()
-    .then((userDoc) => {
+  db.doc(`/users/${recipient}`)
+    .get()
+    .then(recipDoc => {
+      // Return if the other user has DM's disabled
+      if (
+        recipDoc.data().dmEnabled === false &&
+        recipDoc.data().dmEnabled !== null &&
+        recipDoc.data().dmEnabled !== undefined
+      ) {
+        return res.status(400).json({ error: "This user has DMs disabled" });
+      }
+    });
+
+  db.doc(`/users/${creator}`)
+    .get()
+    .then(userDoc => {
       let dmList = userDoc.data().dms;
 
       // Return if the creator doesn't have any DMs.
       // This means they have not created a DM's channel yet
-      if (dmList === null || dmList === undefined) return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`})
+      if (dmList === null || dmList === undefined) {
+        return res
+          .status(400)
+          .json({
+            error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+          });
+      }
+
       let dmRefPromises = [];
-      dmList.forEach((dmRef) => {
+      dmList.forEach(dmRef => {
         dmRefPromises.push(
           new Promise((resolve, reject) => {
-            dmRef.get()
-              .then((dmDoc) => {
+            dmRef
+              .get()
+              .then(dmDoc => {
                 let authors = dmDoc.data().authors;
                 if (
                   (authors[0] === creator && authors[1] === recipient) ||
                   (authors[1] === creator && authors[0] === recipient)
                 ) {
-                  resolve({correct: true, dmRef});
+                  resolve({ correct: true, dmRef });
                 } else {
-                  resolve({correct: false, dmRef});
+                  resolve({ correct: false, dmRef });
                 }
               })
-              .catch((err) => {
+              .catch(err => {
                 reject(err);
+              });
           })
-          })
-        )
-      })
+        );
+      });
 
       return Promise.all(dmRefPromises);
     })
-    .then((results) => {
+    .then(results => {
       let correctDMRef = null;
-      results.forEach((result) => {
+      results.forEach(result => {
         if (result.correct) {
           correctDMRef = result.dmRef;
         }
-      })
+      });
 
       if (correctDMRef === null) {
-        console.log(`There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`);
-        return res.status(400).json({error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`});
+        console.log(
+          `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+        );
+        return res.status(400).json({
+          error: `There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`
+        });
       }
 
       return db.collection(`/dm/${correctDMRef.id}/messages`).add(newMessage);
     })
-    .then((newMsgRef) => {
-      return newMsgRef.update({messageId: newMsgRef.id}, {merge: true});
+    .then(newMsgRef => {
+      return newMsgRef.update({ messageId: newMsgRef.id }, { merge: true });
     })
     .then(() => {
-      return res.status(200).json({message: "OK"});
+      return res.status(200).json({ message: "OK" });
     })
-    .catch((err) => {
+    .catch(err => {
       console.log(err);
-      return res.status(500).json({error: err});
-    })
-}
+      return res.status(500).json({ error: err });
+    });
+};
 
 // Creates a DM between the caller and the user in the request
 /* Request Parameters
@@ -1002,7 +1082,8 @@ exports.createDirectMessage = (req, res) => {
   const recipient = req.body.user;
 
   // Check if they are DMing themselves
-  if (creator === recipient) return res.status(400).json({error: "You can't DM yourself"});
+  if (creator === recipient)
+    return res.status(400).json({ error: "You can't DM yourself" });
 
   // Check if this user has DMs enabled
   let creatorEnabled = isDirectMessageEnabled(creator);
@@ -1011,56 +1092,63 @@ exports.createDirectMessage = (req, res) => {
   let recipientEnabled = isDirectMessageEnabled(recipient);
 
   // Make sure that they don't already have a DM channel
-  let noDMExists = checkNoDirectMessageExists(creator, recipient)
+  let noDMExists = checkNoDirectMessageExists(creator, recipient);
 
-
-  let dataValidations = [
-    creatorEnabled,
-    recipientEnabled,
-    noDMExists
-  ]
+  let dataValidations = [creatorEnabled, recipientEnabled, noDMExists];
 
   Promise.all(dataValidations)
     .then(() => {
       // Create a new DM document
-      return db.collection("dm").add({})
+      return db.collection("dm").add({});
     })
-    .then((dmDocRef) => {
+    .then(dmDocRef => {
       // Fill it with some data.
       // Note that there isn't a messages collection by default.
       let dmData = {
         dmId: dmDocRef.id,
         authors: [creator, recipient],
         createdAt: new Date().toISOString()
-      }
+      };
 
       // Update DM document
       let dmDocPromise = dmDocRef.set(dmData);
 
       // Add the DM reference to the creator
-      let updateCreatorPromise = addDirectMessageToUser(creator, recipient, dmDocRef);
+      let updateCreatorPromise = addDirectMessageToUser(
+        creator,
+        recipient,
+        dmDocRef
+      );
 
       // Add the DM reference to the recipient
-      let updateRecipientPromise = addDirectMessageToUser(recipient, creator, dmDocRef);
+      let updateRecipientPromise = addDirectMessageToUser(
+        recipient,
+        creator,
+        dmDocRef
+      );
 
       // Wait for all promises
-      return Promise.all([dmDocPromise, updateCreatorPromise, updateRecipientPromise]);
+      return Promise.all([
+        dmDocPromise,
+        updateCreatorPromise,
+        updateRecipientPromise
+      ]);
     })
-    .then (() => {
-      return res.status(201).json({message: "Success!"});
+    .then(() => {
+      return res.status(201).json({ message: "Success!" });
     })
-    .catch((err) => {
+    .catch(err => {
       console.log(err);
 
       if (err.code && err.message && err.code > 0) {
         // Specific error that I've created
-        return res.status(err.code).json({error: err.message});
+        return res.status(err.code).json({ error: err.message });
       } else {
         // Generic or firebase error
-        return res.status(500).json({error: err});
+        return res.status(500).json({ error: err });
       }
-    })
-}
+    });
+};
 
 // Checks if the requested user has DMs enable or not
 /* Request Parameters
@@ -1069,19 +1157,19 @@ exports.createDirectMessage = (req, res) => {
 exports.checkDirectMessagesEnabled = (req, res) => {
   isDirectMessageEnabled(req.body.user)
     .then(() => {
-      return res.status(200).json({enabled: true});
+      return res.status(200).json({ enabled: true });
     })
-    .catch((result) => {
+    .catch(result => {
       console.log(result);
       if (result.code === 200) {
         // DMs are disabled
-        return res.status(200).json({enabled: false});
+        return res.status(200).json({ enabled: false });
       } else {
         // Some other error occured
-        return res.status(result.code).json({err: result.message});
+        return res.status(result.code).json({ err: result.message });
       }
-    })
-}
+    });
+};
 
 exports.getUserHandles = (req, res) => {
   db.doc(`/users/${req.body.userHandle}`)
@@ -1105,7 +1193,13 @@ exports.addSubscription = (req, res) => {
   let userRef = db.doc(`/users/${req.userData.handle}`);
   userRef.get().then(doc => {
     new_following = doc.data().following;
-    new_following.push(req.body.following);
+    const struct = {
+      handle: req.body.following,
+      topics: ["Admin"]
+    };
+    new_following
+      ? new_following.push(struct)
+      : (new_following = req.body.following);
 
     // add stuff
     userRef
@@ -1118,8 +1212,11 @@ exports.addSubscription = (req, res) => {
       .catch(err => {
         return res.status(500).json({ err });
       });
-    return res.status(200).json({ message: "ok" });
-  });
+    // 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) => {
@@ -1146,25 +1243,32 @@ exports.uploadProfileImage = (req, res) => {
 
   let imageFileName;
   let imageToBeUploaded = {};
-  let oldImageFileName = req.userData.imageUrl ? req.userData.imageUrl.split("/o/")[1].split("?alt")[0] : null;
+  let oldImageFileName = req.userData.imageUrl
+    ? req.userData.imageUrl.split("/o/")[1].split("?alt")[0]
+    : null;
   // console.log(`old file: ${oldImageFileName}`);
 
   busboy.on("file", (fieldname, file, filename, encoding, mimetype) => {
-    if (mimetype !== 'image/jpeg' && mimetype !== 'image/png') {
+    if (mimetype !== "image/jpeg" && mimetype !== "image/png") {
       return res.status(400).json({ error: "Wrong filetype submitted" });
     }
     // console.log(fieldname);
     // console.log(filename);
     // console.log(mimetype);
     const imageExtension = filename.split(".")[filename.split(".").length - 1]; // Get the image file extension
-    imageFileName = `${Math.round(Math.random() * 100000000000)}.${imageExtension}`;  // Get a random filename
+    imageFileName = `${Math.round(
+      Math.random() * 100000000000
+    )}.${imageExtension}`; // Get a random filename
     const filepath = path.join(os.tmpdir(), imageFileName);
     imageToBeUploaded = { filepath, mimetype };
     file.pipe(fs.createWriteStream(filepath));
   });
   busboy.on("finish", () => {
     // Save the file to the storage bucket
-    admin.storage().bucket(config.storageBucket).upload(imageToBeUploaded.filepath, {
+    admin
+      .storage()
+      .bucket(config.storageBucket)
+      .upload(imageToBeUploaded.filepath, {
         resumable: false,
         metadata: {
           metadata: {
@@ -1180,24 +1284,33 @@ exports.uploadProfileImage = (req, res) => {
       .then(() => {
         // Delete their old image if they have one
         if (oldImageFileName !== null && oldImageFileName !== "no-img.png") {
-        admin.storage().bucket(config.storageBucket).file(oldImageFileName).delete()
+          admin
+            .storage()
+            .bucket(config.storageBucket)
+            .file(oldImageFileName)
+            .delete()
             .then(() => {
-            return res.status(201).json({ message: "Image uploaded successfully1"});
+              return res
+                .status(201)
+                .json({ message: "Image uploaded successfully1" });
             })
-          .catch((err) => {
+            .catch(err => {
               console.log(err);
-            return res.status(201).json({ message: "Image uploaded successfully2"});
-          })
+              return res
+                .status(201)
+                .json({ message: "Image uploaded successfully2" });
+            });
           // return res.status(201).json({ message: "Image uploaded successfully"});
         } else {
-        return res.status(201).json({ message: "Image uploaded successfully3"});
+          return res
+            .status(201)
+            .json({ message: "Image uploaded successfully3" });
         }
-
       })
-    .catch((err) => {
+      .catch(err => {
         console.error(err);
-      return res.status(500).json({ error: err.code})
-    })
+        return res.status(500).json({ error: err.code });
+      });
   });
   busboy.end(req.rawBody);
 
@@ -1253,7 +1366,7 @@ exports.uploadProfileImage = (req, res) => {
   //     });
   // });
   //   busboy.end(req.rawBody);
-}
+};
 
 exports.removeSub = (req, res) => {
   let new_following = [];
@@ -1262,7 +1375,7 @@ exports.removeSub = (req, res) => {
     new_following = doc.data().following;
     // remove username from array
     new_following.forEach(function(follower, index) {
-      if (follower === `${req.body.unfollow}`) {
+      if (follower.handle === `${req.body.unfollow}`) {
         new_following.splice(index, 1);
       }
     });

functions/index.js

@@ -100,18 +100,33 @@ app.post("/addSubscription", fbAuth, addSubscription);
 // remove one subscription
 app.post("/removeSub", fbAuth, removeSub);
 
-
 /*------------------------------------------------------------------*
  *  handlers/post.js                                                *
  *------------------------------------------------------------------*/
 
-const { getallPostsforUser, getallPosts, putPost, likePost, unlikePost, getLikes, quoteWithPost, quoteWithoutPost, checkforLikePost, getOtherUsersPosts} = require("./handlers/post");
 
+const {
+  getallPostsforUser,
+  getallPosts,
+  putPost,
+  hidePost, 
+  likePost,
+  unlikePost,
+  getLikes,
+  quoteWithPost,
+  quoteWithoutPost,
+  checkforLikePost,
+  getOtherUsersPosts,
+  getAlert
+} = require("./handlers/post");
 
 app.get("/getallPostsforUser", fbAuth, getallPostsforUser);
 
 app.get("/getallPosts", getallPosts);
 
+//Hides Post
+app.post("/hidePost", fbAuth, hidePost);
+
 // Adds one post to the database
 app.post("/putPost", fbAuth, putPost);
 
@@ -125,6 +140,8 @@ app.post("/quoteWithoutPost/:postId", fbAuth, quoteWithoutPost);
 
 app.post("/getOtherUsersPosts", fbAuth, getOtherUsersPosts);
 
+app.get("/getAlert", fbAuth, getAlert);
+
 /*------------------------------------------------------------------*
  *  handlers/topic.js                                                *
  *------------------------------------------------------------------*/
@@ -132,7 +149,8 @@ const {
   putTopic,
   getAllTopics,
   deleteTopic,
-  getUserTopics
+  getUserTopics,
+  putNewTopic
 } = require("./handlers/topic");
 
 // add topic to database
@@ -147,4 +165,6 @@ app.post("/deleteTopic", fbAuth, deleteTopic);
 // get topic for this user
 app.post("/getUserTopics", fbAuth, getUserTopics);
 
+app.post("/putNewTopic", fbAuth, putNewTopic);
+
 exports.api = functions.https.onRequest(app);

twistter-frontend/package-lock.json

@@ -2417,6 +2417,11 @@
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
     },
+    "dayjs": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz",
+      "integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="
+    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3092,6 +3097,11 @@
         "merge": "^1.2.0"
       }
     },
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+    },
     "exit-hook": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -3957,6 +3967,11 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
+    "fuse.js": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.6.tgz",
+      "integrity": "sha512-H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg=="
+    },
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -4065,16 +4080,22 @@
       }
     },
     "handlebars": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.3.1.tgz",
-      "integrity": "sha512-c0HoNHzDiHpBt4Kqe99N8tdLPKAnGCQ73gYMPWtAYM4PwGnf7xl8PBUHJqh9ijlzt2uQKaSRxbXRt+rZ7M2/kA==",
+      "version": "4.7.7",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+      "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
       "requires": {
+        "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
         "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
       },
       "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7167,6 +7188,22 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
       "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
     },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+    },
+    "react-modal": {
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.1.tgz",
+      "integrity": "sha512-8uN744Yq0X2lbfSLxsEEc2UV3RjSRb4yDVxRQ1aGzPo86QjNOwhQSukDb8U8kR+636TRTvfMren10fgOjAy9eA==",
+      "requires": {
+        "exenv": "^1.2.0",
+        "prop-types": "^15.5.10",
+        "react-lifecycles-compat": "^3.0.0",
+        "warning": "^4.0.3"
+      }
+    },
     "react-redux": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.1.tgz",
@@ -9761,6 +9798,11 @@
       "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
       "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
     },
+    "underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -9991,6 +10033,14 @@
         "makeerror": "1.0.x"
       }
     },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
     "watch": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",

twistter-frontend/src/Writing_Microblogs.js

@@ -8,6 +8,7 @@ import TextField from '@material-ui/core/TextField';
 // import Typography from '@material-ui/core/Typography';
 import Button from '@material-ui/core/Button';
 import withStyles from "@material-ui/styles/withStyles";
+import CircularProgress from "@material-ui/core/CircularProgress";
 
 const styles = {
   container: {
@@ -21,6 +22,13 @@ const styles = {
   },
   textField: {
     marginBottom: 15
+  },
+  progress: {
+    position: "absolute"
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
   }
 }
 
@@ -31,7 +39,8 @@ class Writing_Microblogs extends Component {
       value: "",
       title: "",
       topics: "",
-      characterCount: 250
+      characterCount: 250,
+      loading: false
     };
 
     this.handleChange = this.handleChange.bind(this);
@@ -56,11 +65,15 @@ class Writing_Microblogs extends Component {
       microBlogTitle: this.state.title,
       microBlogTopics: this.state.topics.split(", ")
     };
+
+    this.setState({
+      loading: true
+    })
     const headers = {
       headers: { "Content-Type": "application/json" }
     };
 
-    axios
+    let postPromise = axios
       .post("/putPost", postData, headers) // TODO: add topics
       .then(res => {
         // alert("Post was shared successfully!");
@@ -71,20 +84,35 @@ class Writing_Microblogs extends Component {
         console.error(err);
       });
     console.log(postData.microBlogTopics);
-    postData.microBlogTopics.forEach(topic => {
-      axios
-        .post("/putTopic", {
-          following: topic
-        })
-        .then(res => {
-          console.log(res.data);
-        })
-        .catch(err => {
-          console.error(err);
-        });
-    });
+    // let topicPromises = [];
+    // postData.microBlogTopics.forEach(topic => {
+    //   topicPromises.push(axios
+    //     .post("/putTopic", {
+    //       following: topic
+    //     })
+    //     .then(res => {
+    //       console.log(res.data);
+    //     })
+    //     .catch(err => {
+    //       console.error(err);
+    //     })
+    //   )
+    // });
     event.preventDefault();
-    this.setState({ value: "", title: "", characterCount: 250, topics: "" });
+    // topicPromises.push(postPromise);
+    Promise.all([postPromise])
+      .then(() => {
+        this.setState({ 
+          value: "", 
+          title: "", 
+          characterCount: 250, 
+          topics: "",
+          loading: false
+        });
+      })
+      .catch((error) => {
+        console.log(error);
+      })
   }
 
   handleChangeforPost(event) {
@@ -149,12 +177,14 @@ class Writing_Microblogs extends Component {
             autoComplete='off'
           />
           <Button
+            className={classes.button}
             onClick={this.handleSubmit}
-            // disabled={loading}
+            disabled={this.state.loading}
             variant="outlined"
             color="primary"
             >
               Share Post
+            {this.state.loading && <CircularProgress size={30} className={classes.progress} />}
           </Button>
         </form>
       </div>

twistter-frontend/src/pages/Home.js

@@ -6,78 +6,134 @@ import axios from "axios";
 
 // Material UI and React Router
 
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Button from '@material-ui/core/Button';
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Button from "@material-ui/core/Button";
 import Grid from "@material-ui/core/Grid";
 import Card from "@material-ui/core/Card";
 import CardContent from "@material-ui/core/CardContent";
-import TextField from '@material-ui/core/TextField';
+import TextField from "@material-ui/core/TextField";
 
 import Typography from "@material-ui/core/Typography";
-import withStyles from '@material-ui/styles/withStyles';
+import withStyles from "@material-ui/styles/withStyles";
 
 // component
-import '../App.css';
-import logo from '../images/twistter-logo.png';
-import noImage from '../images/no-img.png';
-import Writing_Microblogs from '../Writing_Microblogs';
-import ReactModal from 'react-modal';
+import "../App.css";
+import logo from "../images/twistter-logo.png";
+import noImage from "../images/no-img.png";
+import Writing_Microblogs from "../Writing_Microblogs";
+import ReactModal from "react-modal";
 
 // Redux
-import { likePost, unlikePost, getLikes } from '../redux/actions/userActions';
-
+import { likePost, unlikePost, getLikes } from "../redux/actions/userActions";
 
 const styles = {
   card: {
     marginBottom: 5
   }
-}
+};
 
 class Home extends Component {
   state = {
-    likes: []
+    likes: [],
+    loading: false,
+    following: null,
+    topics: null
   };
 
-
   componentDidMount() {
-    axios
-      .get("/getallPosts")
+    this.setState({ loading: true });
+    let userPromise = axios
+      .get("/user")
       .then(res => {
-        // console.log(res.data);
+        console.log(res.data.credentials.following);
+        let list = [];
+        res.data.credentials.following.forEach(element => {
+          list.push(element.handle);
+        });
         this.setState({
-          posts: res.data
+          following: list,
+          topics: res.data.credentials.followedTopics
         });
       })
       .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: allPosts
+        });
+      })
+
+      .catch(err => console.log(err));
+
+    Promise.all([userPromise, postPromise])
+      .then(() => {
+        this.setState({
+          loading: false
+        });
+      })
+      .catch(error => {
+        console.log(error);
+      });
+
     this.props.getLikes();
   }
 
   componentWillReceiveProps(nextProps) {
     this.setState({
       likes: nextProps.user.likes
+    });
+  }
+
+  flagPost = (event) => {
+    // Flags a post
+    let postId = event.target.dataset.key ? event.target.dataset.key : event.target.parentNode.dataset.key;
+    console.log(postId);
+    axios.post(`/hidePost`, {postId})
+    .then((res) => {
+      console.log(res.data);
     })
+    .catch(err => {
+      console.error(err);
+    });
+    // event.preventDefault();
   }
 
   handleClickLikeButton = (event) => {
     // Need the ternary if statement because the user can click on the text or body of the 
     // Button and they are two different html elements
-    let postId = event.target.dataset.key ? event.target.dataset.key : event.target.parentNode.dataset.key;
-    console.log(postId)
+    let postId = event.target.dataset.key
+      ? event.target.dataset.key
+      : event.target.parentNode.dataset.key;
+    console.log(postId);
 
     let doc = document.getElementById(postId);
     // console.log(postId);
     if (this.state.likes.includes(postId)) {
-      this.props.unlikePost(postId, this.state.likes)
+      this.props.unlikePost(postId, this.state.likes);
       doc.dataset.likes--;
     } else {
-      this.props.likePost(postId, this.state.likes)
+      this.props.likePost(postId, this.state.likes);
       doc.dataset.likes++;
     }
 
     doc.innerHTML = "Likes " + doc.dataset.likes;
-
-  }
+  };
 
   formatDate(dateString) {
     let newDate = new Date(Date.parse(dateString));
@@ -85,14 +141,21 @@ class Home extends Component {
   }
 
   render() {
-
-    const { UI:{ loading } } = this.props;
+    const {
+      UI: { loading }
+    } = this.props;
     let authenticated = this.props.user.authenticated;
-    let {classes} = this.props;
+    let { classes } = this.props;
     let username = this.props.user.credentials.handle;
+    console.log(username);
+    var hiddenBool = true;
+    if (username === "Admin") {
+      hiddenBool = false;
+    }
 
-    let postMarkup = this.state.posts ? (
-      this.state.posts.map(post => 
+    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) || post.userHandle === "Admin") ? (
             <Card className={classes.card} key={post.postId}>
               <CardContent>
                 <Typography>
@@ -113,8 +176,19 @@ class Home extends Component {
                 <br />
                 <Typography variant="body2">{post.body}</Typography>
                 <br />
-            <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics}</Typography>        
+                <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics.join(", ")}</Typography>        
                 <br />
+                {!hiddenBool &&
+                  <Button
+                  onClick={this.flagPost}
+                  data-key={post.postId}
+                  variant = "contained"
+                  color = "primary"
+                >
+                  Hide Post
+                </Button>
+                }
+                
                 <Typography id={post.postId} data-likes={post.likeCount} variant="body2" color={"textSecondary"}>Likes {post.likeCount}</Typography>
                 {/* <Like microBlog = {post.postId} count = {post.likeCount} name = {username}></Like> */}
                 <Button
@@ -130,15 +204,25 @@ class Home extends Component {
 
                 {/* <button>Quote</button> */}
 
+                {/* <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography> */}
+                
               </CardContent>
             </Card>
+        ) : (
+              <p></p>
+            )
     )
     ) : (
       <p>Loading post...</p>
     );
 
-    return (
-      authenticated ? (
+    return authenticated ? (
+      this.state.loading ? (
+        <CircularProgress
+          size={60}
+          style={{ marginTop: "300px" }}
+        ></CircularProgress>
+      ) : (
         <Grid container>
           <Grid item sm={4} xs={8}>
             <Writing_Microblogs />
@@ -147,34 +231,43 @@ class Home extends Component {
             {postMarkup}
           </Grid>
         </Grid>
-     ) : loading ? 
-          (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>)
-        :
-          (
+      )
+    ) : loading ? (
+      <CircularProgress
+        size={60}
+        style={{ marginTop: "300px" }}
+      ></CircularProgress>
+    ) : (
       <div>
         <div>
           <img src={logo} className="app-logo" alt="logo" />
-                <br/><br/>
+          <br />
+          <br />
           <b>Welcome to Twistter!</b>
-                <br/><br/>
+          <br />
+          <br />
           <b>See the most interesting topics people are following right now.</b>
         </div>
 
-              <br/><br/><br/><br/>
+        <br />
+        <br />
+        <br />
+        <br />
 
         <div>
           <b>Join today or sign in if you already have an account.</b>
-                <br/><br/>
+          <br />
+          <br />
           <form action="./signup">
             <button className="authButtons signup">Sign up</button>
           </form>
-                <br/>
+          <br />
           <form action="./login">
             <button className="authButtons login">Sign in</button>
           </form>
         </div>
       </div>
-    ));
+    );
   }
 }
 
@@ -185,7 +278,7 @@ class Quote extends Component {
       characterCount: 250,
       showModal: false,
       value: ""
-    }
+    };
 
     this.handleSubmitWithoutPost = this.handleSubmitWithoutPost.bind(this);
     this.handleOpenModal = this.handleOpenModal.bind(this);
@@ -195,19 +288,17 @@ class Quote extends Component {
 
   handleSubmitWithoutPost(event) {
     const post = {
-      
-      userImage: "bing-url",
-    }
+      userImage: "bing-url"
+    };
     const headers = {
       headers: { "Content-Type": "application/json" }
     };
-    axios.post(`/quoteWithoutPost/${this.props.microblog}`, post, headers)
-    .then((res) => {
-      
+    axios
+      .post(`/quoteWithoutPost/${this.props.microblog}`, post, headers)
+      .then(res => {
         console.log(res.data);
       })
       .catch(err => {
-    
         console.error(err);
       });
     event.preventDefault();
@@ -234,18 +325,17 @@ class Quote extends Component {
   handleSubmit(event) {
     const quotedPost = {
       quoteBody: this.state.value,
-      userImage: "bing-url",
+      userImage: "bing-url"
     };
     const headers = {
       headers: { "Content-Type": "application/json" }
     };
-    axios.post(`/quoteWithPost/${this.props.microblog}`, quotedPost, headers)
-    .then((res) => {
-      
+    axios
+      .post(`/quoteWithPost/${this.props.microblog}`, quotedPost, headers)
+      .then(res => {
         console.log(res.data);
       })
       .catch(err => {
-    
         console.error(err);
       });
     event.preventDefault();
@@ -255,13 +345,28 @@ class Quote extends Component {
   render() {
     return (
       <div>
-        <Button variant="outlined" color="primary" onClick={this.handleOpenModal}>Quote with Post</Button>
+        <Button
+          variant="outlined"
+          color="primary"
+          onClick={this.handleOpenModal}
+        >
+          Quote with Post
+        </Button>
         <ReactModal
           isOpen={this.state.showModal}
-           style={{content: {height: "50%", width: "25%", marginTop: "auto", marginLeft: "auto", marginRight: "auto", marginBottom : "auto"}}}
+          style={{
+            content: {
+              height: "50%",
+              width: "25%",
+              marginTop: "auto",
+              marginLeft: "auto",
+              marginRight: "auto",
+              marginBottom: "auto"
+            }
+          }}
         >
           <div style={{ width: "200px", marginLeft: "50px" }}>
-          <form style={{ width: "350px"}}>
+            <form style={{ width: "350px" }}>
               {/* <textarea
               value={this.state.value}
               required
@@ -276,7 +381,7 @@ class Quote extends Component {
               rows={20}
             /> */}
               <TextField
-              style={{width: 300}}
+                style={{ width: 300 }}
                 value={this.state.value}
                 label="Write Quoted Post here..."
                 required
@@ -291,85 +396,93 @@ class Quote extends Component {
                   this.handleChangeforPost(e);
                   this.handleChangeforCharacterCount(e);
                 }}
-              autoComplete='off'
+                autoComplete="off"
               ></TextField>
 
               <div style={{ fontSize: "14px", marginRight: "-100px" }}>
                 <p2>Characters Left: {this.state.characterCount}</p2>
               </div>
-              <Button variant="outlined" color="primary" onClick={this.handleSubmit}>Share Quoted Post</Button>
-        
-          <Button variant="outlined" color="primary" onClick={this.handleCloseModal}>Cancel</Button>
+              <Button
+                variant="outlined"
+                color="primary"
+                onClick={this.handleSubmit}
+              >
+                Share Quoted Post
+              </Button>
 
+              <Button
+                variant="outlined"
+                color="primary"
+                onClick={this.handleCloseModal}
+              >
+                Cancel
+              </Button>
             </form>
           </div>
-          
-          
         </ReactModal>
-        <Button variant="outlined" color="primary" onClick={this.handleSubmitWithoutPost}>Quote without Post</Button>
-
+        <Button
+          variant="outlined"
+          color="primary"
+          onClick={this.handleSubmitWithoutPost}
+        >
+          Quote without Post
+        </Button>
       </div>
-    )
+    );
   }
 }
 
 class Like extends Component {
-
   constructor(props) {
-    super(props)
+    super(props);
     this.state = {
-         num : this.props.count,
-
-    }
+      num: this.props.count
+    };
 
     this.handleClick = this.handleClick.bind(this);
   }
 
   componentDidMount() {
     this.setState({
-      like: localStorage.getItem(this.props.microBlog + this.props.name) === "false"
-
-    })
-
+      like:
+        localStorage.getItem(this.props.microBlog + this.props.name) === "false"
+    });
   }
 
-
-  
   handleClick(){
-
     this.setState({
       like: !this.state.like
     });
-    localStorage.setItem(this.props.microBlog + this.props.name, this.state.like.toString())
+    localStorage.setItem(
+      this.props.microBlog + this.props.name,
+      this.state.like.toString()
+    );
 
-    if(this.state.like == false)
-          {
+    if (this.state.like == false) {
       this.setState(() => {
-              return {num: this.state.num + 1}
+        return { num: this.state.num + 1 };
       });
-            axios.get(`/like/${this.props.microBlog}`)
-            .then((res) => {
+      axios
+        .get(`/like/${this.props.microBlog}`)
+        .then(res => {
           console.log(res.data);
         })
-            .catch((err) => {
+        .catch(err => {
           console.log(err);
-            })
-          }
-          else
-          {
-            this.setState(() => {
-              return {num: this.state.num - 1}
         });
-          axios.get(`/unlike/${this.props.microBlog}`)
-                .then((res) => {
+    } else {
+      this.setState(() => {
+        return { num: this.state.num - 1 };
+      });
+      axios
+        .get(`/unlike/${this.props.microBlog}`)
+        .then(res => {
           console.log(res.data);
         })
-                .catch((err) => {
+        .catch(err => {
           console.log(err);
-                })
+        });
     }
-            
-            
   }
 
   /* componentDidMount() {
@@ -392,31 +505,28 @@ class Like extends Component {
   }  */
 
   render() {
-      
-      const label = this.state.like ? 'Unlike' : 'Like'
-      return(
-        
-
+    const label = this.state.like ? "Unlike" : "Like";
+    return (
       <div>
-          <Typography variant="body2" color={"textSecondary"}>Likes {this.state.num}</Typography>
+        <Typography variant="body2" color={"textSecondary"}>
+          Likes {this.state.num}
+        </Typography>
         <button onClick={this.handleClick}>{label}</button>
       </div>
-      )
+    );
   }
-
 }
 
-const mapStateToProps = (state) => ({
+const mapStateToProps = state => ({
   user: state.user,
   UI: state.UI
-})
-
+});
 
 const mapActionsToProps = {
   likePost,
   unlikePost,
   getLikes
-}
+};
 
 Home.propTypes = {
   user: PropTypes.object.isRequired,
@@ -425,16 +535,17 @@ Home.propTypes = {
   getLikes: PropTypes.func.isRequired,
   classes: PropTypes.object.isRequired,
   UI: PropTypes.object.isRequired
-}
+};
 
 Like.propTypes = {
   user: PropTypes.object.isRequired
-}
+};
 
 Quote.propTypes = {
   user: PropTypes.object.isRequired
-}
-
-
-export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Home, Like, Quote));
+};
 
+export default connect(
+  mapStateToProps,
+  mapActionsToProps
+)(withStyles(styles)(Home, Like, Quote));

twistter-frontend/src/pages/directMessages.js

@@ -83,6 +83,10 @@ const styles = {
 		wordBreak: "break-all",
 		color: 'black'
 	},
+	dmRecentMessageDisabled: {
+		wordBreak: "break-all",
+		color: 'red'
+	},
 	dmListItemContainer: {
 		height: 100
 	},
@@ -426,13 +430,19 @@ export class directMessages extends Component {
 								<Typography
 									className={
 										this.state.selectedChannel && this.state.selectedChannel.dmId === channel.dmId ? (
+                      channel.hasDirectMessagesEnabled ? 
                         classes.dmRecentMessageSelected
+                      :
+                        classes.dmRecentMessageDisabled
 										) : (
+                      channel.hasDirectMessagesEnabled ?
                         classes.dmRecentMessageUnselected
+                      :
+                        classes.dmRecentMessageDisabled
 										)
 									}
 								>
-									{
+									{!channel.hasDirectMessagesEnabled ? "This user has DMs disabled" :
 										!channel.recentMessage ? 
 											'No messages' 
 										: 
@@ -548,8 +558,8 @@ export class directMessages extends Component {
                     >
                       Create
                       {creatingDirectMessage && 
-											    <CircularProgress size={30} style={{position: "absolute"}}/>
                       // Won't accept classes style for some reason
+                      <CircularProgress size={30} style={{position: "absolute"}}/>
                       }
                     </Button>
                   </Grid>
@@ -597,7 +607,16 @@ export class directMessages extends Component {
 										multiline
 										rows={2}
                     margin="dense"
-                                        value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""}
+                    disabled={!this.state.selectedChannel.hasDirectMessagesEnabled}
+                    value={
+                      !this.state.selectedChannel.hasDirectMessagesEnabled ? 
+                        "This user has DMs disabled"
+                      :
+                        this.state.drafts[this.state.selectedChannel.dmId] ? 
+                          this.state.drafts[this.state.selectedChannel.dmId] 
+                        : 
+                          ""
+                    }
                     onChange={this.handleChangeMessage}
 									/>
                     <Fab 

twistter-frontend/src/pages/otherUser.js

@@ -22,6 +22,7 @@ import AddCircle from "@material-ui/icons/AddCircle";
 import TextField from "@material-ui/core/TextField";
 import VerifiedIcon from "@material-ui/icons/CheckSharp";
 import DoneIcon from "@material-ui/icons/Done";
+import CircularProgress from "@material-ui/core/CircularProgress";
 
 // component
 import "../App.css";
@@ -77,7 +78,9 @@ class user extends Component {
       user: null,
       following: null,
       posts: null,
-      myTopics: null
+      myTopics: null,
+      followingList: null,
+      loading: false
     };
   }
 
@@ -90,7 +93,8 @@ class user extends Component {
         .then(res => {
           console.log("removed sub");
           this.setState({
-            following: false
+            following: false,
+            myTopics: []
           });
         })
         .catch(function(err) {
@@ -113,8 +117,27 @@ class user extends Component {
     }
   };
 
-  componentDidMount() {
+  handleAdd = newTopic => {
     axios
+      .post("/putNewTopic", {
+        handle: this.state.profile,
+        topic: newTopic
+      })
+      .then(() => {
+        let temp = this.state.myTopics;
+        temp.push(newTopic);
+        this.setState({
+          myTopics: temp
+        });
+      })
+      .catch(err => {
+        console.err(err);
+      });
+  };
+
+  componentDidMount() {
+    this.setState({ loading: true });
+    let otherUserPromise = axios
       .post("/getUserDetails", {
         handle: this.state.profile
       })
@@ -126,19 +149,26 @@ class user extends Component {
       })
       .catch(err => console.log(err));
 
-    axios
+    let userPromise = axios
       .get("/user")
       .then(res => {
+        let list = [];
+        let fol = false;
+        res.data.credentials.following.forEach(follow => {
+          // console.log(follow);
+          if (this.state.profile === follow.handle) {
+            fol = true;
+            list = follow.topics;
+          }
+        });
         this.setState({
-          following: res.data.credentials.following.includes(
-            this.state.profile
-          ),
-          myTopics: res.data.credentials.followedTopics
+          following: fol,
+          myTopics: list
         });
       })
       .catch(err => console.log(err));
 
-    axios
+    let posts = axios
       .post("/getOtherUsersPosts", {
         handle: this.state.profile
       })
@@ -149,6 +179,44 @@ class user extends Component {
         });
       })
       .catch(err => console.log(err));
+
+    // Only add Admin posts if this is not the Admin account
+    let alertPromise;
+    if (this.state.profile !== "Admin") {
+      alertPromise = axios
+        .get("/getAlert")
+        .then(res => {
+          let temp = this.state.posts;
+          // console.log(res.data);
+          res.data.forEach(element => {
+            element ? temp.push(element) : console.err;
+          });
+          // temp.push(res.data[0]);
+          this.setState({
+            posts: temp
+          });
+        })
+        .catch(function(err) {
+          console.log(err);
+        });
+    } else {
+      alertPromise = new Promise((resolve, reject) => {
+        resolve();
+      });
+    }
+
+    Promise.all([otherUserPromise, userPromise, posts, alertPromise])
+      .then(() => {
+        this.setState({ loading: false });
+      })
+      .catch(error => {
+        console.log(error);
+      });
+  }
+
+  formatDate(dateString) {
+    let newDate = new Date(Date.parse(dateString));
+    return newDate.toDateString();
   }
 
   render() {
@@ -177,8 +245,8 @@ class user extends Component {
       <p>loading username...</p>
     );
 
-    console.log(this.state.topics);
-    console.log(this.state.myTopics);
+    // console.log(this.state.topics);
+    // console.log(this.state.myTopics);
     let topicsMarkup = this.state.topics ? (
       this.state.topics.map(
         topic =>
@@ -186,16 +254,20 @@ class user extends Component {
             this.state.myTopics.includes(topic) ? (
               <MyChip
                 label={topic}
-                key={{ topic }.topic.id}
+                key={{ topic }.id}
                 onDelete
                 deleteIcon={<DoneIcon />}
               />
-            ) : (
+            ) : this.state.following ? (
               <MyChip
                 label={topic}
-                key={{ topic }.topic.id}
+                key={{ topic }.id}
                 color="secondary"
+                clickable
+                onClick={key => this.handleAdd(topic)}
               />
+            ) : (
+              <MyChip label={topic} key={{ topic }.id} color="secondary" />
             )
           ) : (
             <p></p>
@@ -211,10 +283,10 @@ class user extends Component {
     ) : (
       <img src={noImage} height="150" width="150" />
     );
-
+    //(this.state.posts);
     let postMarkup = this.state.posts ? (
       this.state.posts.map(post => (
-        <Card className={classes.card}>
+        <Card className={classes.card} key={post.postId} data-key={post.postId}>
           <CardContent>
             <Typography>
               {this.state.imageUrl ? (
@@ -223,11 +295,11 @@ class user extends Component {
                 <img src={noImage} height="50" width="50" />
               )}
             </Typography>
-            <Typography variant="h7">
+            <Typography variant="h4">
               <b>{post.userHandle}</b>
             </Typography>
             <Typography variant="body2" color={"textSecondary"}>
-              {post.createdAt}
+              {this.formatDate(post.createdAt)}
             </Typography>
 
             <br />
@@ -240,7 +312,7 @@ class user extends Component {
             <Typography variant="body2">{post.body}</Typography>
             <br />
             <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics}
+              <b>Topics:</b> {post.microBlogTopics.join(", ")}
             </Typography>
             <br />
             <Typography variant="body2" color={"textSecondary"}>
@@ -253,8 +325,13 @@ class user extends Component {
       <p>Posts</p>
     );
 
-    return (
-      <Grid container spacing={24}>
+    return this.state.loading ? (
+      <CircularProgress
+        size={60}
+        style={{ marginTop: "300px" }}
+      ></CircularProgress>
+    ) : (
+      <Grid container spacing={10}>
         <Grid item sm={4} xs={8}>
           {imageMarkup}
           {profileMarkup}

twistter-frontend/src/pages/user.js

@@ -13,6 +13,7 @@ import CardMedia from "@material-ui/core/CardMedia";
 import CardContent from "@material-ui/core/CardContent";
 import Button from "@material-ui/core/Button";
 import Grid from "@material-ui/core/Grid";
+import CircularProgress from "@material-ui/core/CircularProgress";
 
 import Chip from "@material-ui/core/Chip";
 import Typography from "@material-ui/core/Typography";
@@ -76,7 +77,8 @@ class user extends Component {
       profile: null,
       imageUrl: null,
       topics: null,
-      newTopic: ""
+      newTopic: "",
+      loading: false
     };
   }
 
@@ -127,7 +129,8 @@ class user extends Component {
   }
 
   componentDidMount() {
-    axios
+    this.setState({loading: true})
+    let userPromise = axios
       .get("/user")
       .then(res => {
         this.setState({
@@ -141,7 +144,7 @@ class user extends Component {
       })
       .catch(err => console.log(err));
 
-    axios
+    let postsPromise = axios
       .get("/getallPostsforUser")
       .then(res => {
         // console.log(res.data);
@@ -150,6 +153,14 @@ class user extends Component {
         });
       })
       .catch(err => console.log(err));
+
+      Promise.all([userPromise, postsPromise])
+        .then(() => {
+          this.setState({loading: false});
+        })
+        .catch((error) => {
+          console.log(error)
+        })
   }
 
   formatDate(dateString) {
@@ -219,7 +230,7 @@ class user extends Component {
               <b>{post.userHandle}</b>
             </Typography>
             <Typography variant="body2" color={"textSecondary"}>
-              {post.createdAt}
+              {this.formatDate(post.createdAt) }
             </Typography>
 
             <br />
@@ -232,7 +243,7 @@ class user extends Component {
             <Typography variant="body2">{post.body}</Typography>
             <br />
             <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics}
+              <b>Topics:</b> {post.microBlogTopics.join(", ")}
             </Typography>
             <br />
             <Typography variant="body2" color={"textSecondary"}>
@@ -258,7 +269,17 @@ class user extends Component {
       </Link>
     ) : null;
 
+    let verifyButtonMarkup = this.state.profile === "Admin" ?
+      <Link to="/verify">
+        <Button className={classes.button} variant="outlined" color="primary">
+          Verify Users
+        </Button>
+      </Link>
+    :
+      null
+
     return (
+      this.state.loading ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
       <div>
         {/* <Paper className={classes.paper}> */}
         <Grid container direction="column">
@@ -266,6 +287,7 @@ class user extends Component {
             <Grid container>
               <Grid item sm>
                 {editButtonMarkup}
+                {verifyButtonMarkup}
               </Grid>
               <Grid item sm>
                 {/* <Grid container direction="column"> */}

twistter-frontend/src/redux/actions/dataActions.js

@@ -142,5 +142,6 @@ export const sendDirectMessage = (user, message) => (dispatch) => {
                     sendDirectMessage: err.response.data
                 }
             })
+            dispatch({type: SET_NOT_LOADING_UI_4});
         })
 }

twistter-frontend/src/redux/actions/userActions.js

@@ -36,6 +36,7 @@ export const getUserData = () => (dispatch) => {
 
 // Sends login data to firebase and sets the user data in Redux
 export const loginUser = (loginData, history) => (dispatch) => {
+    dispatch({type: CLEAR_ERRORS});
     dispatch({ type: LOADING_UI });
     axios
       .post("/login", loginData)
@@ -57,6 +58,7 @@ export const loginUser = (loginData, history) => (dispatch) => {
 
 // Sends signup data to firebase and sets the user data in Redux
 export const signupUser = (newUserData, history) => (dispatch) => {
+    dispatch({type: CLEAR_ERRORS});
     dispatch({ type: LOADING_UI });
     axios
       .post("/signup", newUserData)