Merge branch 'master' into engage_microblog

formatted feed and userline
Merge pull request #91 from ClaytonWWilson/fix_profile
2026-03-10 13:15:05 +00:00 · 2019-11-27 21:08:55 -05:00 · 2019-11-27 20:57:42 -05:00 · 2019-11-21 20:21:24 -05:00 · 2019-11-21 20:20:54 -05:00 · 2019-11-21 20:09:47 -05:00
24 changed files with 1793 additions and 976 deletions
--- a/firebase.json
+++ b/firebase.json
@@ -8,6 +8,7 @@
    },
    "functions": {
      "predeploy": [
+        "npm --prefix \"$RESOURCE_DIR\" run lint"
      ]
    },
    "hosting": {
--- a/functions/handlers/post.js
+++ b/functions/handlers/post.js
@@ -1,99 +1,226 @@
+/* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
 const { db } = require('../util/admin');

-exports.putPost = (req, res) => {

+exports.putPost = (req, res) => {
    const newPost = {
        body: req.body.body,
-        userHandle: req.userData.handle,
+        userHandle: req.user.handle,
        userImage: req.body.userImage,
-        userID: req.userData.userId,
+        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);
    })
    .catch((err) => {
        console.error(err);
-        return res.status(500).json({ error: 'something is wrong'});
+        return res.status(500).json({ error: 'something went wrong'});
    });
 };

-
-exports.getPost = (req, res) => {
-    let postData = {};
-    db.doc(`/posts/${req.params.postId}`)
-    .get()
-    .then((doc) => {
-        if (!doc.exists) {
-            return res.status(404).json({error: 'Post is not found'});
-
-        }
-        postData = doc.data();
-        postData.postId = doc.id;
-        return res.status(200).json(postData);
+exports.getallPostsforUser = (req, res) => {
+    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());
+        });
+        return res.status(200).json(posts);
    })
-    .catch((err) => {
-        console.error(err); 
-        return res.status(500).json({error: 'Something is wrong'});
-    })
-}
-
-exports.likePost = (req, res) => {
+    .then(function() {
+    return res.status(200).json("Successfully retrieved all user's posts from database.");
    
-    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
-    .where('postId', '==', req.params.postId).limit(1);
+    })
+    .catch(function(err) {
+    return res.status(500).json("Failed to retrieve user's posts from database.", err);
+    });
+};
+
+exports.getallPosts = (req, res) => {
+    var post_query = admin.firestore().collection("posts");
+    post_query.get()
+    .then(function(allPosts) {
+        let posts = [];
+        allPosts.forEach(function(doc) {
+            posts.push(doc.data());
+        });
+        return res.status(200).json(posts);
+    })
+    .then(function() {
+    return res.status(200).json("Successfully retrieved every post from database.");
+    })
+    .catch(function(err) {
+    return res.status(500).json("Failed to retrieve posts from database.", err);
+    });
+};
+
+exports.quoteWithPost = (req, res) => {
+
+    let quoteData;
+    const quoteDoc = admin.firestore().collection('quote').
+    where('userHandle', '==', req.user.handle).
+    where('postId', '==', req.params.postId).limit(1);

    const postDoc = db.doc(`/posts/${req.params.postId}`);

-    likeDoc.get()
+    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) {
-            admin.firestore().collection('likes').add({
+        if(data.empty) {
+            return admin.firestore().collection('quote').add({
                postId : req.params.postId,
-                userHandle: req.userData.handle
+                userHandle : req.user.handle,
+                quotePost : req.body.quotePost
            })
            .then(() => {
-                return postDoc.update({likeCount : firebase.firestore.FieldValue.increment(1) })
-            })
-            .then(() => {
-                return res.status(200).json(postDoc);
+               return admin.firestore().collection('posts').add({
+                   quoteData,
+                   quoteUser : req.user.handle,
+                   quotePost : req.body.quotePost,
+                   quotedAt : new Date().toISOString()
+
+               })
            })
        }
        else {
-            return res.status(400).json({error: 'Post has already been liked.'})
+            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('postId', '==', 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({
+                postId : req.params.postId,
+                userHandle : req.user.handle,
+            })
+            .then(() => {
+               return admin.firestore().collection('posts').add({
+                   quoteData,
+                   quoteUser : req.user.handle,
+                   quotedAt : new Date().toISOString()
+
+               })
+            })
+        }
+        else {
+        return res.status(400).json({ error: 'Post has already been quoted.' });
+      }
+    })
+    .catch((err) => {
+        return res.status(500).json({error: 'Something is wrong'});
+
+    })
+
+}
+
+
+exports.likePost = (req, res) => {
+    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) => {
-        console.error(err);
        return res.status(500).json({error: 'Something is wrong'});
    })

 }

-exports.unlikePost = (re, res) => {
+exports.unlikePost = (req, res) => {

    let postData;
-    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
+    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}`);

-    likeDoc.get()
+    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 res.status(400).json({ error: 'Post cannot be unliked because it is not liked at the moment.' });
-          } else {
            return db
              .doc(`/likes/${data.docs[0].id}`)
              .delete()
@@ -104,7 +231,7 @@ exports.unlikePost = (re, res) => {
              .then(() => {
                res.status(200).json(postData);
              });
-          }
+          
    })
    .catch((err) => {
        console.error(err);
@@ -113,61 +240,6 @@ exports.unlikePost = (re, res) => {

 }

-exports.quotePost = (req, res) => {
-
-    const likeDoc = admin.firestore().collection('posts').where('postId', '==', req.params.postId).limit(1);
-
-    const quotedPost = {
-        quotingUser : req.userData.handle,
-        quotedAt: new Date().toISOString(),
-        body: req.body.body,
-
-    }
-    admin.firestore().collection('posts').add(quotedPost)
-    .then((doc) => {
-        const resPost = quotedPost;
-        resPost.postId = doc.id;
-         return res.status(200).json(resPost);
-    }
-    )
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Something is wrong'});
-    })
-}
-
-
-exports.getallPostsforFeed = (req, res) => {
-    admin.firestore().collection('posts').get()
-    .then((data) => {
-        let posts = [];
-        
-        data.forEach(function(doc) {
-            posts.push( {
-                microBlogs: doc.data(),
-                id: doc.id,
-            })
-                 
-        });
-        return res.status(200).json(posts);
-    })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to fetch all posts written by all other users.'})
-    })
-};
-
-exports.getallPostsforUser = (req, res) => {
-    admin.firestore().collection('posts').where('userHandle', '==', req.userData.handle ).get()
-    .then((data) => {
-        let posts = [];
-        data.forEach(function(doc) {
-            posts.push(doc.data());
-        });
-        return res.status(200).json(posts);
-    })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
-    })
+exports.getFilteredPosts = (req, res) => {
+    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
 };
--- a/functions/handlers/topic.js
+++ b/functions/handlers/topic.js
@@ -1,53 +1,93 @@
-/* eslint-disable promise/always-return */
 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
-    };
-
-    admin.firestore().collection('topics').add(newTopic)
-    .then((doc) => {
-        const resTopic = newTopic;
-        newTopic.topicId = doc.id;
-        return res.status(200).json(resTopic);
+      // 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" });
    })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({ error: 'something is wrong'});
+    .catch(err => {
+      return res.status(500).json({ err });
    });
 };

 exports.getAllTopics = (req, res) => {
-    admin.firestore().collection('topics').get()
-    .then((data) => {
-        let topics = [];
-        data.forEach(function(doc) {
-            topics.push(doc.data());
+  admin
+    .firestore()
+    .collection("topics")
+    .get()
+    .then(data => {
+      let topics = [];
+      data.forEach(function(doc) {
+        topics.push({
+          topic: doc.data().topic,
+          id: doc.id
        });
-        return res.status(200).json(topics);
-    })
-    .catch((err) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to fetch all topics.'})
+      });
+      return res.status(200).json(topics);
    })
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: "Failed to fetch all topics." });
+    });
 };

 exports.deleteTopic = (req, res) => {
-    // TODO: handle add and delete by topic id
-    const topic = db.doc(`/topics/${req.params.topicId}`);
-    topic.get().then((doc) => {
-        if (!doc.exists) {
-            return res.status(404).json({error: 'Topic not found'});
-        } else {
-            return topic.delete();
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef
+    .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" });
    })
-    .then(() => {
-        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) => {
-        console.error(err);
-        return res.status(500).json({error: 'Failed to delete topic.'})
-    })
-}
+    .catch(err => {
+      return res.status(500).json({ err });
+    });
+};
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -1,5 +1,4 @@
 /* eslint-disable promise/catch-or-return */
-
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
 const { validateUpdateProfileInfo } = require("../util/validator");
@@ -7,8 +6,6 @@ const { validateUpdateProfileInfo } = require("../util/validator");
 const firebase = require("firebase");
 firebase.initializeApp(config);

-var handle2Email = new Map();
-
 exports.signup = (req, res) => {
  const newUser = {
    email: req.body.email,
@@ -57,7 +54,7 @@ exports.signup = (req, res) => {

  db.doc(`/users/${newUser.handle}`)
    .get()
-    .then((doc) => {
+    .then(doc => {
      if (doc.exists) {
        return res
          .status(400)
@@ -67,26 +64,28 @@ exports.signup = (req, res) => {
        .auth()
        .createUserWithEmailAndPassword(newUser.email, newUser.password);
    })
-    .then((data) => {
+    .then(data => {
      userId = data.user.uid;
      return data.user.getIdToken();
    })
-    .then((idToken) => {
+    .then(idToken => {
      token = idToken;
+      const defaultImageUrl = `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/no-img.png?alt=media`;
      const userCred = {
        email: newUser.email,
        handle: newUser.handle,
        createdAt: newUser.createdAt,
        userId,
-        followedTopics: []
+        followedTopics: [],
+        imageUrl: defaultImageUrl,
+        verified: false
      };
-      handle2Email.set(userCred.handle, userCred.email);
      return db.doc(`/users/${newUser.handle}`).set(userCred);
    })
    .then(() => {
      return res.status(201).json({ token });
    })
-    .catch((err) => {
+    .catch(err => {
      console.error(err);
      if (err.code === "auth/email-already-in-use") {
        return res.status(500).json({ email: "This email is already taken." });
@@ -98,7 +97,6 @@ exports.signup = (req, res) => {
 exports.login = (req, res) => {
  const user = {
    email: req.body.email,
-    handle: req.body.handle,
    password: req.body.password
  };

@@ -107,80 +105,174 @@ exports.login = (req, res) => {

  const emailRegEx = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;

-  // Email check
+  // Checks if email/username field is empty
  if (user.email.trim() === "") {
    errors.email = "Email must not be blank.";
  }
-  else if (!user.email.match(emailRegEx)) {
-    user.email = handle2Email.get(user.email);
-  }

-  // Password check
+  // Checks if password field is empty
  if (user.password.trim() === "") {
    errors.password = "Password must not be blank.";
  }

-  // Checking if any errors have been raised
+  // Checks if any of the above two errors were found
  if (Object.keys(errors).length > 0) {
    return res.status(400).json(errors);
  }

-  firebase
-    .auth()
-    .signInWithEmailAndPassword(user.email, user.password)
-    .then((data) => {
-      return data.user.getIdToken();
-    })
-    .then((token) => {
-      return res.status(200).json({ token });
-    })
-    .catch((err) => {
-      console.error(err);
-      if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email" || err.code === "auth/user-not-found") {
-        return res
-          .status(403)
-          .json({ general: "Invalid credentials. Please try again." });
-      }
-      return res.status(500).json({ error: err.code });
-    });
+  // Email/username field is username since it's not in email format
+  if (!user.email.match(emailRegEx)) {
+    var userDoc = db.collection("users").doc(`${user.email}`);
+    userDoc
+      .get()
+      .then(function(doc) {
+        if (doc.exists) {
+          user.email = doc.data().email;
+        } else {
+          return res
+            .status(403)
+            .json({ general: "Invalid credentials. Please try again." });
+        }
+        return;
+      })
+      .then(function() {
+        firebase
+          .auth()
+          .signInWithEmailAndPassword(user.email, user.password)
+          .then(data => {
+            return data.user.getIdToken();
+          })
+          .then(token => {
+            return res.status(200).json({ token });
+          })
+          .catch(err => {
+            console.error(err);
+            if (
+              err.code === "auth/user-not-found" ||
+              err.code === "auth/invalid-email" ||
+              err.code === "auth/wrong-password"
+            ) {
+              return res
+                .status(403)
+                .json({ general: "Invalid credentials. Please try again." });
+            }
+            return res.status(500).json({ error: err.code });
+          });
+        return;
+      })
+      .catch(function(err) {
+        if (!doc.exists) {
+          return res
+            .status(403)
+            .json({ general: "Invalid credentials. Please try again." });
+        }
+        return res.status(500).send(err);
+      });
+  }
+  // Email/username field is username
+  else {
+    firebase
+      .auth()
+      .signInWithEmailAndPassword(user.email, user.password)
+      .then(data => {
+        return data.user.getIdToken();
+      })
+      .then(token => {
+        return res.status(200).json({ token });
+      })
+      .catch(err => {
+        console.error(err);
+        if (
+          err.code === "auth/user-not-found" ||
+          err.code === "auth/invalid-email" ||
+          err.code === "auth/wrong-password"
+        ) {
+          return res
+            .status(403)
+            .json({ general: "Invalid credentials. Please try again." });
+        }
+        return res.status(500).json({ error: err.code });
+      });
+  }
 };

-//Deletes user account
+//Deletes user account and all associated data
 exports.deleteUser = (req, res) => {
-  var currentUser;
+  // Get the profile image filename
+  // `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/${imageFileName}?alt=media`
+  let imageFileName;
+  req.userData.imageUrl
+    ? (imageFileName = req.userData.imageUrl.split("/o/")[1].split("?alt=")[0])
+    : (imageFileName = "no-img.png");

-  firebase.auth().onAuthStateChanged(function(user) {
-    currentUser = user;
-    if (currentUser) {
-      /*db.collection("users").doc(`${currentUser.handle}`).delete()
-      .then(function() {
-        res.status(200).send("Removed user from database.");
-        return;
-      })
-      .catch(function(err) {
-        res.status(500).send("Failed to remove user from database.", err);
-      });*/
+  const userId = req.userData.userId;
+  let errors = {};

-      //let ref = db.collection('users');
-      //let userDoc = ref.where('userId', '==', currentUser.uid).get();
-      //userDoc.ref.delete();
+  function thenFunction(data) {
+    console.log(`${data} data for ${req.userData.handle} has been deleted.`);
+  }

-      currentUser.delete()
-      .then(function() {
-        console.log("User successfully deleted.");
-        res.status(200).send("Deleted user.");
-        return;
-      })
-      .catch(function(err) {
-        console.log("Error deleting user.", err);
-        res.status(500).send("Failed to delete user.");
+  function catchFunction(data, err) {
+    console.error(err);
+    errors[data] = err;
+  }
+
+  // Deletes user from authentication
+  let auth = admin.auth().deleteUser(userId);
+
+  // Deletes database data
+  let data = db
+    .collection("users")
+    .doc(`${req.user.handle}`)
+    .delete();
+
+  // Deletes any custom profile image
+  let image;
+  if (imageFileName !== "no-img.png") {
+    image = admin
+      .storage()
+      .bucket()
+      .file(imageFileName)
+      .delete();
+  } else {
+    image = Promise.resolve();
+  }
+
+  // Deletes all users posts
+  let posts = db
+    .collection("posts")
+    .where("userHandle", "==", req.user.handle)
+    .get()
+    .then(query => {
+      query.forEach(snap => {
+        snap.ref.delete();
      });
-    } 
-    else {
-      console.log("Cannot get user.");
-      res.status(500).send("Cannot get user.");
-    }
-  });
+      return;
+    });
+
+  let promises = [
+    auth.then(thenFunction("auth")).catch(err => catchFunction("auth", err)),
+    data.then(thenFunction("data")).catch(err => catchFunction("data", err)),
+    image.then(thenFunction("image")).catch(err => catchFunction("image", err)),
+    posts.then(thenFunction("posts")).catch(err => catchFunction("image", err))
+  ];
+
+  // Wait for all promises to resolve
+  let waitPromise = Promise.all(promises);
+
+  waitPromise
+    .then(() => {
+      if (Object.keys(errors) > 0) {
+        return res.status(500).json(errors);
+      } else {
+        return res.status(200).json({
+          message: `All data for ${req.userData.handle} has been deleted.`
+        });
+      }
+    })
+    .catch(err => {
+      return res.status(500).json({ error: err });
+    });
 };

 // Returns all data in the database for the user who is currently signed in
@@ -188,10 +280,10 @@ exports.getProfileInfo = (req, res) => {
  db.collection("users")
    .doc(req.user.handle)
    .get()
-    .then((data) => {
+    .then(data => {
      return res.status(200).json(data.data());
    })
-    .catch((err) => {
+    .catch(err => {
      console.error(err);
      return res.status(500).json(err);
    });
@@ -199,8 +291,6 @@ exports.getProfileInfo = (req, res) => {

 // Updates the data in the database of the user who is currently logged in
 exports.updateProfileInfo = (req, res) => {
-  // TODO: Add functionality for adding/updating profile images
-
  // Data validation
  const { valid, errors, profileData } = validateUpdateProfileInfo(req);
  if (!valid) return res.status(400).json(errors);
@@ -211,13 +301,11 @@ exports.updateProfileInfo = (req, res) => {
    .set(profileData, { merge: true })
    .then(() => {
      console.log(`${req.user.handle}'s profile info has been updated.`);
-      return res
-        .status(201)
-        .json({
-          general: `${req.user.handle}'s profile info has been updated.`
-        });
+      return res.status(201).json({
+        general: `${req.user.handle}'s profile info has been updated.`
+      });
    })
-    .catch((err) => {
+    .catch(err => {
      console.error(err);
      return res.status(500).json({
        error: "Error updating profile data"
@@ -229,14 +317,15 @@ exports.getUserDetails = (req, res) => {
  let userData = {};
  db.doc(`/users/${req.body.handle}`)
    .get()
-    .then((doc) => {
+    .then(doc => {
      if (doc.exists) {
        userData = doc.data();
-        return res.status(200).json({userData});
-    } else {
-      return res.status(400).json({error: "User not found."})
-    }})
-    .catch((err) => {
+        return res.status(200).json({ userData });
+      } else {
+        return res.status(400).json({ error: "User not found." });
+      }
+    })
+    .catch(err => {
      console.error(err);
      return res.status(500).json({ error: err.code });
    });
@@ -246,17 +335,160 @@ exports.getAuthenticatedUser = (req, res) => {
  let credentials = {};
  db.doc(`/users/${req.user.handle}`)
    .get()
-    .then((doc) => {
+    .then(doc => {
      if (doc.exists) {
        credentials = doc.data();
-        return res.status(200).json({credentials});
-    } else {
-      return res.status(400).json({error: "User not found."})
-    }})
-    .catch((err) => {
+        return res.status(200).json({ credentials });
+      } else {
+        return res.status(400).json({ error: "User not found." });
+      }
+    })
+    .catch(err => {
      console.error(err);
      return res.status(500).json({ error: err.code });
    });
 };

+// Verifies the user sent to the request
+// Must be run by the Admin user
+exports.verifyUser = (req, res) => {
+  if (req.userData.handle !== "Admin") {
+    return res.status(403).json({ error: "This must be done as Admin" });
+  }

+  db.doc(`/users/${req.body.user}`)
+    .get()
+    .then(doc => {
+      if (doc.exists) {
+        let verifiedUser = doc.data();
+        verifiedUser.verified = true;
+        return db
+          .doc(`/users/${req.body.user}`)
+          .set(verifiedUser, { merge: true });
+      } else {
+        return res
+          .status(400)
+          .json({ error: `User ${req.body.user} was not found` });
+      }
+    })
+    .then(() => {
+      return res
+        .status(201)
+        .json({ message: `${req.body.user} is now verified` });
+    })
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: err.code });
+    });
+};
+
+// Unverifies the user sent to the request
+// Must be run by admin
+exports.unverifyUser = (req, res) => {
+  if (req.userData.handle !== "Admin") {
+    return res.status(403).json({ error: "This must be done as Admin" });
+  }
+
+  db.doc(`/users/${req.body.user}`)
+    .get()
+    .then(doc => {
+      if (doc.exists) {
+        let unverifiedUser = doc.data();
+        unverifiedUser.verified = false;
+        return db
+          .doc(`/users/${req.body.user}`)
+          .set(unverifiedUser, { merge: true });
+      } else {
+        return res
+          .status(400)
+          .json({ error: `User ${req.body.user} was not found` });
+      }
+    })
+    .then(() => {
+      return res
+        .status(201)
+        .json({ message: `${req.body.user} is no longer verified` });
+    })
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: err.code });
+    });
+};
+exports.getUserHandles = (req, res) => {
+  db.doc(`/users/${req.body.userHandle}`)
+    .get()
+    .then(doc => {
+      if (doc.exists) {
+        let userHandle = doc.data().handle;
+        return res.status(200).json(userHandle);
+      } else {
+        return res.status(404).json({ error: "user not found" });
+      }
+    })
+    .catch(err => {
+      console.error(err);
+      return res.status(500).json({ error: "Failed to get all user handles." });
+    });
+};
+
+exports.addSubscription = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef.get().then(doc => {
+    new_following = doc.data().following;
+    new_following.push(req.body.following);
+
+    // add stuff
+    userRef
+      .set({ following: 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(500).json({ error: "shouldn't execute" });
+  });
+};
+
+exports.getSubs = (req, res) => {
+  let data = [];
+  db.doc(`/users/${req.userData.handle}`)
+    .get()
+    .then(doc => {
+      data = doc.data().following;
+      return res.status(200).json({ data });
+    })
+    .catch(err => {
+      return res.status(500).json({ err });
+    });
+};
+
+exports.removeSub = (req, res) => {
+  let new_following = [];
+  let userRef = db.doc(`/users/${req.userData.handle}`);
+  userRef.get().then(doc => {
+    new_following = doc.data().following;
+    // remove username from array
+    new_following.forEach(function(follower, index) {
+      if (follower === `${req.body.unfollow}`) {
+        new_following.splice(index, 1);
+      }
+    });
+
+    // update database
+    userRef
+      .set({ following: 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(500).json({ error: "shouldn't execute" });
+  });
+};
--- a/functions/index.js
+++ b/functions/index.js
@@ -16,7 +16,13 @@ const {
  login,
  signup,
  deleteUser,
-  updateProfileInfo
+  updateProfileInfo,
+  verifyUser,
+  unverifyUser,
+  getUserHandles,
+  addSubscription,
+  getSubs,
+  removeSub
 } = require("./handlers/users");

 // Adds a user to the database and registers them in firebase with
@@ -29,9 +35,9 @@ app.post("/signup", signup);
 app.post("/login", login);

 //Deletes user account
-app.delete("/delete", deleteUser);
+app.delete("/delete", fbAuth, deleteUser);

-app.get("/getUser", fbAuth, getUserDetails);
+app.post("/getUserDetails", fbAuth, getUserDetails);

 // Returns all profile data of the currently logged in user
 app.get("/getProfileInfo", fbAuth, getProfileInfo);
@@ -41,33 +47,54 @@ app.post("/updateProfileInfo", fbAuth, updateProfileInfo);

 app.get("/user", fbAuth, getAuthenticatedUser);

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

 app.get("/getallPostsforUser", fbAuth, getallPostsforUser);

-app.get("/getallPostsforFeed", fbAuth, getallPostsforFeed);
-
-app.get("/putPost/:postId", fbAuth, getPost);
-app.get("/putPost/:postId/like", fbAuth, likePost);
-app.get("/putPost/:postId/unlike", fbAuth, unlikePost);
-app.post("/putPost/:postId/quote", fbAuth, quotePost);
-
-
+app.get("/getallPosts", getallPosts);

 // Adds one post to the database
 app.post("/putPost", fbAuth, putPost);

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

 // add topic to database
@@ -77,6 +104,9 @@ app.post("/putTopic", fbAuth, putTopic);
 app.get("/getAllTopics", fbAuth, getAllTopics);

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

 exports.api = functions.https.onRequest(app);
--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
@@ -121,16 +121,6 @@
        "react-is": "^16.8.6"
      }
    },
-    "@restart/context": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
-      "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
-    },
-    "@restart/hooks": {
-      "version": "0.3.15",
-      "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.15.tgz",
-      "integrity": "sha512-rVNba1A2oMzKBg16fCrrHmCf4JjOzFhT9TWR8J+Y8iOcY4zffxtP3ke7mEsakvghHZT+9//uDOPSSeuBDW41GQ=="
-    },
    "@types/prop-types": {
      "version": "15.7.3",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
@@ -1429,11 +1419,6 @@
      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
    },
-    "bootstrap": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
-      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
-    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1719,11 +1704,6 @@
        }
      }
    },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
    "clean-css": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
@@ -2248,15 +2228,6 @@
        }
      }
    },
-    "create-react-context": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
-      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
-      "requires": {
-        "gud": "^1.0.0",
-        "warning": "^4.0.3"
-      }
-    },
    "cross-spawn": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
@@ -3121,11 +3092,6 @@
        "merge": "^1.2.0"
      }
    },
-    "exenv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
-    },
    "exit-hook": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -5324,11 +5290,6 @@
      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
    },
-    "keycode": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz",
-      "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ="
-    },
    "kind-of": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -7037,25 +6998,6 @@
        "react-is": "^16.8.1"
      }
    },
-    "prop-types-extra": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz",
-      "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==",
-      "requires": {
-        "react-is": "^16.3.2",
-        "warning": "^3.0.0"
-      },
-      "dependencies": {
-        "warning": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-          "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
-          "requires": {
-            "loose-envify": "^1.0.0"
-          }
-        }
-      }
-    },
    "proxy-addr": {
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
@@ -7192,43 +7134,6 @@
        "prop-types": "^15.6.2"
      }
    },
-    "react-bootstrap": {
-      "version": "1.0.0-beta.14",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.0.0-beta.14.tgz",
-      "integrity": "sha512-UGK5f78FE8wAei1YL/oSwFlJZLqxJ/h4S8DCwHyY8hQjFCrjEW5PoEBTOOhQ6PQL6WOsZe1jkiOJG7L5TZWu+w==",
-      "requires": {
-        "@babel/runtime": "^7.4.2",
-        "@restart/context": "^2.1.4",
-        "@restart/hooks": "^0.3.11",
-        "@types/react": "^16.8.23",
-        "classnames": "^2.2.6",
-        "dom-helpers": "^3.4.0",
-        "invariant": "^2.2.4",
-        "keycode": "^2.2.0",
-        "popper.js": "^1.14.7",
-        "prop-types": "^15.7.2",
-        "prop-types-extra": "^1.1.0",
-        "react-overlays": "^1.2.0",
-        "react-transition-group": "^4.0.0",
-        "uncontrollable": "^7.0.0",
-        "warning": "^4.0.3"
-      },
-      "dependencies": {
-        "dom-helpers": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-          "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-          "requires": {
-            "@babel/runtime": "^7.1.2"
-          }
-        }
-      }
-    },
-    "react-context-toolbox": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/react-context-toolbox/-/react-context-toolbox-2.0.2.tgz",
-      "integrity": "sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A=="
-    },
    "react-dev-utils": {
      "version": "0.5.2",
      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-0.5.2.tgz",
@@ -7257,82 +7162,11 @@
        "scheduler": "^0.15.0"
      }
    },
-    "react-dropdown": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.6.4.tgz",
-      "integrity": "sha512-zTlNRZ6vzjEPsodBNgh6Xjp9IempEx9sReH3crT2Jw4S6KW2wS/BRIH3d/grYf/iXARadDRD91//uUCs9yjoLg==",
-      "requires": {
-        "classnames": "^2.2.3"
-      }
-    },
    "react-is": {
      "version": "16.9.0",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.9.0.tgz",
      "integrity": "sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw=="
    },
-    "react-lifecycles-compat": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
-    },
-    "react-modal": {
-      "version": "3.11.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.1.tgz",
-      "integrity": "sha512-8uN744Yq0X2lbfSLxsEEc2UV3RjSRb4yDVxRQ1aGzPo86QjNOwhQSukDb8U8kR+636TRTvfMren10fgOjAy9eA==",
-      "requires": {
-        "exenv": "^1.2.0",
-        "prop-types": "^15.5.10",
-        "react-lifecycles-compat": "^3.0.0",
-        "warning": "^4.0.3"
-      }
-    },
-    "react-overlays": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-1.2.0.tgz",
-      "integrity": "sha512-i/FCV8wR6aRaI+Kz/dpJhOdyx+ah2tN1RhT9InPrexyC4uzf3N4bNayFTGtUeQVacj57j1Mqh1CwV60/5153Iw==",
-      "requires": {
-        "classnames": "^2.2.6",
-        "dom-helpers": "^3.4.0",
-        "prop-types": "^15.6.2",
-        "prop-types-extra": "^1.1.0",
-        "react-context-toolbox": "^2.0.2",
-        "react-popper": "^1.3.2",
-        "uncontrollable": "^6.0.0",
-        "warning": "^4.0.2"
-      },
-      "dependencies": {
-        "dom-helpers": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
-          "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==",
-          "requires": {
-            "@babel/runtime": "^7.1.2"
-          }
-        },
-        "uncontrollable": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-6.2.3.tgz",
-          "integrity": "sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==",
-          "requires": {
-            "@babel/runtime": "^7.4.5",
-            "invariant": "^2.2.4"
-          }
-        }
-      }
-    },
-    "react-popper": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.4.tgz",
-      "integrity": "sha512-9AcQB29V+WrBKk6X7p0eojd1f25/oJajVdMZkywIoAV6Ag7hzE1Mhyeup2Q1QnvFRtGQFQvtqfhlEoDAPfKAVA==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "create-react-context": "^0.3.0",
-        "popper.js": "^1.14.4",
-        "prop-types": "^15.6.1",
-        "typed-styles": "^0.0.7",
-        "warning": "^4.0.2"
-      }
-    },
    "react-redux": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.1.1.tgz",
@@ -8321,15 +8155,6 @@
        }
      }
    },
-    "react-simple-dropdown": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/react-simple-dropdown/-/react-simple-dropdown-3.2.3.tgz",
-      "integrity": "sha512-NmyyvA0D4wph5ctzkn8U4wmblOacavJMl9gTOhQR3v8I997mc1FL1NFKkj3Mx+HNysBKRD/HI+kpxXCAgXumPw==",
-      "requires": {
-        "classnames": "^2.1.2",
-        "prop-types": "^15.5.8"
-      }
-    },
    "react-transition-group": {
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz",
@@ -9895,11 +9720,6 @@
        "mime-types": "~2.1.24"
      }
    },
-    "typed-styles": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
-      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
-    },
    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -9941,16 +9761,6 @@
      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
      "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
    },
-    "uncontrollable": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.0.2.tgz",
-      "integrity": "sha512-7fa8OBQ5+X4VAcp0os6BD74bCeUPQSHmr4Rqy75Me98NnlD5kNShCqqx4xWo4OmlAMiT2/YSMklLFC4FCuoGYg==",
-      "requires": {
-        "@babel/runtime": "^7.4.5",
-        "invariant": "^2.2.4",
-        "react-lifecycles-compat": "^3.0.4"
-      }
-    },
    "union-value": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -10181,14 +9991,6 @@
        "makeerror": "1.0.x"
      }
    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
    "watch": {
      "version": "0.10.0",
      "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -8,21 +8,16 @@
    "@material-ui/styles": "^4.5.0",
    "@material-ui/system": "^4.5.0",
    "axios": "^0.19.0",
-    "bootstrap": "^4.3.1",
    "clsx": "^1.0.4",
    "create-react-app": "^3.1.2",
    "install": "^0.13.0",
    "jwt-decode": "^2.2.0",
    "node-pre-gyp": "^0.13.0",
    "react": "^16.9.0",
-    "react-bootstrap": "^1.0.0-beta.14",
    "react-dom": "^16.9.0",
-    "react-dropdown": "^1.6.4",
-    "react-modal": "^3.11.1",
    "react-redux": "^7.1.1",
    "react-router-dom": "^5.1.0",
    "react-scripts": "0.9.5",
-    "react-simple-dropdown": "^3.2.3",
    "redux": "^4.0.4",
    "redux-thunk": "^2.3.0",
    "typeface-roboto": "0.0.75"
@@ -46,5 +41,5 @@
      "last 1 safari version"
    ]
  },
-  "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
+  "proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
 }
--- a/twistter-frontend/redux/store.js
+++ b/twistter-frontend/redux/store.js
@@ -15,14 +15,4 @@ const reducers = combineReducers({
    UI: uiReducer
 });

-const store = createStore(
-    reducers,
-    initialState,
-    compose(
-        applyMiddleware(...middleware),
-        window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
-        
-    )
-)
-
-export default store;
+//const store = createStore(reducers, )
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -12,12 +12,6 @@ body {
  height: 200px;
 }

-.userhome{
-  display:flex; 
-  flex-direction:row;
-}
-
-
 .authButtons {
  border-radius: 100px;
  box-shadow: none;
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -6,35 +6,32 @@ import axios from "axios";
 import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
 import Navbar from "./components/layout/NavBar";
 import jwtDecode from "jwt-decode";
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { Button } from 'react-bootstrap';

 // Redux
 import { Provider } from "react-redux";
 import store from "./redux/store";
-import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
-import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
-import themeObject from './util/theme';
-import { SET_AUTHENTICATED } from './redux/types';
-import { logoutUser, getUserData } from './redux/actions/userActions';
+import MuiThemeProvider from "@material-ui/core/styles/MuiThemeProvider";
+import createMuiTheme from "@material-ui/core/styles/createMuiTheme";
+import themeObject from "./util/theme";
+import { SET_AUTHENTICATED } from "./redux/types";
+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';
-import login from './pages/Login';
-import user from './pages/user';
-import logout from './pages/Logout';
-import Delete from './pages/Delete';
-import writeMicroblog from './Writing_Microblogs.js';
-import editProfile from './pages/editProfile';
-import userLine from './Userline.js';
-
-import feed from './Feed.js';
+import home from "./pages/Home";
+import signup from "./pages/Signup";
+import login from "./pages/Login";
+import user from "./pages/user";
+import logout from "./pages/Logout";
+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 otherUser from "./pages/otherUser";

 const theme = createMuiTheme(themeObject);

@@ -47,7 +44,7 @@ if (token) {
      window.location.href = "/login";
    } else {
      store.dispatch({ type: SET_AUTHENTICATED });
-      axios.defaults.headers.common['Authorization'] = token;
+      axios.defaults.headers.common["Authorization"] = token;
      store.dispatch(getUserData());
    }
  } catch (invalidTokenError) {
@@ -56,37 +53,35 @@ if (token) {
  }
 }

-
 class App extends Component {
  render() {
    return (
      <MuiThemeProvider theme={theme}>
        <Provider store={store}>
          <Router>
-            <div className='container' >
+            <div className="container">
              <Navbar />
            </div>
-
            <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} />
-              <Route exact path="/logout" component={logout} />
-              <Route exact path="/delete" component={Delete} />
-              <Route exact path="/user" component={user} />
-              <div className="userhome">
-                <Route exact path="/home" component={writeMicroblog} />
-                <Route exact path="/home" component={feed} />
-              </div>
+                {/* 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} />

-              <Route exact path="/edit" component={editProfile} />
-              <Route exact path="/userline" component={userLine} /> 
+                <Route exact path="/logout" component={logout} />
+                <Route exact path="/delete" component={Delete} />

-              <AuthRoute exact path="/" component={home}/>
+                <Route exact path="/home" component={home} />
+                <Route exact path="/user" component={user} />
+                <Route exact path="/edit" component={editProfile} />
+                <Route exact path="/verify" component={verify} />
+                <Route exact path="/search" component={Search} />
+                <Route exact path="/user/:userhandle" component={otherUser} />
+
+                <AuthRoute exact path="/" component={home} />
              </Switch>
            </div>
-
          </Router>
        </Provider>
      </MuiThemeProvider>
--- a/twistter-frontend/src/Feed.js
+++ b/twistter-frontend/src/Feed.js
@@ -1,97 +0,0 @@
-import React, { Component } from "react";
-
-import axios from 'axios';
-import Box from '@material-ui/core/Box';
-//import {connect } from 'react-redux';
-//import { likePost, unlikePost } from '../redux/actions/dataActions';
-//import PropTypes from 'prop-types';
-import Like from "./Like.js";
-import Route from 'react-router-dom/Route';
-
-import Quote from "./Quote.js";
-
-class Feed extends Component {
-    
-
-    
-    constructor(props) {
-        super(props);
-        this.state = {
-            microBlogs: [],
-            
-        };
-
-        
-    }
-
-     componentDidMount() {
-
-        axios.get("/getallPostsforFeed")
-           .then((res) => {
-               const post = res.data;
-               this.setState({microBlogs : post})
-
-           })            
-   }  
-
-   render() {
-
-
-    const sortedPosts = (this.state.microBlogs).sort((a,b) =>
-    -a.createdAt.localeCompare(b.createdAt)
-    )
-
-       return(
-        <div>
-        <div style={{fontsize: "13px", marginLeft: "30%", textAlign: "left", }}>
-            <p>Feed</p>
-        </div>
-        <Box width="25%" flex="1" height="auto" marginLeft= "30%" m={2} fontSize="13px" padding="5px" flexWrap= "wrap" flexDirection= "row" >
-
-            <div style={{flexWrap: "wrap", flex: "1", flexDirection: "row",  wordBreak: "break-word", textAlign: "left"}}>
-            <p>
-            {sortedPosts.map((microBlog) => <p>Microblog Title: {microBlog.microBlogTitle}
-                                                      <br></br>When post was created: {microBlog.createdAt.substring(0,10) + 
-                                                      " " + microBlog.createdAt.substring(11,19)}
-                                                      <br></br>Who wrote the microBlog: {microBlog.userHandle}
-                                                      <br></br>Body of post: {microBlog.body}
-                                                      
-                                                      <br></br>Tagged topics: {microBlog.microBlogTopics.join("," + " ")}
-                                                      <br></br><br></br><br></br>
-                                                      <div className="buttons">
-
-                                                        <Like></Like>
-
-                                                      <span>Likes: {microBlog.likeCount}</span>
-                                                         <Quote></Quote>
-                                                        
-                                                        <br></br><br></br><br></br><br></br>
-                                                      </div>
-                                                                     
-            </p>)} 
-            </p>
-            </div>
-            </Box>
-        </div>
-        
-        )
-   }
-}
-/* Feed.propTypes = {
-    likePost: PropTypes.func.isRequired,
-    unlikePost: PropTypes.func.isRequired,
-    user: PropTypes.object.isRequired,
-    post: PropTypes.object.isRequired
-}
-
-const mapStateToProps = state => ({
-    user: state.user
-})
-
-const mapActionsToProps = {
-    likePost,
-    unlikePost
-}
-
-export default connect(mapStateToProps, mapActionsToProps)(Feed);  */
-export default Feed;
--- a/twistter-frontend/src/Like.js
+++ b/twistter-frontend/src/Like.js
@@ -1,54 +0,0 @@
-import React, { Component } from "react";
-import { BrowserRouter as Router } from 'react-router-dom';
-import Route from 'react-router-dom/Route';
-import axios from 'axios';
-
-class Like extends Component {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            like : false,
-            
-        };
-
-
-        this.handleSubmit = this.handleSubmit.bind(this);
-    }
-
-    handleSubmit(){
-
-
-        this.setState({
-            like: !this.state.like
-          });
-
-          
-            const postId = "AJdhYAE4diocF8UcrHDq"
-
-          if(this.state.like == false)
-          {
-            axios.get(`/putPost/${postId}/like`)
-            .then((res) => {
-                console.log(res.data);
-            })
-          }
-          else
-          {
-          axios.get(`/putPost/${postId}/unlike`)
-                .then((res) => {
-                    console.log(res.data);
-                })
-            } 
-
-    }
-
-    render() {
-        const label = this.state.like ? 'Unlike' : 'Like'
-        return (
-            <button onClick = {{backgroundColor: "lightBlue" }} onClick={this.handleSubmit}>{label}</button>
-        )
-    }
-}
-
-export default Like;
--- a/twistter-frontend/src/Quote.js
+++ b/twistter-frontend/src/Quote.js
@@ -1,78 +0,0 @@
-import React, { Component } from "react";
-import { BrowserRouter as Router } from 'react-router-dom';
-import Route from 'react-router-dom/Route';
-import axios from 'axios';
-import Modal from "react-modal";
-
-
-
-
-
-class Quote extends Component {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            post: null
-        };
-        this.handleSubmit = this.handleSubmit.bind(this);
-        this.handleSubmit2 = this.handleSubmit2.bind(this);
-
-
-    }
-
-    handleSubmit2() {
-        const postId = "AJdhYAE4diocF8UcrHDq";
-        const postNoComment = {
-            body : ""
-        }
-        const headers = {
-            headers: { 'Content-Type': 'application/json'}
-        }
-        
-        axios.post(`/putPost/${postId}/quote`, postNoComment, headers)
-            .then((res) =>{
-                alert('Quoting was successful!')
-                console.log(res.data);
-            })
-            .catch((err) => {
-                alert('An error occured.');
-                console.error(err);
-            })
-        event.preventDefault();
-        
-    }
-
-    handleSubmit() {
-        const postId = "AJdhYAE4diocF8UcrHDq";
-        const postComment = {
-            body : ""
-        }
-        const headers = {
-            headers: { 'Content-Type': 'application/json'}
-        }
-        
-        axios
-            .post(`/putPost/${postId}/quote`, postComment, headers)
-            .then((res) =>{
-                alert('Quoting was successful!')
-                console.log(res.data);
-            })
-            .catch((err) => {
-                alert('An error occured.');
-                console.error(err);
-            })
-        event.preventDefault();
-
-    }
-    render() {
-        return(
-            <div>
-                <button onClick={this.handleSubmit}>Quote with comment</button>
-                <button onClick={this.handleSubmit2}>Quote without comment</button>
-            </div>
-        )
-    }
-}
-
-export default Quote
--- a/twistter-frontend/src/Writing_Microblogs.js
+++ b/twistter-frontend/src/Writing_Microblogs.js
@@ -1,112 +1,128 @@
 import React, { Component } from "react";
-import { BrowserRouter as Router } from 'react-router-dom';
-import Route from 'react-router-dom/Route';
-import axios from 'axios';
-
-
+import { BrowserRouter as Router } from "react-router-dom";
+import Route from "react-router-dom/Route";
+import axios from "axios";

 class Writing_Microblogs extends Component {
-    
-    constructor(props) {
-        super(props);
-        this.state = {
-            value: '',
-            title: '',
-            topics: '',
-            characterCount: 250
-            
-        };
-        
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: "",
+      title: "",
+      topics: "",
+      characterCount: 250
+    };

-        this.handleChange = this.handleChange.bind(this);
-        this.handleSubmit = this.handleSubmit.bind(this);
-        this.handleChangeforPost = this.handleChangeforPost.bind(this);
-        this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
-        
-    }
+    this.handleChange = this.handleChange.bind(this);
+    this.handleSubmit = this.handleSubmit.bind(this);
+    this.handleChangeforPost = this.handleChangeforPost.bind(this);
+    this.handleChangeforTopics = this.handleChangeforTopics.bind(this);
+  }

-    handleChange(event) {
-        this.setState( {title: event.target.value });
-    }
+  handleChange(event) {
+    this.setState({ title: event.target.value });
+  }

-    handleChangeforTopics(event) {
-        this.setState( {topics: event.target.value});
-    }
+  handleChangeforTopics(event) {
+    this.setState({ topics: event.target.value });
+  }

-    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,  
-            userImage: "bing-url",
-            microBlogTitle: this.state.title,
-            microBlogTopics: this.state.topics.split(', ')
-        }
-        const headers = {
-            headers: { 'Content-Type': 'application/json'}
-        }
-        
-        axios
-            .post("/putPost", postData, headers)
-            .then((res) =>{
-                alert('Post was shared successfully!')
-                console.log(res.data);
-            })
-            .catch((err) => {
-                alert('An error occured.');
-                console.error(err);
-            })
-        event.preventDefault();
-        this.setState({value: '', title: '',characterCount: 250, topics: ''})
-    }
+  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,
+      userImage: "bing-url",
+      microBlogTitle: this.state.title,
+      microBlogTopics: this.state.topics.split(", ")
+    };
+    const headers = {
+      headers: { "Content-Type": "application/json" }
+    };

-    handleChangeforPost(event) {
-        this.setState({value: event.target.value })
-    }
+    axios
+      .post("/putPost", postData, headers)
+      .then(res => {
+        alert("Post was shared successfully!");
+        console.log(res.data);
+      })
+      .catch(err => {
+        alert("An error occured.");
+        console.error(err);
+      });
+    event.preventDefault();
+    this.setState({ value: "", title: "", characterCount: 250, topics: "" });
+  }

-    handleChangeforCharacterCount(event) {
-        const charCount = event.target.value.length
-        const charRemaining = 250 - charCount
-        this.setState({characterCount: charRemaining })
-    
-    }
+  handleChangeforPost(event) {
+    this.setState({ value: event.target.value });
+  }

-    render() {
-        
+  handleChangeforCharacterCount(event) {
+    const charCount = event.target.value.length;
+    const charRemaining = 250 - charCount;
+    this.setState({ characterCount: charRemaining });
+  }

-        return (
-            <div>
+  render() {
+    return (
+      <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>

-            <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 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={{ 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>
-             
-             <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>
-            
-        );
-    }
-
-
+            <div style={{ marginRight: "-100px" }}>
+              <button onClick>Share Post</button>
+            </div>
+          </form>
+        </div>
+      </div>
+    );
+  }
 }

-export default Writing_Microblogs;
+export default Writing_Microblogs;
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -1,81 +1,84 @@
 /* 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='/login'>
-                        Login
-                    </Button>}
-                    {!authenticated && <Button component={ Link } to='/signup'>
-                        Sign Up
-                    </Button>}
-                    {authenticated && <Button component={ Link } to='/logout'>
-                        Logout
-                    </Button>}
-                    {/* Commented out the delete button, because it should probably go on
-                        the profile or editProfile page instead of the NavBar */}
-                    {/* <Button component={ Link } to='/delete'>
-                        Delete Account
-                    </Button> */}
-                </ToolBar>
-            </AppBar>
-        )
-    }
+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="/login">
+              Login
+            </Button>
+          )}
+          {!authenticated && (
+            <Button component={Link} to="/signup">
+              Sign Up
+            </Button>
+          )}
+          {authenticated && (
+            <Button component={Link} to="/search">
+              Search
+            </Button>
+          )}
+          {authenticated && (
+            <Button component={Link} to="/logout">
+              Logout
+            </Button>
+          )}
+        </ToolBar>
+      </AppBar>
+    );
+  }
 }

-const mapStateToProps = (state) => ({
-    user: state.user
-})
-
-// const mapActionsToProps = { logoutUser };
+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));
-
-// export default Navbar;
--- a/twistter-frontend/src/pages/Delete.js
+++ b/twistter-frontend/src/pages/Delete.js
@@ -7,7 +7,8 @@ import Button from "@material-ui/core/Button";
 import withStyles from "@material-ui/core/styles/withStyles";

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

 const styles = {
@@ -32,7 +33,8 @@ const styles = {
 export class Delete extends Component {

  componentDidMount() {
-    this.props.logoutUser();
+    //this.props.logoutUser();
+    this.props.deleteUser();
    this.props.history.push('/');
  }

@@ -45,10 +47,12 @@ const mapStateToProps = (state) => ({
  user: state.user
 });

-const mapActionsToProps = { logoutUser };
+//const mapActionsToProps = { logoutUser };
+const mapActionsToProps = { deleteUser };

 Delete.propTypes = {
-  logoutUser: PropTypes.func.isRequired,
+  //logoutUser: PropTypes.func.isRequired,
+  deleteUser: PropTypes.func.isRequired,
  user: PropTypes.object.isRequired,
  classes: PropTypes.object.isRequired
 };
--- a/twistter-frontend/src/pages/Home.js
+++ b/twistter-frontend/src/pages/Home.js
@@ -1,12 +1,86 @@
+/* eslint-disable */
 import React, { Component } from 'react';
-import '../App.css';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import axios from 'axios';

+// Material UI and React Router
+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";
+
+// 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';


 class Home extends Component {
+  state = {
+    
+  };
+
+
+  componentDidMount() {
+    axios
+      .get("/getallPosts")
+      .then(res => {
+        console.log(res.data);
+        this.setState({
+          posts: res.data
+        })
+        this.setState({posts: (this.state.posts).sort((a,b) =>
+          -a.createdAt.localeCompare(b.createdAt))
+        })
+      })
+      .catch(err => console.log(err));
+  }
+
+  
  render() {
+     let authenticated = this.props.user.authenticated;
+
+    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.substring(0,10) + 
+                                                          " " + post.createdAt.substring(11,19)}</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>        
+            <br />
+            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount}</Typography>
+            <Like microBlog = {post.postId}></Like>
+            <Quote microblog = {post.postId}></Quote>
+          </CardContent>
+        </Card>
+      )
+    ) : (<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" />
@@ -31,7 +105,179 @@ class Home extends Component {
        </div>
      </div>
    );
+  }
+}
+
+
+const mapStateToProps = (state) => ({
+  user: state.user
+})
+
+Home.propTypes = {
+  user: PropTypes.object.isRequired
+}
+
+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);
  }

-export default Home;
+  handleSubmitWithoutPost(event) {
+    const headers = {
+      headers: { "Content-Type": "application/json" }
+    };
+    axios.post(`/quoteWithoutPost/${this.props.microblog}`, headers)
+    .then((res) => {
+      
+      console.log(res.data);
+    })
+    .catch(err => {
+    
+      console.error(err);
+    });
+    event.preventDefault();
+  }
+
+  handleOpenModal() {
+    this.setState({ showModal: true });
+  }
+  
+  handleCloseModal() {
+    this.setState({ showModal: false });
+  }
+
+  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 = {
+      quotePost: this.state.value,
+    };
+    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 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>
+            <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}
+            />
+            
+            <div style={{ fontSize: "14px", marginRight: "-100px" }}>
+              <p2>Characters Left: {this.state.characterCount}</p2>
+            </div>
+              <button onClick={this.handleSubmit}>Share Quoted Post</button>
+        
+          <button onClick={this.handleCloseModal}>Cancel</button>
+
+          </form>
+        </div>
+          
+          
+        </ReactModal>
+        <button onClick={this.handleSubmitWithoutPost}>Quote without Post</button>
+
+      </div>
+    )
+  }
+}
+
+class Like extends Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      like: false
+    }
+
+    this.handleClick = this.handleClick.bind(this);
+  }
+
+  handleClick(){
+    
+    this.setState({
+      like: !this.state.like
+    }); 
+
+    if(this.state.like == false)
+          {
+
+            axios.get(`/like/${this.props.microBlog}`)
+            .then((res) => {
+                console.log(res.data);
+            })
+            .catch((err) => {
+              console.log(err);
+            })
+          }
+          else
+          {
+          axios.get(`/unlike/${this.props.microBlog}`)
+                .then((res) => {
+                    console.log(res.data);
+                })
+                .catch((err) => {
+                  console.log(err);
+                })
+            }
+  
+  }
+    render() {
+      const label = this.state.like ? 'Unlike' : 'Like'
+      return(
+        <div>
+          <button onClick={this.handleClick}>{label}</button>
+        </div>
+      )
+    }
+
+}
+
+export default connect(mapStateToProps)(Home);
--- a/twistter-frontend/src/pages/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -16,13 +16,15 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // Redux stuff
 import { connect } from 'react-redux';
 import { loginUser } from '../redux/actions/userActions';
+import { fontFamily } from '@material-ui/system';

+//Theme
 const styles = {
  form: {
    textAlign: "center"
  },
  textField: {
-    marginBottom: 30
+    marginBottom: 20
  },
  pageTitle: {
    // marginTop: 20,
@@ -34,6 +36,9 @@ const styles = {
  },
  progress: {
    position: "absolute"
+  },
+  p: {
+    fontFamily: "cursive",
  }
 };

@@ -104,9 +109,12 @@ export class Login extends Component {
        <Grid item sm />
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
-          <Typography variant="h2" className={classes.pageTitle}>
-            Log in to Twistter
+          <br></br>
+          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
+            <b>Log in to Twistter</b>
+            <br></br>
          </Typography>
+          <br></br>
          <form noValidate onSubmit={this.handleSubmit}>
            <TextField
              id="email"
--- a/twistter-frontend/src/pages/Search.js
+++ b/twistter-frontend/src/pages/Search.js
@@ -0,0 +1,80 @@
+import React, { Component } from "react";
+// import props
+import { TextField, Button } from "@material-ui/core";
+import Grid from "@material-ui/core/Grid";
+import Axios from "axios";
+
+import { BrowserRouter as Router } from "react-router-dom";
+
+export class Search extends Component {
+  state = {
+    searchPhase: null,
+    searchResult: null
+  };
+
+  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);
+      });
+  };
+
+  handleInput(event) {
+    this.setState({
+      searchPhase: event.target.value
+    });
+    console.log(this.state.searchPhase);
+  }
+
+  handleRedirect() {
+    location.reload();
+  }
+
+  render() {
+    let resultMarkup = this.state.searchResult ? (
+      <Router>
+        <div>
+          <a href={`/user/${this.state.searchResult}`}>
+            {this.state.searchResult}
+          </a>
+        </div>
+      </Router>
+    ) : (
+      //   console.log(this.state.searchResult)
+      <p> No result </p>
+    );
+
+    return (
+      <Grid>
+        <Grid>
+          <TextField
+            id="standard-required"
+            label="Search"
+            defaultValue="username"
+            margin="normal"
+            value={this.state.searchPhase}
+            onChange={event => this.handleInput(event)}
+          />
+        </Grid>
+        <Grid>
+          <Button color="primary" onClick={this.handleSearch}>
+            Search
+          </Button>
+        </Grid>
+        <Grid>{resultMarkup}</Grid>
+      </Grid>
+    );
+  }
+}
+
+export default Search;
--- a/twistter-frontend/src/pages/Signup.js
+++ b/twistter-frontend/src/pages/Signup.js
@@ -16,13 +16,17 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // Redux stuff
 import { connect } from 'react-redux';
 import { signupUser } from '../redux/actions/userActions';
+import { border } from '@material-ui/system';

 const styles = {
  form: {
    textAlign: "center"
  },
  textField: {
-    marginBottom: 30
+    marginBottom: 20,
+    //border: "1px solid #234",
+    display: "inline-block",
+    boxSizing: "border-box",
  },
  pageTitle: {
    marginBottom: 40
@@ -33,6 +37,14 @@ const styles = {
  },
  progress: {
    position: "absolute"
+  },
+  div: {
+    borderRadius: "5px",
+    backgroundColor: "grey",
+    padding: "20px",
+  },
+  p: {
+    fontFamily: "Segoe UI",
  }
 };

@@ -92,9 +104,12 @@ export class Signup extends Component {
        <Grid item sm />
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
-          <Typography variant="h2" className={classes.pageTitle}>
-            Create a new account
+          <br></br>
+          <Typography variant="p" className={classes.pageTitle}>
+            <b>Create a new account</b>
+            <br></br>
          </Typography>
+          <br></br>
          <form noValidate onSubmit={this.handleSubmit}>
          <TextField
              id="handle"
@@ -146,6 +161,8 @@ export class Signup extends Component {
              onChange={this.handleChange}
              fullWidth
            />
+            <br></br>
+            <br></br>
            <Button
              type="submit"
              variant="contained"
--- a/twistter-frontend/src/pages/editProfile.js
+++ b/twistter-frontend/src/pages/editProfile.js
@@ -6,6 +6,7 @@ import PropTypes from "prop-types";

 // 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";
@@ -220,12 +221,34 @@ export class edit extends Component {
              color="primary"
              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>
+            <br />
+            <Button
+              variant="contained"
+              color="secondary"
+              className={classes.button}
+              component={ Link }
+              to='/delete'
+            >
+              Delete Account
+            </Button>
          </form>
        </Grid>
        <Grid item sm />
--- a/twistter-frontend/src/pages/otherUser.js
+++ b/twistter-frontend/src/pages/otherUser.js
@@ -0,0 +1,158 @@
+/* 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 { 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";
+
+// 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"
+});
+
+class user extends Component {
+  state = {
+    profile: window.location.pathname.split("/").pop(),
+    imageUrl: null,
+    topics: null,
+    user: null,
+    following: null
+  };
+
+  handleSub = () => {
+    if (this.state.following === true) {
+      axios
+        .post("/removeSub", {
+          unfollow: this.state.profile
+        })
+        .then(res => {
+          console.log("removed sub");
+          this.setState({
+            following: false
+          });
+        })
+        .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);
+        });
+    }
+  };
+
+  componentDidMount() {
+    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));
+
+    axios
+      .get("/user")
+      .then(res => {
+        this.setState({
+          following: res.data.credentials.following.includes(this.state.profile)
+        });
+      })
+      .catch(err => console.log(err));
+  }
+
+  render() {
+    let profileMarkup = this.state.profile ? (
+      <div>
+        <Typography variant="h5">
+          @{this.state.profile}{" "}
+          {this.state.verified ? (
+            <VerifiedIcon style={{ fill: "#1397D5" }} />
+          ) : null}
+        </Typography>
+      </div>
+    ) : (
+      <p>loading username...</p>
+    );
+    let topicsMarkup = this.state.topics ? (
+      this.state.topics.map(
+        topic => <MyChip label={topic} key={{ topic }.topic.id} /> // console.log({ topic }.topic.id)
+      )
+    ) : (
+      <p> loading topics...</p>
+    );
+
+    let imageMarkup = this.state.imageUrl ? (
+      <img src={this.state.imageUrl} height="150" width="150" />
+    ) : (
+      <img src={noImage} height="150" width="150" />
+    );
+
+    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>
+    );
+
+    console.log(this.state.following);
+
+    return (
+      <Grid container spacing={24}>
+        <Grid item sm={4} xs={8}>
+          {imageMarkup}
+          {profileMarkup}
+          {followMarkup}
+          {topicsMarkup}
+          <br />
+        </Grid>
+      </Grid>
+    );
+  }
+}
+
+const mapStateToProps = state => ({
+  user: state.user
+});
+
+user.propTypes = {
+  user: PropTypes.object.isRequired
+};
+
+export default connect(mapStateToProps)(user);
--- a/twistter-frontend/src/pages/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -1,117 +1,304 @@
 /* eslint-disable */
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import axios from 'axios';
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import axios from "axios";
 //import '../App.css';
-import { makeStyles, styled } from '@material-ui/core/styles';
-import Grid from '@material-ui/core/Grid';
-import Card from '@material-ui/core/Card';
-import CardMedia from '@material-ui/core/CardMedia';
-import CardContent from '@material-ui/core/CardContent';
-import Chip from '@material-ui/core/Chip';
-import Paper from '@material-ui/core/Paper';
+// Material-UI
+import withStyles from "@material-ui/core/styles/withStyles";
+import { makeStyles, styled } from "@material-ui/core/styles";
+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 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 Profile from '../components/profile/Profile';
-import Userline from '../Userline';
-import noImage from '../images/no-img.png';
-
-
-const PostCard = styled(Card)({
-  background: 'linear-gradient(45deg, #1da1f2 90%)',
-  border: 3,
-  borderRadius: 3,
-  height:325,
-  width: 345,
-  padding: '0 30px',
-});
+import "../App.css";
+import noImage from "../images/no-img.png";
+import Writing_Microblogs from "../Writing_Microblogs";

 const MyChip = styled(Chip)({
  margin: 2,
-  color: 'primary'
+  color: "primary"
 });

+const styles = {
+  button: {
+    positon: "relative",
+    float: "left",
+    marginLeft: 30,
+    marginTop: 20
+  },
+  paper: {
+    // marginLeft: "10%",
+    // marginRight: "10%"
+  },
+  card: {
+    marginBottom: 10
+  },
+  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
+  }
+};

-const styles = (theme) => ({
-  ...theme
-});
-
-const handleDelete = () => {
-  alert("Delete this topic!");
-}
-
-const handleAddCircle = () => {
-  alert("Add topic");
-}
-
-class user extends Component {  
+class user extends Component {
  state = {
    profile: null,
-    topics: null
+    imageUrl: null,
+    topics: null,
+    newTopic: null
  };

+  handleDelete = topic => {
+    console.log(topic);
+    axios
+      .post(`/deleteTopic`, {
+        unfollow: topic
+      })
+      .then(function() {
+        location.reload();
+      })
+      .catch(function(err) {
+        console.log(err);
+      });
+  };
+
+  handleAddCircle = () => {
+    axios
+      .post("/putTopic", {
+        following: this.state.newTopic
+      })
+      .then(function() {
+        location.reload();
+      })
+      .catch(function(err) {
+        console.log(err);
+      });
+  };
+
+  handleChange(event) {
+    this.setState({
+      newTopic: event.target.value
+    });
+  }
+
  componentDidMount() {
    axios
      .get("/user")
      .then(res => {
-        console.log(res.data.credentials.handle);
        this.setState({
-          profile: res.data.credentials.handle
+          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
        });
      })
      .catch(err => console.log(err));
+
    axios
-      .get("/getAllTopics")
+      .get("/getallPostsforUser")
      .then(res => {
-        console.log(res.data[1]);
+        // console.log(res.data);
        this.setState({
-          topics: res.data
+          posts: res.data
+        })
+        this.setState({posts: (this.state.posts).sort((a,b) =>
+          -a.createdAt.localeCompare(b.createdAt))
        })
      })
      .catch(err => console.log(err));
  }
+
  render() {
-    const classes = this.props;
+    const { classes } = this.props;
+    let authenticated = this.props.user.authenticated;
+
    let profileMarkup = this.state.profile ? (
-      <p>
-      <Typography variant='h5'>{this.state.profile}</Typography>
-      </p>) : (<p>loading username...</p>);
-    
+      <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>
+    );

    let topicsMarkup = this.state.topics ? (
-      this.state.topics.map(topic => <MyChip 
-        label={{topic}.topic.topic}
-        onDelete={handleDelete}/>)
-    ) : (<p> loading topics...</p>);
+      this.state.topics.map(
+        topic => (
+          <MyChip
+            label={topic}
+            key={topic.id}
+            onDelete={key => this.handleDelete(topic)}
+          />
+        ) // console.log({ topic }.topic.id)
+      )
+    ) : (
+      <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 postMarkup = this.state.posts ? (
+      this.state.posts.map(post => (
+        <Card className={classes.card}>
+          <CardContent>
+            <Typography>
+              {this.state.imageUrl ? (
+                <img src={this.state.imageUrl} height="50" width="50" />
+              ) : (
+                <img src={noImage} height="50" width="50" />
+              )}
+            </Typography>
+            <Typography variant="h7">
+              <b>{post.userHandle}</b>
+            </Typography>
+            <Typography variant="body2" color={"textSecondary"}>
+              {post.createdAt}
+            </Typography>
+
+            <Typography variant="h7"><b>{post.userHandle}</b></Typography>
+            <Typography variant="body2" color={"textSecondary"}>{post.createdAt.substring(0,10) + 
+                                                          " " + post.createdAt.substring(11,19)}</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>
+            <br />
+            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount}</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="/edit">
+        <Button className={classes.button} variant="outlined" color="primary">
+          Edit Profile
+        </Button>
+      </Link>
+    ) : null;

    return (
-      <Grid container spacing={16}>
-        <Grid item sm={8} xs={12}>
-          <p>Post</p>
+      <div>
+        {/* <Paper className={classes.paper}> */}
+        <Grid container direction="column">
+          <Grid item>
+            <Grid container>
+              <Grid item sm>
+                {editButtonMarkup}
+              </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
+                  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>
-        <Grid item sm={4} xs={12}>
-          <img src={noImage}/>
-          {profileMarkup}
-          {topicsMarkup}
-          <MyChip
-            icon={<AddCircle />}
-            clickable
-            onClick={handleAddCircle}
-          />
-        </Grid>
-      </Grid>
+      </div>
    );
  }
 }

-Userline.PropTypes = {
-  handle: PropTypes.object.isRequired
-};
-
-const mapStateToProps = (state) => ({
+const mapStateToProps = state => ({
  user: state.user
 });

-export default user;
+user.propTypes = {
+  user: PropTypes.object.isRequired
+};
+
+export default connect(mapStateToProps)(withStyles(styles)(user));
--- a/twistter-frontend/src/pages/verify.js
+++ b/twistter-frontend/src/pages/verify.js
@@ -0,0 +1,153 @@
+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 { errors, 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);
Author	SHA1	Message	Date
asankaran35	1a2af4e9bb	Merge branch 'master' into engage_microblog	2019-11-27 21:08:55 -05:00
Aditya Sankaran	c34f06f130	formatted feed and userline	2019-11-27 20:57:42 -05:00
Leon Liang	64cc9bd156	Merge pull request #91 from ClaytonWWilson/fix_profile Fix profile	2019-11-21 20:21:24 -05:00
Leon Liang	6a78d74930	simplified backend get/remove topic function	2019-11-21 20:20:54 -05:00
Leon Liang	4e817c9647	integrated backend change, added pointer cursor	2019-11-21 20:09:47 -05:00
Leon Liang	7976110e2b	modified function to add/delete topic only from user	2019-11-21 19:59:04 -05:00
Leon Liang	3da2449050	change topic display to user-specific topics	2019-11-21 18:10:44 -05:00
Leon Liang	607ea3fd55	Merge pull request #83 from ClaytonWWilson/edit-profile-linking Changing profile page layout	2019-11-21 17:58:56 -05:00
Aditya Sankaran	e8110d643f	finished quoting microblogs	2019-11-21 15:42:43 -05:00
Leon Liang	c3091cc10a	Merge pull request #90 from ClaytonWWilson/auto_complete completed search page and redirect to user profile page	2019-11-19 22:31:52 -05:00
Leon Liang	81749c19ce	completed search page and redirect to user profile page	2019-11-19 22:30:15 -05:00
Aditya Sankaran	1ccc195036	liking and unliking work	2019-11-19 21:09:07 -05:00
Leon Liang	0aaa9014b9	Merge pull request #88 from ClaytonWWilson/user_page User page	2019-11-19 19:22:48 -05:00
Leon Liang	2de3da928a	added UI for follow and unfollow other user	2019-11-19 19:03:28 -05:00
Leon Liang	42c53fdbc4	Add profile image, topics for other user page	2019-11-19 15:56:39 -05:00
Leon Liang	c8aa1fd050	Added page to display other users' profile	2019-11-19 13:57:24 -05:00
Leon Liang	c6022dbc38	Merge pull request #86 from ClaytonWWilson/subscribe Added function to follow and unfollow users	2019-11-15 17:49:59 -05:00
Leon Liang	1d26eb97ad	Added function to follow and unfollow users	2019-11-15 17:47:47 -05:00
Clayton Wilson	9372a092ad	Fix edit profile button link	2019-11-05 17:43:19 -05:00
Clayton Wilson	7a6ac8499c	fix merge	2019-11-05 17:38:11 -05:00
Clayton Wilson	6149e15b35	Profile page kinda works on mobile	2019-11-05 17:35:16 -05:00
Clayton Wilson	80670d054e	Main layout of profile page	2019-11-05 17:19:28 -05:00
Clayton Wilson	947e5b01a4	Converted tabs back to spaces	2019-11-05 17:16:34 -05:00
Clayton Wilson	7cc8a3f11f	Fixing up profile UI	2019-11-05 17:04:33 -05:00
Clayton Wilson	7476833f0a	Main layout of profile page	2019-11-05 16:32:16 -05:00
Clayton Wilson	903ea35662	Fix indents	2019-11-01 16:19:54 -04:00
Clayton Wilson	e644498108	Merge pull request #67 from ClaytonWWilson/verify-profile Users can be verified and have a check mark displayed on their profiles	2019-11-01 16:11:53 -04:00
Clayton Wilson	97bc9c4fb1	Verify users front-end	2019-11-01 16:11:02 -04:00
Shobhit Makhija	f2dac314e5	Merge pull request #74 from ClaytonWWilson/Beautify Fixing UI	2019-11-01 15:39:57 -04:00
Clayton Wilson	b01aa92f96	Add post id	2019-11-01 15:39:08 -04:00
shobhitm23	d3bfd8b5f3	Fixing UI	2019-11-01 15:36:22 -04:00
Clayton Wilson	d6876eab0b	Fix .then() must return	2019-11-01 14:28:49 -04:00
Clayton Wilson	f4bedea2c7	Merge branch 'master' into verify-profile	2019-11-01 13:40:30 -04:00
Clayton Wilson	d4ea00d2e9	Merge pull request #72 from ClaytonWWilson/fix-delete Fix delete	2019-11-01 13:26:25 -04:00
Clayton Wilson	acd33d6a96	Merge branch 'master' into fix-delete	2019-11-01 13:26:11 -04:00
Clayton Wilson	f1e4362205	Change imageFileName from const to let	2019-11-01 00:37:49 -04:00
Clayton Wilson	1e4b2d16ef	Fix edge case	2019-11-01 00:29:22 -04:00
Clayton Wilson	e8e69cec31	Delete removes all data now	2019-11-01 00:26:01 -04:00
Leon Liang	ae89e3d63b	Merge pull request #69 from ClaytonWWilson/search_page added search page	2019-10-31 16:57:38 -04:00
Leon Liang	f60c045483	Merge branch 'master' into search_page	2019-10-31 16:57:22 -04:00
Leon Liang	1842eef2f8	added search page	2019-10-31 16:54:34 -04:00
Clayton Wilson	56323801aa	Merge pull request #65 from ClaytonWWilson/auth-backend-3 Auth backend 3	2019-10-31 16:14:22 -04:00
Clayton Wilson	ce984df437	Merge branch 'master' into auth-backend-3	2019-10-31 16:09:17 -04:00
Clayton Wilson	112988c8fb	Add '@' to profile handle	2019-10-31 15:46:33 -04:00
Clayton Wilson	325d37f0de	Back-end for verifying users	2019-10-31 15:12:22 -04:00
Leon Liang	35e5cf8e9d	revert changes that I f ed up	2019-10-31 15:11:16 -04:00
Leon Liang	649b9b4a69	Merge pull request #68 from ClaytonWWilson/delete_topic Delete topic	2019-10-31 14:44:41 -04:00
Leon Liang	e73b2d02f3	Merge branch 'master' into delete_topic	2019-10-31 14:44:03 -04:00
Leon Liang	50bc73870b	delete topic fully works	2019-10-31 14:32:54 -04:00
Clayton Wilson	ca1d86acf1	Users can be verified and have a check mark displayed on their profiles	2019-10-31 13:56:40 -04:00
Aaron Sun	da14700987	Fixed a small bug with the Delete Account button	2019-10-30 18:15:01 -04:00
Aaron Sun	26afabe709	All posts from db can now show on home page timeline	2019-10-30 18:04:35 -04:00
Aaron Sun	a61c296ddf	Made the posts look prettier	2019-10-30 16:12:53 -04:00
Aaron Sun	1337071bec	UI can now display all features of a post	2019-10-30 15:07:19 -04:00
Aaron Sun	cd19364efc	Can now display post body on profile page	2019-10-30 11:40:44 -04:00
Clayton Wilson	3c31db9bf5	Converted tabs back to spaces	2019-10-29 23:02:36 -04:00
Aaron Sun	8438ce27cf	Get user's posts works now	2019-10-29 22:25:38 -04:00
Aaron Sun	6db14e3868	Improved the profile page format	2019-10-29 19:39:11 -04:00
DreamCoder23	16567e2373	Merge pull request #63 from ClaytonWWilson/auth-backend-3 Auth backend 3	2019-10-29 14:40:02 -04:00
Aaron Sun	d3a77afe43	Pulled and merged the latest code from master	2019-10-29 14:02:56 -04:00
Aaron Sun	42b73632c0	Delete user's posts fully works now	2019-10-29 10:34:09 -04:00
Clayton Wilson	3d875e2bde	Fixing up profile UI	2019-10-28 23:25:12 -04:00
Leon Liang	b20408c144	delete topic	2019-10-28 21:38:32 -04:00
Aaron Sun	c482f56762	Invalid credential message displays after non-exisitng email is passed in	2019-10-28 20:14:38 -04:00
Aaron Sun	9525ff7d0a	Delete post works in Postman but not in actual database	2019-10-28 17:57:03 -04:00
Shobhit Makhija	f602b8251f	Merge pull request #61 from ClaytonWWilson/filteredPosts Arrow-callback warning	2019-10-28 01:34:43 -04:00
shobhitm23	70a12dcca4	Arrow-callback warning	2019-10-28 00:21:29 -04:00
Aaron Sun	657277bcad	Username and user id now show in post data	2019-10-27 23:11:24 -04:00
Aaron Sun	d69828ef7f	Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3	2019-10-27 20:48:15 -04:00
Aaron Sun	5fa4caf0a3	Log in with username fully works now	2019-10-27 17:47:04 -04:00
Aaron Sun	fd226b454e	Delete users fully works now	2019-10-27 14:46:31 -04:00
Leon Liang	97998a8f09	merge changes	2019-10-27 13:24:53 -04:00
Leon Liang	13a1401759	Reformat code	2019-10-27 02:53:12 -04:00
Leon Liang	0bbc453d54	Merge pull request #55 from ClaytonWWilson/delete_topic Delete topic	2019-10-27 00:10:56 -04:00
Leon Liang	e236ceeb4b	Merge branch 'master' into delete_topic	2019-10-27 00:10:38 -04:00
Leon Liang	1c81ae1663	show user's profile image	2019-10-27 00:09:17 -04:00
Leon Liang	c356dd18fa	added UI allowing topic creation	2019-10-27 00:08:38 -04:00
Leon Liang	ec041732d9	reformat	2019-10-25 23:14:25 -04:00