Improved Fonts

Merge branch 'Beautify'
2026-03-10 13:15:05 +00:00 · 2019-11-01 16:15:45 -04:00 · 2019-11-01 15:37:54 -04:00
29 changed files with 614 additions and 5992 deletions
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # CS307-Team24
-CS307 Team 24 Twistter website
+CS307 Team 24 Twistter website.
--- a/functions/handlers/post.js
+++ b/functions/handlers/post.js
@@ -1,543 +1,70 @@
 /* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
-const { admin, db } = require("../util/admin");
-
+const admin = require('firebase-admin');

 exports.putPost = (req, res) => {
-  const newPost = {
-    body: req.body.body,
-    userHandle: req.user.handle,
-    userImage: req.body.userImage,
-    userID: req.user.uid,
-    microBlogTitle: req.body.microBlogTitle,
-    createdAt: new Date().toISOString(),
-    likeCount: 0,
-    commentCount: 0,
-    microBlogTopics: req.body.microBlogTopics,
-    quoteBody: null
-  };
+    const newPost = {
+        body: req.body.body,
+        userHandle: req.user.handle,
+        userImage: req.body.userImage,
+        userID: req.user.uid,
+        microBlogTitle: req.body.microBlogTitle,
+        createdAt: new Date().toISOString(),
+        likeCount: 0,
+        commentCount: 0,
+        microBlogTopics: req.body.microBlogTopics
+    };

-  admin
-    .firestore()
-    .collection("posts")
-    .add(newPost)
-    .then(doc => {
-      doc.update({ postId: doc.id });
-      const resPost = newPost;
-      resPost.postId = doc.id;
-      return res.status(200).json(resPost);
+    admin.firestore().collection('posts').add(newPost)
+    .then((doc) => {
+        const resPost = newPost;
+        resPost.postId = doc.id;
+        return res.status(200).json(resPost);
    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "something went wrong" });
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something went wrong'});
    });
 };

-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()
-    .collection("posts")
-    .where("userHandle", "==", req.user.handle);
-
-  post_query
-    .get()
+    var post_query = admin.firestore().collection("posts").where("userHandle", "==", req.user.handle);
+    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);
+        let posts = [];
+        myPosts.forEach(function(doc) {
+            posts.push(doc.data());
+        });
+        return res.status(200).json(posts);
    })
-    
    .then(function() {
-      return res
-        .status(200)
-        .json("Successfully retrieved all user's posts from database.");
+    res.status(200).send("Successfully retrieved all user's posts from database.");
+    return;
    })
    .catch(function(err) {
-      return res
-        .status(500)
-        .json({message: "Failed to retrieve user's posts from database.", error: err});
+    res.status(500).send("Failed to retrieve user's posts from database.", 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());
+    var post_query = admin.firestore().collection("posts");
+    post_query.get()
+    .then(function(allPosts) {
+        let posts = [];
+        allPosts.forEach(function(doc) {
+            posts.push(doc.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);
+        return res.status(200).json(posts);
    })
    .then(function() {
-      return res
-        .status(200)
-        .json("Successfully retrieved all user's posts from database.");
+    res.status(200).send("Successfully retrieved every post from database.");
+    return;
    })
    .catch(function(err) {
-      return res
-        .status(500)
-        .json("Failed to retrieve user's posts from database.", err);
-    });
-};
-
-exports.getOtherUsersPosts = (req, res) => {
-  var post_query = admin
-    .firestore()
-    .collection("posts")
-    .where("userHandle", "==", req.body.handle);
-    
-    // post_query += admin
-    // .firestore()
-    // .collection("posts")
-    // .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
-
-  post_query
-    .get()
-    .then(function(myPosts) {
-      let posts = [];
-      myPosts.forEach(function(doc) {
-        posts.push(doc.data());
-      });
-      posts.sort((a, b) => -a.createdAt.localeCompare(b.createdAt));
-      return res.status(200).json(posts);
-    })
-    .then(function() {
-      return res
-        .status(200)
-        .json("Successfully retrieved all user's posts from database.");
-    })
-    .catch(function(err) {
-      return res
-        .status(500)
-        .json("Failed to retrieve user's posts from database.", err);
-    });
-};
-
-exports.quoteWithPost = (req, res) => {
-  let quoteData;
-  const quoteDoc = admin
-    .firestore()
-    .collection("quote")
-    .where("userHandle", "==", req.user.handle)
-    .where("quoteId", "==", req.params.postId)
-    .limit(1);
-
-  const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-  postDoc
-    .get()
-    .then(doc => {
-      if (doc.exists) {
-        quoteData = doc.data();
-        return quoteDoc.get();
-      } else {
-        return res.status(404).json({ error: "Post not found" });
-      }
-    })
-    .then(data => {
-      if (data.empty) {
-        return admin
-          .firestore()
-          .collection("quote")
-          .add({
-            quoteId: req.params.postId,
-            userHandle: req.user.handle,
-            quoteBody: req.body.quoteBody
-          })
-          .then(() => {
-            const post = {
-              body: quoteData.body,
-              userHandle: req.user.handle,
-              quoteBody: req.body.quoteBody,
-              createdAt: new Date().toISOString(),
-              userImage: req.body.userImage,
-              likeCount: 0,
-              commentCount: 0,
-              userID: req.user.uid,
-              microBlogTitle: quoteData.microBlogTitle,
-              microBlogTopics: quoteData.microBlogTopics,
-              quoteId: req.params.postId
-            };
-            return admin
-              .firestore()
-              .collection("posts")
-              .add(post)
-              .then(doc => {
-                doc.update({ postId: doc.id });
-                const resPost = post;
-                resPost.postId = doc.id;
-                return res.status(200).json(resPost);
-              });
-          });
-      } else {
-        return res.status(400).json({ error: "Post has already been quoted." });
-      }
-    })
-
-    .catch(err => {
-      return res.status(500).json({ error: err });
-    });
-};
-
-exports.quoteWithoutPost = (req, res) => {
-  let quoteData;
-  const quoteDoc = admin
-    .firestore()
-    .collection("quote")
-    .where("userHandle", "==", req.user.handle)
-    .where("quoteId", "==", req.params.postId)
-    .limit(1);
-
-  const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-  postDoc
-    .get()
-    .then(doc => {
-      if (doc.exists) {
-        quoteData = doc.data();
-        return quoteDoc.get();
-      } else {
-        return res.status(404).json({ error: "Post not found" });
-      }
-    })
-    .then(data => {
-      if (data.empty) {
-        return admin
-          .firestore()
-          .collection("quote")
-          .add({
-            quoteId: req.params.postId,
-            userHandle: req.user.handle,
-            quoteBody: null
-          })
-          .then(() => {
-            const post = {
-              userHandle: req.user.handle,
-              body: quoteData.body,
-              quoteBody: null,
-              createdAt: new Date().toISOString(),
-              likeCount: 0,
-              commentCount: 0,
-              userID: req.user.uid,
-              userImage: req.body.userImage,
-              microBlogTitle: quoteData.microBlogTitle,
-              microBlogTopics: quoteData.microBlogTopics,
-              quoteId: req.params.postId
-            };
-            return admin
-              .firestore()
-              .collection("posts")
-              .add(post)
-              .then(doc => {
-                doc.update({ postId: doc.id });
-                const resPost = post;
-                resPost.postId = doc.id;
-                return res.status(200).json(resPost);
-              });
-          });
-      } else {
-        return res.status(400).json({ error: "Post has already been quoted." });
-      }
-    })
-    .catch(err => {
-      //   return res.status(500).json({ error: "Something is wrong" });
-      return res.status(500).json({ error: err });
-    });
-};
-
-exports.checkforLikePost = (req, res) => {
-  const likedPostDoc = admin
-    .firestore()
-    .collection("likes")
-    .where("userHandle", "==", req.user.handle)
-    .where("postId", "==", req.params.postId)
-    .limit(1);
-  let result;
-
-  likedPostDoc
-    .get()
-    .then(data => {
-      if (data.empty) {
-        result = false;
-        return res.status(200).json(result);
-      } else {
-        result = true;
-        return res.status(200).json(result);
-      }
-    })
-    .catch(err => {
-      console.log(err);
-      return res.status(500).json({ error: err });
-    });
-};
-
-exports.likePost = (req, res) => {
-  const postId = req.params.postId;
-  let likedPostDoc;
-  db.doc(`/users/${req.userData.handle}`)
-    .get()
-    .then(userDoc => {
-      let likes = userDoc.data().likes;
-      if (likes === undefined || likes === null) {
-        likes = [];
-      }
-
-      if (likes.includes(postId)) {
-        return res
-          .status(400)
-          .json({ error: "This user has already liked this post" });
-      }
-
-      likes.push(postId);
-
-      return userDoc.ref.update({ likes });
-    })
-    .then(() => {
-      return db.doc(`/posts/${postId}`).get();
-    })
-    .then(postDoc => {
-      let postData = postDoc.data();
-      postData.likeCount++;
-      likedPostDoc = postData;
-      return postDoc.ref.update({ likeCount: postData.likeCount });
-    })
-    .then(() => {
-      return res.status(201).json(likedPostDoc);
-    })
-    .catch(err => {
-      console.log(err);
-      return res.status(500).json({ error: err });
-    });
-
-  // let postData;
-  // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
-  // .where('postId', '==', req.params.postId).limit(1);
-
-  // const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-  // postDoc.get()
-  // .then((doc) => {
-  //     if(doc.exists) {
-  //         postData = doc.data();
-  //         return likeDoc.get();
-  //     }
-  //     else
-  //     {
-  //         return res.status(404).json({error: 'Post not found'});
-  //     }
-  // })
-  // .then((data) => {
-  //     if (data.empty) {
-  //         return admin.firestore().collection('likes').add({
-  //             postId : req.params.postId,
-  //             userHandle: req.user.handle
-
-  //         })
-  //         .then(() => {
-  //             postData.likeCount++;
-  //             return postDoc.update({likeCount : postData.likeCount})
-  //         })
-  //         .then(() => {
-  //             return res.status(200).json(postData);
-  //         })
-  //     }
-  // })
-  // .catch((err) => {
-  //     return res.status(500).json({error: 'Something is wrong'});
-  // })
-};
-
-exports.unlikePost = (req, res) => {
-  const postId = req.params.postId;
-  let likedPostDoc;
-  db.doc(`/users/${req.userData.handle}`)
-    .get()
-    .then(userDoc => {
-      let likes = userDoc.data().likes;
-      if (likes === undefined || likes === null) {
-        likes = [];
-      }
-
-      if (!likes.includes(postId)) {
-        return res
-          .status(400)
-          .json({ error: "This user hasn't liked this post yet" });
-      }
-
-      let i;
-      for (i = 0; i < likes.length; i++) {
-        if (likes[i] === postId) {
-          likes.splice(i, 1);
-        }
-      }
-
-      return userDoc.ref.update({ likes });
-    })
-    .then(() => {
-      return db.doc(`/posts/${postId}`).get();
-    })
-    .then(postDoc => {
-      let postData = postDoc.data();
-      postData.likeCount--;
-      likedPostDoc = postData;
-      return postDoc.ref.update({ likeCount: postData.likeCount });
-    })
-    .then(() => {
-      return res.status(201).json(likedPostDoc);
-    })
-    .catch(err => {
-      console.log(err);
-      return res.status(500).json({ error: err });
-    });
-
-  // let postData;
-  // const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.user.handle)
-  // .where('postId', '==', req.params.postId).limit(1);
-
-  // const postDoc = db.doc(`/posts/${req.params.postId}`);
-
-  // postDoc.get()
-  // .then((doc) => {
-  //     if(doc.exists) {
-  //         postData = doc.data();
-  //         return likeDoc.get();
-  //     }
-  //     else
-  //     {
-  //         return res.status(404).json({error: 'Post not found'});
-  //     }
-  // })
-  // .then((data) => {
-  //         return db
-  //           .doc(`/likes/${data.docs[0].id}`)
-  //           .delete()
-  //           .then(() => {
-  //             postData.likeCount--;
-  //             return postDoc.update({ likeCount: postData.likeCount });
-  //           })
-  //           .then(() => {
-  //             res.status(200).json(postData);
-  //           });
-
-  // })
-  // .catch((err) => {
-  //     console.error(err);
-  //     return res.status(500).json({error: 'Something is wrong'});
-  // })
-};
-
-exports.getLikes = (req, res) => {
-  db.doc(`/users/${req.userData.handle}`)
-    .get()
-    .then(doc => {
-      let likes = doc.data().likes;
-      if (likes === undefined || likes === null) {
-        likes = [];
-      }
-      return res.status(200).json({ likes });
-    })
-    .catch(err => {
-      console.log(err);
-      return res.status(500).json({ error: err });
+    res.status(500).send("Failed to retrieve posts from database.", err);
    });
 };

 exports.getFilteredPosts = (req, res) => {
-  admin
-    .firestore()
-    .collection("posts")
-    .where("userHandle", "==", "new user")
-    .where("microBlogTopics", "==");
-};
+    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
+};
--- a/functions/handlers/topic.js
+++ b/functions/handlers/topic.js
@@ -1,63 +1,20 @@
 const { admin, db } = require("../util/admin");
 exports.putTopic = (req, res) => {
-  let new_following = [];
-  let userRef = db.doc(`/users/${req.userData.handle}`);
-  userRef
-    .get()
-    .then(doc => {
-      new_following = doc.data().followedTopics;
-      new_following.push(req.body.following);
+  const newTopic = {
+    topic: req.body.topic
+  };

-      // add stuff
-      userRef
-        .set({ followedTopics: new_following }, { merge: true })
-        .then(doc => {
-          return res
-            .status(201)
-            .json({ message: `Following ${req.body.following}` });
-        })
-        .catch(err => {
-          return res.status(500).json({ err });
-        });
-      return res.status(200).json({ message: "OK" });
+  admin
+    .firestore()
+    .collection("topics")
+    .add(newTopic)
+    .then(doc => {
+      const resTopic = newTopic;
+      return res.status(200).json(resTopic);
    })
    .catch(err => {
-      return res.status(500).json({ err });
-    });
-};
-
-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 });
+      console.error(err);
+      return res.status(500).json({ error: "something is wrong" });
    });
 };

@@ -83,46 +40,21 @@ exports.getAllTopics = (req, res) => {
 };

 exports.deleteTopic = (req, res) => {
-  let new_following = [];
-  let userRef = db.doc(`/users/${req.userData.handle}`);
-  userRef
+  const topic = db.doc(`/topics/${req.params.topicId}`);
+  topic
    .get()
    .then(doc => {
-      new_following = doc.data().followedTopics;
-      // remove username from array
-      new_following.forEach(function(follower, index) {
-        if (follower === `${req.body.unfollow}`) {
-          new_following.splice(index, 1);
-        }
-      });
-
-      // update database
-      userRef
-        .set({ followedTopics: new_following }, { merge: true })
-        .then(doc => {
-          return res
-            .status(202)
-            .json({ message: `Successfully unfollow ${req.body.unfollow}` });
-        })
-        .catch(err => {
-          return res.status(500).json({ err });
-        });
-      return res.status(200).json({ message: "ok" });
+      if (!doc.exists) {
+        return res.status(404).json({ error: "Topic not found" });
+      } else {
+        return topic.delete();
+      }
+    })
+    .then(() => {
+      return res.json({ message: "Topic successfully deleted!" });
    })
    .catch(err => {
-      return res.status(500).json({ err });
-    });
-};
-
-exports.getUserTopics = (req, res) => {
-  let data = [];
-  db.doc(`/users/${req.body.handle}`)
-    .get()
-    .then(doc => {
-      data = doc.data().followedTopics;
-      return res.status(200).json({ data });
-    })
-    .catch(err => {
-      return res.status(500).json({ err });
+      console.error(err);
+      return res.status(500).json({ error: "Failed to delete topic." });
    });
 };
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
--- a/functions/index.js
+++ b/functions/index.js
@@ -11,25 +11,13 @@ app.use(cors());
 *------------------------------------------------------------------*/
 const {
  getAuthenticatedUser,
-  getDirectMessages,
-  sendDirectMessage,
-  createDirectMessage,
-  checkDirectMessagesEnabled,
-  toggleDirectMessages,
-  getAllHandles,
  getUserDetails,
  getProfileInfo,
  login,
  signup,
  deleteUser,
  updateProfileInfo,
-  uploadProfileImage,
-  verifyUser,
-  unverifyUser,
-  getUserHandles,
-  addSubscription,
-  getSubs,
-  removeSub
+  getUserHandles
 } = require("./handlers/users");

 // Adds a user to the database and registers them in firebase with
@@ -44,114 +32,35 @@ app.post("/login", login);
 //Deletes user account
 app.delete("/delete", fbAuth, deleteUser);

-// Returns all direct messages that the user is participating in
-app.get("/dms", fbAuth, getDirectMessages);
-
-// Send a message in a DM from one user to another
-app.post("/dms/send", fbAuth, sendDirectMessage);
-
-// Create a new DM between two users
-app.post("/dms/new", fbAuth, createDirectMessage);
-
-// Checks if the user provided has DMs enabled or not
-app.post("/dms/enabled", checkDirectMessagesEnabled);
-
-// Used to toggle DMs on or off for the current user
-app.post("/dms/toggle", fbAuth, toggleDirectMessages);
-
 app.get("/getUser", fbAuth, getUserDetails);

-app.post("/getUserDetails", fbAuth, getUserDetails);
-
-// Returns a list of all usernames
-// Used for searching
-app.get("/getAllHandles", fbAuth, getAllHandles);
-
 // Returns all profile data of the currently logged in user
 app.get("/getProfileInfo", fbAuth, getProfileInfo);

 // Updates the currently logged in user's profile information
 app.post("/updateProfileInfo", fbAuth, updateProfileInfo);

-// Returns all user data for the logged in user.
-// Used when setting the state in Redux.
 app.get("/user", fbAuth, getAuthenticatedUser);

-// Uploads a profile image
-app.post("/user/image", fbAuth, uploadProfileImage);
-
-// Verifies the user sent to the request
-// Must be run by the Admin user
-app.post("/verifyUser", fbAuth, verifyUser);
-
-// Unverifies the user sent to the request
-// Must be run by admin
-app.post("/unverifyUser", fbAuth, unverifyUser);
-
 // get user handles with search phase
-app.post("/getUserHandles", fbAuth, getUserHandles);
-
-// get user's subscription
-app.get("/getSubs", fbAuth, getSubs);
-
-// add user to another user's "following" data field
-app.post("/addSubscription", fbAuth, addSubscription);
-
-// remove one subscription
-app.post("/removeSub", fbAuth, removeSub);
+app.get("/getUserHandles", fbAuth, getUserHandles);

 /*------------------------------------------------------------------*
 *  handlers/post.js                                                *
 *------------------------------------------------------------------*/
-
-
-const {
-  getallPostsforUser,
-  getallPosts,
-  putPost,
-  hidePost, 
-  likePost,
-  unlikePost,
-  getLikes,
-  quoteWithPost,
-  quoteWithoutPost,
-  checkforLikePost,
-  getOtherUsersPosts,
-  getAlert
-} = require("./handlers/post");
+const { getallPostsforUser, getallPosts, putPost } = 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);

-app.get("/likes", fbAuth, getLikes);
-app.get("/like/:postId", fbAuth, likePost);
-app.get("/unlike/:postId", fbAuth, unlikePost);
-app.get("/checkforLikePost/:postId", fbAuth, checkforLikePost);
-
-app.post("/quoteWithPost/:postId", fbAuth, quoteWithPost);
-app.post("/quoteWithoutPost/:postId", fbAuth, quoteWithoutPost);
-
-app.post("/getOtherUsersPosts", fbAuth, getOtherUsersPosts);
-
-app.get("/getAlert", fbAuth, getAlert);
-
 /*------------------------------------------------------------------*
 *  handlers/topic.js                                                *
 *------------------------------------------------------------------*/
-const {
-  putTopic,
-  getAllTopics,
-  deleteTopic,
-  getUserTopics,
-  putNewTopic
-} = require("./handlers/topic");
+const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic");

 // add topic to database
 app.post("/putTopic", fbAuth, putTopic);
@@ -160,11 +69,6 @@ app.post("/putTopic", fbAuth, putTopic);
 app.get("/getAllTopics", fbAuth, getAllTopics);

 // delete a specific topic
-app.post("/deleteTopic", fbAuth, deleteTopic);
-
-// get topic for this user
-app.post("/getUserTopics", fbAuth, getUserTopics);
-
-app.post("/putNewTopic", fbAuth, putNewTopic);
+app.delete("/deleteTopic/:topicId", fbAuth, deleteTopic);

 exports.api = functions.https.onRequest(app);
--- a/functions/package-lock.json
+++ b/functions/package-lock.json
@@ -673,14 +673,6 @@
        "readable-stream": "~1.0.32"
      }
    },
-    "busboy": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
-      "integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==",
-      "requires": {
-        "dicer": "0.3.0"
-      }
-    },
    "bytebuffer": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
@@ -2601,9 +2593,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
    },
    "lodash.at": {
      "version": "4.6.0",
--- a/functions/package.json
+++ b/functions/package.json
@@ -14,7 +14,6 @@
  },
  "dependencies": {
    "axios": "^0.19.0",
-    "busboy": "^0.3.1",
    "firebase": "^6.6.2",
    "firebase-admin": "^8.6.0",
    "firebase-functions": "^3.1.0",
--- a/functions/util/fbAuth.js
+++ b/functions/util/fbAuth.js
@@ -4,12 +4,12 @@ const { admin, db } = require('./admin');
 // The function will only execute if the user is logged in, or rather, they have
 // a valid token
 module.exports = (req, res, next) => {
-    // console.log(req);
-    // console.log(req.body);
-    // console.log(req.headers);
-    // console.log(req.headers.authorization);
-    // console.log(JSON.stringify(req.body));
-    // console.log(JSON.stringify(req.header));
+    console.log(req);
+    console.log(req.body);
+    console.log(req.headers);
+    console.log(req.headers.authorization);
+    console.log(JSON.stringify(req.body));
+    console.log(JSON.stringify(req.header));

    let idToken;
    
--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -10,21 +10,17 @@
    "axios": "^0.19.0",
    "clsx": "^1.0.4",
    "create-react-app": "^3.1.2",
-    "dayjs": "^1.8.17",
-    "fuse.js": "^3.4.6",
    "install": "^0.13.0",
    "jwt-decode": "^2.2.0",
    "node-pre-gyp": "^0.13.0",
    "react": "^16.9.0",
    "react-dom": "^16.9.0",
-    "react-modal": "^3.11.1",
    "react-redux": "^7.1.1",
    "react-router-dom": "^5.1.0",
    "react-scripts": "0.9.5",
    "redux": "^4.0.4",
    "redux-thunk": "^2.3.0",
-    "typeface-roboto": "0.0.75",
-    "underscore": "^1.9.1"
+    "typeface-roboto": "0.0.75"
  },
  "devDependencies": {},
  "scripts": {
@@ -45,5 +41,5 @@
      "last 1 safari version"
    ]
  },
-  "proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
+  "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
 }
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -19,6 +19,8 @@ import { logoutUser, getUserData } from "./redux/actions/userActions";
 // Components
 import AuthRoute from "./util/AuthRoute";

+// axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
+
 // Pages
 import home from "./pages/Home";
 import signup from "./pages/Signup";
@@ -29,10 +31,7 @@ import Delete from "./pages/Delete";
 import writeMicroblog from "./Writing_Microblogs.js";
 import editProfile from "./pages/editProfile";
 import userLine from "./Userline.js";
-import verify from "./pages/verify";
 import Search from "./pages/Search.js";
-import directMessages from "./pages/directMessages";
-import otherUser from "./pages/otherUser";

 const theme = createMuiTheme(themeObject);

@@ -63,25 +62,24 @@ class App extends Component {
            <div className="container">
              <Navbar />
            </div>
-            <div className="app" style={{height: "700"}}>
+            <div className="app">
              <Switch>
+
                {/* AuthRoute checks if the user is logged in and if they are it redirects them to /home */}
                <AuthRoute exact path="/signup" component={signup} />
                <AuthRoute exact path="/login" component={login} />
-                <AuthRoute exact path="/" component={home} />
+                <AuthRoute exact path="/" component={home}/>

                <Route exact path="/logout" component={logout} />
                <Route exact path="/delete" component={Delete} />

                <Route exact path="/home" component={home} />
                <Route exact path="/user" component={user} />
-                <Route exact path="/user/edit" component={editProfile} />
-                <Route exact path="/verify" component={verify} />
+                <Route exact path="/edit" component={editProfile} />
                <Route exact path="/search" component={Search} />
-                <Route exact path="/dm" component={directMessages} />
-                <Route exact path="/user/:userhandle" component={otherUser} />

                <AuthRoute exact path="/" component={home} />
+
              </Switch>
            </div>
          </Router>
--- a/twistter-frontend/src/Userline.js
+++ b/twistter-frontend/src/Userline.js
@@ -1,10 +1,10 @@
 import React, { Component } from "react";
-// import { BrowserRouter as Router } from 'react-router-dom';
-// import Route from 'react-router-dom/Route';
+import { BrowserRouter as Router } from 'react-router-dom';
+import Route from 'react-router-dom/Route';
 import axios from 'axios';
 import Box from '@material-ui/core/Box'
-// import {borders} from '@material-ui/system';
-// import { sizing } from '@material-ui/system';
+import {borders} from '@material-ui/system';
+import { sizing } from '@material-ui/system';
 // var moment = require('moment');


@@ -41,7 +41,7 @@ class Userline extends Component {
            <div style={{fontsize: "13px", textAlign: "left", marginLeft: "14px"}}>
                <p>Userline</p>
            </div>
-            <Box border={1} width="25%" flex="1" height="auto" m={2} fontSize="13px" textAlign="left" padding="5px" flexWrap="wrap" flexDirection="row" >
+            <Box border={1} width="25%" flex="1" height="auto" m={2} fontSize="13px" textAlign= "left" padding="5px" flexWrap= "wrap" flexDirection= "row" >
                <div style={{flexWrap: "wrap", flex: "1", flexDirection: "row", wordBreak: "break-word"}}>
                <p>
                {sortedPosts.map((microBlog) => <p>Microblog Title: {microBlog.microBlogTitle}
@@ -50,7 +50,7 @@ class Userline extends Component {
                                                          <br></br>Number of comments: {microBlog.commentCount}
                                                          <br></br>Number of likes: {microBlog.likeCount}
                                                          <br></br>Body of post: {microBlog.body}
-                                                          <br></br>Tagged topics: {microBlog.microBlogTopics.join(", ")}               
+                                                          <br></br>Tagged topics: {microBlog.microBlogTopics.join("," + " ")}               
                </p>)} 
                </p>
                </div>
--- a/twistter-frontend/src/Writing_Microblogs.js
+++ b/twistter-frontend/src/Writing_Microblogs.js
@@ -1,37 +1,8 @@
 import React, { Component } from "react";
-// import { BrowserRouter as Router } from "react-router-dom";
-// import Route from "react-router-dom/Route";
+import { BrowserRouter as Router } from "react-router-dom";
+import Route from "react-router-dom/Route";
 import axios from "axios";

-// Material-UI
-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: {
-    position: "fixed"
-  },
-  form: {
-    width: "300px",
-    height: "50px",
-    marginTop: "180px",
-    marginLeft: "50px"
-  },
-  textField: {
-    marginBottom: 15
-  },
-  progress: {
-    position: "absolute"
-  },
-  button: {
-    positon: "relative",
-    marginBottom: 30
-  }
-}
-
 class Writing_Microblogs extends Component {
  constructor(props) {
    super(props);
@@ -39,8 +10,7 @@ class Writing_Microblogs extends Component {
      value: "",
      title: "",
      topics: "",
-      characterCount: 250,
-      loading: false
+      characterCount: 250
    };

    this.handleChange = this.handleChange.bind(this);
@@ -57,7 +27,7 @@ class Writing_Microblogs extends Component {
    this.setState({ topics: event.target.value });
  }

-  handleSubmit = (event) => {
+  handleSubmit(event) {
    // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
    const postData = {
      body: this.state.value,
@@ -65,58 +35,25 @@ 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
-      .post("/putPost", postData, headers) // TODO: add topics
+    axios
+      .post("/putPost", postData, headers)
      .then(res => {
-        // alert("Post was shared successfully!");
+        alert("Post was shared successfully!");
        console.log(res.data);
      })
      .catch(err => {
        alert("An error occured.");
        console.error(err);
      });
-    console.log(postData.microBlogTopics);
-    // let topicPromises = [];
-    // postData.microBlogTopics.forEach(topic => {
-    //   topicPromises.push(axios
-    //     .post("/putTopic", {
-    //       following: topic
-    //     })
-    //     .then(res => {
-    //       console.log(res.data);
-    //     })
-    //     .catch(err => {
-    //       console.error(err);
-    //     })
-    //   )
-    // });
    event.preventDefault();
-    // topicPromises.push(postPromise);
-    Promise.all([postPromise])
-      .then(() => {
-        this.setState({ 
-          value: "", 
-          title: "", 
-          characterCount: 250, 
-          topics: "",
-          loading: false
-        });
-      })
-      .catch((error) => {
-        console.log(error);
-      })
+    this.setState({ value: "", title: "", characterCount: 250, topics: "" });
  }

  handleChangeforPost(event) {
-
    this.setState({ value: event.target.value });
  }

@@ -127,69 +64,65 @@ class Writing_Microblogs extends Component {
  }

  render() {
-    const { classes } = this.props;
    return (
-      <div className={classes.container}>
-        <form noValidate className={classes.form}>
-          <TextField
-            id="title"
-            name="title"
-            label="Title"
-            className={classes.textField}
-            value={this.state.title}
-            variant="outlined"
-            onChange={this.handleChange}
-            fullWidth
-            autoComplete='off'
-          />
+      <div>
+        <div
+          style={{
+            width: "200px",
+            height: "50px",
+            marginTop: "180px",
+            marginLeft: "50px"
+          }}
+        >
+          <form>
+            <textarea
+              placeholder="Enter Microblog Title"
+              value={this.state.title}
+              required
+              onChange={this.handleChange}
+              cols={30}
+              rows={1}
+            />
+          </form>
+        </div>
+        <div style={{ width: "200px", height: "50px", marginLeft: "50px" }}>
+          <form>
+            <textarea
+              placeholder="Enter topics seperated by a comma"
+              value={this.state.topics}
+              required
+              onChange={this.handleChangeforTopics}
+              cols={40}
+              rows={1}
+            />
+          </form>
+        </div>

-          <TextField
-            id="topics"
-            name="topics"
-            label="Topics"
-            className={classes.textField}
-            value={this.state.topics}
-            variant="outlined"
-            onChange={this.handleChangeforTopics}
-            color="primary"
-            fullWidth
-            autoComplete='off'
-          />
-          <TextField
-            id="content"
-            name="content"
-            label="Content"
-            color="primary"
-            className={classes.textField}
-            value={this.state.value}
-            helperText={`${this.state.characterCount} characters left`}
-            multiline
-            rows="9"
-            variant="outlined"
-            inputProps={{
-              maxLength: 250
-            }}
-            onChange={(e) => {
-              this.handleChangeforPost(e);
-              this.handleChangeforCharacterCount(e);
-            }}
-            fullWidth
-            autoComplete='off'
-          />
-          <Button
-            className={classes.button}
-            onClick={this.handleSubmit}
-            disabled={this.state.loading}
-            variant="outlined"
-            color="primary"
-            >
-              Share Post
-            {this.state.loading && <CircularProgress size={30} className={classes.progress} />}
-          </Button>
-        </form>
+        <div style={{ width: "200px", marginLeft: "50px" }}>
+          <form onSubmit={this.handleSubmit}>
+            <textarea
+              value={this.state.value}
+              required
+              maxLength="250"
+              placeholder="Write Microblog here..."
+              onChange={e => {
+                this.handleChangeforPost(e);
+                this.handleChangeforCharacterCount(e);
+              }}
+              cols={40}
+              rows={20}
+            />
+            <div style={{ fontSize: "14px", marginRight: "-100px" }}>
+              <p2>Characters Left: {this.state.characterCount}</p2>
+            </div>
+            <div style={{ marginRight: "-100px" }}>
+              <button onClick>Share Post</button>
+            </div>
+          </form>
+        </div>
      </div>
    );
  }
 }

-export default withStyles(styles)(Writing_Microblogs);
+export default Writing_Microblogs;
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -1,89 +1,71 @@
 /* eslint-disable */
-import React, { Component } from "react";
-import { Link } from "react-router-dom";
-import PropTypes from "prop-types";
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';

 // Material UI stuff
-import AppBar from "@material-ui/core/AppBar";
-import ToolBar from "@material-ui/core/Toolbar";
-import Button from "@material-ui/core/Button";
+import AppBar from '@material-ui/core/AppBar';
+import ToolBar from '@material-ui/core/Toolbar';
+import Button from '@material-ui/core/Button';
 import withStyles from "@material-ui/core/styles/withStyles";

 // Redux stuff
-import { logoutUser } from "../../redux/actions/userActions";
-import { connect } from "react-redux";
+import { logoutUser } from '../../redux/actions/userActions';
+import { connect } from 'react-redux';

 const styles = {
-  form: {
-    textAlign: "center"
-  },
-  textField: {
-    marginBottom: 30
-  },
-  pageTitle: {
-    marginBottom: 40
-  },
-  button: {
-    positon: "relative",
-    marginBottom: 30
-  },
-  progress: {
-    position: "absolute"
-  }
-};
-
+    form: {
+      textAlign: "center"
+    },
+    textField: {
+      marginBottom: 30
+    },
+    pageTitle: {
+      marginBottom: 40
+    },
+    button: {
+      positon: "relative",
+      marginBottom: 30
+    },
+    progress: {
+      position: "absolute"
+    }
+  };
+  
 export class Navbar extends Component {
-  render() {
-    const authenticated = this.props.user.authenticated;
-    return (
-      <AppBar>
-        <ToolBar>
-          <Button component={Link} to="/">
-            Home
-          </Button>
-          {authenticated && (
-            <Button component={Link} to="/user">
-              Profile
-            </Button>
-          )}
-          {authenticated && (
-            <Button component={Link} to="/dm">
-              DMs
-            </Button>
-          )}
-          {!authenticated && (
-            <Button component={Link} to="/login">
-              Login
-            </Button>
-          )}
-          {!authenticated && (
-            <Button component={Link} to="/signup">
-              Sign Up
-            </Button>
-          )}
-          {authenticated && (
-            <Button component={Link} to="/search">
-              Search
-            </Button>
-          )}
-          {authenticated && (
-            <Button style={{position: "absolute", right: 30}} component={Link} to="/logout">
-              Logout
-            </Button>
-          )}
-        </ToolBar>
-      </AppBar>
-    );
-  }
+    render() {
+        const authenticated = this.props.user.authenticated;
+        return (
+            <AppBar>
+                <ToolBar>
+                    <Button component={ Link } to='/'>
+                        Home
+                    </Button>
+                    {authenticated && <Button component={ Link } to='/user'>
+                        Profile
+                    </Button>}
+                    {!authenticated && <Button component={ Link } to='/login'>
+                        Login
+                    </Button>}
+                    {!authenticated && <Button component={ Link } to='/signup'>
+                        Sign Up
+                    </Button>}
+                    {authenticated && <Button component={ Link } to='/logout'>
+                        Logout
+                    </Button>}
+                </ToolBar>
+            </AppBar>
+        )
+    }
 }

-const mapStateToProps = state => ({
-  user: state.user
-});
+const mapStateToProps = (state) => ({
+    user: state.user
+})

 Navbar.propTypes = {
-  user: PropTypes.object.isRequired,
-  classes: PropTypes.object.isRequired
-};
+    user: PropTypes.object.isRequired,
+    classes: PropTypes.object.isRequired
+}

 export default connect(mapStateToProps)(withStyles(styles)(Navbar));
--- a/twistter-frontend/src/pages/Home.js
+++ b/twistter-frontend/src/pages/Home.js
@@ -1,267 +1,92 @@
 /* eslint-disable */
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import axios from "axios";
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import axios from 'axios';

 // Material UI and React Router
-
-import CircularProgress from "@material-ui/core/CircularProgress";
-import Button from "@material-ui/core/Button";
-import Grid from "@material-ui/core/Grid";
-import Card from "@material-ui/core/Card";
-import CardContent from "@material-ui/core/CardContent";
-import TextField from "@material-ui/core/TextField";
-
+import Grid from '@material-ui/core/Grid';
+import Card from '@material-ui/core/Card';
+import CardContent from '@material-ui/core/CardContent';
 import Typography from "@material-ui/core/Typography";
-import withStyles from "@material-ui/styles/withStyles";

 // component
-import "../App.css";
-import logo from "../images/twistter-logo.png";
-import noImage from "../images/no-img.png";
-import Writing_Microblogs from "../Writing_Microblogs";
-import ReactModal from "react-modal";
-
-// Redux
-import { likePost, unlikePost, getLikes } from "../redux/actions/userActions";
-
-const styles = {
-  card: {
-    marginBottom: 5
-  }
-};
+import '../App.css';
+import logo from '../images/twistter-logo.png';
+import noImage from '../images/no-img.png';
+import Writing_Microblogs from '../Writing_Microblogs';

 class Home extends Component {
-  state = {
-    likes: [],
-    loading: false,
-    following: null,
-    topics: null
-  };
+  state = {};

  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;
-    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);
-        // })
+        console.log(res.data);
        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
-      ? event.target.dataset.key
-      : event.target.parentNode.dataset.key;
-    console.log(postId);
-
-    let doc = document.getElementById(postId);
-    // console.log(postId);
-    if (this.state.likes.includes(postId)) {
-      this.props.unlikePost(postId, this.state.likes);
-      doc.dataset.likes--;
-    } else {
-      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));
-    return newDate.toDateString();
  }

  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);
-    let postMarkup = this.state.posts ? ( this.state.following === undefined || this.state.following === null ? <Typography>You aren't following anybody right now</Typography> :
-      this.state.posts.map(post => !post.hidden && this.state.following && (this.state.following.includes(post.userHandle) || post.userHandle === "Admin") ? (
-            <Card className={classes.card} key={post.postId}>
-              <CardContent>
-                <Typography>
-                  {/* {
-                    this.state.imageUrl ? (<img src={this.state.imageUrl} height="50" width="50" />) : 
-                                          (<img src={noImage} height="50" width="50"/>)
-                  } */}
-                  {
-                    post.profileImage ? (<img src={post.profileImage} height="50" width="50" />) : 
-                                        (<img src={noImage} height="50" width="50"/>)
-                  }
-                </Typography>
-                <Typography variant="h5"><b>{post.userHandle}</b></Typography>
-                <Typography variant="body2" color={"textSecondary"}>{this.formatDate(post.createdAt)}</Typography>
-                <br />
-                <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
-                <Typography variant="body2">{post.quoteBody}</Typography>
-                <br />
-                <Typography variant="body2">{post.body}</Typography>
-                <br />
-                <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics.join(", ")}</Typography>        
-                <br />
-                {!hiddenBool &&
-                  <Button
-                  onClick={this.flagPost}
-                  data-key={post.postId}
-                  variant = "contained"
-                  color = "primary"
-                >
-                  Hide Post
-                </Button>
-                }
-                
-                <Typography id={post.postId} data-likes={post.likeCount} variant="body2" color={"textSecondary"}>Likes {post.likeCount}</Typography>
-                {/* <Like microBlog = {post.postId} count = {post.likeCount} name = {username}></Like> */}
-                <Button
-                  onClick={this.handleClickLikeButton}
-                  data-key={post.postId}
-                  disabled={loading}
-                  variant="outlined"
-                  color="primary"
-                >{
-                  this.state.likes && this.state.likes.includes(post.postId) ? 'Unlike' : 'Like'
-                  }</Button>
-                <Quote microblog = {post.postId}></Quote> 
-
-                {/* <button>Quote</button> */}
-
-                {/* <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography> */}
-                
-              </CardContent>
-            </Card>
-        ) : (
-              <p></p>
-            )
-    )
-    ) : (
-      <p>Loading post...</p>
-    );
-
-    return authenticated ? (
-      this.state.loading ? (
-        <CircularProgress
-          size={60}
-          style={{ marginTop: "300px" }}
-        ></CircularProgress>
-      ) : (
-        <Grid container>
-          <Grid item sm={4} xs={8}>
-            <Writing_Microblogs />
-          </Grid>
-          <Grid item sm={4} xs={8}>
-            {postMarkup}
-          </Grid>
-        </Grid>
+    let postMarkup = this.state.posts ? (
+      this.state.posts.map(post => 
+        <Card>
+          <CardContent>
+            <Typography>
+              {
+                this.state.imageUrl ? (<img src={this.state.imageUrl} height="250" width="250" />) : 
+                                      (<img src={noImage} height="50" width="50"/>)
+              }
+            </Typography>
+            <Typography variant="h7"><b>{post.userHandle}</b></Typography>
+            <Typography variant="body2" color={"textSecondary"}>{post.createdAt}</Typography>
+            <br />
+            <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
+            <Typography variant="body2">{post.body}</Typography>
+            <br />
+            <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics}</Typography>
+            <br />
+            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
+          </CardContent>
+        </Card>
      )
-    ) : loading ? (
-      <CircularProgress
-        size={60}
-        style={{ marginTop: "300px" }}
-      ></CircularProgress>
-    ) : (
+    ) : (<p>My Posts</p>);
+
+    return (
+      authenticated ?
+      <Grid container spacing={16}>
+        <Grid item sm={4} xs={8}>
+          <Writing_Microblogs />
+        </Grid>
+        <Grid item sm={4} xs={8}>
+          {postMarkup}
+        </Grid>
+      </Grid> 
+      :
      <div>
        <div>
          <img src={logo} className="app-logo" alt="logo" />
-          <br />
-          <br />
-          <b>Welcome to Twistter!</b>
-          <br />
-          <br />
-          <b>See the most interesting topics people are following right now.</b>
+          <br/><br/>
+          <b>Welcome to Twistter!</b> 
+          <br/><br/>
+          <b>See the most interesting topics people are following right now.</b> 
        </div>

-        <br />
-        <br />
-        <br />
-        <br />
+        <br/><br/><br/><br/>

-        <div>
-          <b>Join today or sign in if you already have an account.</b>
-          <br />
-          <br />
+        <div>                    
+          <b>Join today or sign in if you already have an account.</b> 
+          <br/><br/>
          <form action="./signup">
-            <button className="authButtons signup">Sign up</button>
+            <button className="authButtons signup">Sign up</button> 
          </form>
-          <br />
+          <br/>
          <form action="./login">
            <button className="authButtons login">Sign in</button>
          </form>
@@ -271,281 +96,12 @@ class Home extends Component {
  }
 }

-class Quote extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      characterCount: 250,
-      showModal: false,
-      value: ""
-    };
-
-    this.handleSubmitWithoutPost = this.handleSubmitWithoutPost.bind(this);
-    this.handleOpenModal = this.handleOpenModal.bind(this);
-    this.handleCloseModal = this.handleCloseModal.bind(this);
-    this.handleSubmit = this.handleSubmit.bind(this);
-  }
-
-  handleSubmitWithoutPost(event) {
-    const post = {
-      userImage: "bing-url"
-    };
-    const headers = {
-      headers: { "Content-Type": "application/json" }
-    };
-    axios
-      .post(`/quoteWithoutPost/${this.props.microblog}`, post, headers)
-      .then(res => {
-        console.log(res.data);
-      })
-      .catch(err => {
-        console.error(err);
-      });
-    event.preventDefault();
-  }
-
-  handleOpenModal() {
-    this.setState({ showModal: true });
-  }
-
-  handleCloseModal() {
-    this.setState({ showModal: false, characterCount: 250, value: "" });
-  }
-
-  handleChangeforPost(event) {
-    this.setState({ value: event.target.value });
-  }
-
-  handleChangeforCharacterCount(event) {
-    const charCount = event.target.value.length;
-    const charRemaining = 250 - charCount;
-    this.setState({ characterCount: charRemaining });
-  }
-
-  handleSubmit(event) {
-    const quotedPost = {
-      quoteBody: this.state.value,
-      userImage: "bing-url"
-    };
-    const headers = {
-      headers: { "Content-Type": "application/json" }
-    };
-    axios
-      .post(`/quoteWithPost/${this.props.microblog}`, quotedPost, headers)
-      .then(res => {
-        console.log(res.data);
-      })
-      .catch(err => {
-        console.error(err);
-      });
-    event.preventDefault();
-    this.setState({ showModal: false, characterCount: 250, value: "" });
-  }
-
-  render() {
-    return (
-      <div>
-        <Button
-          variant="outlined"
-          color="primary"
-          onClick={this.handleOpenModal}
-        >
-          Quote with Post
-        </Button>
-        <ReactModal
-          isOpen={this.state.showModal}
-          style={{
-            content: {
-              height: "50%",
-              width: "25%",
-              marginTop: "auto",
-              marginLeft: "auto",
-              marginRight: "auto",
-              marginBottom: "auto"
-            }
-          }}
-        >
-          <div style={{ width: "200px", marginLeft: "50px" }}>
-            <form style={{ width: "350px" }}>
-              {/* <textarea
-              value={this.state.value}
-              required
-              maxLength="250"
-              placeholder="Write Quoted Post here..."
-              onChange={e => {
-                this.handleChangeforPost(e);
-                this.handleChangeforCharacterCount(e);
-                
-              }}
-              cols={40}
-              rows={20}
-            /> */}
-              <TextField
-                style={{ width: 300 }}
-                value={this.state.value}
-                label="Write Quoted Post here..."
-                required
-                multiline
-                color="primary"
-                rows="14"
-                variant="outlined"
-                inputProps={{
-                  maxLength: 250
-                }}
-                onChange={e => {
-                  this.handleChangeforPost(e);
-                  this.handleChangeforCharacterCount(e);
-                }}
-                autoComplete="off"
-              ></TextField>
-
-              <div style={{ fontSize: "14px", marginRight: "-100px" }}>
-                <p2>Characters Left: {this.state.characterCount}</p2>
-              </div>
-              <Button
-                variant="outlined"
-                color="primary"
-                onClick={this.handleSubmit}
-              >
-                Share Quoted Post
-              </Button>
-
-              <Button
-                variant="outlined"
-                color="primary"
-                onClick={this.handleCloseModal}
-              >
-                Cancel
-              </Button>
-            </form>
-          </div>
-        </ReactModal>
-        <Button
-          variant="outlined"
-          color="primary"
-          onClick={this.handleSubmitWithoutPost}
-        >
-          Quote without Post
-        </Button>
-      </div>
-    );
-  }
-}
-
-class Like extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      num: this.props.count
-    };
-
-    this.handleClick = this.handleClick.bind(this);
-  }
-
-  componentDidMount() {
-    this.setState({
-      like:
-        localStorage.getItem(this.props.microBlog + this.props.name) === "false"
-    });
-  }
-
-  handleClick(){
-    this.setState({
-      like: !this.state.like
-    });
-    localStorage.setItem(
-      this.props.microBlog + this.props.name,
-      this.state.like.toString()
-    );
-
-    if (this.state.like == false) {
-      this.setState(() => {
-        return { num: this.state.num + 1 };
-      });
-      axios
-        .get(`/like/${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() {
-    axios.get(`/checkforLikePost/${this.props.microBlog}`)
-    .then((res) => {
-      this.setState({
-        like2: res.data
-      })
-      console.log(res.data);
-    })
-    .catch((err) => {
-      console.log(err)
-    })
-    if (this.state.like2 === this.state.like)
-    {
-      this.setState({
-        like: false
-      })
-    }
-  }  */
-
-  render() {
-    const label = this.state.like ? "Unlike" : "Like";
-    return (
-      <div>
-        <Typography variant="body2" color={"textSecondary"}>
-          Likes {this.state.num}
-        </Typography>
-        <button onClick={this.handleClick}>{label}</button>
-      </div>
-    );
-  }
-}
-
-const mapStateToProps = state => ({
-  user: state.user,
-  UI: state.UI
-});
-
-const mapActionsToProps = {
-  likePost,
-  unlikePost,
-  getLikes
-};
+const mapStateToProps = (state) => ({
+  user: state.user
+})

 Home.propTypes = {
-  user: PropTypes.object.isRequired,
-  likePost: PropTypes.func.isRequired,
-  unlikePost: PropTypes.func.isRequired,
-  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)(Home);
--- a/twistter-frontend/src/pages/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -39,6 +39,9 @@ const styles = {
  },
  p: {
    fontFamily: "cursive",
+  },
+  div: {
+    backgroundColor: "lightgrey",
  }
 };

@@ -110,16 +113,18 @@ export class Login extends Component {
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
          <br></br>
-          <Typography variant="h6" className={classes.pageTitle} fontFamily = "Georgia, serif">
-            <b>Log in to Twistter</b>
+          <br></br>
+          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
+            <b><font face="Segoe UI">Log in to Twistter</font></b>
            <br></br>
          </Typography>
          <br></br>
+          <div>
          <form noValidate onSubmit={this.handleSubmit}>
            <TextField
              id="email"
              name="email"
-              label="Email or Username*"
+              label="Email*"
              className={classes.textField}
              value={this.state.email}
              helperText={errors.email}
@@ -127,7 +132,6 @@ export class Login extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <TextField
              id="password"
@@ -141,7 +145,6 @@ export class Login extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <Button
              type="submit"
@@ -159,6 +162,7 @@ export class Login extends Component {
              <Typography color="error">Invalid username/email or password</Typography>
            )}
          </form>
+        </div>
        </Grid>
        <Grid item sm />
      </Grid>
--- a/twistter-frontend/src/pages/Search.js
+++ b/twistter-frontend/src/pages/Search.js
@@ -1,77 +1,38 @@
 import React, { Component } from "react";
 // import props
-// import { TextField, Button } from "@material-ui/core";
-import TextField from "@material-ui/core/TextField"
+import { TextField, Paper } from "@material-ui/core";
 import Grid from "@material-ui/core/Grid";
-import axios from "axios";
-import Fuse from "fuse.js";
-
-import { BrowserRouter as Router } from "react-router-dom";
-
-import CircularProgress from "@material-ui/core/CircularProgress";
-
-const fuseOptions = {
-  shouldSort: true,
-  threshold: 0.6,
-  location: 0,
-  distance: 100,
-  maxPatternLength: 32,
-  minMatchCharLength: 1,
-  keys: []
-};
-
-let fuse;
+import Axios from "axios";
+import user from "./user.js";

+import {
+  BrowserRouter as Router,
+  Switch,
+  Route,
+  Link,
+  useRouteMatch
+} from "react-router-dom";

 export class Search extends Component {
  state = {
-    handles: [],
-    // searchPhrase: null,
-    searchResult: null,
-    loading: false
+    searchPhase: null,
+    searchResult: null
  };

-  componentDidMount() {
-    this.setState({loading: true});
-    axios.get("/getAllHandles")
-    .then((res) => {
+  handleSearch(event) {
+    Axios.get("/getUserHandles").then(res => {
      this.setState({
-        handles: res.data,
-        loading: false
-      }, () => {
-        // console.log(res.data);
-        fuse = new Fuse(this.state.handles, fuseOptions); // "list" is the item array
-      })
-    })
+        searchResult: res.data
+      });
+    });
+    console.log(this.state.searchPhase);
  }

-  // handleSearch = () => {
-  //   console.log(this.state.searchPhase);
-  //   axios.post("/getUserHandles", {
-  //     userHandle: this.state.searchPhase
-  //   })
-  //     .then(res => {
-  //       console.log(res);
-
-  //       this.setState({
-  //         searchResult: res.data
-  //       });
-  //     })
-  //     .catch(err => {
-  //       console.log(err);
-  //     });
-  // };
-
-  handleChange = (event) => {
-    let result = fuse.search(event.target.value);
-    let parsed = [];
-    result.forEach((res) => {
-      // console.log(res)
-      parsed.push(this.state.handles[res])
-    })
+  handleInput(event) {
    this.setState({
-      searchResult: parsed.length !== 0 ? parsed : "No Results"
-    })
+      searchPhase: event.target.value
+    });
+    this.handleSearch();
  }

  handleRedirect() {
@@ -79,50 +40,33 @@ export class Search extends Component {
  }

  render() {
-    let resultMarkup = this.state.searchResult && this.state.searchResult !== "No Results" ? (
-      this.state.searchResult.map(res => 
-        <Router key={res}>
+    let resultMarkup = this.state.searchResult ? (
+      this.state.searchResult.map(result => (
+        <Router>
          <div>
-            <a href={`/user/${res}`}>
-              {res}
-            </a>
+            <Link to={`/user`}>{result}</Link>
          </div>
        </Router>
-      )
-    ) 
-      : 
-    this.state.searchResult === "No Results" ?
-      (
-       <p> No results </p>
-      )
-        :
-      (
-        null
-      )
+      ))
+    ) : (
+      //   console.log(this.state.searchResult)
+      <p> searching... </p>
+    );

    return (
-
-      this.state.loading 
-      ? 
-        <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> 
-      : 
+      <Grid>
        <Grid>
-          <Grid>
-            <TextField
-              id="standard-required"
-              label="Username"
-              margin="normal"
-              // value={this.state.searchPhrase}
-              onChange={this.handleChange}
-            />
-          </Grid>
-          <Grid>
-            {/* <Button color="primary" onClick={this.handleSearch}>
-              Search
-            </Button> */}
-          </Grid>
-          <Grid>{resultMarkup}</Grid>
+          <TextField
+            id="standard-required"
+            label="Search"
+            defaultValue="username"
+            margin="normal"
+            value={this.state.searchPhase}
+            onChange={event => this.handleInput(event)}
+          />
        </Grid>
+        <Grid>{resultMarkup}</Grid>
+      </Grid>
    );
  }
 }
--- a/twistter-frontend/src/pages/Signup.js
+++ b/twistter-frontend/src/pages/Signup.js
@@ -104,9 +104,10 @@ export class Signup extends Component {
        <Grid item sm />
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
+          <br></br>
          <br></br>
          <Typography variant="p" className={classes.pageTitle}>
-            <b>Create a new account</b>
+            <b><font face="Segoe UI">Create a new account</font></b>
            <br></br>
          </Typography>
          <br></br>
@@ -122,7 +123,6 @@ export class Signup extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <TextField
              id="email"
@@ -135,7 +135,6 @@ export class Signup extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <TextField
              id="password"
@@ -149,7 +148,6 @@ export class Signup extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <TextField
              id="confirmPassword"
@@ -163,7 +161,6 @@ export class Signup extends Component {
              variant="outlined"
              onChange={this.handleChange}
              fullWidth
-              autoComplete='off'
            />
            <br></br>
            <br></br>
--- a/twistter-frontend/src/pages/directMessages.js
+++ b/twistter-frontend/src/pages/directMessages.js
@@ -1,677 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import _ from "underscore";
-
-// Material UI
-import Box from '@material-ui/core/Box';
-import Button from '@material-ui/core/Button';
-import Card from '@material-ui/core/Card';
-import CircularProgress from '@material-ui/core/CircularProgress';
-import Fab from '@material-ui/core/Fab';
-import Grid from '@material-ui/core/Grid';
-import Popover from '@material-ui/core/Popover';
-import TextField from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
-import withStyles from '@material-ui/core/styles/withStyles';
-
-// Material UI Icons
-import AddCircleIcon from '@material-ui/icons/AddBox';
-import CheckMarkIcon from '@material-ui/icons/Check';
-import ErrorIcon from '@material-ui/icons/ErrorOutline';
-import SendIcon from '@material-ui/icons/Send';
-
-// Redux
-import { connect } from 'react-redux';
-import { 
-    getDirectMessages, 
-    createNewDirectMessage, 
-    getNewDirectMessages, 
-    reloadDirectMessageChannels, 
-    sendDirectMessage
-} from '../redux/actions/dataActions';
-
-const styles = {
-	pageContainer: {
-		minHeight: 'calc(100vh - 50px - 60px)'
-	},
-	sidePadding: {
-		maxWidth: 350
-	},
-	dmList: {
-		width: 300,
-        marginLeft: 15
-	},
-	dmItemsUpper: {
-        marginBottom: 1,
-        // height: 'calc(100vh - 50px - 142px)',
-        minHeight: 100,
-        maxHeight: 'calc(100vh - 50px - 142px)',
-        overflow: "auto"
-    },
-    dmItemsLower: {
-
-    },
-	dmItemUsernameSelected: {
-		fontSize: 20,
-		color: 'white'
-	},
-	dmItemUsernameUnselected: {
-		fontSize: 20,
-		color: '#1da1f2'
-	},
-	dmItemTimeSelected: {
-		color: '#D6D6D6',
-		fontSize: 12,
-		float: 'right',
-		marginRight: 5,
-		marginTop: 5
-	},
-	dmItemTimeUnselected: {
-		color: 'black',
-		fontSize: 12,
-		float: 'right',
-		marginRight: 5,
-		marginTop: 5
-	},
-	dmRecentMessageSelected: {
-		wordBreak: "break-all",
-		color: '#D6D6D6'
-	},
-	dmRecentMessageUnselected: {
-		wordBreak: "break-all",
-		color: 'black'
-	},
-	dmRecentMessageDisabled: {
-		wordBreak: "break-all",
-		color: 'red'
-	},
-	dmListItemContainer: {
-		height: 100
-	},
-	dmListLayoutContainer: {
-		height: "100%"
-	},
-	dmListRecentMessage: {
-		marginLeft: 10,
-		marginRight: 10
-	},
-	dmListTextLayout: {
-		height: 30
-	},
-	dmCardUnselected: {
-		fontSize: 20,
-		backgroundColor: '#FFFFFF',
-		width: 300
-	},
-	dmCardSelected: {
-		fontSize: 20,
-		backgroundColor: '#1da1f2',
-		width: 300
-  },
-	messagesGrid: {
-		// // margin: "auto"
-		// height: "auto",
-		// width: "auto"
-	},
-	messagesBox: {
-		width: 450
-	},
-	messagesContainer: {
-		height: 'calc(100vh - 50px - 110px)',
-		overflow: 'auto',
-		width: 450,
-		marginLeft: 2,
-		marginRight: 17
-	},
-	fromMessage: {
-		minWidth: 150,
-		maxWidth: 350,
-		minHeight: 40,
-		marginRight: 2,
-		marginTop: 2,
-		marginBottom: 10,
-		backgroundColor: '#008394',
-		color: '#FFFFFF',
-		float: 'right'
-	},
-	toMessage: {
-		minWidth: 150,
-		maxWidth: 350,
-		minHeight: 40,
-		marginLeft: 15,
-		marginTop: 2,
-		marginBottom: 10,
-		backgroundColor: '#008394',
-		color: '#FFFFFF',
-		float: 'left'
-	},
-	messageContent: {
-		// maxWidth: 330,
-		// width: 330,
-		wordBreak: "break-all",
-		textAlign: 'left',
-		marginLeft: 5,
-		marginRight: 5
-	},
-	messageTime: {
-		color: '#D6D6D6',
-		textAlign: 'left',
-		marginLeft: 5,
-		fontSize: 12
-	},
-	writeMessage: {
-		backgroundColor: '#FFFFFF',
-		boxShadow: '0px 0px 5px 0px grey',
-		width: 450
-	},
-	messageTextField: {
-		width: 388
-	},
-	messageButton: {
-		backgroundColor: '#1da1f2',
-		marginTop: 8,
-		marginLeft: 2
-	},
-	loadingUsernameChecks: {
-		height: 55,
-		width: 55,
-		marginLeft: 5
-	},
-	errorIcon: {
-		height: 55,
-		width: 55,
-		marginLeft: 5,
-		color: '#ff3d00'
-	},
-	checkMarkIcon: {
-		height: 55,
-		width: 55,
-		marginLeft: 5,
-		color: '#1da1f2'
-    },
-    createButton: {
-        // textAlign: "center",
-        // display: "block",
-        marginLeft: 96,
-        marginRight: 96,
-        position: "relative"
-    }
-};
-
-export class directMessages extends Component {
-	constructor() {
-		super();
-		this.state = {
-			hasChannelSelected: false,
-			selectedChannel: null,
-			dmData: null,
-			anchorEl: null,
-			createDMUsername: '',
-            usernameValid: false,
-            // message: '',
-            drafts: {},
-            errors: null
-		};
-	}
-
-	componentDidUpdate() {
-		if (this.state.hasChannelSelected) {
-			document.getElementById('messagesContainer').scrollTop = document.getElementById(
-				'messagesContainer'
-			).scrollHeight;
-		}
-	}
-
-	componentDidMount() {
-        this.props.getDirectMessages();
-        // this.updatePage();
-    }
-    
-    // Updates the state whenever redux is updated
-    componentWillReceiveProps(nextProps) {
-        if (nextProps.directMessages && !_.isEqual(nextProps.directMessages, this.state.dmData)) {
-            this.setState({ dmData: nextProps.directMessages}, () => {
-                if (this.state.selectedChannel) {
-                    this.state.dmData.forEach((channel) => {
-                        if (channel.dmId === this.state.selectedChannel.dmId) {
-                            this.setState({
-                                selectedChannel: channel
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    updatePage = async() => {
-        while (true) {
-            await this.sleep(15000);
-            // console.log("getting new DMs");
-            this.props.getNewDirectMessages();
-        }
-    }
-
-    sleep = (ms) => {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
-
-	// Handles selecting different DM channels
-	handleClickChannel = (event) => {
-		this.setState({
-			hasChannelSelected: true
-		});
-
-		const dmItemsUpper = document.getElementById("dmItemsUpper");
-		let target = event.target;
-		let dmChannelKey;
-
-		// Determine which DM channel was clicked by finding the data-key.
-		// A while loop is necessary, because the user can click on any part of the
-		// DM list item. dmItemsUpper is the list container of the dmItems
-		while (target !== dmItemsUpper) {
-			dmChannelKey = target.dataset.key;
-
-			if (dmChannelKey) {
-				break;
-			} else {
-				target = target.parentNode;
-			}
-		}
-
-		// Save the entire DM channel in the state so that it is easier to load the messages
-		this.state.dmData.forEach((channel) => {
-			if (channel.dmId === dmChannelKey) {
-				this.setState({
-					selectedChannel: channel
-				});
-			}
-		});
-	};
-
-	formatDateToString(dateString) {
-		let newDate = new Date(Date.parse(dateString));
-		return newDate.toDateString();
-	}
-
-	formatDateToTimeDiff(dateString) {
-		return dayjs(dateString).fromNow();
-	}
-
-	shortenText = (text, length) => {
-		// Shorten the text
-		let shortened = text.slice(0, length + 1);
-
-		// Trim whitespace from the end of the text
-		if (shortened[shortened.length - 1] === ' ') {
-			shortened = shortened.trimRight();
-		}
-
-		// Add ... to the end
-		shortened = `${shortened}...`;
-
-		return shortened;
-	}
-
-	handleOpenAddDMPopover = (event) => {
-		this.setState({
-			anchorEl: event.currentTarget
-		});
-	};
-
-	handleCloseAddDMPopover = () => {
-		this.setState({
-			anchorEl: null,
-            createDMUsername: '',
-			usernameValid: false
-		});
-	};
-
-	handleChangeAddDMUsername = (event) => {
-		this.setState({
-			createDMUsername: event.target.value
-        });
-    };
-    
-    handleClickCreate = () => {
-        this.props.createNewDirectMessage(this.state.createDMUsername)
-            .then(() => {
-                return this.props.reloadDirectMessageChannels();
-            })
-            .then(() => {
-                this.handleCloseAddDMPopover();
-                return;
-            })
-            .catch(() => {
-                return;
-            })
-    }
-
-    handleChangeMessage = (event) => {
-        let drafts = this.state.drafts;
-        drafts[this.state.selectedChannel.dmId] = event.target.value;
-        this.setState({
-            drafts
-        });
-    }
-
-    handleClickSend = () => {
-        // console.log(this.state.drafts[this.state.selectedChannel.dmId]);
-        let drafts = this.state.drafts;
-        if (this.state.hasChannelSelected && drafts[this.state.selectedChannel.dmId]) {
-            this.props.sendDirectMessage(this.state.selectedChannel.recipient, drafts[this.state.selectedChannel.dmId]);
-            drafts[this.state.selectedChannel.dmId] = null;
-            this.setState({
-                drafts
-            });
-        }
-    }
-
-	render() {
-		const { classes, user: { credentials: { dmEnabled } } } = this.props;
-        const loadingDirectMessages = this.props.UI.loading2;
-        const creatingDirectMessage = this.props.UI.loading3;
-        const sendingDirectMessage = this.props.UI.loading4;
-        let errors = this.props.UI.errors ? this.props.UI.errors : {};
-		dayjs.extend(relativeTime);
-
-		// Used for the add button on the dmList
-		const open = Boolean(this.state.anchorEl);
-		const id = open ? 'simple-popover' : undefined;
-
-    let dmListMarkup = this.state.dmData ? (
-			this.state.dmData.map((channel) => (
-				<Card
-					onClick={this.handleClickChannel}
-					key={channel.dmId}
-					data-key={channel.dmId}
-					className={
-						this.state.selectedChannel && this.state.selectedChannel.dmId === channel.dmId ? classes.dmCardSelected : classes.dmCardUnselected
-					}
-				>
-					<Box className={classes.dmListItemContainer}>
-						<Grid container direction="column" className={classes.dmListLayoutContainer} spacing={1}>
-							<Grid item>
-								<Grid container className={classes.dmListTextLayout}>
-									<Grid item sm />
-									<Grid item sm>
-										<Typography
-											className={
-												this.state.selectedChannel && this.state.selectedChannel.dmId === channel.dmId ? (
-													classes.dmItemUsernameSelected
-												) : (
-													classes.dmItemUsernameUnselected
-												)
-											}
-										>
-											{channel.recipient}
-										</Typography>
-									</Grid>
-									<Grid item sm>
-										<Typography
-											className={
-												this.state.selectedChannel && this.state.selectedChannel.dmId === channel.dmId ? (
-													classes.dmItemTimeSelected
-												) : (
-													classes.dmItemTimeUnselected
-												)
-											}
-										>
-											{channel.recentMessageTimestamp ? (
-												this.formatDateToTimeDiff(channel.recentMessageTimestamp)
-											) : null}
-										</Typography>
-									</Grid>
-								</Grid>
-							</Grid>
-							<Grid item className={classes.dmListRecentMessage}>
-								<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' 
-										: 
-											channel.recentMessage.length > 65 ?
-												this.shortenText(channel.recentMessage, 65)
-											:
-												channel.recentMessage
-									}
-								</Typography>
-							</Grid>
-						</Grid>
-					</Box>
-				</Card>
-			))
-		) : (
-			<p>You don't have any DMs yet</p>
-		)
-
-		let messagesMarkup =
-			this.state.selectedChannel !== null ? this.state.selectedChannel.messages.length > 0 ? (
-				this.state.selectedChannel.messages.map((messageObj) => (
-					<Grid item key={messageObj.messageId}>
-						<Card
-							className={
-								messageObj.author === this.state.selectedChannel.recipient ? (
-									classes.toMessage
-								) : (
-									classes.fromMessage
-								)
-							}
-						>
-							<Typography className={classes.messageContent}>{messageObj.message}</Typography>
-							<Typography className={classes.messageTime}>
-								{this.formatDateToString(messageObj.createdAt)}
-							</Typography>
-						</Card>
-					</Grid>
-				))
-			) : (
-				<p>No DMs here</p>
-			) : (
-				<p>Select a DM channel</p>
-			);
-
-		let addDMMarkup = (
-			<div>
-				<AddCircleIcon
-					style={{
-						color: '#1da1f2',
-						height: 82,
-						width: 82,
-						marginTop: 9,
-						cursor: 'pointer'
-					}}
-					aria-describedby={id}
-					onClick={this.handleOpenAddDMPopover}
-				/>
-				<Popover
-					id={id}
-					open={open}
-					anchorEl={this.state.anchorEl}
-					onClose={this.handleCloseAddDMPopover}
-					anchorOrigin={{
-						vertical: 'center',
-						horizontal: 'center'
-					}}
-					transformOrigin={{
-						vertical: 'top',
-						horizontal: 'center'
-					}}
-				>
-					<Box
-						style={{
-							height: 200,
-							width: 400
-						}}
-					>
-						<Grid container>
-							<Grid item sm />
-							<Grid item style={{ height: 200, width: 285 }}>
-								<Grid container direction="column" spacing={2}>
-									<Grid item>
-										<Typography style={{ marginTop: 15 }}>
-											Who would you like to start a DM with?
-										</Typography>
-									</Grid>
-									<Grid item>
-										<TextField
-											onChange={this.handleChangeAddDMUsername}
-											value={this.state.createDMUsername}
-											label="Username"
-                      variant="outlined"
-                      helperText={errors.createDirectMessage}
-                      error={errors.createDirectMessage ? true : false}
-											style={{
-                        width: 265,
-                        marginRight: 10,
-                        marginLeft: 10,
-                        textAlign: 'center',
-											}}
-										/>
-									</Grid>
-                  <Grid item> 
-                    <Button
-                      className={classes.createButton}
-                      variant="outlined"
-                      color="primary"
-                      onClick={this.handleClickCreate}
-                      disabled={
-                        creatingDirectMessage ||
-                        this.state.createDMUsername === ""    
-                      }
-                    >
-                      Create
-                      {creatingDirectMessage && 
-                      // Won't accept classes style for some reason
-                      <CircularProgress size={30} style={{position: "absolute"}}/>
-                      }
-                    </Button>
-                  </Grid>
-								</Grid>
-							</Grid>
-							<Grid item sm />
-						</Grid>
-					</Box>
-				</Popover>
-			</div>
-		);
-
-		return (
-			loadingDirectMessages ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> : 
-				(dmEnabled !== undefined && dmEnabled !== null && !dmEnabled ? <Typography>Oops! It looks like you have DMs disabled. You can enable them on the Edit Profile page.</Typography> :
-			<Grid container className={classes.pageContainer}>
-				<Grid item className={classes.sidePadding} sm />
-				<Grid item className={classes.dmList}>
-					<Grid container direction="column">
-						<Grid item className={classes.dmItemsUpper} id="dmItemsUpper">
-							{dmListMarkup}
-						</Grid>
-              <Grid item className={classes.dmItemsLower}>
-                <Card key="5555" data-key="5555" className={classes.dmCardUnselected}>
-                  <Box className={classes.dmListItemContainer}>
-                    {addDMMarkup}
-                  </Box>
-							  </Card>
-              </Grid>
-					</Grid>
-				</Grid>
-				<Grid item className={classes.messagesGrid} sm>
-					<Box>
-						{this.state.hasChannelSelected && (
-							<Card className={classes.messagesBox}>
-								<Box className={classes.messagesContainer} id="messagesContainer">
-									<Grid container direction="column">
-										{messagesMarkup}
-									</Grid>
-								</Box>
-								<Box className={classes.writeMessage}>
-									<TextField
-										className={classes.messageTextField}
-										variant="outlined"
-										multiline
-										rows={2}
-                    margin="dense"
-                    disabled={!this.state.selectedChannel.hasDirectMessagesEnabled}
-                    value={
-                      !this.state.selectedChannel.hasDirectMessagesEnabled ? 
-                        "This user has DMs disabled"
-                      :
-                        this.state.drafts[this.state.selectedChannel.dmId] ? 
-                          this.state.drafts[this.state.selectedChannel.dmId] 
-                        : 
-                          ""
-                    }
-                    onChange={this.handleChangeMessage}
-									/>
-                    <Fab 
-                      className={classes.messageButton}
-                      onClick={this.handleClickSend}
-                      disabled={
-                        sendingDirectMessage ||
-                        !this.state.drafts[this.state.selectedChannel.dmId] ||
-                        this.state.drafts[this.state.selectedChannel.dmId] === ""
-                      }
-                    >
-										<SendIcon style={{ color: '#FFFFFF' }} />
-                    {
-                      sendingDirectMessage && 
-                      <CircularProgress size={30} style={{position: "absolute"}}/>
-                      // Won't accept classes style for some reason
-                    }
-									</Fab>
-								</Box>
-							</Card>
-						)}
-            {!this.state.hasChannelSelected &&
-						this.state.dmData && <Typography>Select a DM on the left</Typography>}
-					</Box>
-				</Grid>
-				<Grid item className={classes.sidePadding} sm />
-			</Grid>
-			)
-		);
-	}
-}
-
-directMessages.propTypes = {
-	classes: PropTypes.object.isRequired,
-    getDirectMessages: PropTypes.func.isRequired,
-    createNewDirectMessage: PropTypes.func.isRequired,
-    getNewDirectMessages: PropTypes.func.isRequired,
-    reloadDirectMessageChannels: PropTypes.func.isRequired,
-    sendDirectMessage: PropTypes.func.isRequired,
-	user: PropTypes.object.isRequired,
-	UI: PropTypes.object.isRequired
-};
-
-const mapStateToProps = (state) => ({
-	user: state.user,
-	UI: state.UI,
-	directMessages: state.data.directMessages
-});
-
-const mapActionsToProps = {
-    getDirectMessages,
-    createNewDirectMessage,
-    getNewDirectMessages,
-    reloadDirectMessageChannels,
-    sendDirectMessage
-};
-
-export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(directMessages));
--- a/twistter-frontend/src/pages/editProfile.js
+++ b/twistter-frontend/src/pages/editProfile.js
@@ -1,28 +1,17 @@
 import React, { Component } from "react";
-import { Link } from 'react-router-dom';
 import axios from "axios";
 import PropTypes from "prop-types";
-
-import noImage from '../images/no-img.png';
+// TODO: Add a read-only '@' in the left side of the handle input
+// TODO: Add a cancel button, that takes the user back to their profile page

 // Material-UI stuff
-import Box from "@material-ui/core/Box"
 import Button from "@material-ui/core/Button";
+import { Link } from 'react-router-dom';
 import CircularProgress from "@material-ui/core/CircularProgress";
 import Grid from "@material-ui/core/Grid";
-import Popover from "@material-ui/core/Popover";
 import TextField from "@material-ui/core/TextField";
 import Typography from "@material-ui/core/Typography";
 import withStyles from "@material-ui/core/styles/withStyles";
-import FormControlLabel from "@material-ui/core/FormControlLabel";
-import Switch from "@material-ui/core/Switch";
-import IconButton from "@material-ui/core/IconButton";
-import EditIcon from "@material-ui/icons/Edit";
-import Tooltip from "@material-ui/core/Tooltip";
-
-// Redux stuff
-import { connect } from "react-redux";
-import { uploadImage } from "../redux/actions/userActions";

 const styles = {
  form: {
@@ -39,77 +28,34 @@ const styles = {
    positon: "relative",
    marginBottom: 30
  },
-  box: {
-    position: "relative"
-  },
-  back: {
-    float: "left",
-    marginLeft: 15
-  },
-  delete: {
-    float: "right",
-    marginRight: 15
-  },
  progress: {
    position: "absolute"
-  },
-  uploadProgress: {
-    position: "absolute",
-    marginLeft: -155,
-    marginTop: 95
-  },
-  popoverBackground: {
-    marginTop: "-100px",
-    width: "calc(100vw)",
-    height: 'calc(100vh + 100px)',
-    backgroundColor: "gray",
-    position: "absolute",
-    opacity: "70%"
  }
 };

-export class editProfile extends Component {
-  // mapReduxToState = (credentials) => {
-  //   this.setState({
-  //     imageUrl: credentials.imageUrl ? credentials.imageUrl : noImage,
-  //     firstName: credentials.firstName ? credentials.firstName : '',
-  //     lastName: credentials.lastName ? credentials.lastName : '',
-  //     email: credentials.email ? credentials.email : 'error, email doesn\'t exist',
-  //     handle: credentials.handle ? credentials.handle : 'error, handle doesn\'t exist',
-  //     bio: credentials.bio ? credentials.bio : ''
-  //   });
-  // };
-
+export class edit extends Component {
  // Runs as soon as the page loads.
  // Sets the default values of all the textboxes to the data
  // that is stored in the database for the user.
  componentDidMount() {
-    // const { credentials } = this.props;
-    // console.log(this.props.user);
-    // this.mapReduxToState(credentials);
-    this.setState({pageLoading: true})
-
    axios
      .get("/getProfileInfo")
      .then((res) => {
-        // Need to have the ternary if statements, because react throws an error if
-        // any of the res.data keys are undefined
        this.setState({
-          imageUrl: res.data.imageUrl,
-          firstName: res.data.firstName ? res.data.firstName : "",
-          lastName: res.data.lastName ? res.data.lastName : "",
+          firstName: res.data.firstName,
+          lastName: res.data.lastName,
          email: res.data.email,
          handle: res.data.handle,
-          bio: res.data.bio ? res.data.bio : "",
-          dmEnabled: res.data.dmEnabled === false ? false : true,
-          pageLoading: false
+          bio: res.data.bio
        });
      })
      .catch((err) => {
        console.error(err);
        if (err.response.status === 403) {
-          // This user is not logged in
-          this.props.history.push('/');
+          alert("You are not logged in");
+          // TODO: Redirect them, to the profile they are trying to edit
+          // If they are on /itsjimmy/edit, they will be redirected to /itsjimmy
+          this.props.history.push('../');
        }
      });
  }
@@ -118,17 +64,12 @@ export class editProfile extends Component {
  constructor() {
    super();
    this.state = {
-      imageUrl: "",
      firstName: "",
      lastName: "",
      email: "",
      handle: "",
      bio: "",
-      dmEnabled: false,
-      togglingDirectMessages: false,
-      anchorEl: null,
      loading: false,
-      pageLoading: false,
      errors: {}
    };
  }
@@ -163,11 +104,11 @@ export class editProfile extends Component {
        this.setState({
          loading: false
        });
-        this.props.history.push('/user');
+        // this.props.history.push('/');
+        // TODO: Need to redirect user to their profile page
      })
      .catch((err) => {
        console.log(err);
-        // TODO: Should redirect to login page if they get a 403
        this.setState({
          errors: err.response.data,
          loading: false
@@ -188,324 +129,136 @@ export class editProfile extends Component {
    });
  };

-  handleDMSwitch = () => {
-    let enable;
-    
-    if (this.state.dmEnabled) {
-      enable = {enable: false};
-    } else {
-      enable = {enable: true};
-    }
-
-    this.setState({
-      dmEnabled: enable.enable,
-      togglingDirectMessages: true
-    });
-
-    axios.post("/dms/toggle", enable)
-      .then(() => {
-        this.setState({
-          togglingDirectMessages: false
-        });
-      })
-  }
-
-  handleImageChange = (event) => {
-    if (event.target.files[0]) {
-      const image = event.target.files[0];
-      const formData = new FormData();
-      formData.append('image', image, image.name);
-      this.props.uploadImage(formData);
-    }
-  }
-
-  handleEditPicture = () => {
-    const fileInput = document.getElementById('imageUpload');
-    fileInput.click();
-  }
-
-  // logging = () => {
-  //   console.log(this.state);
-  //   console.log(this.props);
-  //   this.mapReduxToState(this.props.credentials);
-  // }
-
-  handleOpenConfirmDelete = (event) => {
-		this.setState({
-      // anchorEl: event.currentTarget
-      anchorEl: document.getElementById("container-grid")
-		});
-	};
-
-	handleCloseConfirmDelete = () => {
-		this.setState({
-			anchorEl: null,
-            createDMUsername: ''
-		});
-	};
-
  render() {
    const { classes } = this.props;
-    const uploading = this.props.UI.loading;
    const { errors, loading } = this.state;

-
-    let imageMarkup = this.props.user.credentials.imageUrl ? (
-      <Box
-      // className={classes.box}
-      >
-        <img
-        src={this.props.user.credentials.imageUrl}
-        height="250"
-        width="250"
-        className={classes.box}/>
-        {uploading && (
-          <CircularProgress size={60} className={classes.uploadProgress} />
-        )}
-      </Box>
-    ) : (
-      <Box
-      // className={classes.box}
-      >
-        <img
-        src={noImage}
-        height="250"
-        width="250"
-        className={classes.box}/>
-        {uploading && (
-          <CircularProgress size={60} className={classes.uploadProgress} />
-        )}
-      </Box>
-    )
-
-    // Used for the delete button
-		const open = Boolean(this.state.anchorEl);
-		const id = open ? 'simple-popover' : undefined;
-
    return (
-      this.state.pageLoading ? 
-        <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>
-      :
-        <Grid container className={classes.form} id="container-grid">
-          <Grid item sm >
-            <Button
+      <Grid container className={classes.form}>
+        <Grid item sm />
+        <Grid item sm>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Edit Profile
+          </Typography>
+          <form noValidate onSubmit={this.handleSubmit}>
+            <Grid container className={classes.form} spacing={4}>
+              <Grid item sm>
+                <TextField
+                  id="firstName"
+                  name="firstName"
+                  label="First Name"
+                  className={classes.textField}
+                  value={this.state.firstName}
+                  helperText={errors.firstName}
+                  error={errors.firstName ? true : false}
+                  variant="outlined"
+                  onChange={this.handleChange}
+                  fullWidth
+                />
+              </Grid>
+              <Grid item sm>
+                <TextField
+                  id="lastName"
+                  name="lastName"
+                  label="Last Name"
+                  className={classes.textField}
+                  value={this.state.lastName}
+                  helperText={errors.lastname}
+                  error={errors.lastName ? true : false}
+                  variant="outlined"
+                  onChange={this.handleChange}
+                  fullWidth
+                />
+              </Grid>
+            </Grid>
+            <TextField
+              id="email"
+              name="email"
+              label="Email*"
+              className={classes.textField}
+              value={this.state.email}
+              disabled
+              helperText="(disabled)"
+              // INFO: These will be uncommented if changing emails is allowed
+              // helperText={errors.email}
+              // error={errors.email ? true : false}
              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="handle"
+              name="handle"
+              label="Handle*"
+              className={classes.textField}
+              value={this.state.handle}
+              disabled
+              helperText="(disabled)"
+              // INFO: These will be uncommented if changing usernames is allowed
+              // helperText={errors.handle}
+              // error={errors.handle ? true : false}
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <TextField
+              id="bio"
+              name="bio"
+              label="Bio"
+              className={classes.textField}
+              value={this.state.bio}
+              helperText={errors.bio}
+              error={errors.bio ? true : false}
+              multiline
+              rows="8"
+              variant="outlined"
+              onChange={this.handleChange}
+              fullWidth
+            />
+            <Button
+              type="submit"
+              variant="contained"
              color="primary"
-//               className={classes.button}
-              disabled={loading || uploading}
-              className={classes.back}
+              className={classes.button}
+              disabled={loading}
+              //component={ Link }
+              //to='/user'
+            >
+              Submit
+              {loading && (
+                <CircularProgress size={30} className={classes.progress} />
+              )}
+            </Button>
+            <br />
+            <Button
+              //variant="contained"
+              color="primary"
+              className={classes.button}
              component={ Link }
              to='/user'
            >
              Back to Profile
            </Button>
-          </Grid>
-          <Grid item sm>
-            <Typography variant="h2" className={classes.pageTitle}>
-              Edit Profile
-            </Typography>
-            <form noValidate onSubmit={this.handleSubmit}>
-              {imageMarkup}
-              <input type="file" id="imageUpload" onChange={this.handleImageChange} hidden = "hidden"/>
-              <Tooltip title="Edit profile picture" placement="top">
-              <IconButton onClick={this.handleEditPicture} className="button">
-              <EditIcon color="primary"/>
-              </IconButton></Tooltip>
-              <Grid container className={classes.form} spacing={4}>
-                <Grid item sm>
-                  <TextField
-                    id="firstName"
-                    name="firstName"
-                    label="First Name"
-                    className={classes.textField}
-                    value={this.state.firstName}
-                    helperText={errors.firstName}
-                    error={errors.firstName ? true : false}
-                    variant="outlined"
-                    onChange={this.handleChange}
-                    fullWidth
-                    autoComplete='off'
-                  />
-                </Grid>
-                <Grid item sm>
-                  <TextField
-                    id="lastName"
-                    name="lastName"
-                    label="Last Name"
-                    className={classes.textField}
-                    value={this.state.lastName}
-                    helperText={errors.lastname}
-                    error={errors.lastName ? true : false}
-                    variant="outlined"
-                    onChange={this.handleChange}
-                    fullWidth
-                    autoComplete='off'
-                  />
-                </Grid>
-              </Grid>
-              <TextField
-                id="email"
-                name="email"
-                label="Email*"
-                className={classes.textField}
-                value={this.state.email}
-                disabled
-                helperText="(disabled)"
-                // INFO: These will be uncommented if changing emails is allowed
-                // helperText={errors.email}
-                // error={errors.email ? true : false}
-                variant="outlined"
-                onChange={this.handleChange}
-                fullWidth
-                autoComplete='off'
-              />
-              <TextField
-                id="handle"
-                name="handle"
-                label="Handle*"
-                className={classes.textField}
-                value={"@" + this.state.handle}
-                disabled
-                helperText="(disabled)"
-                // INFO: These will be uncommented if changing usernames is allowed
-                // helperText={errors.handle}
-                // error={errors.handle ? true : false}
-                variant="outlined"
-                onChange={this.handleChange}
-                fullWidth
-                autoComplete='off'
-              />
-              <TextField
-                id="bio"
-                name="bio"
-                label="Bio"
-                className={classes.textField}
-                value={this.state.bio}
-                helperText={errors.bio}
-                error={errors.bio ? true : false}
-                multiline
-                rows="8"
-                variant="outlined"
-                onChange={this.handleChange}
-                fullWidth
-                autoComplete='off'
-              />
-              <FormControlLabel
-                control={
-                  <Switch
-                    color="primary"
-                    disabled={this.state.togglingDirectMessages} 
-                    checked={this.state.dmEnabled} 
-                    onChange={this.handleDMSwitch} 
-                  />
-                }
-                label="Enable Direct Messages"
-              />
-              <br></br>
-              <Button
-                type="submit"
-                variant="contained"
-                color="primary"
-                className={classes.button}
-                disabled={loading}
-                //component={ Link }
-                //to='/user'
-              >
-                Submit
-                {loading && (
-                  <CircularProgress size={30} className={classes.progress} />
-                )}
-              </Button>
-              
-            </form>
-          </Grid>
-          <Grid item sm>
+            <br />
            <Button
-              variant="outlined"
+              variant="contained"
              color="secondary"
-              className={classes.delete}
-              onClick={this.handleOpenConfirmDelete}
+              className={classes.button}
+              component={ Link }
+              to='/delete'
            >
              Delete Account
            </Button>
-          </Grid>
-          <Box hidden={!Boolean(this.state.anchorEl)} className={classes.popoverBackground}></Box>
-          <Popover
-              id={id}
-              open={open}
-              anchorEl={this.state.anchorEl}
-              onClose={this.handleCloseConfirmDelete}
-              anchorOrigin={{
-                vertical: 'center',
-                horizontal: 'center'
-              }}
-              transformOrigin={{
-                vertical: 'top',
-                horizontal: 'center'
-              }}
-              style={{
-                marginTop: "-200px"
-              }}
-            >
-              <Box
-                style={{
-                  height: 200,
-                  width: 400
-                }}
-              >
-                <Grid container direction="column" spacing={3}>
-                  <Grid item>
-                      <Typography style={{marginTop: 30, marginLeft: 50, marginRight: 50, textAlign: "center", fontSize: 24}}>Are you sure you want to delete your account?</Typography>
-                  </Grid>
-                  <Grid item>
-                    <Button 
-                      color="secondary"
-                      variant="contained"
-                      component={ Link }
-                      to='/delete'
-                      style={{
-                        marginBottom: "-40px",
-                        marginLeft: 10,
-                        width: 90
-                      }}
-                    >
-                      Yes
-                    </Button>
-                    <Button 
-                      color="primary"
-                      variant="outlined"
-                      onClick={this.handleCloseConfirmDelete}
-                      style={{
-                        marginBottom: "-40px",
-                        marginLeft: 195
-                      }}
-                    >
-                      Cancel
-                    </Button>
-                  </Grid>
-                </Grid>
-              </Box>
-            </Popover>
+          </form>
        </Grid>
+        <Grid item sm />
+      </Grid>
    );
  }
 }

-
-const mapStateToProps = (state) => ({
-  user: state.user,
-  UI: state.UI,
-  // credentials: state.user.credentials
-});
-
-const mapActionsToProps = { uploadImage }
-
-editProfile.propTypes = {
-  uploadImage: PropTypes.func.isRequired,
-  classes: PropTypes.object.isRequired,
-	user: PropTypes.object.isRequired,
-	UI: PropTypes.object.isRequired
+edit.propTypes = {
+  classes: PropTypes.object.isRequired
 };

-// export default withStyles(styles)(edit);
-export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(editProfile));
+export default withStyles(styles)(edit);
--- a/twistter-frontend/src/pages/otherUser.js
+++ b/twistter-frontend/src/pages/otherUser.js
@@ -1,360 +0,0 @@
-/* eslint-disable */
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import axios from "axios";
-//import '../App.css';
-
-// Material UI and React Router
-import { makeStyles, styled } from "@material-ui/core/styles";
-import withStyles from "@material-ui/core/styles/withStyles";
-
-import { Link } from "react-router-dom";
-import Card from "@material-ui/core/Card";
-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 Chip from "@material-ui/core/Chip";
-import Typography from "@material-ui/core/Typography";
-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";
-import noImage from "../images/no-img.png";
-import Writing_Microblogs from "../Writing_Microblogs";
-
-const MyChip = styled(Chip)({
-  margin: 2,
-  color: "primary"
-});
-
-const styles = {
-  button: {
-    positon: "relative",
-    float: "left",
-    marginLeft: 30,
-    marginTop: 20
-  },
-  paper: {
-    // marginLeft: "10%",
-    // marginRight: "10%"
-  },
-  card: {
-    marginBottom: 5
-  },
-  profileImage: {
-    marginTop: 20
-  },
-  topicsContainer: {
-    border: "lightgray solid 1px",
-    marginTop: 20,
-    paddingTop: 10,
-    paddingBottom: 10,
-    height: 300
-  },
-  addCircle: {
-    width: 65,
-    height: 65,
-    marginTop: 10
-  },
-  username: {
-    marginBottom: 100
-  }
-};
-
-class user extends Component {
-  constructor() {
-    super();
-    this.state = {
-      profile: window.location.pathname.split("/").pop(),
-      imageUrl: null,
-      topics: null,
-      user: null,
-      following: null,
-      posts: null,
-      myTopics: null,
-      followingList: null,
-      loading: false
-    };
-  }
-
-  handleSub = () => {
-    if (this.state.following === true) {
-      axios
-        .post("/removeSub", {
-          unfollow: this.state.profile
-        })
-        .then(res => {
-          console.log("removed sub");
-          this.setState({
-            following: false,
-            myTopics: []
-          });
-        })
-        .catch(function(err) {
-          console.log(err);
-        });
-    } else {
-      axios
-        .post("/addSubscription", {
-          following: this.state.profile
-        })
-        .then(res => {
-          console.log("adding sub");
-          this.setState({
-            following: true
-          });
-        })
-        .catch(function(err) {
-          console.log(err);
-        });
-    }
-  };
-
-  handleAdd = newTopic => {
-    axios
-      .post("/putNewTopic", {
-        handle: this.state.profile,
-        topic: newTopic
-      })
-      .then(() => {
-        let temp = this.state.myTopics;
-        temp.push(newTopic);
-        this.setState({
-          myTopics: temp
-        });
-      })
-      .catch(err => {
-        console.err(err);
-      });
-  };
-
-  componentDidMount() {
-    this.setState({ loading: true });
-    let otherUserPromise = axios
-      .post("/getUserDetails", {
-        handle: this.state.profile
-      })
-      .then(res => {
-        this.setState({
-          imageUrl: res.data.userData.imageUrl,
-          topics: res.data.userData.followedTopics
-        });
-      })
-      .catch(err => console.log(err));
-
-    let userPromise = axios
-      .get("/user")
-      .then(res => {
-        let list = [];
-        let fol = false;
-        res.data.credentials.following.forEach(follow => {
-          // console.log(follow);
-          if (this.state.profile === follow.handle) {
-            fol = true;
-            list = follow.topics;
-          }
-        });
-        this.setState({
-          following: fol,
-          myTopics: list
-        });
-      })
-      .catch(err => console.log(err));
-
-    let posts = axios
-      .post("/getOtherUsersPosts", {
-        handle: this.state.profile
-      })
-      .then(res => {
-        // console.log(res.data);
-        this.setState({
-          posts: res.data
-        });
-      })
-      .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() {
-    const { classes } = this.props;
-
-    let followMarkup = this.state.following ? (
-      <Button variant="contained" color="primary" onClick={this.handleSub}>
-        unfollow
-      </Button>
-    ) : (
-      <Button variant="contained" color="primary" onClick={this.handleSub}>
-        follow
-      </Button>
-    );
-    let profileMarkup = this.state.profile ? (
-      <div>
-        <Typography variant="h5">
-          @{this.state.profile}{" "}
-          {this.state.verified ? (
-            <VerifiedIcon style={{ fill: "#1397D5" }} />
-          ) : null}
-        </Typography>
-        {followMarkup}
-      </div>
-    ) : (
-      <p>loading username...</p>
-    );
-
-    // console.log(this.state.topics);
-    // console.log(this.state.myTopics);
-    let topicsMarkup = this.state.topics ? (
-      this.state.topics.map(
-        topic =>
-          this.state.myTopics ? (
-            this.state.myTopics.includes(topic) ? (
-              <MyChip
-                label={topic}
-                key={{ topic }.id}
-                onDelete
-                deleteIcon={<DoneIcon />}
-              />
-            ) : this.state.following ? (
-              <MyChip
-                label={topic}
-                key={{ topic }.id}
-                color="secondary"
-                clickable
-                onClick={key => this.handleAdd(topic)}
-              />
-            ) : (
-              <MyChip label={topic} key={{ topic }.id} color="secondary" />
-            )
-          ) : (
-            <p></p>
-          )
-        // topic => <MyChip label={topic} key={{ topic }.topic.id} /> // console.log({ topic }.topic.id)
-      )
-    ) : (
-      <p> no topic yet</p>
-    );
-
-    let imageMarkup = this.state.imageUrl ? (
-      <img src={this.state.imageUrl} height="150" width="150" />
-    ) : (
-      <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}>
-          <CardContent>
-            <Typography>
-              {this.state.imageUrl ? (
-                <img src={this.state.imageUrl} height="50" width="50" />
-              ) : (
-                <img src={noImage} height="50" width="50" />
-              )}
-            </Typography>
-            <Typography variant="h4">
-              <b>{post.userHandle}</b>
-            </Typography>
-            <Typography variant="body2" color={"textSecondary"}>
-              {this.formatDate(post.createdAt)}
-            </Typography>
-
-            <br />
-            <Typography variant="body1">
-              <b>{post.microBlogTitle}</b>
-            </Typography>
-            <Typography variant="body2">{post.quoteBody}</Typography>
-
-            <br />
-            <Typography variant="body2">{post.body}</Typography>
-            <br />
-            <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics.join(", ")}
-            </Typography>
-            <br />
-            <Typography variant="body2" color={"textSecondary"}>
-              Likes {post.likeCount}
-            </Typography>
-          </CardContent>
-        </Card>
-      ))
-    ) : (
-      <p>Posts</p>
-    );
-
-    return this.state.loading ? (
-      <CircularProgress
-        size={60}
-        style={{ marginTop: "300px" }}
-      ></CircularProgress>
-    ) : (
-      <Grid container spacing={10}>
-        <Grid item sm={4} xs={8}>
-          {imageMarkup}
-          {profileMarkup}
-          {/* {followMarkup} */}
-          {topicsMarkup}
-          <br />
-        </Grid>
-        <Grid item sm={4} xs={8}>
-          {postMarkup}
-          <br />
-        </Grid>
-      </Grid>
-    );
-  }
-}
-
-const mapStateToProps = state => ({
-  user: state.user
-});
-
-user.propTypes = {
-  user: PropTypes.object.isRequired,
-  classes: PropTypes.object.isRequired
-};
-
-export default connect(mapStateToProps)(withStyles(styles)(user));
--- a/twistter-frontend/src/pages/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -1,103 +1,46 @@
 /* eslint-disable */
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
-import axios from "axios";
-//import '../App.css';
-// Material-UI
-import withStyles from "@material-ui/core/styles/withStyles";
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import axios from 'axios';
+//import '../App.css';
+
+// Material UI and React Router
 import { makeStyles, styled } from "@material-ui/core/styles";
-import { Link } from "react-router-dom";
+import { Link } from 'react-router-dom';
 import Card from "@material-ui/core/Card";
-import CardMedia from "@material-ui/core/CardMedia";
-import CardContent from "@material-ui/core/CardContent";
-import Button from "@material-ui/core/Button";
+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";
 import AddCircle from "@material-ui/icons/AddCircle";
 import TextField from "@material-ui/core/TextField";
-import VerifiedIcon from "@material-ui/icons/CheckSharp";
-import Paper from "@material-ui/core/Paper";
-import GridList from "@material-ui/core/GridList";
-import GridListTile from "@material-ui/core/GridListTile";
-import GridListTileBar from "@material-ui/core/GridListTileBar";
-import Container from "@material-ui/core/Container";

 // component
-import "../App.css";
-import noImage from "../images/no-img.png";
-import Writing_Microblogs from "../Writing_Microblogs";
-
+import '../App.css';
+import noImage from '../images/no-img.png';
+import Writing_Microblogs from '../Writing_Microblogs';
 const MyChip = styled(Chip)({
  margin: 2,
  color: "primary"
 });

-const styles = {
-  button: {
-    positon: "relative",
-    float: "left",
-    marginLeft: 30,
-    marginTop: 20
-  },
-  paper: {
-    // marginLeft: "10%",
-    // marginRight: "10%"
-  },
-  card: {
-    marginBottom: 5
-  },
-  profileImage: {
-    marginTop: 20
-  },
-  topicsContainer: {
-    border: "lightgray solid 1px",
-    marginTop: 20,
-    paddingTop: 10,
-    paddingBottom: 10,
-    height: 300
-  },
-  addCircle: {
-    width: 65,
-    height: 65,
-    marginTop: 10
-  },
-  username: {
-    marginBottom: 100
-  }
-};
-
 class user extends Component {
-  constructor() {
-    super();
-    this.state = {
-      profile: null,
-      imageUrl: null,
-      topics: null,
-      newTopic: "",
-      loading: false
-    };
-  }
+  state = {
+    profile: null,
+    imageUrl: null,
+    topics: null,
+    newTopic: null
+  };

  handleDelete = topic => {
-    console.log(topic);
    axios
-      .post(`/deleteTopic`, {
-        unfollow: topic
-      })
-      .then(() => {
-        let tempTopics = this.state.topics;
-        tempTopics.forEach((oldTopic, index) => {
-          if (oldTopic === topic) {
-            tempTopics.splice(index, 1);
-          }
-        });
-        this.setState({
-          topics: tempTopics
-        });
+      .delete(`/deleteTopic/${topic.id}`)
+      .then(function() {
+        location.reload();
      })
      .catch(function(err) {
        console.log(err);
@@ -107,15 +50,10 @@ class user extends Component {
  handleAddCircle = () => {
    axios
      .post("/putTopic", {
-        following: this.state.newTopic
+        topic: this.state.newTopic
      })
-      .then(() => {
-        let tempTopics = this.state.topics;
-        tempTopics.push(this.state.newTopic);
-        this.setState({
-          topics: tempTopics,
-          newTopic: ""
-        });
+      .then(function() {
+        location.reload();
      })
      .catch(function(err) {
        console.log(err);
@@ -129,68 +67,49 @@ class user extends Component {
  }

  componentDidMount() {
-    this.setState({loading: true})
-    let userPromise = axios
+    axios
      .get("/user")
      .then(res => {
        this.setState({
          profile: res.data.credentials.handle,
-          imageUrl: res.data.credentials.imageUrl,
-          verified: res.data.credentials.verified
-            ? res.data.credentials.verified
-            : false,
-          topics: res.data.credentials.followedTopics
+          imageUrl: res.data.credentials.imageUrl
        });
      })
      .catch(err => console.log(err));

-    let postsPromise = axios
+    axios
+      .get("/getAllTopics")
+      .then(res => {
+        this.setState({
+          topics: res.data
+        });
+      })
+      .catch(err => console.log(err));
+
+    axios
      .get("/getallPostsforUser")
      .then(res => {
-        // console.log(res.data);
+        console.log(res.data);
        this.setState({
          posts: res.data
-        });
+        })
      })
      .catch(err => console.log(err));
-
-      Promise.all([userPromise, postsPromise])
-        .then(() => {
-          this.setState({loading: false});
-        })
-        .catch((error) => {
-          console.log(error)
-        })
-  }
-
-  formatDate(dateString) {
-    let newDate = new Date(Date.parse(dateString));
-    return newDate.toDateString();
  }

  render() {
-    const { classes } = this.props;
    let authenticated = this.props.user.authenticated;
-
+    let classes = this.props;
    let profileMarkup = this.state.profile ? (
-      <div>
-        <Typography variant="h5" className={classes.username}>
-          @{this.state.profile}{" "}
-          {this.state.verified ? (
-            <VerifiedIcon style={{ fill: "#1397D5" }} />
-          ) : null}
-        </Typography>
-      </div>
-    ) : (
-      <p className={classes.username}>loading username...</p>
-    );
-
+      <p>
+      <Typography variant='h5'>{this.state.profile}</Typography>
+      </p>) : (<p>loading username...</p>);
    let topicsMarkup = this.state.topics ? (
      this.state.topics.map(
        topic => (
          <MyChip
-            label={topic}
-            key={topic}
+            label={{ topic }.topic.topic}
+            key={{ topic }.topic.id}
            onDelete={key => this.handleDelete(topic)}
          />
        ) // console.log({ topic }.topic.id)
@@ -199,151 +118,74 @@ class user extends Component {
      <p> loading topics...</p>
    );

-    let imageMarkup = this.state.imageUrl ? (
-      <img
-        className={classes.profileImage}
-        src={this.state.imageUrl}
-        height="250"
-        width="250"
-      />
-    ) : (
-      <img
-        className={classes.profileImage}
-        src={noImage}
-        height="250"
-        width="250"
-      />
-    );
+    let imageMarkup = this.state.imageUrl ? (<img src={this.state.imageUrl} height="150" width="150" />) : 
+                                            (<img src={noImage} height="150" width="150"/>);

    let postMarkup = this.state.posts ? (
-      this.state.posts.map(post => (
-        <Card className={classes.card} key={post.postId}>
+      this.state.posts.map(post => 
+        <Card>
          <CardContent>
            <Typography>
-              {this.state.imageUrl ? (
-                <img src={this.state.imageUrl} height="50" width="50" />
-              ) : (
-                <img src={noImage} height="50" width="50" />
-              )}
+              {
+                this.state.imageUrl ? (<img src={this.state.imageUrl} height="250" width="250" />) : 
+                                      (<img src={noImage} height="50" width="50"/>)
+              }
            </Typography>
-            <Typography variant="h6">
-              <b>{post.userHandle}</b>
-            </Typography>
-            <Typography variant="body2" color={"textSecondary"}>
-              {this.formatDate(post.createdAt) }
-            </Typography>
-
-            <br />
-            <Typography variant="body1">
-              <b>{post.microBlogTitle}</b>
-            </Typography>
-            <Typography variant="body2">{post.quoteBody}</Typography>
-
+            <Typography variant="h7"><b>{post.userHandle}</b></Typography>
+            <Typography variant="body2" color={"textSecondary"}>{post.createdAt}</Typography>
            <br />
+            <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
            <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 />
-            <Typography variant="body2" color={"textSecondary"}>
-              Likes {post.likeCount}
-            </Typography>
+            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
          </CardContent>
        </Card>
-      ))
-    ) : (
-      <p>My Posts</p>
-    );
-
-    // FIX: This needs to check if user's profile page being displayed
-    // is the same as the user who is logged in
-    // Can't check for that right now, because this page is always
-    // showing the logged in users profile, instead of retreiving the
-    // profile based on the URL entered
-    let editButtonMarkup = true ? (
-      <Link to="/user/edit">
-        <Button className={classes.button} variant="outlined" color="primary">
-          Edit Profile
-        </Button>
-      </Link>
-    ) : null;
-
-    let verifyButtonMarkup = this.state.profile === "Admin" ?
-      <Link to="/verify">
-        <Button className={classes.button} variant="outlined" color="primary">
-          Verify Users
-        </Button>
-      </Link>
-    :
-      null
+      )
+    ) : (<p>My Posts</p>);

    return (
-      this.state.loading ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
-      <div>
-        {/* <Paper className={classes.paper}> */}
-        <Grid container direction="column">
-          <Grid item>
-            <Grid container>
-              <Grid item sm>
-                {editButtonMarkup}
-                {verifyButtonMarkup}
-              </Grid>
-              <Grid item sm>
-                {/* <Grid container direction="column"> */}
-                {/* <Grid item sm> */}
-                {imageMarkup}
-                {profileMarkup}
-                {/* </Grid> */}
-                {/* <Grid item sm> */}
-                {/* {postMarkup} */}
-                {/* </Grid> */}
-                {/* </Grid> */}
-              </Grid>
-              <Grid item sm>
-                <Container className={classes.topicsContainer} maxWidth="xs">
-                  {topicsMarkup}
-                </Container>
-                <TextField
-                  id="newTopic"
-                  label="new topic"
-                  // defaultValue=""
-                  margin="normal"
-                  variant="outlined"
-                  value={this.state.newTopic}
-                  onChange={event => this.handleChange(event)}
-                />
-                <AddCircle
-                  className={classes.addCircle}
-                  color="primary"
-                  // iconStyle={classes.addCircle}
-                  clickable="true"
-                  onClick={this.handleAddCircle}
-                  cursor="pointer"
-                />
-              </Grid>
-            </Grid>
-          </Grid>
-          <Grid item>
-            <Grid container>
-              <Grid item sm />
-              <Grid item>{postMarkup}</Grid>
-              <Grid item sm />
-            </Grid>
-          </Grid>
+      <Grid container spacing={24}>
+        <Grid item sm={4} xs={8}>
+          {imageMarkup}
+          {profileMarkup}
+          {topicsMarkup}
+          <TextField
+          id="newTopic"
+          label="new topic"
+          defaultValue=""
+          margin="normal"
+          variant="outlined"
+          value={this.state.newTopic}
+          onChange={(event) => this.handleChange(event)}
+          />
+          <AddCircle
+            color="primary"
+            clickable
+            onClick={this.handleAddCircle}
+          />
+          <br />
+          {authenticated && <Button component={ Link } to='/edit'>Edit Profile Info</Button>}
        </Grid>
-      </div>
+        <Grid item sm={4} xs={8}>
+          {postMarkup}
+        </Grid>
+        <Grid item sm={4} xs={8}>
+          <Writing_Microblogs />
+        </Grid>
+              
+      </Grid>
    );
  }
 }

-const mapStateToProps = state => ({
+const mapStateToProps = (state) => ({
  user: state.user
-});
+})

 user.propTypes = {
-  user: PropTypes.object.isRequired,
-  classes: PropTypes.object.isRequired
-};
+  user: PropTypes.object.isRequired
+}

-export default connect(mapStateToProps)(withStyles(styles)(user));
+export default connect(mapStateToProps)(user);
--- a/twistter-frontend/src/pages/verify.js
+++ b/twistter-frontend/src/pages/verify.js
@@ -1,153 +0,0 @@
-import React, { Component } from "react";
-import axios from "axios";
-import PropTypes from "prop-types";
-// TODO: Add a read-only '@' in the left side of the handle input
-// TODO: Add a cancel button, that takes the user back to their profile page
-
-// Material-UI stuff
-import Button from "@material-ui/core/Button";
-import { Link } from 'react-router-dom';
-import CircularProgress from "@material-ui/core/CircularProgress";
-import Grid from "@material-ui/core/Grid";
-import TextField from "@material-ui/core/TextField";
-import Typography from "@material-ui/core/Typography";
-import withStyles from "@material-ui/core/styles/withStyles";
-
-const styles = {
-  form: {
-    textAlign: "center"
-  },
-  textField: {
-    marginBottom: 30
-  },
-  pageTitle: {
-    // marginTop: 20,
-    marginBottom: 40
-  },
-  button: {
-    positon: "relative",
-    marginBottom: 10
-  },
-  progress: {
-    position: "absolute"
-  }
-};
-
-export class verify extends Component {
-
-  // Constructor for the state
-  constructor() {
-    super();
-    this.state = {
-      handle: "",
-      loading: false,
-      errors: {}
-    };
-  }
-
-//   // Runs whenever the submit button is clicked.
-  handleSubmit = (event) => {
-    event.preventDefault();
-    this.setState({
-      loading: true
-    });
-    const verifyHandle = {
-      user: this.state.handle
-    };
-      
-    axios
-      .post("/verifyUser", verifyHandle)
-      .then((res) => {
-        console.log(res);
-        this.setState({
-          loading: false
-        });
-        // this.props.history.push('/');
-        // TODO: Need to redirect user to their profile page
-      })
-      .catch((err) => {
-        console.log(err);
-        this.setState({
-          errors: err.response.data,
-          loading: false
-        });
-      });
-  };
-
-  // Updates the state whenever one of the textboxes changes.
-  // The key is the name of the textbox and the value is the
-  // value in the text box.
-  // Also sets errors to null of textboxes that have been edited
-  handleChange = (event) => {
-    this.setState({
-      [event.target.name]: event.target.value,
-      errors: {
-        [event.target.name]: null
-      }
-    });
-  };
-
-  render() {
-    const { classes } = this.props;
-    const { loading } = this.state;
-
-    return (
-      <Grid container className={classes.form}>
-        <Grid item sm />
-        <Grid item sm>
-          <Typography variant="h4" className={classes.pageTitle}>
-            Verify Users
-          </Typography>
-          <form noValidate onSubmit={this.handleSubmit}>
-            <TextField
-              id="handle"
-              name="handle"
-              label="Username"
-              className={classes.textField}
-              value={this.state.handle}
-              // helperText={errors.handle}
-              // error={errors.handle ? true : false}
-              variant="outlined"
-              onChange={this.handleChange}
-              fullWidth
-            />
-            <Grid container direction="column">
-              <Grid item>
-                <Button
-                  type="submit"
-                  variant="contained"
-                  color="primary"
-                  className={classes.button}
-                  disabled={loading}
-                >
-                  Submit
-                  {loading && (
-                    <CircularProgress size={30} className={classes.progress} />
-                  )}
-                </Button>
-              </Grid>
-              <Grid item>
-                <Button
-                  variant="oulined"
-                  color="primary"
-                  // className={classes.button}
-                  component={ Link }
-                  to='/user'
-                >
-                  Back to Profile
-                </Button>
-              </Grid>
-            </Grid>
-          </form>
-        </Grid>
-        <Grid item sm />
-      </Grid>
-    );
-  }
-}
-
-verify.propTypes = {
-  classes: PropTypes.object.isRequired
-};
-
-export default withStyles(styles)(verify);
--- a/twistter-frontend/src/redux/actions/dataActions.js
+++ b/twistter-frontend/src/redux/actions/dataActions.js
@@ -1,147 +0,0 @@
-import {
-    SET_DIRECT_MESSAGES, 
-    LOADING_UI, 
-    SET_ERRORS, 
-    CLEAR_ERRORS,
-    SET_LOADING_UI_2,
-    SET_LOADING_UI_3,
-    SET_LOADING_UI_4,
-    SET_NOT_LOADING_UI_2,
-    SET_NOT_LOADING_UI_3,
-    SET_NOT_LOADING_UI_4
-} from '../types';
-import axios from "axios";
-
-// TODO: Tidy up these functions. They shouldn't have all these promises in them.
-
-export const getDirectMessages = () => (dispatch) => {
-    dispatch({type: SET_LOADING_UI_2});
-    axios.get('/dms')
-        .then((res) => {
-            dispatch({
-                type: SET_DIRECT_MESSAGES,
-                payload: res.data.data
-            });
-            dispatch({type: SET_NOT_LOADING_UI_2});
-            dispatch({type: CLEAR_ERRORS});
-        })
-        .catch((err) => {
-            console.error(err);
-            dispatch({
-                type: SET_ERRORS,
-                payload: {
-                    errors: err.response.data.error
-                }
-            });
-        })
-}
-
-export const getNewDirectMessages = () => (dispatch) => {
-    return new Promise((resolve, reject) => {
-        axios.get('/dms')
-            .then((res) => {
-                dispatch({
-                    type: SET_DIRECT_MESSAGES,
-                    payload: res.data.data
-                });
-                dispatch({type: SET_NOT_LOADING_UI_2});
-                dispatch({type: CLEAR_ERRORS});
-                resolve();
-            })
-            .catch((err) => {
-                console.log(err)
-                reject(err);
-            })
-    })
-}
-
-export const reloadDirectMessageChannels = () => (dispatch) => {
-    return new Promise((resolve, reject) => {
-        axios.get('/dms')
-            .then((res) => {
-                dispatch({
-                    type: SET_DIRECT_MESSAGES,
-                    payload: res.data.data
-                });
-                dispatch({type: SET_NOT_LOADING_UI_3});
-                dispatch({type: CLEAR_ERRORS});
-                resolve();
-            })
-            .catch((err) => {
-                console.log(err)
-                reject(err);
-            })
-    })
-    
-}
-
-export const createNewDirectMessage = (username) => (dispatch) => {
-    return new Promise((resolve, reject) => {
-        dispatch({type: SET_LOADING_UI_3});
-        const data = {
-            user: username
-        }
-        // console.log(username);
-
-        axios.post('/dms/new', data)
-            .then((res) => {
-                // console.log(res.data);
-                if (res.data.err) {
-                    dispatch({
-                        type: SET_ERRORS,
-                        payload: {
-                            createDirectMessage: res.data.err
-                        }
-                    });
-                    dispatch({type: SET_NOT_LOADING_UI_3});
-                } else {
-                    // dispatch(getNewDirectMessages());
-                    // dispatch({type: SET_NOT_LOADING_UI_3});
-                }
-                resolve();
-            })
-            .catch((err) => {
-                dispatch({
-                    type: SET_ERRORS,
-                    payload: {
-                        createDirectMessage: err.response.data.error
-                    }
-                });
-                dispatch({type: SET_NOT_LOADING_UI_3});
-                console.log(err.response.data);
-                reject(err);
-            })
-    });
-}
-
-export const sendDirectMessage = (user, message) => (dispatch) => {
-    dispatch({type: SET_LOADING_UI_4});
-    const data = {
-        message,
-        user
-    };
-
-    axios.post('/dms/send', data)
-        .then((res) => {
-            // console.log(res);
-            return axios.get('/dms')
-        })
-        .then((res) => {
-            dispatch({
-                type: SET_DIRECT_MESSAGES,
-                payload: res.data.data
-            });
-            dispatch({type: SET_NOT_LOADING_UI_4});
-            dispatch({type: CLEAR_ERRORS});
-        })
-        .catch((err) => {
-            console.log(err);
-            dispatch({
-                type: SET_ERRORS,
-                payload: {
-                    sendDirectMessage: err.response.data
-                }
-            })
-            dispatch({type: SET_NOT_LOADING_UI_4});
-        })
-}
--- a/twistter-frontend/src/redux/actions/userActions.js
+++ b/twistter-frontend/src/redux/actions/userActions.js
@@ -1,42 +1,19 @@
-
-import {
-  SET_USER, 
-  SET_ERRORS, 
-  CLEAR_ERRORS, 
-  LOADING_UI, 
-  // SET_AUTHENTICATED, 
-  SET_UNAUTHENTICATED,
-  LIKE_POST, 
-  UNLIKE_POST, 
-  SET_LIKES,
-  LOADING_USER
-} from '../types';
+import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';
 import axios from 'axios';

-// Saves Authorization in browser local storage and adds it as a header to axios
-const setAuthorizationHeader = (token) => {
-  const FBIdToken = `Bearer ${token}`;
-  localStorage.setItem('FBIdToken', FBIdToken);
-  axios.defaults.headers.common['Authorization'] = FBIdToken;
-}

-// Gets Database info for the logged in user and sets it in Redux
 export const getUserData = () => (dispatch) => {
-  dispatch({ type: LOADING_USER });
    axios.get('/user')
        .then((res) => {
            dispatch({
                type: SET_USER,
                payload: res.data,
-            });
-            dispatch({type: CLEAR_ERRORS});
+            })
        })
        .catch((err) => console.error(err));
 }

-// 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)
@@ -44,7 +21,7 @@ export const loginUser = (loginData, history) => (dispatch) => {
        // Save the login token
        setAuthorizationHeader(res.data.token);
        dispatch(getUserData());
-        // dispatch({ type: CLEAR_ERRORS })
+        dispatch({ type: CLEAR_ERRORS })
        // Redirects to home page
        history.push('/home');
      })
@@ -56,9 +33,7 @@ export const loginUser = (loginData, history) => (dispatch) => {
      });
 };

-// Sends signup data to firebase and sets the user data in Redux
 export const signupUser = (newUserData, history) => (dispatch) => {
-    dispatch({type: CLEAR_ERRORS});
    dispatch({ type: LOADING_UI });
    axios
      .post("/signup", newUserData)
@@ -68,7 +43,7 @@ export const signupUser = (newUserData, history) => (dispatch) => {
        // Save the signup token
        setAuthorizationHeader(res.data.token);
        dispatch(getUserData());
-        // dispatch({ type: CLEAR_ERRORS })
+        dispatch({ type: CLEAR_ERRORS })
        // Redirects to home page
        history.push('/home');
      })
@@ -80,14 +55,12 @@ export const signupUser = (newUserData, history) => (dispatch) => {
      });
 };

-// Deletes the Authorization header and clears all user data from Redux
 export const logoutUser = () => (dispatch) => {
    localStorage.removeItem('FBIdToken');
    delete axios.defaults.headers.common['Authorization'];
    dispatch({ type: SET_UNAUTHENTICATED });
 }

-
 export const deleteUser = () => (dispatch) => {
  axios
    .delete("/delete")
@@ -108,65 +81,8 @@ export const deleteUser = () => (dispatch) => {
  dispatch({ type: SET_UNAUTHENTICATED });
 }

-export const getLikes = () => (dispatch) => {
-  axios.get('/likes')
-    .then((res) => {
-      dispatch({
-        type: SET_LIKES,
-        payload: res.data
-      })
-    })
-}
-
-export const likePost = (postId, postArray) => (dispatch) => {
-  postArray.push(postId);
-      dispatch({
-        type: LIKE_POST,
-        payload: {
-          likes: postArray
-        }
-    })
-  axios.get(`/like/${postId}`)
-    .then((res) => {
-      getLikes();
-    })
-  
-  
-}
-
-export const unlikePost = (postId, postArray) => (dispatch) => {
-  let i;
-  for (i = 0; i < postArray.length; i++) {
-    if (postArray[i] === postId) {
-      postArray.splice(i, 1);
-      break;
-    }
-  }
-
-  dispatch({
-    type: UNLIKE_POST,
-    payload:  {
-      likes: postArray
-    }
-  })
-
-  axios.get(`/unlike/${postId}`)
-    .then((res) => {
-      getLikes();
-    })
-
-}
-
-// Sends an image data form to firebase to be uploaded to the user profile
-export const uploadImage = (formData) => (dispatch) => {
-  dispatch({ type: LOADING_UI });
-  axios.post('/user/image', formData)
-    .then(() => {
-      dispatch(getUserData());
-      // dispatch({ type: CLEAR_ERRORS });
-    })
-    .catch(err => {
-      console.log(err);
-    })
-}
-
+const setAuthorizationHeader = (token) => {
+    const FBIdToken = `Bearer ${token}`;
+    localStorage.setItem('FBIdToken', FBIdToken);
+    axios.defaults.headers.common['Authorization'] = FBIdToken;
+}
--- a/twistter-frontend/src/redux/reducers/dataReducer.js
+++ b/twistter-frontend/src/redux/reducers/dataReducer.js
@@ -1,17 +0,0 @@
-import {SET_DIRECT_MESSAGES, SET_USERNAME_VALID, SET_USERNAME_INVALID} from '../types';
-
-const initialState = {
-    directMessages: null,
-};
-
-export default function(state = initialState, action) {
-    switch(action.type) {
-        case SET_DIRECT_MESSAGES:
-            return {
-                ...state,
-                directMessages: action.payload
-            };
-        default:
-            return state;
-    }
-}
--- a/twistter-frontend/src/redux/reducers/uiReducer.js
+++ b/twistter-frontend/src/redux/reducers/uiReducer.js
@@ -1,20 +1,7 @@
-import { 
-    SET_ERRORS, 
-    CLEAR_ERRORS, 
-    LOADING_UI, 
-    SET_LOADING_UI_2, 
-    SET_LOADING_UI_3, 
-    SET_LOADING_UI_4,
-    SET_NOT_LOADING_UI_2,
-    SET_NOT_LOADING_UI_3,
-    SET_NOT_LOADING_UI_4
- } from '../types';
+import { SET_ERRORS, CLEAR_ERRORS, LOADING_UI } from '../types';

 const initialState = {
    loading: false,
-    loading2: false,
-    loading3: false,
-    loading4: false,
    errors: null
 };

@@ -36,37 +23,7 @@ export default function(state = initialState, action) {
            return {
                ...state,
                loading: true
-            };
-        case SET_LOADING_UI_2:
-            return {
-                ...state,
-                loading2: true
-            };
-        case SET_LOADING_UI_3:
-            return {
-                ...state,
-                loading3: true
-            };
-        case SET_LOADING_UI_4:
-            return {
-                ...state,
-                loading4: true
-            };
-        case SET_NOT_LOADING_UI_2:
-            return {
-                ...state,
-                loading2: false
-            };
-        case SET_NOT_LOADING_UI_3:
-            return {
-                ...state,
-                loading3: false
-            };
-        case SET_NOT_LOADING_UI_4:
-            return {
-                ...state,
-                loading4: false
-            };
+            }
        default:
            return state;
    }
--- a/twistter-frontend/src/redux/reducers/userReducer.js
+++ b/twistter-frontend/src/redux/reducers/userReducer.js
@@ -1,17 +1,4 @@
-
-import {
-    SET_USER,
-    // SET_ERRORS, 
-    // CLEAR_ERRORS, 
-    // LOADING_UI, 
-    SET_AUTHENTICATED, 
-    SET_UNAUTHENTICATED,
-    LOADING_USER,
-    LIKE_POST, 
-    UNLIKE_POST, 
-    SET_LIKES
-} from '../types';
-
+import {SET_USER, SET_ERRORS, CLEAR_ERRORS, LOADING_UI, SET_AUTHENTICATED, SET_UNAUTHENTICATED} from '../types';

 const initialState = {
    authenticated: false,
@@ -32,31 +19,9 @@ export default function(state = initialState, action) {
            return initialState;
        case SET_USER:
            return {
-                ...state,
                authenticated: true,
-                loading: false,
                ...action.payload,
            };
-        case LIKE_POST:
-            return {
-                ...state,
-                ...action.payload
-            }
-        case UNLIKE_POST:
-            return {
-                ...state,
-                ...action.payload
-            }
-        case SET_LIKES:
-            return {
-                ...state,
-                ...action.payload
-            }
-        case LOADING_USER:
-            return {
-                ...state,
-                loading: true
-            }
        default:
            return state;
    }
--- a/twistter-frontend/src/redux/types.js
+++ b/twistter-frontend/src/redux/types.js
@@ -3,22 +3,10 @@ export const SET_AUTHENTICATED = 'SET_AUTHENTICATED';
 export const SET_UNAUTHENTICATED = 'SET_UNAUTHENTICATED';
 export const SET_USER = 'SET_USER';
 export const LOADING_USER = 'LOADING_USER';
-export const LIKE_POST = 'LIKE_POST';
-export const UNLIKE_POST = 'UNLIKE_POST';
-export const SET_LIKES = 'SET_LIKES';

 // UI reducer types
 export const SET_ERRORS = 'SET_ERRORS';
 export const LOADING_UI = 'LOADING_UI';
-export const SET_LOADING_UI_2 = 'SET_LOADING_UI_2';
-export const SET_LOADING_UI_3 = 'SET_LOADING_UI_3';
-export const SET_LOADING_UI_4 = 'SET_LOADING_UI_4';
-export const SET_NOT_LOADING_UI_2 = 'SET_NOT_LOADING_UI_2';
-export const SET_NOT_LOADING_UI_3 = 'SET_NOT_LOADING_UI_3';
-export const SET_NOT_LOADING_UI_4 = 'SET_NOT_LOADING_UI_4';
 export const CLEAR_ERRORS = 'CLEAR_ERRORS';

-// Data reducer types
-export const SET_DIRECT_MESSAGES = 'SET_DIRECT_MESSAGES';
-export const SET_USERNAME_VALID = 'SET_USERNAME_VALID';
-export const SET_USERNAME_INVALID = 'SET_USERNAME_INVALID';
+// Data reducer types
Author	SHA1	Message	Date
shobhitm23	49ce28109b	Improved Fonts	2019-11-01 16:15:45 -04:00
shobhitm23	3f24d90fef	Merge branch 'Beautify'	2019-11-01 15:37:54 -04:00