Dark Mode implementation

Direct Messages

functions/handlers/post.js

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
-const { admin, db } = require("../util/admin");
+const admin = require("firebase-admin");
-
+const { db } = require("../util/admin");
 
 exports.putPost = (req, res) => {
   const newPost = {
@@ -33,18 +33,6 @@ 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()
@@ -58,106 +46,6 @@ 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() {
@@ -172,17 +60,60 @@ exports.getAlert = (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) {
@@ -190,7 +121,6 @@ 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() {
@@ -207,23 +137,21 @@ exports.getOtherUsersPosts = (req, res) => {
 
 exports.quoteWithPost = (req, res) => {
     let quoteData;
-  const quoteDoc = admin
+    const quoteDoc = admin.firestore().collection('quote').
-    .firestore()
+    where('userHandle', '==', req.user.handle).
-    .collection("quote")
+    where('quoteId', '==', req.params.postId).limit(1);
-    .where("userHandle", "==", req.user.handle)
-    .where("quoteId", "==", req.params.postId)
-    .limit(1);
 
     const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-  postDoc
+    postDoc.get()
-    .get()
+    .then((doc) => {
-    .then(doc => {
+        if(doc.exists) {
-      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 => {
@@ -273,23 +201,21 @@ exports.quoteWithPost = (req, res) => {
 
 exports.quoteWithoutPost = (req, res) => {
     let quoteData;
-  const quoteDoc = admin
+    const quoteDoc = admin.firestore().collection('quote').
-    .firestore()
+    where('userHandle', '==', req.user.handle).
-    .collection("quote")
+    where('quoteId', '==', req.params.postId).limit(1);
-    .where("userHandle", "==", req.user.handle)
-    .where("quoteId", "==", req.params.postId)
-    .limit(1);
 
     const postDoc = db.doc(`/posts/${req.params.postId}`);
 
-  postDoc
+    postDoc.get()
-    .get()
+    .then((doc) => {
-    .then(doc => {
+        if(doc.exists) {
-      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 => {
@@ -346,9 +272,7 @@ exports.checkforLikePost = (req, res) => {
     .limit(1);
   let result;
 
-  likedPostDoc
+  likedPostDoc.get().then(data => {
-    .get()
-    .then(data => {
     if (data.empty) {
       result = false;
       return res.status(200).json(result);
@@ -357,49 +281,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
+                return res.status(400).json({error: "This user has already liked this post"});
-          .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)
@@ -437,23 +361,24 @@ 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
+                return res.status(400).json({error: "This user hasn't liked this post yet"});
-          .status(400)
-          .json({ error: "This user hasn't liked this post yet" });
             }
 
             let i;
@@ -463,24 +388,25 @@ 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)
@@ -516,28 +442,32 @@ 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,41 +26,6 @@ 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

@@ -226,7 +226,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,32 +239,25 @@ exports.deleteUser = (req, res) => {
         let otherUsersPromises = [];
 
         // Resolve if they don't have a dmRecipients list
-          if (
+        if (dmRecipients === undefined || dmRecipients === null || dmRecipients.length === 0) {
-            dmRecipients === undefined ||
-            dmRecipients === null ||
-            dmRecipients.length === 0
-          ) {
           resolve();
           return;
         }
-          dmRecipients.forEach(dmRecipient => {
+        dmRecipients.forEach((dmRecipient) => {
           otherUsersPromises.push(
             // Get each users data
-              db
+            db.doc(`/users/${dmRecipient}`).get()
-                .doc(`/users/${dmRecipient}`)
+              .then((otherUserDocSnap) => {
-                .get()
-                .then(otherUserDocSnap => {
                 // Get the index of deleteUsername so that we can remove the dangling
                 // reference to the DM document
-                  let otherUserDMRecipients = otherUserDocSnap.data()
+                let otherUserDMRecipients = otherUserDocSnap.data().dmRecipients;
-                    .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
@@ -279,29 +272,28 @@ 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
+                db.collection(`/dm/${dmRef.id}/messages`).listDocuments()
-                    .collection(`/dm/${dmRef.id}/messages`)
+                  .then((docs) => {
-                    .listDocuments()
+                    console.log("second")
-                    .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);
@@ -309,8 +301,8 @@ exports.deleteUser = (req, res) => {
                     // Commit the writes
                     return batch.commit();
                   })
-                );
+              )
-              });
+            })
 
             return Promise.all(dmRefsPromises);
           })
@@ -318,17 +310,18 @@ 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
@@ -341,18 +334,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;
@@ -461,18 +454,17 @@ exports.getUserDetails = (req, res) => {
 
 exports.getAllHandles = (req, res) => {
   var user_query = admin.firestore().collection("users");
-  user_query
+  user_query.get()
-    .get()
+  .then((allUsers) => {
-    .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
     });
   });
@@ -565,7 +557,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
@@ -577,7 +569,6 @@ exports.getDirectMessages = (req, res) => {
  *         messageId: str
  *       }
  *     recipient: str
-   *     hasDirectMessagesEnabled: bool
  *     recentMessage: str
  *     recentMessageTimestamp: ISOString
  *   }
@@ -586,9 +577,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 means that there aren't any messages
+      // If the messagesCollection is missing, that mean that there aren't any messages
       if (messagesCollection === null || messagesCollection === undefined) {
         return;
       }
@@ -597,106 +588,90 @@ exports.getDirectMessages = (req, res) => {
       let promises = [];
 
       // Get all of the messages in the DM
-      messagesCollection.get().then(dmQuerySnap => {
+      messagesCollection.get()
-        dmQuerySnap.forEach(dmQueryDocSnap => {
+        .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
+              return (b.createdAt > a.createdAt) ? -1 : ((b.createdAt < a.createdAt) ? 1 : 0);
-              ? -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)
+  if (dms === undefined || dms === null || dms.length === 0) return res.status(200).json({data: null});
-    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(
+    dmPromises.push(new Promise((resolve, reject) => {
-      new Promise((resolve, reject) => {
+      dm  // DM document reference
-        dm.get() // DM document reference
+      .get()
-          .then(doc => {
+      .then((doc) => {
         let docData = doc.data();
 
         // Recipient is the person you are messaging
-            docData.authors[0] === req.userData.handle
+        docData.authors[0] === req.userData.handle ?
-              ? (dmData.recipient = docData.authors[1])
+          dmData.recipient = docData.authors[1] :
-              : (dmData.recipient = docData.authors[0]);
+          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 =
+            dmData.recentMessage = msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
-                msgs.length !== 0 ? msgs[msgs.length - 1].message : null;
+            dmData.recentMessageTimestamp = msgs.length !== 0 ? msgs[msgs.length - 1].createdAt : 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({
+        return res.status(400).json({error: {
-              error: {
+          message: "An error occurred when reading the DM document reference",
-                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
-  Promise.all(dmPromises)
+  dmWaitPromise = 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 (
+        if (a.recentMessageTimestamp === null && b.recentMessageTimestamp === null) {
-          a.recentMessageTimestamp === null &&
-          b.recentMessageTimestamp === null
-        ) {
           if (b.createdAt < a.createdAt) {
             return -1;
           } else if (b.createdAt > a.createdAt) {
@@ -716,32 +691,15 @@ 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;
-              }
     })
-            .data().dmEnabled === false
+    .catch((err) => {
-            ? false
+      return res.status(500).json({error:{
-            : 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
@@ -750,44 +708,38 @@ exports.getDirectMessages = (req, res) => {
 exports.toggleDirectMessages = (req, res) => {
   const enable = req.body.enable;
   const user = req.userData.handle;
-  db.doc(`/users/${user}`)
+  db.doc(`/users/${user}`).update({dmEnabled: enable})
-    .update({ dmEnabled: enable })
     .then(() => {
-      return res.status(201).json({ message: "Success" });
+      return res.status(201).json({message: "Success"});
     })
-    .catch(err => {
+    .catch((err) => {
-      return res.status(500).json({ error: 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 =
+      result.message = "No user was sent in the request. The request should have a non-empty 'user' key.";
-        "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 (
+          if (doc.data().dmEnabled === true || doc.data().dmEnabled === null || doc.data().dmEnabled === undefined) {
-            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 = 400;
+            result.code = 200;
             result.message = `${username} has DMs disabled`;
             reject(result);
           }
@@ -798,46 +750,42 @@ isDirectMessageEnabled = username => {
           reject(result);
         }
       })
-      .catch(err => {
+      .catch((err) => {
-        console.log("HI");
+        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 (
+        if (dmList === null || dmList === undefined || dmRecipients === null || dmRecipients === undefined) {
-          dmList === null ||
-          dmList === undefined ||
-          dmRecipients === null ||
-          dmRecipients === undefined
-        ) {
           // They don't have any DMs yet
           console.log("No DMs array");
-          userASnapshot.ref
+          userASnapshot.ref.set({dms:[], dmRecipients:[]}, {merge: true})
-            .set({ dms: [], dmRecipients: [] }, { merge: true })
             .then(() => {
               resolve();
-            });
+            })
         } else if (dmList.length === 0) {
           // Their DMs are empty
           console.log("DMs array is empty");
@@ -862,20 +810,17 @@ 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}`));
-              reject({
-                code: 400,
-                message: `You already have a DM with that user`
-              });
               return;
             }
-          });
+          })
 
           resolve();
 
+
           // Promise.all(forEachPromises)
           //   .then((dmDocs) => {
           //     // Check if any of the DMs have for userA have userA and userB as the authors.
@@ -921,10 +866,15 @@ 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
@@ -935,39 +885,36 @@ 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}`)
+    db.doc(`/users/${username}`).get()
-      .get()
+      .then((docSnap) => {
-      .then(docSnap => {
         let dmList = docSnap.data().dms;
         let dmRecipients = docSnap.data().dmRecipients;
         dmList.push(dmRef);
         dmRecipients.push(recipient);
-        return db
+        return db.doc(`/users/${username}`).update({dms: dmList, dmRecipients});
-          .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
@@ -985,92 +932,66 @@ exports.sendDirectMessage = (req, res) => {
     createdAt: new Date().toISOString(),
     message,
     messageId: null
-  };
-
-  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}`)
+  db.doc(`/users/${creator}`).get()
-    .get()
+    .then((userDoc) => {
-    .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) {
+      if (dmList === null || dmList === undefined) return res.status(400).json({error: `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.`
-          });
-      }
-
       let dmRefPromises = [];
-      dmList.forEach(dmRef => {
+      dmList.forEach((dmRef) => {
         dmRefPromises.push(
           new Promise((resolve, reject) => {
-            dmRef
+            dmRef.get()
-              .get()
+              .then((dmDoc) => {
-              .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(
+        console.log(`There is no DM channel between ${creator} and ${recipient}. Use /api/dms/new.`);
-          `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 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 => {
+    .then((newMsgRef) => {
-      return newMsgRef.update({ messageId: newMsgRef.id }, { merge: true });
+      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
@@ -1081,8 +1002,7 @@ exports.createDirectMessage = (req, res) => {
   const recipient = req.body.user;
 
   // Check if they are DMing themselves
-  if (creator === recipient)
+  if (creator === recipient) return res.status(400).json({error: "You can't DM yourself"});
-    return res.status(400).json({ error: "You can't DM yourself" });
 
   // Check if this user has DMs enabled
   let creatorEnabled = isDirectMessageEnabled(creator);
@@ -1091,63 +1011,56 @@ 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(
+      let updateCreatorPromise = addDirectMessageToUser(creator, recipient, dmDocRef);
-        creator,
-        recipient,
-        dmDocRef
-      );
 
       // Add the DM reference to the recipient
-      let updateRecipientPromise = addDirectMessageToUser(
+      let updateRecipientPromise = addDirectMessageToUser(recipient, creator, dmDocRef);
-        recipient,
-        creator,
-        dmDocRef
-      );
 
       // Wait for all promises
-      return Promise.all([
+      return Promise.all([dmDocPromise, updateCreatorPromise, updateRecipientPromise]);
-        dmDocPromise,
-        updateCreatorPromise,
-        updateRecipientPromise
-      ]);
     })
-    .then(() => {
+    .then (() => {
-      return res.status(201).json({ message: "Success!" });
+      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
@@ -1156,19 +1069,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}`)
@@ -1192,13 +1105,7 @@ exports.addSubscription = (req, res) => {
   let userRef = db.doc(`/users/${req.userData.handle}`);
   userRef.get().then(doc => {
     new_following = doc.data().following;
-    const struct = {
+    new_following.push(req.body.following);
-      handle: req.body.following,
-      topics: ["Admin"]
-    };
-    new_following
-      ? new_following.push(struct)
-      : (new_following = req.body.following);
 
     // add stuff
     userRef
@@ -1211,11 +1118,8 @@ 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) => {
@@ -1242,32 +1146,25 @@ exports.uploadProfileImage = (req, res) => {
 
   let imageFileName;
   let imageToBeUploaded = {};
-  let oldImageFileName = req.userData.imageUrl
+  let oldImageFileName = req.userData.imageUrl ? req.userData.imageUrl.split("/o/")[1].split("?alt")[0] : null;
-    ? 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(
+    imageFileName = `${Math.round(Math.random() * 100000000000)}.${imageExtension}`;  // Get a random filename
-      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
+    admin.storage().bucket(config.storageBucket).upload(imageToBeUploaded.filepath, {
-      .storage()
-      .bucket(config.storageBucket)
-      .upload(imageToBeUploaded.filepath, {
       resumable: false,
       metadata: {
         metadata: {
@@ -1283,33 +1180,24 @@ exports.uploadProfileImage = (req, res) => {
     .then(() => {
       // Delete their old image if they have one
       if (oldImageFileName !== null && oldImageFileName !== "no-img.png") {
-          admin
+        admin.storage().bucket(config.storageBucket).file(oldImageFileName).delete()
-            .storage()
-            .bucket(config.storageBucket)
-            .file(oldImageFileName)
-            .delete()
           .then(() => {
-              return res
+            return res.status(201).json({ message: "Image uploaded successfully1"});
-                .status(201)
-                .json({ message: "Image uploaded successfully1" });
           })
-            .catch(err => {
+          .catch((err) => {
             console.log(err);
-              return res
+            return res.status(201).json({ message: "Image uploaded successfully2"});
-                .status(201)
+          })
-                .json({ message: "Image uploaded successfully2" });
-            });
           // return res.status(201).json({ message: "Image uploaded successfully"});
       } else {
-          return res
+        return res.status(201).json({ message: "Image uploaded successfully3"});
-            .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);
 
@@ -1365,7 +1253,7 @@ exports.uploadProfileImage = (req, res) => {
   //     });
   // });
   //   busboy.end(req.rawBody);
-};
+}
 
 exports.removeSub = (req, res) => {
   let new_following = [];
@@ -1374,7 +1262,7 @@ exports.removeSub = (req, res) => {
     new_following = doc.data().following;
     // remove username from array
     new_following.forEach(function(follower, index) {
-      if (follower.handle === `${req.body.unfollow}`) {
+      if (follower === `${req.body.unfollow}`) {
         new_following.splice(index, 1);
       }
     });

functions/index.js

@@ -100,33 +100,18 @@ 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);
 
@@ -140,8 +125,6 @@ app.post("/quoteWithoutPost/:postId", fbAuth, quoteWithoutPost);
 
 app.post("/getOtherUsersPosts", fbAuth, getOtherUsersPosts);
 
-app.get("/getAlert", fbAuth, getAlert);
-
 /*------------------------------------------------------------------*
  *  handlers/topic.js                                                *
  *------------------------------------------------------------------*/
@@ -149,8 +132,7 @@ const {
   putTopic,
   getAllTopics,
   deleteTopic,
-  getUserTopics,
+  getUserTopics
-  putNewTopic
 } = require("./handlers/topic");
 
 // add topic to database
@@ -165,6 +147,4 @@ 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);

package-lock.json

@@ -1,428 +1,3 @@
 {
-  "requires": true,
+  "lockfileVersion": 1
-  "lockfileVersion": 1,
-  "dependencies": {
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
-    "axios": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
-      "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
-      }
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      }
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-    },
-    "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-      "requires": {
-        "safe-buffer": "5.1.2"
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
-    "cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
-    "eslint-plugin-promise": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz",
-      "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
-      "requires": {
-        "accepts": "~1.3.7",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
-        "content-type": "~1.0.4",
-        "cookie": "0.4.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "requires": {
-        "debug": "=3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-    },
-    "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
-    },
-    "jwt-decode": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
-      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "requires": {
-        "mime-db": "1.40.0"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
-    "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
-      }
-    },
-    "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
-        "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.17.1"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    }
-  }
 }

twistter-frontend/package-lock.json

@@ -2417,11 +2417,6 @@
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
       "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
     },
-    "dayjs": {
-      "version": "1.8.17",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.17.tgz",
-      "integrity": "sha512-47VY/htqYqr9GHd7HW/h56PpQzRBSJcxIQFwqL3P20bMF/3az5c3PWdVY3LmPXFl6cQCYHL7c79b9ov+2bOBbw=="
-    },
     "debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -9792,11 +9787,6 @@
       "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
       "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
     },
-    "underscore": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
-      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",

twistter-frontend/package.json

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

twistter-frontend/public/global.js

@@ -0,0 +1,20 @@
+import { createGlobalStyle } from 'styled-components';
+
+export const GlobalStyles = createGlobalStyle`
+  *,
+  *::after,
+  *::before {
+    box-sizing: border-box;
+  }
+
+  body {
+    align-items: center;
+    background: ${({ theme }) => theme.body};
+    color: ${({ theme }) => theme.text};
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100vh;
+    margin: 0;
+    padding: 0;
+  }

twistter-frontend/public/theme.js

@@ -0,0 +1,14 @@
+export const lightTheme = {
+    body: '#E2E2E2',
+    text: '#363537',
+    toggleBorder: '#FFF',
+    gradient: 'linear-gradient(#39598A, #79D7ED)',
+  }
+  
+  export const darkTheme = {
+    body: '#363537',
+    text: '#FAFAFA',
+    toggleBorder: '#6B8096',
+    gradient: 'linear-gradient(#091236, #1E215D)',
+  }
+  

twistter-frontend/src/Writing_Microblogs.js

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

twistter-frontend/src/components/toggle/toggle.js

@@ -0,0 +1,23 @@
+import React from 'react'
+import { func, string } from 'prop-types';
+import styled from 'styled-components';
+// Import a couple of SVG files we'll use in the design: https://www.flaticon.com
+import { ReactComponent as MoonIcon } from 'icons/moon.svg';
+import { ReactComponent as SunIcon } from 'icons/sun.svg';
+
+const Toggle = ({ theme, toggleTheme }) => {
+  const isLight = theme === 'light';
+  return (
+    <button onClick={toggleTheme} >
+      <SunIcon />
+      <MoonIcon />
+    </button>
+  );
+};
+
+Toggle.propTypes = {
+  theme: string.isRequired,
+  toggleTheme: func.isRequired,
+}
+
+export default Toggle;

twistter-frontend/src/pages/Home.js

@@ -6,134 +6,78 @@ import axios from "axios";
 
 // Material UI and React Router
 
-import CircularProgress from "@material-ui/core/CircularProgress";
+import CircularProgress from '@material-ui/core/CircularProgress';
-import Button from "@material-ui/core/Button";
+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 '../App.css';
-import logo from "../images/twistter-logo.png";
+import logo from '../images/twistter-logo.png';
-import noImage from "../images/no-img.png";
+import noImage from '../images/no-img.png';
-import Writing_Microblogs from "../Writing_Microblogs";
+import Writing_Microblogs from '../Writing_Microblogs';
-import ReactModal from "react-modal";
+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() {
-    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: list,
-          topics: res.data.credentials.followedTopics
-        });
-      })
-      .catch(err => console.log(err));
 
-    let allPosts;
+  componentDidMount() {
-    let postPromise = axios
+    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
+          posts: res.data
         });
       })
-
       .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
+    let postId = event.target.dataset.key ? event.target.dataset.key : event.target.parentNode.dataset.key;
-      ? event.target.dataset.key
+    console.log(postId)
-      : 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));
@@ -141,21 +85,14 @@ class Home extends Component {
   }
 
   render() {
-    const {
-      UI: { loading }
-    } = this.props;
-    let authenticated = this.props.user.authenticated;
-    let { classes } = this.props;
-    let username = this.props.user.credentials.handle;
-    console.log(username);
-    var hiddenBool = true;
-    if (username === "Admin") {
-      hiddenBool = false;
-    }
 
-    console.log(hiddenBool);
+    const { UI:{ loading } } = this.props;
-    let postMarkup = this.state.posts ? ( this.state.following === undefined || this.state.following === null ? <Typography>You aren't following anybody right now</Typography> :
+    let authenticated = this.props.user.authenticated;
-      this.state.posts.map(post => !post.hidden && this.state.following && (this.state.following.includes(post.userHandle) || post.userHandle === "Admin") ? (
+    let {classes} = this.props;
+    let username = this.props.user.credentials.handle;
+
+    let postMarkup = this.state.posts ? (
+      this.state.posts.map(post => 
         <Card className={classes.card} key={post.postId}>
           <CardContent>
             <Typography>
@@ -176,19 +113,8 @@ class Home extends Component {
             <br />
             <Typography variant="body2">{post.body}</Typography>
             <br />
-                <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics.join(", ")}</Typography>        
+            <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics}</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
@@ -204,25 +130,15 @@ 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 (
-      this.state.loading ? (
+      authenticated ? (
-        <CircularProgress
-          size={60}
-          style={{ marginTop: "300px" }}
-        ></CircularProgress>
-      ) : (
       <Grid container>
         <Grid item sm={4} xs={8}>
           <Writing_Microblogs />
@@ -231,43 +147,34 @@ class Home extends Component {
           {postMarkup}
         </Grid>
       </Grid> 
-      )
+     ) : loading ? 
-    ) : loading ? (
+          (<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>)
-      <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>
-    );
+    ));
   }
 }
 
@@ -278,7 +185,7 @@ class Quote extends Component {
       characterCount: 250,
       showModal: false,
       value: ""
-    };
+    }
 
   this.handleSubmitWithoutPost = this.handleSubmitWithoutPost.bind(this);
   this.handleOpenModal = this.handleOpenModal.bind(this);
@@ -288,17 +195,19 @@ class Quote extends Component {
 
   handleSubmitWithoutPost(event) {
     const post = {
-      userImage: "bing-url"
+      
-    };
+      userImage: "bing-url",
+    }
     const headers = {
       headers: { "Content-Type": "application/json" }
     };
-    axios
+    axios.post(`/quoteWithoutPost/${this.props.microblog}`, post, headers)
-      .post(`/quoteWithoutPost/${this.props.microblog}`, post, headers)
+    .then((res) => {
-      .then(res => {
+      
       console.log(res.data);
     })
     .catch(err => {
+    
       console.error(err);
     });
     event.preventDefault();
@@ -325,17 +234,18 @@ 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
+    axios.post(`/quoteWithPost/${this.props.microblog}`, quotedPost, headers)
-      .post(`/quoteWithPost/${this.props.microblog}`, quotedPost, headers)
+    .then((res) => {
-      .then(res => {
+      
       console.log(res.data);
     })
     .catch(err => {
+    
       console.error(err);
     });
     event.preventDefault();
@@ -345,28 +255,13 @@ class Quote extends Component {
   render() {
     return (
       <div>
-        <Button
+        <Button variant="outlined" color="primary" onClick={this.handleOpenModal}>Quote with Post</Button>
-          variant="outlined"
-          color="primary"
-          onClick={this.handleOpenModal}
-        >
-          Quote with Post
-        </Button>
         <ReactModal 
            isOpen={this.state.showModal}
-          style={{
+           style={{content: {height: "50%", width: "25%", marginTop: "auto", marginLeft: "auto", marginRight: "auto", marginBottom : "auto"}}}
-            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
@@ -381,7 +276,7 @@ class Quote extends Component {
               rows={20}
             /> */}
             <TextField
-                style={{ width: 300 }}
+              style={{width: 300}}
               value={this.state.value}
               label="Write Quoted Post here..."
               required
@@ -396,93 +291,85 @@ 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
+              <Button variant="outlined" color="primary" onClick={this.handleSubmit}>Share Quoted Post</Button>
-                variant="outlined"
+        
-                color="primary"
+          <Button variant="outlined" color="primary" onClick={this.handleCloseModal}>Cancel</Button>
-                onClick={this.handleSubmit}
-              >
-                Share Quoted Post
-              </Button>
 
-              <Button
-                variant="outlined"
-                color="primary"
-                onClick={this.handleCloseModal}
-              >
-                Cancel
-              </Button>
           </form>
         </div>
+          
+          
         </ReactModal>
-        <Button
+        <Button variant="outlined" color="primary" onClick={this.handleSubmitWithoutPost}>Quote without Post</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:
+      like: localStorage.getItem(this.props.microBlog + this.props.name) === "false"
-        localStorage.getItem(this.props.microBlog + this.props.name) === "false"
+
-    });
+    })
+
   }
 
+
+  
   handleClick(){
+
     this.setState({
       like: !this.state.like
     }); 
-    localStorage.setItem(
+    localStorage.setItem(this.props.microBlog + this.props.name, this.state.like.toString())
-      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
+            axios.get(`/like/${this.props.microBlog}`)
-        .get(`/like/${this.props.microBlog}`)
+            .then((res) => {
-        .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 => {
-          console.log(res.data);
             })
-        .catch(err => {
-          console.log(err);
-        });
           }
+          else
+          {
+            this.setState(() => {
+              return {num: this.state.num - 1}
+           });
+          axios.get(`/unlike/${this.props.microBlog}`)
+                .then((res) => {
+                    console.log(res.data);
+                })
+                .catch((err) => {
+                  console.log(err);
+                })
+            }
+            
+            
   }
 
   /* componentDidMount() {
@@ -505,28 +392,31 @@ 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"}>
+          <Typography variant="body2" color={"textSecondary"}>Likes {this.state.num}</Typography>
-          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,
@@ -535,17 +425,16 @@ 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,10 +83,6 @@ const styles = {
 		wordBreak: "break-all",
 		color: 'black'
 	},
-	dmRecentMessageDisabled: {
-		wordBreak: "break-all",
-		color: 'red'
-	},
 	dmListItemContainer: {
 		height: 100
 	},
@@ -430,19 +426,13 @@ 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' 
 										: 
@@ -558,8 +548,8 @@ export class directMessages extends Component {
                                         >
                                             Create
                                             {creatingDirectMessage && 
-                      // Won't accept classes style for some reason
 											    <CircularProgress size={30} style={{position: "absolute"}}/>
+                                                // Won't accept classes style for some reason
                                             }
                                         </Button>
                                     </Grid>
@@ -607,16 +597,7 @@ export class directMessages extends Component {
 										multiline
 										rows={2}
                                         margin="dense"
-                    disabled={!this.state.selectedChannel.hasDirectMessagesEnabled}
+                                        value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""}
-                    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,7 +22,6 @@ 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";
@@ -78,9 +77,7 @@ class user extends Component {
       user: null,
       following: null,
       posts: null,
-      myTopics: null,
+      myTopics: null
-      followingList: null,
-      loading: false
     };
   }
 
@@ -93,8 +90,7 @@ class user extends Component {
         .then(res => {
           console.log("removed sub");
           this.setState({
-            following: false,
+            following: false
-            myTopics: []
           });
         })
         .catch(function(err) {
@@ -117,27 +113,8 @@ 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 });
+    axios
-    let otherUserPromise = axios
       .post("/getUserDetails", {
         handle: this.state.profile
       })
@@ -149,26 +126,19 @@ class user extends Component {
       })
       .catch(err => console.log(err));
 
-    let userPromise = axios
+    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: fol,
+          following: res.data.credentials.following.includes(
-          myTopics: list
+            this.state.profile
+          ),
+          myTopics: res.data.credentials.followedTopics
         });
       })
       .catch(err => console.log(err));
 
-    let posts = axios
+    axios
       .post("/getOtherUsersPosts", {
         handle: this.state.profile
       })
@@ -179,44 +149,6 @@ 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() {
@@ -245,8 +177,8 @@ class user extends Component {
       <p>loading username...</p>
     );
 
-    // console.log(this.state.topics);
+    console.log(this.state.topics);
-    // console.log(this.state.myTopics);
+    console.log(this.state.myTopics);
     let topicsMarkup = this.state.topics ? (
       this.state.topics.map(
         topic =>
@@ -254,20 +186,16 @@ class user extends Component {
             this.state.myTopics.includes(topic) ? (
               <MyChip
                 label={topic}
-                key={{ topic }.id}
+                key={{ topic }.topic.id}
                 onDelete
                 deleteIcon={<DoneIcon />}
               />
-            ) : this.state.following ? (
+            ) : (
               <MyChip
                 label={topic}
-                key={{ topic }.id}
+                key={{ topic }.topic.id}
                 color="secondary"
-                clickable
-                onClick={key => this.handleAdd(topic)}
               />
-            ) : (
-              <MyChip label={topic} key={{ topic }.id} color="secondary" />
             )
           ) : (
             <p></p>
@@ -283,10 +211,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} key={post.postId} data-key={post.postId}>
+        <Card className={classes.card}>
           <CardContent>
             <Typography>
               {this.state.imageUrl ? (
@@ -295,11 +223,11 @@ class user extends Component {
                 <img src={noImage} height="50" width="50" />
               )}
             </Typography>
-            <Typography variant="h4">
+            <Typography variant="h7">
               <b>{post.userHandle}</b>
             </Typography>
             <Typography variant="body2" color={"textSecondary"}>
-              {this.formatDate(post.createdAt)}
+              {post.createdAt}
             </Typography>
 
             <br />
@@ -312,7 +240,7 @@ class user extends Component {
             <Typography variant="body2">{post.body}</Typography>
             <br />
             <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics.join(", ")}
+              <b>Topics:</b> {post.microBlogTopics}
             </Typography>
             <br />
             <Typography variant="body2" color={"textSecondary"}>
@@ -325,13 +253,8 @@ class user extends Component {
       <p>Posts</p>
     );
 
-    return this.state.loading ? (
+    return (
-      <CircularProgress
+      <Grid container spacing={24}>
-        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,7 +13,6 @@ 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";
@@ -77,8 +76,7 @@ class user extends Component {
       profile: null,
       imageUrl: null,
       topics: null,
-      newTopic: "",
+      newTopic: ""
-      loading: false
     };
   }
 
@@ -129,8 +127,7 @@ class user extends Component {
   }
 
   componentDidMount() {
-    this.setState({loading: true})
+    axios
-    let userPromise = axios
       .get("/user")
       .then(res => {
         this.setState({
@@ -144,7 +141,7 @@ class user extends Component {
       })
       .catch(err => console.log(err));
 
-    let postsPromise = axios
+    axios
       .get("/getallPostsforUser")
       .then(res => {
         // console.log(res.data);
@@ -153,14 +150,6 @@ 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) {
@@ -230,7 +219,7 @@ class user extends Component {
               <b>{post.userHandle}</b>
             </Typography>
             <Typography variant="body2" color={"textSecondary"}>
-              {this.formatDate(post.createdAt) }
+              {post.createdAt}
             </Typography>
 
             <br />
@@ -243,7 +232,7 @@ class user extends Component {
             <Typography variant="body2">{post.body}</Typography>
             <br />
             <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics.join(", ")}
+              <b>Topics:</b> {post.microBlogTopics}
             </Typography>
             <br />
             <Typography variant="body2" color={"textSecondary"}>
@@ -269,17 +258,7 @@ 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">
@@ -287,7 +266,6 @@ 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,6 +142,5 @@ 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,7 +36,6 @@ 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)
@@ -58,7 +57,6 @@ 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)