Fix merge errors, but posts are not displaying on home.js

Fix unfollow

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()
@@ -62,59 +74,81 @@ exports.getallPostsforUser = (req, res) => {
     });
 };
 
+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) => {
+    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) => {
+      .catch(error => {
         reject(error);
-      })
+      });
   });
 
   // Get all users
   var usersPromise = new Promise((resolve, reject) => {
-    db.collection("users").get()
-      .then((allUsers) => {
-        allUsers.forEach((user) => {
+    db.collection("users")
+      .get()
+      .then(allUsers => {
+        allUsers.forEach(user => {
           users[user.data().handle] = user.data();
-        })
+        });
         resolve();
       })
-      .catch((error) => {
+      .catch(error => {
         reject(error);
-      })
+      });
   });
 
   // Wait for the two promises
   Promise.all([postsPromise, usersPromise])
     .then(() => {
-      let newPosts = []
+      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;
+      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});
-    })
+    .catch(error => {
+      return res.status(500).json({ error });
+    });
 };
 
-exports.getOtherUsersPosts = (req, res) => {
+exports.getAlert = (req, res) => {
   var post_query = admin
     .firestore()
     .collection("posts")
-    .where("userHandle", "==", req.body.handle);
+    .where("microBlogTitle", "==", "Alert");
 
   post_query
     .get()
@@ -123,6 +157,40 @@ 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() {
+      return res
+        .status(200)
+        .json("Successfully retrieved all user's posts from database.");
+    })
+    .catch(function(err) {
+      return res
+        .status(500)
+        .json("Failed to retrieve user's posts from database.", err);
+    });
+};
+
+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) {
+      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() {
@@ -138,23 +206,25 @@ 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);
+  let quoteData;
+  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}`);
+  const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    postDoc.get()
-    .then((doc) => {
-        if(doc.exists) {
-            quoteData = doc.data();
-            return quoteDoc.get();
-        }
-        else
-        {
-            return res.status(404).json({error: 'Post not found'});
-        }
+  postDoc
+    .get()
+    .then(doc => {
+      if (doc.exists) {
+        quoteData = doc.data();
+        return quoteDoc.get();
+      } else {
+        return res.status(404).json({ error: "Post not found" });
+      }
     })
     .then(data => {
       if (data.empty) {
@@ -202,23 +272,25 @@ 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);
+  let quoteData;
+  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}`);
+  const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    postDoc.get()
-    .then((doc) => {
-        if(doc.exists) {
-            quoteData = doc.data();
-            return quoteDoc.get();
-        }
-        else
-        {
-            return res.status(404).json({error: 'Post not found'});
-        }
+  postDoc
+    .get()
+    .then(doc => {
+      if (doc.exists) {
+        quoteData = doc.data();
+        return quoteDoc.get();
+      } else {
+        return res.status(404).json({ error: "Post not found" });
+      }
     })
     .then(data => {
       if (data.empty) {
@@ -260,7 +332,7 @@ exports.quoteWithoutPost = (req, res) => {
       }
     })
     .catch(err => {
-    //   return res.status(500).json({ error: "Something is wrong" });
+      //   return res.status(500).json({ error: "Something is wrong" });
       return res.status(500).json({ error: err });
     });
 };
@@ -274,202 +346,198 @@ exports.checkforLikePost = (req, res) => {
     .limit(1);
   let result;
 
-  likedPostDoc.get().then(data => {
-    if (data.empty) {
-      result = false;
-      return res.status(200).json(result);
-    } else {
-      result = true;
-      return res.status(200).json(result);
-    }
-  })
-  .catch((err) => {
+  likedPostDoc
+    .get()
+    .then(data => {
+      if (data.empty) {
+        result = false;
+        return res.status(200).json(result);
+      } else {
+        result = true;
+        return res.status(200).json(result);
+      }
+    })
+    .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 => {
+      let likes = userDoc.data().likes;
+      if (likes === undefined || likes === null) {
+        likes = [];
+      }
 
-    const postId = req.params.postId;
-    let likedPostDoc;
-    db.doc(`/users/${req.userData.handle}`)
-        .get()
-        .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" });
+      }
 
-            if (likes.includes(postId)) {
-                return res.status(400).json({error: "This user has already liked this post"});
-            }
+      likes.push(postId);
 
-            likes.push(postId);
+      return userDoc.ref.update({ likes });
+    })
+    .then(() => {
+      return db.doc(`/posts/${postId}`).get();
+    })
+    .then(postDoc => {
+      let postData = postDoc.data();
+      postData.likeCount++;
+      likedPostDoc = postData;
+      return postDoc.ref.update({ likeCount: postData.likeCount });
+    })
+    .then(() => {
+      return res.status(201).json(likedPostDoc);
+    })
+    .catch(err => {
+      console.log(err);
+      return res.status(500).json({ error: err });
+    });
 
-            return userDoc.ref.update({likes})
-        })
-        .then(() => {
-            return db.doc(`/posts/${postId}`).get()
+  // let postData;
+  // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
+  // .where('postId', '==', req.params.postId).limit(1);
 
-        })
-        .then((postDoc) => {
-            let postData = postDoc.data();
-            postData.likeCount++;
-            likedPostDoc = postData;
-            return postDoc.ref.update({likeCount : postData.likeCount})
-        })
-        .then(() => {
-            return res.status(201).json(likedPostDoc);
-        })
-        .catch((err) => {
-            console.log(err);
-            return res.status(500).json({error: err});
-        })
+  // const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    // let postData;
-    // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
-    // .where('postId', '==', req.params.postId).limit(1);
-
-    // const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-    // postDoc.get()
-    // .then((doc) => {
-    //     if(doc.exists) {
-    //         postData = doc.data();
-    //         return likeDoc.get();
-    //     }
-    //     else
-    //     {
-    //         return res.status(404).json({error: 'Post not found'});
-    //     }
-    // })
-    // .then((data) => {
-    //     if (data.empty) {
-    //         return admin.firestore().collection('likes').add({
-    //             postId : req.params.postId,
-    //             userHandle: req.user.handle
-
-    //         })
-    //         .then(() => {
-    //             postData.likeCount++;
-    //             return postDoc.update({likeCount : postData.likeCount})
-    //         })
-    //         .then(() => {
-    //             return res.status(200).json(postData);
-    //         })
-    //     }
-    // })
-    // .catch((err) => {
-    //     return res.status(500).json({error: 'Something is wrong'});
-    // })
-
-}
+  // postDoc.get()
+  // .then((doc) => {
+  //     if(doc.exists) {
+  //         postData = doc.data();
+  //         return likeDoc.get();
+  //     }
+  //     else
+  //     {
+  //         return res.status(404).json({error: 'Post not found'});
+  //     }
+  // })
+  // .then((data) => {
+  //     if (data.empty) {
+  //         return admin.firestore().collection('likes').add({
+  //             postId : req.params.postId,
+  //             userHandle: req.user.handle
 
+  //         })
+  //         .then(() => {
+  //             postData.likeCount++;
+  //             return postDoc.update({likeCount : postData.likeCount})
+  //         })
+  //         .then(() => {
+  //             return res.status(200).json(postData);
+  //         })
+  //     }
+  // })
+  // .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 => {
+      let likes = userDoc.data().likes;
+      if (likes === undefined || likes === null) {
+        likes = [];
+      }
 
-    const postId = req.params.postId;
-    let likedPostDoc;
-    db.doc(`/users/${req.userData.handle}`)
-        .get()
-        .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" });
+      }
 
-            if (!likes.includes(postId)) {
-                return res.status(400).json({error: "This user hasn't liked this post yet"});
-            }
+      let i;
+      for (i = 0; i < likes.length; i++) {
+        if (likes[i] === postId) {
+          likes.splice(i, 1);
+        }
+      }
 
-            let i;
-            for (i = 0; i < likes.length; i++) {
-                if (likes[i] === postId) {
-                    likes.splice(i, 1);
-                }
-            }
+      return userDoc.ref.update({ likes });
+    })
+    .then(() => {
+      return db.doc(`/posts/${postId}`).get();
+    })
+    .then(postDoc => {
+      let postData = postDoc.data();
+      postData.likeCount--;
+      likedPostDoc = postData;
+      return postDoc.ref.update({ likeCount: postData.likeCount });
+    })
+    .then(() => {
+      return res.status(201).json(likedPostDoc);
+    })
+    .catch(err => {
+      console.log(err);
+      return res.status(500).json({ error: err });
+    });
 
-            return userDoc.ref.update({likes})
-        })
-        .then(() => {
-            return db.doc(`/posts/${postId}`).get()
+  // let postData;
+  // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
+  // .where('postId', '==', req.params.postId).limit(1);
 
-        })
-        .then((postDoc) => {
-            let postData = postDoc.data();
-            postData.likeCount--;
-            likedPostDoc = postData;
-            return postDoc.ref.update({likeCount : postData.likeCount})
-        })
-        .then(() => {
-            return res.status(201).json(likedPostDoc);
-        })
-        .catch((err) => {
-            console.log(err);
-            return res.status(500).json({error: err});
-        })
+  // const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-    // let postData;
-    // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
-    // .where('postId', '==', req.params.postId).limit(1);
-
-    // const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-    // postDoc.get()
-    // .then((doc) => {
-    //     if(doc.exists) {
-    //         postData = doc.data();
-    //         return likeDoc.get();
-    //     }
-    //     else
-    //     {
-    //         return res.status(404).json({error: 'Post not found'});
-    //     }
-    // })
-    // .then((data) => {
-    //         return db
-    //           .doc(`/likes/${data.docs[0].id}`)
-    //           .delete()
-    //           .then(() => {
-    //             postData.likeCount--;
-    //             return postDoc.update({ likeCount: postData.likeCount });
-    //           })
-    //           .then(() => {
-    //             res.status(200).json(postData);
-    //           });
-          
-    // })
-    // .catch((err) => {
-    //     console.error(err);
-    //     return res.status(500).json({error: 'Something is wrong'});
-    // })
-
-}
+  // postDoc.get()
+  // .then((doc) => {
+  //     if(doc.exists) {
+  //         postData = doc.data();
+  //         return likeDoc.get();
+  //     }
+  //     else
+  //     {
+  //         return res.status(404).json({error: 'Post not found'});
+  //     }
+  // })
+  // .then((data) => {
+  //         return db
+  //           .doc(`/likes/${data.docs[0].id}`)
+  //           .delete()
+  //           .then(() => {
+  //             postData.likeCount--;
+  //             return postDoc.update({ likeCount: postData.likeCount });
+  //           })
+  //           .then(() => {
+  //             res.status(200).json(postData);
+  //           });
 
+  // })
+  // .catch((err) => {
+  //     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) => {
-            let likes = doc.data().likes;
-            if (likes === undefined || likes === null) {
-                likes = [];
-            }
-            return res.status(200).json({likes});
-        })
-        .catch((err) => {
-            console.log(err);
-            return res.status(500).json({error: err});
-        })
-}
+  db.doc(`/users/${req.userData.handle}`)
+    .get()
+    .then(doc => {
+      let likes = doc.data().likes;
+      if (likes === undefined || likes === null) {
+        likes = [];
+      }
+      return res.status(200).json({ likes });
+    })
+    .catch(err => {
+      console.log(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/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/src/pages/Home.js

@@ -41,12 +41,17 @@ class Home extends Component {
   };
 
   componentDidMount() {
-    this.setState({loading: true});
+    this.setState({ loading: true });
     let userPromise = axios
       .get("/user")
       .then(res => {
+        console.log(res.data.credentials.following);
+        let list = [];
+        res.data.credentials.following.forEach(element => {
+          list.push(element.handle);
+        });
         this.setState({
-          following: res.data.credentials.following,
+          following: list,
           topics: res.data.credentials.followedTopics
         });
       })
@@ -62,15 +67,15 @@ class Home extends Component {
       })
       .catch(err => console.log(err));
 
-      Promise.all([userPromise, postPromise])
-        .then(() => {
-          this.setState({
-            loading: false
-          })
-        })
-        .catch((error) => {
-          console.log(error);
-        })
+    Promise.all([userPromise, postPromise])
+      .then(() => {
+        this.setState({
+          loading: false
+        });
+      })
+      .catch(error => {
+        console.log(error);
+      });
 
     this.props.getLikes();
   }
@@ -81,7 +86,21 @@ class Home extends Component {
     });
   }
 
-  handleClickLikeButton = event => {
+  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
@@ -114,51 +133,50 @@ class Home extends Component {
     let authenticated = this.props.user.authenticated;
     let { classes } = this.props;
     let username = this.props.user.credentials.handle;
-    console.log(this.state.following);
+    console.log(username);
+    var hiddenBool = true;
+    if (username === "Admin") {
+      hiddenBool = false;
+    }
 
+    console.log(hiddenBool);
     let postMarkup = this.state.posts ? (
-      this.state.posts.map(post =>
-        this.state.following ? (
-          this.state.following.includes(post.userHandle) ? (
+// <<<<<<< admin-delete
+      this.state.posts.map(post => !post.hidden && this.state.following && this.state.following.includes(post.userHandle) ? (
             <Card className={classes.card} key={post.postId}>
               <CardContent>
                 <Typography>
                   {/* {
-                this.state.imageUrl ? (<img src={this.state.imageUrl} height="50" width="50" />) : 
-                                      (<img src={noImage} height="50" width="50"/>)
-              } */}
-                  {post.profileImage ? (
-                    <img src={post.profileImage} height="50" width="50" />
-                  ) : (
-                    <img src={noImage} height="50" width="50" />
-                  )}
-                </Typography>
-                <Typography variant="h5">
-                  <b>{post.userHandle}</b>
-                </Typography>
-                <Typography variant="body2" color={"textSecondary"}>
-                  {this.formatDate(post.createdAt)}
+                    this.state.imageUrl ? (<img src={this.state.imageUrl} height="50" width="50" />) : 
+                                          (<img src={noImage} height="50" width="50"/>)
+                  } */}
+                  {
+                    post.profileImage ? (<img src={post.profileImage} height="50" width="50" />) : 
+                                        (<img src={noImage} height="50" width="50"/>)
+                  }
                 </Typography>
+                <Typography variant="h5"><b>{post.userHandle}</b></Typography>
+                <Typography variant="body2" color={"textSecondary"}>{this.formatDate(post.createdAt)}</Typography>
                 <br />
-                <Typography variant="body1">
-                  <b>{post.microBlogTitle}</b>
-                </Typography>
+                <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
                 <Typography variant="body2">{post.quoteBody}</Typography>
                 <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 />
-                <Typography
-                  id={post.postId}
-                  data-likes={post.likeCount}
-                  variant="body2"
-                  color={"textSecondary"}
+                {!hiddenBool &&
+                  <Button
+                  onClick={this.flagPost}
+                  data-key={post.postId}
+                  variant = "contained"
+                  color = "primary"
                 >
-                  Likes {post.likeCount}
-                </Typography>
+                  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
                   onClick={this.handleClickLikeButton}
@@ -166,70 +184,88 @@ class Home extends Component {
                   disabled={loading}
                   variant="outlined"
                   color="primary"
-                >
-                  {this.state.likes && this.state.likes.includes(post.postId)
-                    ? "Unlike"
-                    : "Like"}
-                </Button>
-                <Quote microblog={post.postId}></Quote>
+                >{
+                  this.state.likes && this.state.likes.includes(post.postId) ? 'Unlike' : 'Like'
+                  }</Button>
+                <Quote microblog = {post.postId}></Quote> 
 
                 {/* <button>Quote</button> */}
+
+                <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
+                
               </CardContent>
             </Card>
-          ) : (
-            <p></p>
-          )
         ) : (
-          <p>Loading</p>
-        )
-      )
+              <p></p>
+            )
+    )
+// =======
+//       this.state.posts.map(post =>
+//         this.state.following ? (
+//           this.state.following.includes(post.userHandle) ? (
+//           ) : (
+//             <p></p>
+//           )
+//         ) : (
+//           <p></p>
+//         )
+// >>>>>>> master
+      
     ) : (
       <p>Loading post...</p>
     );
 
-    return (
-      authenticated ? (
-        this.state.loading ? (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>) :
-      <Grid container>
-        <Grid item sm={4} xs={8}>
-          <Writing_Microblogs />
+    return authenticated ? (
+      this.state.loading ? (
+        <CircularProgress
+          size={60}
+          style={{ marginTop: "300px" }}
+        ></CircularProgress>
+      ) : (
+        <Grid container>
+          <Grid item sm={4} xs={8}>
+            <Writing_Microblogs />
+          </Grid>
+          <Grid item sm={4} xs={8}>
+            {postMarkup}
+          </Grid>
         </Grid>
-        <Grid item sm={4} xs={8}>
-          {postMarkup}
-        </Grid>
-      </Grid> 
-     ) : loading ?
-          (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>)
-        :
-          (
-            <div>
-              <div>
-                <img src={logo} className="app-logo" alt="logo" />
-                <br/><br/>
-                <b>Welcome to Twistter!</b> 
-                <br/><br/>
-                <b>See the most interesting topics people are following right now.</b> 
-              </div>
+      )
+    ) : loading ? (
+      <CircularProgress
+        size={60}
+        style={{ marginTop: "300px" }}
+      ></CircularProgress>
+    ) : (
+      <div>
+        <div>
+          <img src={logo} className="app-logo" alt="logo" />
+          <br />
+          <br />
+          <b>Welcome to Twistter!</b>
+          <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 />
-                <form action="./signup">
-                  <button className="authButtons signup">Sign up</button>
-                </form>
-                <br />
-                <form action="./login">
-                  <button className="authButtons login">Sign in</button>
-                </form>
-              </div>
-            </div>
-          )
+        <div>
+          <b>Join today or sign in if you already have an account.</b>
+          <br />
+          <br />
+          <form action="./signup">
+            <button className="authButtons signup">Sign up</button>
+          </form>
+          <br />
+          <form action="./login">
+            <button className="authButtons login">Sign in</button>
+          </form>
+        </div>
+      </div>
     );
   }
 }
@@ -412,7 +448,7 @@ class Like extends Component {
     });
   }
 
-  handleClick() {
+  handleClick(){
     this.setState({
       like: !this.state.like
     });

twistter-frontend/src/pages/directMessages.js

@@ -377,7 +377,7 @@ export class directMessages extends Component {
 		const open = Boolean(this.state.anchorEl);
 		const id = open ? 'simple-popover' : undefined;
 
-        let dmListMarkup = this.state.dmData ? (
+    let dmListMarkup = this.state.dmData ? (
 			this.state.dmData.map((channel) => (
 				<Card
 					onClick={this.handleClickChannel}
@@ -432,7 +432,7 @@ export class directMessages extends Component {
 										)
 									}
 								>
-									{
+									{!channel.hasDirectMessagesEnabled ? "This user has DMs disabled" :
 										!channel.recentMessage ? 
 											'No messages' 
 										: 
@@ -524,35 +524,35 @@ export class directMessages extends Component {
 											onChange={this.handleChangeAddDMUsername}
 											value={this.state.createDMUsername}
 											label="Username"
-                                            variant="outlined"
-                                            helperText={errors.createDirectMessage}
-                                            error={errors.createDirectMessage ? true : false}
+                      variant="outlined"
+                      helperText={errors.createDirectMessage}
+                      error={errors.createDirectMessage ? true : false}
 											style={{
-                                                width: 265,
-                                                marginRight: 10,
-                                                marginLeft: 10,
-                                                textAlign: 'center',
+                        width: 265,
+                        marginRight: 10,
+                        marginLeft: 10,
+                        textAlign: 'center',
 											}}
 										/>
 									</Grid>
-                                    <Grid item> 
-                                        <Button
-                                            className={classes.createButton}
-                                            variant="outlined"
-                                            color="primary"
-                                            onClick={this.handleClickCreate}
-                                            disabled={
-                                                creatingDirectMessage ||
-                                                this.state.createDMUsername === ""    
-                                            }
-                                        >
-                                            Create
-                                            {creatingDirectMessage && 
-											    <CircularProgress size={30} style={{position: "absolute"}}/>
-                                                // Won't accept classes style for some reason
-                                            }
-                                        </Button>
-                                    </Grid>
+                  <Grid item> 
+                    <Button
+                      className={classes.createButton}
+                      variant="outlined"
+                      color="primary"
+                      onClick={this.handleClickCreate}
+                      disabled={
+                        creatingDirectMessage ||
+                        this.state.createDMUsername === ""    
+                      }
+                    >
+                      Create
+                      {creatingDirectMessage && 
+                      // Won't accept classes style for some reason
+                      <CircularProgress size={30} style={{position: "absolute"}}/>
+                      }
+                    </Button>
+                  </Grid>
 								</Grid>
 							</Grid>
 							<Grid item sm />
@@ -572,13 +572,13 @@ export class directMessages extends Component {
 						<Grid item className={classes.dmItemsUpper} id="dmItemsUpper">
 							{dmListMarkup}
 						</Grid>
-                        <Grid item className={classes.dmItemsLower}>
-                            <Card key="5555" data-key="5555" className={classes.dmCardUnselected}>
-								<Box className={classes.dmListItemContainer}>
-                                    {addDMMarkup}
-                                </Box>
-							</Card>
-                        </Grid>
+              <Grid item className={classes.dmItemsLower}>
+                <Card key="5555" data-key="5555" className={classes.dmCardUnselected}>
+                  <Box className={classes.dmListItemContainer}>
+                    {addDMMarkup}
+                  </Box>
+							  </Card>
+              </Grid>
 					</Grid>
 				</Grid>
 				<Grid item className={classes.messagesGrid} sm>
@@ -596,30 +596,39 @@ export class directMessages extends Component {
 										variant="outlined"
 										multiline
 										rows={2}
-                                        margin="dense"
-                                        value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""}
-                                        onChange={this.handleChangeMessage}
+                    margin="dense"
+                    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 
-                                        className={classes.messageButton}
-                                        onClick={this.handleClickSend}
-                                        disabled={
-                                            sendingDirectMessage ||
-                                            !this.state.drafts[this.state.selectedChannel.dmId] ||
-                                            this.state.drafts[this.state.selectedChannel.dmId] === ""
-                                        }
-                                    >
+                    <Fab 
+                      className={classes.messageButton}
+                      onClick={this.handleClickSend}
+                      disabled={
+                        sendingDirectMessage ||
+                        !this.state.drafts[this.state.selectedChannel.dmId] ||
+                        this.state.drafts[this.state.selectedChannel.dmId] === ""
+                      }
+                    >
 										<SendIcon style={{ color: '#FFFFFF' }} />
-                                        {
-                                            sendingDirectMessage && 
-                                            <CircularProgress size={30} style={{position: "absolute"}}/>
-                                            // Won't accept classes style for some reason
-                                        }
+                    {
+                      sendingDirectMessage && 
+                      <CircularProgress size={30} style={{position: "absolute"}}/>
+                      // Won't accept classes style for some reason
+                    }
 									</Fab>
 								</Box>
 							</Card>
 						)}
-                        {!this.state.hasChannelSelected &&
+            {!this.state.hasChannelSelected &&
 						this.state.dmData && <Typography>Select a DM on the left</Typography>}
 					</Box>
 				</Grid>

twistter-frontend/src/pages/otherUser.js

@@ -79,6 +79,7 @@ class user extends Component {
       following: null,
       posts: null,
       myTopics: null,
+      followingList: null,
       loading: false
     };
   }
@@ -92,7 +93,8 @@ class user extends Component {
         .then(res => {
           console.log("removed sub");
           this.setState({
-            following: false
+            following: false,
+            myTopics: []
           });
         })
         .catch(function(err) {
@@ -115,8 +117,26 @@ class user extends Component {
     }
   };
 
+  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});
+    this.setState({ loading: true });
     let otherUserPromise = axios
       .post("/getUserDetails", {
         handle: this.state.profile
@@ -132,11 +152,18 @@ class user extends Component {
     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));
@@ -153,13 +180,43 @@ class user extends Component {
       })
       .catch(err => console.log(err));
 
-      Promise.all([otherUserPromise, userPromise, posts])
-        .then(() => {
-          this.setState({loading: false});
-        })
-        .catch((error) => {
-          console.log(error);
+    // 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() {
@@ -188,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 =>
@@ -197,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>
@@ -222,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 ? (
@@ -234,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 />
@@ -264,9 +325,13 @@ class user extends Component {
       <p>Posts</p>
     );
 
-    return (
-      this.state.loading ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
-      <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/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});
         })
 }