user Feed

work
connecting
2026-03-10 13:15:05 +00:00 · 2019-11-08 17:09:57 -05:00 · 2019-11-01 13:20:34 -04:00 · 2019-11-01 04:42:44 -04:00 · 2019-10-30 21:55:48 -04:00 · 2019-10-30 18:31:55 -04:00
34 changed files with 1235 additions and 327 deletions
--- a/firebase.json
+++ b/firebase.json
@@ -8,7 +8,6 @@
    },
    "functions": {
      "predeploy": [
-        "npm --prefix \"$RESOURCE_DIR\" run lint"
      ]
    },
    "hosting": {
--- a/functions/handlers/post.js
+++ b/functions/handlers/post.js
@@ -1,11 +1,14 @@
 /* eslint-disable promise/always-return */
 const admin = require('firebase-admin');
+const { db } = require('../util/admin');
+
 exports.putPost = (req, res) => {

    const newPost = {
        body: req.body.body,
-        userHandle: req.body.userHandle,
+        userHandle: req.userData.handle,
        userImage: req.body.userImage,
+        userID: req.userData.userId,
        microBlogTitle: req.body.microBlogTitle,
        createdAt: new Date().toISOString(),
        likeCount: 0,
@@ -15,29 +18,156 @@ exports.putPost = (req, res) => {
    };

    admin.firestore().collection('posts').add(newPost)
-            .then((doc) => {
-            const resPost = newPost;
-            resPost.postId = doc.id;
-            return res.status(200).json(resPost);
-        })
-        .catch((err) => {
-            console.error(err);
-            return res.status(500).json({ error: 'something is wrong'});
+    .then((doc) => {
+        const resPost = newPost;
+        resPost.postId = doc.id;
+        return res.status(200).json(resPost);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something is 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);
+    })
+    .catch((err) => {
+        console.error(err); 
+        return res.status(500).json({error: 'Something is wrong'});
+    })
+}
+
+exports.likePost = (req, res) => {
+    
+    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
+    .where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    likeDoc.get()
+    .then((data) => {
+        if (data.empty) {
+            admin.firestore().collection('likes').add({
+                postId : req.params.postId,
+                userHandle: req.userData.handle
+            })
+            .then(() => {
+                return postDoc.update({likeCount : firebase.firestore.FieldValue.increment(1) })
+            })
+            .then(() => {
+                return res.status(200).json(postDoc);
+            })
+        }
+        else {
+            return res.status(400).json({error: 'Post has already been liked.'})
+        }
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Something is wrong'});
+    })
+
+}
+
+exports.unlikePost = (re, res) => {
+
+    let postData;
+    const likeDoc = admin.firestore().collection('likes').where('userHandle', '==', req.userData.handle)
+    .where('postId', '==', req.params.postId).limit(1);
+
+    const postDoc = db.doc(`/posts/${req.params.postId}`);
+
+    likeDoc.get()
+    .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()
+              .then(() => {
+                postData.likeCount--;
+                return postDoc.update({ likeCount: postData.likeCount });
+              })
+              .then(() => {
+                res.status(200).json(postData);
+              });
+          }
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Something is wrong'});
+    })
+
+}
+
+exports.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', '==', 'new user' ).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.'})
-        })
-    }
+    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.'})
+    })
+};
--- a/functions/handlers/topic.js
+++ b/functions/handlers/topic.js
@@ -0,0 +1,53 @@
+/* eslint-disable promise/always-return */
+const { admin, db } = require("../util/admin");
+exports.putTopic = (req, res) => {
+
+    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);
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({ error: 'something is wrong'});
+    });
+};
+
+exports.getAllTopics = (req, res) => {
+    admin.firestore().collection('topics').get()
+    .then((data) => {
+        let topics = [];
+        data.forEach(function(doc) {
+            topics.push(doc.data());
+        });
+        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();
+        }
+    })
+    .then(() => {
+        res.json({ message: 'Topic successfully deleted!'});
+    })
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to delete topic.'})
+    })
+}
--- a/functions/handlers/users.js
+++ b/functions/handlers/users.js
@@ -1,4 +1,5 @@
 /* eslint-disable promise/catch-or-return */
+
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
 const { validateUpdateProfileInfo } = require("../util/validator");
@@ -6,6 +7,8 @@ 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,
@@ -71,11 +74,13 @@ exports.signup = (req, res) => {
    .then((idToken) => {
      token = idToken;
      const userCred = {
-        email: req.body.email,
+        email: newUser.email,
        handle: newUser.handle,
        createdAt: newUser.createdAt,
-        userId
+        userId,
+        followedTopics: []
      };
+      handle2Email.set(userCred.handle, userCred.email);
      return db.doc(`/users/${newUser.handle}`).set(userCred);
    })
    .then(() => {
@@ -93,16 +98,22 @@ exports.signup = (req, res) => {
 exports.login = (req, res) => {
  const user = {
    email: req.body.email,
+    handle: req.body.handle,
    password: req.body.password
  };

  // Auth validation
  let errors = {};

+  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
  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
  if (user.password.trim() === "") {
@@ -125,7 +136,7 @@ exports.login = (req, res) => {
    })
    .catch((err) => {
      console.error(err);
-      if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email") {
+      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." });
@@ -134,6 +145,44 @@ exports.login = (req, res) => {
    });
 };

+//Deletes user account
+exports.deleteUser = (req, res) => {
+  var currentUser;
+
+  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);
+      });*/
+
+      //let ref = db.collection('users');
+      //let userDoc = ref.where('userId', '==', currentUser.uid).get();
+      //userDoc.ref.delete();
+
+      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.");
+      });
+    } 
+    else {
+      console.log("Cannot get user.");
+      res.status(500).send("Cannot get user.");
+    }
+  });
+};
+
 // Returns all data in the database for the user who is currently signed in
 exports.getProfileInfo = (req, res) => {
  db.collection("users")
@@ -153,7 +202,7 @@ exports.updateProfileInfo = (req, res) => {
  // TODO: Add functionality for adding/updating profile images

  // Data validation
-  const { valid, errors, profileData } = validateUpdateProfileInfo(req.body);
+  const { valid, errors, profileData } = validateUpdateProfileInfo(req);
  if (!valid) return res.status(400).json(errors);

  // Update the database entry for this user
@@ -178,50 +227,11 @@ exports.updateProfileInfo = (req, res) => {

 exports.getUserDetails = (req, res) => {
  let userData = {};
-  db.doc(`/users/${req.params.handle}`)
+  db.doc(`/users/${req.body.handle}`)
    .get()
    .then((doc) => {
      if (doc.exists) {
-        userData.user = doc.data();
-        return db
-          .collection("post")
-          .where("userHandle", "==", req.params.handle)
-          .orderBy("createdAt", "desc")
-          .get();
-      } else {
-        return res.status(404).json({
-          error: "User not found"
-        });
-      }
-    })
-    .then((data) => {
-      userData.posts = [];
-      data.forEach((doc) => {
-        userData.posts.push({
-          body: doc.data().body,
-          createAt: doc.data().createAt,
-          userHandle: doc.data().userHandle,
-          userImage: doc.data().userImage,
-          likeCount: doc.data().likeCount,
-          commentCount: doc.data().commentCount,
-          postId: doc.id
-        });
-      });
-      return res.json(userData);
-    })
-    .catch((err) => {
-      console.error(err);
-      return res.status(500).json({ error: err.code });
-    });
-};
-
-exports.getAuthenticatedUser = (req, res) => {
-  let userData = {};
-  db.doc(`/users/${req.user.handle}`)
-    .get()
-    .then((doc) => {
-      if (doc.exists) {
-        userData.credentials = doc.data();
+        userData = doc.data();
        return res.status(200).json({userData});
    } else {
      return res.status(400).json({error: "User not found."})
@@ -231,3 +241,22 @@ exports.getAuthenticatedUser = (req, res) => {
      return res.status(500).json({ error: err.code });
    });
 };
+
+exports.getAuthenticatedUser = (req, res) => {
+  let credentials = {};
+  db.doc(`/users/${req.user.handle}`)
+    .get()
+    .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) => {
+      console.error(err);
+      return res.status(500).json({ error: err.code });
+    });
+};
+
+
--- a/functions/index.js
+++ b/functions/index.js
@@ -15,6 +15,7 @@ const {
  getProfileInfo,
  login,
  signup,
+  deleteUser,
  updateProfileInfo
 } = require("./handlers/users");

@@ -27,7 +28,10 @@ app.post("/signup", signup);
 // and password
 app.post("/login", login);

-app.get("/getUser/:handle", getUserDetails);
+//Deletes user account
+app.delete("/delete", deleteUser);
+
+app.get("/getUser", fbAuth, getUserDetails);

 // Returns all profile data of the currently logged in user
 app.get("/getProfileInfo", fbAuth, getProfileInfo);
@@ -40,11 +44,39 @@ app.get("/user", fbAuth, getAuthenticatedUser);
 /*------------------------------------------------------------------*
 *  handlers/post.js                                                *
 *------------------------------------------------------------------*/
-const { getallPostsforUser, putPost } = require("./handlers/post");
+const { getallPostsforUser, putPost, getPost, getallPostsforFeed, likePost, unlikePost, quotePost
+} = 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("/getallPostsforUser", getallPostsforUser);

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

+/*------------------------------------------------------------------*
+ *  handlers/topic.js                                                *
+ *------------------------------------------------------------------*/
+const {
+  putTopic,
+  getAllTopics,
+  deleteTopic
+} = require("./handlers/topic");
+
+// add topic to database
+app.post("/putTopic", fbAuth, putTopic);
+
+// get all topics from database
+app.get("/getAllTopics", fbAuth, getAllTopics);
+
+// delete a specific topic
+app.delete("/deleteTopic/:topicId", fbAuth, deleteTopic);
+
 exports.api = functions.https.onRequest(app);
--- a/functions/package-lock.json
+++ b/functions/package-lock.json
@@ -34,21 +34,6 @@
        "dom-storage": "2.1.0",
        "tslib": "1.10.0",
        "xmlhttprequest": "1.8.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/app-types": {
@@ -70,15 +55,9 @@
      "integrity": "sha512-foQHhvyB0RR+mb/+wmHXd/VOU+D8fruFEW1k79Q9wzyTPpovMBa1Mcns5fwEWBhUfi8bmoEtaGB8RSAHnTFzTg=="
    },
    "@firebase/database": {
-<<<<<<< HEAD
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.3.tgz",
-      "integrity": "sha512-LnXKRE1AmjlS+iRF7j8vx+Ni8x85CmLP5u5Pw5rDKhKLn2eTR1tJKD937mUeeGEtDHwR1rrrkLYOqRR2cSG3hQ==",
-=======
      "version": "0.5.4",
      "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
      "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "requires": {
        "@firebase/database-types": "0.4.3",
        "@firebase/logger": "0.1.25",
@@ -113,11 +92,7 @@
    "@firebase/firestore": {
      "version": "1.5.3",
      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.5.3.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-CPYLvkGZBKE47oQC9a0q13UMVRj3LvnSbB1nOerktE3CGRHKy44LxDumamN8Kj067hV/80mKK9FdbeUufwO/Rg==",
-=======
      "integrity": "sha512-O/yAbXpitOA6g627cUl0/FHYlkTy1EiEKMKOlnlMOJF2fH+nLVZREXjsrCC7N2tIvTn7yYwfpZ4zpSNvrhwiTA==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "requires": {
        "@firebase/firestore-types": "1.5.0",
        "@firebase/logger": "0.1.25",
@@ -126,21 +101,6 @@
        "@grpc/proto-loader": "^0.5.0",
        "grpc": "1.23.3",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/firestore-types": {
@@ -173,16 +133,6 @@
        "@firebase/util": "0.2.28",
        "idb": "3.0.2",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/installations-types": {
@@ -190,6 +140,11 @@
      "resolved": "https://registry.npmjs.org/@firebase/installations-types/-/installations-types-0.1.2.tgz",
      "integrity": "sha512-fQaWIW8hyX1XUN7+FCSPjvM1agFjGidVuF4Sxi7aFwfyh5t+4fD2VpM4wCQbWmodnx4fZLvsuQd9mkxxU+lGYQ=="
    },
+    "@firebase/logger": {
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
+      "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
+    },
    "@firebase/messaging": {
      "version": "0.4.11",
      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.4.11.tgz",
@@ -198,16 +153,6 @@
        "@firebase/messaging-types": "0.3.2",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/messaging-types": {
@@ -225,21 +170,6 @@
        "@firebase/performance-types": "0.0.3",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/performance-types": {
@@ -272,16 +202,6 @@
        "@firebase/storage-types": "0.3.3",
        "@firebase/util": "0.2.28",
        "tslib": "1.10.0"
-      },
-      "dependencies": {
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "@firebase/storage-types": {
@@ -289,6 +209,14 @@
      "resolved": "https://registry.npmjs.org/@firebase/storage-types/-/storage-types-0.3.3.tgz",
      "integrity": "sha512-fUp4kpbxwDiWs/aIBJqBvXgFHZvgoND2JA0gJYSEsXtWtVwfgzY/710plErgZDeQKopX5eOR1sHskZkQUy0U6w=="
    },
+    "@firebase/util": {
+      "version": "0.2.28",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
+      "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
+      "requires": {
+        "tslib": "1.10.0"
+      }
+    },
    "@firebase/webchannel-wrapper": {
      "version": "0.2.26",
      "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.26.tgz",
@@ -608,10 +536,9 @@
      "dev": true
    },
    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
    },
    "ansi-styles": {
      "version": "3.2.1",
@@ -830,28 +757,28 @@
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "requires": {
            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
      }
    },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    }
-  }
-},
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -1190,15 +1117,9 @@
      }
    },
    "end-of-stream": {
-<<<<<<< HEAD
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-=======
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz",
      "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "optional": true,
      "requires": {
        "once": "^1.4.0"
@@ -1280,6 +1201,12 @@
        "text-table": "^0.2.0"
      },
      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
        "debug": {
          "version": "4.1.1",
          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1294,6 +1221,15 @@
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
        }
      }
    },
@@ -1556,33 +1492,6 @@
        "@firebase/polyfill": "0.3.22",
        "@firebase/storage": "0.3.12",
        "@firebase/util": "0.2.28"
-      },
-      "dependencies": {
-        "@firebase/database": {
-          "version": "0.5.4",
-          "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.5.4.tgz",
-          "integrity": "sha512-Hz1Bi3fzIcNNocE4EhvvwoEQGurG2BGssWD3/6a2bzty+K1e57SLea2Ied8QYNBUU1zt/4McHfa3Y71EQIyn/w==",
-          "requires": {
-            "@firebase/database-types": "0.4.3",
-            "@firebase/logger": "0.1.25",
-            "@firebase/util": "0.2.28",
-            "faye-websocket": "0.11.3",
-            "tslib": "1.10.0"
-          }
-        },
-        "@firebase/logger": {
-          "version": "0.1.25",
-          "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.1.25.tgz",
-          "integrity": "sha512-/lRhuepVcCCnQ2jcO5Hr08SYdmZDTQU9fdPdzg+qXJ9k/QnIrD2RbswXQcL6mmae3uPpX7fFXQAoScJ9pzp50w=="
-        },
-        "@firebase/util": {
-          "version": "0.2.28",
-          "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.28.tgz",
-          "integrity": "sha512-ZQMAWtXj8y5kvB6izs0aTM/jG+WO8HpqhXA/EwD6LckJ+1P5LnAhaLZt1zR4HpuCE+jeP5I32Id5RJ/aifFs6A==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        }
      }
    },
    "firebase-admin": {
@@ -1710,8 +1619,7 @@
    "functional-red-black-tree": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "optional": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
    },
    "gaxios": {
      "version": "2.0.1",
@@ -2259,15 +2167,9 @@
      }
    },
    "gtoken": {
-<<<<<<< HEAD
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.0.0.tgz",
-      "integrity": "sha512-XaRCfHJxhj06LmnWNBzVTAr85NfAErq0W1oabkdqwbq3uL/QTB1kyvGog361Uu2FMG/8e3115sIy/97Rnd4GjQ==",
-=======
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-4.1.0.tgz",
      "integrity": "sha512-wqyn2gf5buzEZN4QNmmiiW2i2JkEdZnL7Z/9p44RtZqgt4077m4khRgAYNuu8cBwHWCc6MsP6eDUn/KkF6jFIw==",
->>>>>>> 7969d3b10bc35a9078834c5ee2ba8c8fd60d338f
      "optional": true,
      "requires": {
        "gaxios": "^2.0.0",
@@ -2441,8 +2343,7 @@
    "imurmurhash": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "optional": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
    },
    "inflight": {
      "version": "1.0.6",
@@ -2457,8 +2358,7 @@
    "inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "optional": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
    },
    "inquirer": {
      "version": "6.5.2",
@@ -2528,10 +2428,8 @@
    "is-fullwidth-code-point": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
    },
    "is-obj": {
      "version": "2.0.0",
@@ -2929,7 +2827,6 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "optional": true,
      "requires": {
        "wrappy": "1"
      }
@@ -3374,8 +3271,7 @@
    "signal-exit": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "optional": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
    },
    "slice-ansi": {
      "version": "2.1.0",
@@ -3428,11 +3324,28 @@
    "string-width": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
      "requires": {
-        "code-point-at": "^1.0.0",
        "is-fullwidth-code-point": "^2.0.0",
        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
      }
    },
    "string_decoder": {
@@ -3442,12 +3355,11 @@
      "optional": true
    },
    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
      "requires": {
-        "ansi-regex": "^3.0.0"
+        "ansi-regex": "^4.1.0"
      }
    },
    "strip-json-comments": {
@@ -3755,8 +3667,7 @@
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "optional": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
    "write": {
      "version": "1.0.3",
--- a/functions/package.json
+++ b/functions/package.json
@@ -16,7 +16,8 @@
    "axios": "^0.19.0",
    "firebase": "^6.6.2",
    "firebase-admin": "^8.6.0",
-    "firebase-functions": "^3.1.0"
+    "firebase-functions": "^3.1.0",
+    "strip-ansi": "^5.2.0"
  },
  "devDependencies": {
    "eslint": "^5.12.0",
--- a/functions/util/fbAuth.js
+++ b/functions/util/fbAuth.js
@@ -32,6 +32,7 @@ module.exports = (req, res, next) => {
        .then((data) => {
            req.user.handle = data.docs[0].data().handle;  // Save username
            req.user.imageUrl = data.docs[0].data().imageUrl;
+            req.userData = data.docs[0].data();  // Stores all user data from the database
            return next();
        })
        .catch((err) => {
--- a/functions/util/validator.js
+++ b/functions/util/validator.js
@@ -9,23 +9,39 @@ const isEmpty = (str) => {
  else return false;
 };

-exports.validateUpdateProfileInfo = (data) => {
+exports.validateUpdateProfileInfo = (req) => {
+  const newData = req.body;
+  // const oldData = req.userData;
  let errors = {};
-  let profileData = {};
+  let profileData = req.userData;

  // ?: Should users be able to change their handles and emails?

-  // Only adds the key to the database if the values are not empty
-  if (!isEmpty(data.firstName)) profileData.firstName = data.firstName.trim();
-  if (!isEmpty(data.lastName)) profileData.lastName = data.lastName.trim();
-  if (!isEmpty(data.bio)) profileData.bio = data.bio.trim();
+  // Deletes any unused keys so that they aren't stored in the database
+  if (newData.firstName) {
+    profileData.firstName = newData.firstName.toString().trim();
+  } else {
+    delete profileData.firstName;
+  }

-  if (isEmpty(data.email)) {
+  if (newData.lastName) {
+    profileData.lastName = newData.lastName.toString().trim();
+  } else {
+    delete profileData.lastName;
+  }
+
+  if (newData.bio) {
+    profileData.bio = newData.bio.toString().trim();
+  } else {
+    delete profileData.bio;
+  }
+
+  if (isEmpty(newData.email)) {
    errors.email = "Must not be empty.";
-  } else if (!isEmail(data.email)) {
+  } else if (!isEmail(newData.email)) {
    errors.email = "Must be a valid email.";
  } else {
-    profileData.email = data.email;
+    profileData.email = newData.email;
  }

  return {
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,15 @@
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
    },
+    "axios": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "requires": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      }
+    },
    "body-parser": {
      "version": "1.19.0",
      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -164,6 +173,24 @@
        "unpipe": "~1.0.0"
      }
    },
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "requires": {
+        "debug": "=3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
    "forwarded": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -204,6 +231,16 @@
      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
    },
+    "is-buffer": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+    },
+    "jwt-decode": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz",
+      "integrity": "sha1-fYa9VmefWM5qhHBKZX3TkruoGnk="
+    },
    "media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
--- a/twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json
+++ b/twistter-e4649-firebase-adminsdk-pgjve-1e57494429.json
@@ -1,12 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "twistter-e4649",
-  "private_key_id": "1e57494429e4fd7d17f6fc28524e14b8e5227596",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCyRdMZwXrpf3HB\nsVrGZVoPt+S+ahkT4SCCEWV/Q4O4hVyW277Rs0p7k5ZkZfkhcVVBUqKGMgW/Esvz\npx0VIgpg3gg308kMRmC3MGzYbodjynVyDHatyAZhhUi9cg0N2K9+vSsW5eSmWROe\nfVvB8hvr6m5xGVdJFA7DV4/0vm2cfy+Q/FlFb6vFmQTZtPZzGFf5BKoNMe7pMxey\n4zspAIZgRmxWDbAqqzX0PYk/WbXFgH/wn2X25S+ArHhoay2Hms65/NbWCV6mpFUJ\nYqzrlCn/WcwXGAm7tjmu00yD+bARabImh8R7+PSBaHMQ+SGdri2snIXWsvB/xi9/\nSNFqzHynAgMBAAECggEAVty/zapg1bnTt0FPziBfIA6FpaPzoSSN3uJUFozSdwuA\nAD+E/A9EiO7yFew71egvVrtJVmK0OxQRDSDNglkKPoWg8na+XL1D7a5qMpC0ZlKl\nJBNfljBCr6yuMySJqMf+Rp4siyUr4kO/0/cXyOnLYglhk7j5tzFPOi4FhgZtSRU9\nYckk5wwcBObUFE0Rmqf0gPcI9WuFUkusIjz3rjuEju1/U6E/VV5gHmMuQy3f9LHB\nnsiLAobx9+TGgs12CvkjWYpW5raUCCn5z/EYNPZSt7rg9CSWqXW009HCfTqi6i7o\nNpZ7qpp5DVQdHNFJunSGvI+k44+i8OE7HEY4xXt+OQKBgQDZ/E1QwJQoHuzPkrGW\nAc0a+NQeG8NwaXwsezlvYXMTbL27SxKXC3dzPT1WgNUKpaKj3wLJPar4NgPPSPi3\nqgmcvMqgwm4B+HPbXc1oxBS7/jD3pWJVyPO9Re17Uc0RYV/DORQhWe1Yq7TyMHvl\nbD/KqIvOxswigVxK4JMIxp4s7wKBgQDRXJfb4BHdR7CGfuTVQ19gH5uLgrK9ezBk\nQOLK+u9yBpoKyYSnD3OH/i0wG5bm3rUegzvwHGKKhDfiLbajMIt04n2DuVUm57HQ\n+Jca29V8XMWfhTbu3kDl+OOFmLvPCwg8C9edNTJWUVYu3EbwsyzCQY5TDroWGQdF\n6cQIkAIbyQKBgQCUtWd1UHuCR16cWOHniQEIhnoGtEAHHx9EJShQkLV1qfhhnlxn\nSL5LkpqWubsc0VR74LbA3N4XCJpevdRXT5vRHoZJV3q+w2UeYQaxkxrmCQoU1/GW\nvklxdRQGzg5M7hXrU7Qk8HlXxYPiuSq8n7WBJqyB+uLmI0P4HO6RzRW5ZwKBgBkr\nf5pQkvU+dCuHP+2fvuyogCPCn8iF8ehroJh0mKrlvklDtu36vpH/7eDVwEubRL0Z\nW/BfCT3L7YgEpOtzn6B6xko60tDtlAQijtAM09qysJOgCV2oXLcJOBlMpm+azO+j\nINXmmlmkR680jlbLw7rK9NhpcdfMRIKUOxwobAh5AoGBAJMN6n7Hy8nJRJZ18iHY\n3hEkVbKrLLMMHFDQj5BZQCeAp1v0Fj30RYJWS4hTzR9ht0MtdmPub460lh9hhqCM\nl3UnCJoz00ApF3Z2FRN/l0KpCFD9Gw2Hjyc3u9sEUpqd8G3cg3IZE6eZ6CZWljFT\nHcuQ2cTFdB8bq8oLUxXeY3Yv\n-----END PRIVATE KEY-----\n",
-  "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com",
-  "client_id": "102241295911303209723",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com"
-}
--- a/twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json
+++ b/twistter-e4649-firebase-adminsdk-pgjve-382fc005e1.json
@@ -0,0 +1,12 @@
+{
+  "type": "service_account",
+  "project_id": "twistter-e4649",
+  "private_key_id": "382fc005e17340a21dd39079feca75371330644d",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDL1bwTpEluR6dJ\nVfS/K1d76j2I3Wrn4qSbrTYm4/cAPBPlsBRO0bwrkhr+g0I6rwW/fFz8udjNAFB1\nfDfz769buR6go5us71I5LxMNviIhzFr59ZsEkcnUCgW8G7koicLEjWdstI4lJxZT\nRRolH+SFpPwsQAY399zjdBiCC8STbavVVhe+ChEDl/S2K72W7A7nWSMbLsyGsz2o\nQ9uIG3onwFNE7WRIeObWCxSBKlydMmTJ+p/CsTdFY4fUHb97QsMEmzRJox10kmyt\nP9l5wfJ2wUYvRXRJKq7Mwx1UnLduXP2oe/XvR5fzJLJ780HO6BNBf5IKcTHXHVBA\ne6ZtiL5dAgMBAAECggEAFvfN1NttjXL0KKak3hMA1+z8Y2WqXC1aUFMOMlz8Qhct\nmXNjy8CFAYEvGtVTgHqkR9Vi7PShYfLSc3U8diI155H5H4S6pUaPmfNHTwRzosyn\ncQRPJA6sEqvRGvHMxVfwjbvultMpiTTZpnxiMSNiLqT5PUs26CuSb5bErt1V7dP5\nn/lhY+4rzfXSrw38ZsO/gEvLZ/7iRA+JZgqE3Qs2cD5idxqqOcOLLiW741JpXTmd\n5ug/urJgSyvz+cNo3yHnajEtAxiSfkpU4sUHZ/WWqaRGWxpt3XWILtR9Q/4afPeM\n/T82YvddoW5pUwDpgvZxdVYjopuoxvnS298L0AGySQKBgQDqDD7Yh6SbOR3w4ZN9\nRO7q5KiJbyZmVdZ3lLZddsL/vto9JkUtnLDOMpYnb2TezGfN6ErzAkRQCSUsWK4m\nERbSK6oyUvevhlt/gHGP34uc/OCxGk2D7WCAS3s54ofDt2369tzIpGjsnkYM+h3b\nuZ5lFoWHG1YM3JtgcIIU6UygTwKBgQDe9ArV08wPDuXf4rcldmImQDB7xhGcg9xU\njAKEn5FZW1mvmBy3Sq1qpZj0baZz6eEDn6FBLwH1Ke5gdfrd8WnESUNnFnBBqpA1\nospIgUmKZ1sjyly9CHMQ11Kbzt7+kA9GYZrMbaMjS8M18qFEBZ7CoPLv5DLyabJW\nOkPzTwb/kwKBgQDR3fUkmEzj202bx8pHE97gxfTSd9aJAQN06uaz3GByjyKGnqB9\ni/mGjBnUdrCOj9+s5VT/ntK+qdSpdUODYuOBxiGxSnBK9kFpjTVHe35nYOHiLOHB\nIMPdhtGSUCzJNNvrpBzJ1ZM4SZwq2sSXWFRN9On7Amog0liJG5mpQqGxRQKBgHmP\nzFycF3XaZKH2xm8ppgg/FXBXJYEWMEr07+aJ7kEvWq4wHPAfSoCMe+JB6vDmg2Zr\nYgvdao7W5v83NKpQl5+LZrHNfTWAnxJviSWRQJyzD/Fqw7fZ5Is5K/SCDfn0aC+y\nxilSWhHDnFNM0Hr7KX3rLap43QJpePAk4qnF3AX7AoGBAOe5C1VMKoTapnxvo/FI\nBCvXw05SSEExfXVR0ryoqUxgu1asCkYyJSoWxOZQ+33npQ1/zV1mCXn/lNZcyveW\nZ5/cUw71grW8KBYFrW7LeQIzjZb7xPI3Z4EV0uYd2b69GkQk1buHj/gsswRhGEvx\nJM1DN1SCenbGcVLprM0vVelp\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-pgjve@twistter-e4649.iam.gserviceaccount.com",
+  "client_id": "102241295911303209723",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-pgjve%40twistter-e4649.iam.gserviceaccount.com"
+}
--- a/twistter-frontend/README.md
+++ b/twistter-frontend/README.md
@@ -1,5 +1,10 @@
 This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app).

+
+Cloud: https://us-central1-twistter-e4649.cloudfunctions.net/api
+Local: http://localhost:5001/twistter-e4649/us-central1/api (npm install --save firebase)
+
+
 Below you will find some information on how to perform common tasks.<br>
 You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md).

--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
@@ -61,6 +61,14 @@
        }
      }
    },
+    "@material-ui/icons": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.5.1.tgz",
+      "integrity": "sha512-YZ/BgJbXX4a0gOuKWb30mBaHaoXRqPanlePam83JQPZ/y4kl+3aW0Wv9tlR70hB5EGAkEJGW5m4ktJwMgxQAeA==",
+      "requires": {
+        "@babel/runtime": "^7.4.4"
+      }
+    },
    "@material-ui/styles": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.5.0.tgz",
@@ -113,6 +121,16 @@
        "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",
@@ -1411,6 +1429,11 @@
      "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",
@@ -1696,6 +1719,11 @@
        }
      }
    },
+    "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",
@@ -2220,6 +2248,15 @@
        }
      }
    },
+    "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",
@@ -3084,6 +3121,11 @@
        "merge": "^1.2.0"
      }
    },
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+    },
    "exit-hook": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -5282,6 +5324,11 @@
      "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",
@@ -6990,6 +7037,25 @@
        "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",
@@ -7126,6 +7192,43 @@
        "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",
@@ -7154,11 +7257,82 @@
        "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",
@@ -8147,6 +8321,15 @@
        }
      }
    },
+    "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",
@@ -9712,11 +9895,21 @@
        "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",
      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
    },
+    "typeface-roboto": {
+      "version": "0.0.75",
+      "resolved": "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-0.0.75.tgz",
+      "integrity": "sha512-VrR/IiH00Z1tFP4vDGfwZ1esNqTiDMchBEXYY9kilT6wRGgFoCAlgkEUMHb1E3mB0FsfZhv756IF0+R+SFPfdg=="
+    },
    "uglify-js": {
      "version": "3.4.10",
      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
@@ -9748,6 +9941,16 @@
      "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",
@@ -9978,6 +10181,14 @@
        "makeerror": "1.0.x"
      }
    },
+    "warning": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
    "watch": {
      "version": "0.10.0",
      "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -4,21 +4,28 @@
  "private": true,
  "dependencies": {
    "@material-ui/core": "^4.4.3",
+    "@material-ui/icons": "^4.5.1",
    "@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"
+    "redux-thunk": "^2.3.0",
+    "typeface-roboto": "0.0.75"
  },
  "devDependencies": {},
  "scripts": {
--- a/twistter-frontend/redux/store.js
+++ b/twistter-frontend/redux/store.js
@@ -15,4 +15,14 @@ const reducers = combineReducers({
    UI: uiReducer
 });

-//const store = createStore(reducers, )
+const store = createStore(
+    reducers,
+    initialState,
+    compose(
+        applyMiddleware(...middleware),
+        window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
+        
+    )
+)
+
+export default store;
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -12,6 +12,12 @@ 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,6 +6,8 @@ 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";
@@ -19,28 +21,38 @@ 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';
+
 const theme = createMuiTheme(themeObject);

 const token = localStorage.FBIdToken;
 if (token) {
-  const decodedToken = jwtDecode(token);
-  if (decodedToken.exp * 1000 < Date.now()) {
-    store.dispatch(logoutUser);
+  try {
+    const decodedToken = jwtDecode(token);
+    if (decodedToken.exp * 1000 < Date.now()) {
+      store.dispatch(logoutUser());
+      window.location.href = "/login";
+    } else {
+      store.dispatch({ type: SET_AUTHENTICATED });
+      axios.defaults.headers.common['Authorization'] = token;
+      store.dispatch(getUserData());
+    }
+  } catch (invalidTokenError) {
+    store.dispatch(logoutUser());
    window.location.href = "/login";
-  } else {
-    store.dispatch({ type: SET_AUTHENTICATED });
-    axios.defaults.headers.common['Authorization'] = token;
-    store.dispatch(getUserData());
  }
 }

@@ -61,11 +73,15 @@ class App extends Component {
              <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} />
-              <Route exact path="/home" component={writeMicroblog} />
+              <div className="userhome">
+                <Route exact path="/home" component={writeMicroblog} />
+                <Route exact path="/home" component={feed} />
+              </div>
+
              <Route exact path="/edit" component={editProfile} />
-              <Route exact path="/user" component={userLine} />
+              <Route exact path="/userline" component={userLine} /> 

              <AuthRoute exact path="/" component={home}/>
              </Switch>
--- a/twistter-frontend/src/Feed.js
+++ b/twistter-frontend/src/Feed.js
@@ -0,0 +1,97 @@
+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
@@ -0,0 +1,54 @@
+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
@@ -0,0 +1,78 @@
+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
@@ -4,6 +4,7 @@ import Route from 'react-router-dom/Route';
 import axios from 'axios';


+
 class Writing_Microblogs extends Component {
    
    constructor(props) {
@@ -36,7 +37,6 @@ class Writing_Microblogs extends Component {
        // alert('A title for the microblog was inputted: ' + this.state.title + '\nA microblog was posted: ' + this.state.value);
        const postData = {
            body: this.state.value,  
-            userHandle: "new user",
            userImage: "bing-url",
            microBlogTitle: this.state.title,
            microBlogTopics: this.state.topics.split(', ')
@@ -46,7 +46,7 @@ class Writing_Microblogs extends Component {
        }
        
        axios
-            .post('/putPost', postData, headers)
+            .post("/putPost", postData, headers)
            .then((res) =>{
                alert('Post was shared successfully!')
                console.log(res.data);
@@ -71,8 +71,11 @@ class Writing_Microblogs extends Component {
    }

    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} />
@@ -97,6 +100,7 @@ class Writing_Microblogs extends Component {
                 </div>
                </form>
             </div>
+
             </div>
            
        );
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-// import PropTypes from 'prop-types';
+import PropTypes from 'prop-types';

 // Material UI stuff
 import AppBar from '@material-ui/core/AppBar';
@@ -11,26 +11,26 @@ import withStyles from "@material-ui/core/styles/withStyles";

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

-// const styles = {
-//     form: {
-//       textAlign: "center"
-//     },
-//     textField: {
-//       marginBottom: 30
-//     },
-//     pageTitle: {
-//       marginBottom: 40
-//     },
-//     button: {
-//       positon: "relative",
-//       marginBottom: 30
-//     },
-//     progress: {
-//       position: "absolute"
-//     }
-//   };
+const styles = {
+    form: {
+      textAlign: "center"
+    },
+    textField: {
+      marginBottom: 30
+    },
+    pageTitle: {
+      marginBottom: 40
+    },
+    button: {
+      positon: "relative",
+      marginBottom: 30
+    },
+    progress: {
+      position: "absolute"
+    }
+  };



@@ -38,39 +38,44 @@ import withStyles from "@material-ui/core/styles/withStyles";
  
  export class Navbar extends Component {
      render() {
+        const authenticated = this.props.user.authenticated;
        return (
            <AppBar>
                <ToolBar>
                    <Button component={ Link } to='/'>
                        Home
                    </Button>
-                    <Button component={ Link } to='/login'>
+                    {!authenticated && <Button component={ Link } to='/login'>
                        Login
-                    </Button>
-                    <Button component={ Link } to='/signup'>
+                    </Button>}
+                    {!authenticated && <Button component={ Link } to='/signup'>
                        Sign Up
-                    </Button>
-		    <Button component={ Link } to='/logout'>
-			Logout
-		    </Button>
+                    </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>
        )
    }
 }

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

 // const mapActionsToProps = { logoutUser };

-// Navbar.propTypes = {
-//     logoutUser: PropTypes.func.isRequired,
-//     user: PropTypes.object.isRequired,
-//     classes: PropTypes.object.isRequired
-// }
+Navbar.propTypes = {
+    user: PropTypes.object.isRequired,
+    classes: PropTypes.object.isRequired
+}

-// export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Navbar));
+export default connect(mapStateToProps)(withStyles(styles)(Navbar));

-export default Navbar;
+// export default Navbar;
--- a/twistter-frontend/src/components/profile/Profile.js
+++ b/twistter-frontend/src/components/profile/Profile.js
@@ -0,0 +1,48 @@
+import React, { Component, Fragment } from "react";
+import PropTypes from "prop-types";
+import axios from "axios";
+import { connect } from 'react-redux';
+
+//MUI
+import withStyles from "@material-ui/core/styles/withStyles";
+import Card from "@material-ui/core/CardMedia";
+import Typography from "@material-ui/core/Typography";
+import Button from "@material-ui/core/Button";
+import { Paper } from "@material-ui/core";
+
+const styles = theme => ({
+  ...theme
+});
+
+class Profile extends Component {
+  state = {
+    profile: null
+  };
+
+  componentDidMount() {
+    axios
+      .get("/user")
+      .then(res => {
+        console.log(res.data.userData.credentials.handle);
+        this.setState({
+          profile: res.data.userData.credentials.handle
+        });
+      })
+      .catch(err => console.log(err));
+  }
+  render() {
+    let profileMarkup = this.state.profile ? (
+        <p>
+        <Typography variant='h5'>{this.state.profile}</Typography>
+        </p>) : <p>loading profile...</p>
+
+    return profileMarkup;
+  }
+}
+
+const mapStateToProps = state => ({
+  user: state.user,
+  classes: PropTypes.object.isRequired
+});
+
+export default connect(mapStateToProps)(withStyles(styles)(Profile));
--- a/twistter-frontend/src/components/profile/StaticProfile.js
+++ b/twistter-frontend/src/components/profile/StaticProfile.js
--- a/twistter-frontend/src/images/original.png
+++ b/twistter-frontend/src/images/original.png
--- a/twistter-frontend/src/images/twistter-logo.png
+++ b/twistter-frontend/src/images/twistter-logo.png
--- a/twistter-frontend/src/pages/Delete.js
+++ b/twistter-frontend/src/pages/Delete.js
@@ -0,0 +1,56 @@
+/* eslint-disable */
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+
+// Material UI stuff
+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";
+
+const styles = {
+  form: {
+    textAlign: "center"
+  },
+  textField: {
+    marginBottom: 30
+  },
+  pageTitle: {
+    marginBottom: 40
+  },
+  button: {
+    positon: "relative",
+    marginBottom: 30
+  },
+  progress: {
+    position: "absolute"
+  }
+};
+
+export class Delete extends Component {
+
+  componentDidMount() {
+    this.props.logoutUser();
+    this.props.history.push('/');
+  }
+
+  render() {
+    return null;
+  }
+}
+
+const mapStateToProps = (state) => ({
+  user: state.user
+});
+
+const mapActionsToProps = { logoutUser };
+
+Delete.propTypes = {
+  logoutUser: PropTypes.func.isRequired,
+  user: PropTypes.object.isRequired,
+  classes: PropTypes.object.isRequired
+};
+
+export default connect(mapStateToProps, mapActionsToProps)(withStyles(styles)(Delete));
--- a/twistter-frontend/src/pages/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -146,7 +146,7 @@ export class Login extends Component {
              )}
            </Button>
            {errors.general && (
-              <Typography color="error">Wrong Email or Password</Typography>
+              <Typography color="error">Invalid username/email or password</Typography>
            )}
          </form>
        </Grid>
--- a/twistter-frontend/src/pages/Signup.js
+++ b/twistter-frontend/src/pages/Signup.js
@@ -159,7 +159,7 @@ export class Signup extends Component {
              )}
            </Button>
            {errors.general && (
-              <Typography color="error">Wrong Email or Password</Typography>
+              <Typography color="error">Invalid username/email or password</Typography>
            )}
          </form>
        </Grid>
--- a/twistter-frontend/src/pages/editProfile.js
+++ b/twistter-frontend/src/pages/editProfile.js
@@ -88,6 +88,14 @@ export class edit extends Component {
      handle: this.state.handle,
      bio: this.state.bio
    };
+    
+    // Removes all keys from newProfileData that are empty, undefined, or null
+    Object.keys(newProfileData).forEach(key => {
+      if (newProfileData[key] === "" || newProfileData[key] === undefined || newProfileData[key] === null) {
+        delete newProfileData[key];
+      }
+    })
+      
    axios
      .post("/updateProfileInfo", newProfileData)
      .then((res) => {
--- a/twistter-frontend/src/pages/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import axios from 'axios';
 //import '../App.css';
 import { makeStyles, styled } from '@material-ui/core/styles';
@@ -9,6 +10,13 @@ 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';
+import Typography from "@material-ui/core/Typography";
+import AddCircle from '@material-ui/icons/AddCircle';
+
+// component
+import Profile from '../components/profile/Profile';
+import Userline from '../Userline';
+import noImage from '../images/no-img.png';


 const PostCard = styled(Card)({
@@ -20,30 +28,90 @@ const PostCard = styled(Card)({
  padding: '0 30px',
 });

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

-class user extends Component {
-  componentDidMount(){
-    //TODO: get user details
-    //TODO: get posts
+
+const styles = (theme) => ({
+  ...theme
+});
+
+const handleDelete = () => {
+  alert("Delete this topic!");
+}
+
+const handleAddCircle = () => {
+  alert("Add topic");
+}
+
+class user extends Component {  
+  state = {
+    profile: null,
+    topics: null
+  };
+
+  componentDidMount() {
+    axios
+      .get("/user")
+      .then(res => {
+        console.log(res.data.credentials.handle);
+        this.setState({
+          profile: res.data.credentials.handle
+        });
+      })
+      .catch(err => console.log(err));
+    axios
+      .get("/getAllTopics")
+      .then(res => {
+        console.log(res.data[1]);
+        this.setState({
+          topics: res.data
+        })
+      })
+      .catch(err => console.log(err));
  }
-
  render() {
+    const classes = this.props;
+    let profileMarkup = this.state.profile ? (
+      <p>
+      <Typography variant='h5'>{this.state.profile}</Typography>
+      </p>) : (<p>loading username...</p>);
+    
+
+    let topicsMarkup = this.state.topics ? (
+      this.state.topics.map(topic => <MyChip 
+        label={{topic}.topic.topic}
+        onDelete={handleDelete}/>)
+    ) : (<p> loading topics...</p>);
+
    return (
      <Grid container spacing={16}>
        <Grid item sm={8} xs={12}>
          <p>Post</p>
        </Grid>
        <Grid item sm={4} xs={12}>
-          <PostCard>
-            <CardMedia image="./no-img-png" />
-            <CardContent>Username</CardContent>
-          </PostCard>
+          <img src={noImage}/>
+          {profileMarkup}
+          {topicsMarkup}
+          <MyChip
+            icon={<AddCircle />}
+            clickable
+            onClick={handleAddCircle}
+          />
        </Grid>
      </Grid>
    );
  }
 }

+Userline.PropTypes = {
+  handle: PropTypes.object.isRequired
+};

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

 export default user;
--- a/twistter-frontend/src/redux/actions/userActions.js
+++ b/twistter-frontend/src/redux/actions/userActions.js
@@ -61,6 +61,26 @@ export const logoutUser = () => (dispatch) => {
    dispatch({ type: SET_UNAUTHENTICATED });
 }

+export const deleteUser = () => (dispatch) => {
+  axios
+    .delete("/delete")
+    .then((res) => {
+      console.log(res);
+      console.log("User account successfully deleted.");
+    }
+    )
+    .catch((err) => {
+      dispatch ({
+        type: SET_ERRORS,
+        payload: err.response.data,
+      })
+    });
+
+  localStorage.removeItem('FBIdToken');
+  delete axios.defaults.headers.common['Authorization'];
+  dispatch({ type: SET_UNAUTHENTICATED });
+}
+
 const setAuthorizationHeader = (token) => {
    const FBIdToken = `Bearer ${token}`;
    localStorage.setItem('FBIdToken', FBIdToken);
--- a/twistter-frontend/src/util/theme.js
+++ b/twistter-frontend/src/util/theme.js
@@ -50,7 +50,13 @@ export default {
      marginBottom: 20
    },
    paper: {
-      padding: 20
+      padding: 10,
+      display: 'flex',
+      justifyContent: 'center',
+      flexWrap: 'wrap'
+    },
+    chip: {
+      margin: 0.5,
    },
    profile: {
      '& .image-wrapper': {
Author	SHA1	Message	Date
Aditya Sankaran	83052f0a80	user Feed	2019-11-08 17:09:57 -05:00
Aditya Sankaran	cc20e30990	work	2019-11-01 13:20:34 -04:00
Aditya Sankaran	6dbca16ace	connecting	2019-11-01 04:42:44 -04:00
Aditya Sankaran	12938e8e9a	comment out redux	2019-10-30 21:55:48 -04:00
Aditya Sankaran	84ad61b954	liking and quoting work	2019-10-30 18:31:55 -04:00
Aditya Sankaran	19780a1395	made userline not hardcoded	2019-10-26 17:06:42 -04:00
Aditya Sankaran	981795b288	writing microblogs not hardcoded anymore	2019-10-26 16:57:25 -04:00
Leon Liang	eb3766edb2	Merge pull request #54 from ClaytonWWilson/delete_topic added function to delete topic	2019-10-25 23:13:27 -04:00
Leon Liang	d9f6fb5d8e	added function to delete topic	2019-10-25 23:04:09 -04:00
Clayton Wilson	b31a571b29	Add followedTopics array on signup	2019-10-25 19:27:45 -04:00
Clayton Wilson	60f83da514	Merge pull request #47 from ClaytonWWilson/block_topics Fix login page loop bug	2019-10-25 15:31:12 -04:00
Clayton Wilson	41bcc78c3a	Fix login page loop bug	2019-10-25 15:20:10 -04:00
Clayton Wilson	f82f9984c6	Comment out axios.defaults.baseUrl	2019-10-25 14:33:23 -04:00
Aditya Sankaran	6335690046	Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24	2019-10-25 13:15:53 -04:00
Aditya Sankaran	9d1f987ac1	added userID property for posts	2019-10-25 13:15:17 -04:00
Leon Liang	b255006f7a	Merge pull request #45 from ClaytonWWilson/display_topic Display topic	2019-10-25 01:57:14 -04:00
Leon Liang	f13580c727	display topics under profile	2019-10-25 01:56:07 -04:00
Leon Liang	4ec560de75	made logo background transparent	2019-10-25 00:00:43 -04:00
Leon Liang	65ac1c7384	Merge pull request #43 from ClaytonWWilson/add_topic_user created functions retrieving all topics	2019-10-24 23:13:39 -04:00
Leon Liang	340d3537a6	created functions retrieving all topics	2019-10-24 23:13:03 -04:00
Leon Liang	de44f1eb89	Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24	2019-10-24 22:43:32 -04:00
Leon Liang	5405d96150	created function to add topic	2019-10-24 22:42:46 -04:00
Clayton Wilson	0e6af081fa	Merge pull request #42 from ClaytonWWilson/update-navbar Update navbar	2019-10-24 22:41:04 -04:00
Clayton Wilson	021e25de86	Make NavBar display login/signup/logout correctly	2019-10-24 22:38:42 -04:00
Leon Liang	de38339cad	Merge pull request #39 from ClaytonWWilson/profile_display Profile display: able to see from /user	2019-10-24 22:12:27 -04:00
Leon Liang	a498b4748f	Merge branch 'master' into profile_display	2019-10-24 22:12:02 -04:00
Leon Liang	4200c05ca1	added profile display	2019-10-24 22:08:49 -04:00
Leon Liang	6e9a86e5ce	changed getUser	2019-10-24 22:08:28 -04:00
Leon Liang	97650f6539	added axios baseURL	2019-10-24 22:08:09 -04:00
Leon Liang	4aa029c649	modified getUserDetails	2019-10-24 19:34:31 -04:00
Clayton Wilson	1b3ac4d05a	Merge pull request #35 from ClaytonWWilson/edit-profile-fix Fixing editProfile bugs and making the database storage more efficient	2019-10-24 19:32:05 -04:00
Clayton Wilson	64c10cd172	Rename variable to make code more concise	2019-10-24 19:30:21 -04:00
Leon Liang	37cce6c828	deleted profile.js	2019-10-24 17:48:39 -04:00
Leon Liang	bcaf0920a6	deleted staticProfile	2019-10-24 17:45:41 -04:00
Leon Liang	b16c3eb50f	Merge pull request #33 from ClaytonWWilson/auth-backend-3 Auth backend 3	2019-10-24 17:09:58 -04:00
Leon Liang	79d23af3fc	Merge branch 'master' into auth-backend-3	2019-10-24 17:09:45 -04:00
Leon Liang	52bd8eed64	Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24	2019-10-24 17:07:29 -04:00
Leon Liang	ac28b3e19e	getUserDetails is now working	2019-10-24 17:06:44 -04:00
Leon Liang	570866ff40	getUserDetail returns only user handle	2019-10-24 16:27:22 -04:00
Leon Liang	bdad36957c	package lock	2019-10-24 16:25:29 -04:00
Leon Liang	e524bc2811	pass in fbAuth to getUserDetails	2019-10-24 16:25:19 -04:00
Leon Liang	714e6a4e07	new adminsdk	2019-10-24 16:24:56 -04:00
Leon Liang	cdbf0fcdc6	renew adminsdk	2019-10-24 16:24:33 -04:00
Clayton Wilson	8f5020f881	Fixing editProfile bugs and making the database storage more efficient	2019-10-24 15:44:53 -04:00
Aaron Sun	eea2f56b49	Code for removing user from db still in progress (commented out)	2019-10-24 15:27:20 -04:00
Clayton Wilson	de4018a6d2	Merge pull request #34 from ClaytonWWilson/edit-profile-fix Update fbAuth so the user data from firebase is stored in req.userData	2019-10-24 13:23:03 -04:00
Clayton Wilson	b17fb1f3f0	Update fbAuth so the user data from firebase is stored in req.userData	2019-10-23 23:16:43 -04:00
Aaron Sun	45f88861c8	Delete Account works on the UI now	2019-10-23 18:08:42 -04:00
Aaron Sun	ad853923c8	Delete Account on UI can log the user out	2019-10-23 17:18:52 -04:00
Aaron Sun	bc0b2549b4	Delete user backend code works	2019-10-22 20:45:48 -04:00
Leon Liang	e984afff74	modified profile.js	2019-10-22 18:26:21 -04:00
Aaron Sun	1b66f18dd5	Log in with username partially works	2019-10-22 16:50:38 -04:00
Leon Liang	dede04aa8e	added dependency	2019-10-22 15:08:38 -04:00
Leon Liang	bb0343ab30	Remove redundant profile	2019-10-22 15:08:07 -04:00
Aaron Sun	7b8e40c7b0	Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24	2019-10-22 14:33:46 -04:00
Clayton Wilson	c5942a6634	Merge pull request #31 from ClaytonWWilson/login-frontend Comment out extra /user path declaration	2019-10-22 13:57:05 -04:00
Clayton Wilson	e062ffbb41	Comment out extra /user path declaration	2019-10-22 13:17:43 -04:00
Aaron Sun	cb4885cadf	Switched proxy back to cloud	2019-10-20 21:49:21 -04:00
Aaron Sun	d2032eef75	Login with username works now	2019-10-20 21:45:24 -04:00