changed putPost function to see postID

changed variable name to postId
Added post.id in backend to display posts
2026-03-10 21:25:04 +00:00 · 2019-10-31 15:46:40 -04:00 · 2019-10-31 15:29:54 -04:00 · 2019-10-31 14:15:40 -04:00 · 2019-10-29 14:28:53 -04:00 · 2019-10-29 13:45:36 -04:00
19 changed files with 453 additions and 1141 deletions
--- a/functions/handlers/post.js
+++ b/functions/handlers/post.js
@@ -1,103 +1,78 @@
 /* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/always-return */
-const admin = require('firebase-admin');
+const { admin, db } = require("../util/admin");
+

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

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

 exports.getallPostsforUser = (req, res) => {
-    var post_query = admin.firestore().collection("posts").where("userHandle", "==", req.user.handle);
-    post_query.get()
-    .then(function(myPosts) {
+    db.collection('posts').where('userHandle', '==', 'new user' ).get()
+    .then((data) => {
        let posts = [];
-        myPosts.forEach(function(doc) {
+        data.forEach(function(doc) {
            posts.push(doc.data());
        });
        return res.status(200).json(posts);
    })
-    .then(function() {
-    res.status(200).send("Successfully retrieved all user's posts from database.");
-    return;
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
    })
-    .catch(function(err) {
-    res.status(500).send("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() {
-    res.status(200).send("Successfully retrieved every post from database.");
-    return;
-    })
-    .catch(function(err) {
-    res.status(500).send("Failed to retrieve posts from database.", err);
-    });
-};
-
-exports.getFilteredPosts = (req, res) => {
-    admin.firestore().collection('posts').where('userHandle', '==', 'new user').where('microBlogTopics', '==')
-};
-
-exports.getFilteredPostsOnTopics = (req, res) => {
-    
-    // get topics that user follows
-    // make a set storing all topics
-    // for each post, make a set of topics and if A and B != 0, you can display post
-    var queryTopics = admin.firestore().collection('users').where('userHandle', '==', req.userHandle)
-    var topics = new Set();
-    topics.add(queryTopics.get().microBlogTopics)
-    
-    //console.log(topics);
-    
-    var queryPosts = admin.firestore().collection('posts').where('microBlogTopics','==', topics);
-    
-    console.log(queryPosts);
-    
-    queryPosts.get()
-    .then(function(Posts) {
-        let posts = [];
-        Posts.forEach(function(doc){
-            posts.push(doc.data());
-        });
-        return res.status(200).json(posts);
-    })
-    .then(function() {
-        res.status(200).send("Successfully retrieved filtered posts from database.");
-        return;
-    })
-    .catch(function(err) {
-        res.status(500).send("Failed to retrieve posts from database.", err);
-    });
-}
+exports.getAllPosts = (req, res) => {
+    db.collection('posts')
+        .orderBy('createdAt', 'desc')
+        .get()
+        .then((data) => {
+            let posts = [];
+            data.forEach((doc) => {
+              posts.push({
+                body: doc.data().body,
+                userHandle: doc.data().userHandle,
+                createdAt: doc.data().createdAt,
+                commentCount: doc.data().commentCount,
+                likeCount: doc.data().likeCount,
+                userImage: doc.data().userImage,
+                microBlogTitle: doc.data().microBlogTitle,
+                microBlogTopics: doc.data().microBlogTopics,
+                postId: doc.id,
+              });
+            });
+            return res.status(200).json(posts);
+          })
+          .catch((err) => {
+            console.error(err);
+            return res.status(500).json({ error: err.code });
+          });
+};
--- a/functions/handlers/topic.js
+++ b/functions/handlers/topic.js
@@ -1,60 +1,36 @@
-const { admin, db } = require("../util/admin");
+/* eslint-disable prefer-arrow-callback */
+/* eslint-disable promise/always-return */
+const admin = require('firebase-admin');
 exports.putTopic = (req, res) => {
-  const newTopic = {
-    topic: req.body.topic
-  };

-  admin
-    .firestore()
-    .collection("topics")
-    .add(newTopic)
-    .then(doc => {
-      const resTopic = newTopic;
-      return res.status(200).json(resTopic);
+    const newTopic = {
+        topic: req.body.topic
+    };
+
+    admin.firestore().collection('topics').add(newTopic)
+    .then((doc) => {
+        const resTopic = newTopic;
+        return res.status(200).json(resTopic);
    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "something is wrong" });
+    .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({
-          topic: doc.data().topic,
-          id: doc.id
+    admin.firestore().collection('topics').get()
+    .then((data) => {
+        let topics = [];
+        data.forEach(function(doc) {
+            topics.push(doc.data());
        });
-      });
-      return res.status(200).json(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) => {
-  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();
-      }
+    .catch((err) => {
+        console.error(err);
+        return res.status(500).json({error: 'Failed to fetch all posts written by specific user.'})
    })
-    .then(() => {
-      return 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,6 @@
+/* eslint-disable prefer-arrow-callback */
 /* eslint-disable promise/catch-or-return */
+
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
 const { validateUpdateProfileInfo } = require("../util/validator");
@@ -6,6 +8,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,
@@ -54,7 +58,7 @@ exports.signup = (req, res) => {

  db.doc(`/users/${newUser.handle}`)
    .get()
-    .then(doc => {
+    .then((doc) => {
      if (doc.exists) {
        return res
          .status(400)
@@ -64,28 +68,25 @@ 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: [],
-        imageUrl: defaultImageUrl,
-        verified: false
+        userId
      };
+      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." });
@@ -97,6 +98,7 @@ exports.signup = (req, res) => {
 exports.login = (req, res) => {
  const user = {
    email: req.body.email,
+    handle: req.body.handle,
    password: req.body.password
  };

@@ -105,172 +107,80 @@ 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,}))$/;

-  // Checks if email/username field is empty
+  // 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);
+  }

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

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

-  // 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;
-      })
+  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 });
+    });
+};
+
+//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() {
-        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 });
-          });
+        res.status(200).send("Removed user from database.");
        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();
+        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;
      })
-      .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 });
+      .catch(function(err) {
+        console.log("Error deleting user.", err);
+        res.status(500).send("Failed to delete user.");
      });
-  }
-};
-
-//Deletes user account and all associated data
-exports.deleteUser = (req, res) => {
-  // 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'
-  
-  const userId = req.userData.userId;
-  let errors = {};
-
-  function thenFunction(data) {
-    console.log(`${data} data for ${req.userData.handle} has been deleted.`);
-  }
-
-  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();
-      });
-      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.`});
+    } 
+    else {
+      console.log("Cannot get user.");
+      res.status(500).send("Cannot get user.");
    }
-  })
-  .catch((err) => {
-    return res.status(500).json({error: err});
-  })
+  });
 };

 // Returns all data in the database for the user who is currently signed in
@@ -278,10 +188,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);
    });
@@ -289,6 +199,8 @@ 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);
@@ -299,11 +211,13 @@ 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"
@@ -315,15 +229,14 @@ 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 });
    });
@@ -333,87 +246,17 @@ 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) => {
-  admin
-    .firestore()
-    .collection("users")
-    .get()
-    .then(data => {
-      let users = [];
-      data.forEach(function(doc) {
-        users.push(doc.data().handle);
-      });
-      return res.status(200).json(users);
-    })
-    .catch(err => {
-      console.error(err);
-      return res.status(500).json({ error: "Failed to get all user handles." });
-    });
-};
--- a/functions/index.js
+++ b/functions/index.js
@@ -16,10 +16,7 @@ const {
  login,
  signup,
  deleteUser,
-  updateProfileInfo,
-  verifyUser,
-  unverifyUser,
-  getUserHandles
+  updateProfileInfo
 } = require("./handlers/users");

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

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

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

@@ -44,35 +41,25 @@ 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.get("/getUserHandles", fbAuth, getUserHandles);
-
 /*------------------------------------------------------------------*
 *  handlers/post.js                                                *
 *------------------------------------------------------------------*/
-const { getallPostsforUser, getallPosts, putPost, getFilteredPostsOnTopics } = require("./handlers/post");
+const { getallPostsforUser, putPost, getAllPosts
+} = require("./handlers/post");

-app.get("/getallPostsforUser", fbAuth, getallPostsforUser);
-
-app.get("/getallPosts", getallPosts);
-
-app.get("/getFilteredPostsOnTopics", getFilteredPostsOnTopics);
+app.get("/getallPostsforUser", getallPostsforUser);

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

+// Displays posts on home page
+app.get("/getAllPosts", getAllPosts );
+
 /*------------------------------------------------------------------*
 *  handlers/topic.js                                                *
 *------------------------------------------------------------------*/
-const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic");
+const { putTopic, getAllTopics
+} = require("./handlers/topic");

 // add topic to database
 app.post("/putTopic", fbAuth, putTopic);
@@ -80,7 +67,4 @@ 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
@@ -535,11 +535,6 @@
      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
      "dev": true
    },
-    "ansi-regex": {
-      "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",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -1195,18 +1190,11 @@
        "progress": "^2.0.0",
        "regexpp": "^2.0.1",
        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
        "strip-json-comments": "^2.0.1",
        "table": "^5.2.3",
        "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",
@@ -1221,15 +1209,6 @@
          "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"
-          }
        }
      }
    },
@@ -2376,7 +2355,6 @@
        "mute-stream": "0.0.7",
        "run-async": "^2.2.0",
        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
        "strip-ansi": "^5.1.0",
        "through": "^2.3.6"
      },
@@ -2425,12 +2403,6 @@
      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
      "optional": true
    },
-    "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-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
    "is-obj": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
@@ -3280,8 +3252,7 @@
      "dev": true,
      "requires": {
        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "astral-regex": "^1.0.0"
      }
    },
    "snakeize": {
@@ -3321,47 +3292,12 @@
      "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
      "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo="
    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "requires": {
-        "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": {
      "version": "0.10.31",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
      "optional": true
    },
-    "strip-ansi": {
-      "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": "^4.1.0"
-      }
-    },
    "strip-json-comments": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -3408,7 +3344,6 @@
          "dev": true,
          "requires": {
            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
            "strip-ansi": "^5.1.0"
          }
        },
--- a/functions/package.json
+++ b/functions/package.json
@@ -16,8 +16,7 @@
    "axios": "^0.19.0",
    "firebase": "^6.6.2",
    "firebase-admin": "^8.6.0",
-    "firebase-functions": "^3.1.0",
-    "strip-ansi": "^5.2.0"
+    "firebase-functions": "^3.1.0"
  },
  "devDependencies": {
    "eslint": "^5.12.0",
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -52,3 +52,6 @@ body {
  color: #1da1f2;
 }

+.a{
+  text-decoration: none;
+}
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -10,11 +10,11 @@ import jwtDecode from "jwt-decode";
 // 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";
@@ -22,17 +22,15 @@ 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 verify from "./pages/verify";
-import Search from "./pages/Search.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';

 const theme = createMuiTheme(themeObject);

@@ -45,7 +43,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) {
@@ -54,36 +52,34 @@ 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} />

-                {/* 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="/logout" component={logout} />
-                <Route exact path="/delete" component={Delete} />
-
-                <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} />
-
-                <AuthRoute exact path="/" component={home} />
+              <Route exact path="/user" component={user} />
+              <Route exact path="/home" component={writeMicroblog} />
+              <Route exact path="/edit" component={editProfile} />
+              {/* <Route exact path="/user" component={userLine} /> */}

+              <AuthRoute exact path="/" component={home}/>
              </Switch>
            </div>
+
          </Router>
        </Provider>
      </MuiThemeProvider>
--- a/twistter-frontend/src/Writing_Microblogs.js
+++ b/twistter-frontend/src/Writing_Microblogs.js
@@ -1,128 +1,108 @@
 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" }
-    };
+    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,  
+            userHandle: "new user",
+            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: ''})
+    }

-    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: "" });
-  }
+    handleChangeforPost(event) {
+        this.setState({value: event.target.value })
+    }

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

-  handleChangeforCharacterCount(event) {
-    const charCount = event.target.value.length;
-    const charRemaining = 250 - charCount;
-    this.setState({ characterCount: charRemaining });
-  }
+    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} />

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

-export default Writing_Microblogs;
+export default Writing_Microblogs;
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -10,7 +10,7 @@ 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 { connect } from 'react-redux';

 const styles = {
@@ -31,9 +31,13 @@ const styles = {
      position: "absolute"
    }
  };
+
+
+
+
  
-export class Navbar extends Component {
-    render() {
+  export class Navbar extends Component {
+      render() {
        const authenticated = this.props.user.authenticated;
        return (
            <AppBar>
@@ -41,9 +45,6 @@ export class Navbar extends Component {
                    <Button component={ Link } to='/'>
                        Home
                    </Button>
-                    {authenticated && <Button component={ Link } to='/user'>
-                        Profile
-                    </Button>}
                    {!authenticated && <Button component={ Link } to='/login'>
                        Login
                    </Button>}
@@ -53,6 +54,11 @@ export class Navbar extends Component {
                    {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>
        )
@@ -63,9 +69,13 @@ const mapStateToProps = (state) => ({
    user: state.user
 })

+// const mapActionsToProps = { logoutUser };
+
 Navbar.propTypes = {
    user: PropTypes.object.isRequired,
    classes: PropTypes.object.isRequired
 }

 export default connect(mapStateToProps)(withStyles(styles)(Navbar));
+
+// export default Navbar;
--- a/twistter-frontend/src/components/post/Posts.js
+++ b/twistter-frontend/src/components/post/Posts.js
@@ -0,0 +1,55 @@
+import React, { Component } from 'react'
+import withStyles from '@material-ui/core/styles/withStyles';
+import Link from 'react-router-dom/Link';
+// MUI Stuff
+import Card from '@material-ui/core/Card';
+import CardContent from '@material-ui/core/CardContent';
+import CardMedia from '@material-ui/core/CardMedia';
+import { Typography } from '@material-ui/core';
+ 
+
+const styles = {
+    card:{
+        display: 'flex',
+        marginBottom: 20,
+    },
+    image:{
+        minWidth: 200,
+    },
+    content: {
+        padding: 25,
+        objectFit: 'cover',
+    }
+}
+class Posts extends Component {
+    render() {
+          const { classes, post : {body, createdAt, userImage, userHandle, commmentCount, likeCount, microBlogTopics} } = this.props
+
+        return (
+            <Card className={classes.card}>
+                <CardMedia
+                image={userImage}
+                title="Profile Image"
+                className={classes.image}/>
+                <CardContent class={classes.content}>
+                    <Typography 
+                        variant = "h5" 
+                        component={Link} 
+                        to={`/users/${userHandle}`}
+                        color="primary"
+                        >
+                        {userHandle}
+                    </Typography>
+                    <Typography 
+                        variant = "body2" 
+                        color="textSecondary">
+                        {createdAt}
+                    </Typography>
+                    <Typography variant="body1">{body}</Typography>
+                </CardContent>
+            </Card>            
+        )
+    }
+}
+
+export default withStyles(styles)(Posts);
--- a/twistter-frontend/src/pages/Delete.js
+++ b/twistter-frontend/src/pages/Delete.js
@@ -7,8 +7,7 @@ import Button from "@material-ui/core/Button";
 import withStyles from "@material-ui/core/styles/withStyles";

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

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

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

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

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

 Delete.propTypes = {
-  //logoutUser: PropTypes.func.isRequired,
-  deleteUser: PropTypes.func.isRequired,
+  logoutUser: 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,74 +1,12 @@
-/* eslint-disable */
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import axios from 'axios';
-
-// Material UI and React Router
-import 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';
+

 class Home extends Component {
-  state = {};
-
-  componentDidMount() {
-    axios
-      .get("/getallPosts")
-      .then(res => {
-        console.log(res.data);
-        this.setState({
-          posts: res.data
-        })
-      })
-      .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}</Typography>
-            <br />
-            <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
-            <Typography variant="body2">{post.body}</Typography>
-            <br />
-            <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics}</Typography>
-            <br />
-            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
-          </CardContent>
-        </Card>
-      )
-    ) : (<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" />
@@ -93,15 +31,7 @@ class Home extends Component {
        </div>
      </div>
    );
+    }
  }
-}

-const mapStateToProps = (state) => ({
-  user: state.user
-})
-
-Home.propTypes = {
-  user: PropTypes.object.isRequired
-}
-
-export default connect(mapStateToProps)(Home);
+export default Home;
--- a/twistter-frontend/src/pages/Login.js
+++ b/twistter-frontend/src/pages/Login.js
@@ -16,15 +16,13 @@ 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: 20
+    marginBottom: 30
  },
  pageTitle: {
    // marginTop: 20,
@@ -36,9 +34,6 @@ const styles = {
  },
  progress: {
    position: "absolute"
-  },
-  p: {
-    fontFamily: "cursive",
  }
 };

@@ -109,12 +104,9 @@ export class Login extends Component {
        <Grid item sm />
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
-          <br></br>
-          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
-            <b>Log in to Twistter</b>
-            <br></br>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Log in to Twistter
          </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
@@ -1,74 +0,0 @@
-import React, { Component } from "react";
-// import props
-import { TextField, Paper } from "@material-ui/core";
-import Grid from "@material-ui/core/Grid";
-import Axios from "axios";
-import user from "./user.js";
-
-import {
-  BrowserRouter as Router,
-  Switch,
-  Route,
-  Link,
-  useRouteMatch
-} from "react-router-dom";
-
-export class Search extends Component {
-  state = {
-    searchPhase: null,
-    searchResult: null
-  };
-
-  handleSearch(event) {
-    Axios.get("/getUserHandles").then(res => {
-      this.setState({
-        searchResult: res.data
-      });
-    });
-    console.log(this.state.searchPhase);
-  }
-
-  handleInput(event) {
-    this.setState({
-      searchPhase: event.target.value
-    });
-    this.handleSearch();
-  }
-
-  handleRedirect() {
-    location.reload();
-  }
-
-  render() {
-    let resultMarkup = this.state.searchResult ? (
-      this.state.searchResult.map(result => (
-        <Router>
-          <div>
-            <Link to={`/user`}>{result}</Link>
-          </div>
-        </Router>
-      ))
-    ) : (
-      //   console.log(this.state.searchResult)
-      <p> searching... </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>{resultMarkup}</Grid>
-      </Grid>
-    );
-  }
-}
-
-export default Search;
--- a/twistter-frontend/src/pages/Signup.js
+++ b/twistter-frontend/src/pages/Signup.js
@@ -16,17 +16,13 @@ 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: 20,
-    //border: "1px solid #234",
-    display: "inline-block",
-    boxSizing: "border-box",
+    marginBottom: 30
  },
  pageTitle: {
    marginBottom: 40
@@ -37,14 +33,6 @@ const styles = {
  },
  progress: {
    position: "absolute"
-  },
-  div: {
-    borderRadius: "5px",
-    backgroundColor: "grey",
-    padding: "20px",
-  },
-  p: {
-    fontFamily: "Segoe UI",
  }
 };

@@ -104,12 +92,9 @@ export class Signup extends Component {
        <Grid item sm />
        <Grid item sm>
        <img src={logo} className="app-logo" alt="logo" />
-          <br></br>
-          <Typography variant="p" className={classes.pageTitle}>
-            <b>Create a new account</b>
-            <br></br>
+          <Typography variant="h2" className={classes.pageTitle}>
+            Create a new account
          </Typography>
-          <br></br>
          <form noValidate onSubmit={this.handleSubmit}>
          <TextField
              id="handle"
@@ -161,8 +146,6 @@ 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,7 +6,6 @@ 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";
@@ -221,34 +220,12 @@ 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/user.js
+++ b/twistter-frontend/src/pages/user.js
@@ -1,224 +1,129 @@
 /* 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 '../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 Button from '@material-ui/core/Button';
-import Grid from "@material-ui/core/Grid";
-
-import Chip from "@material-ui/core/Chip";
+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';
-import TextField from '@material-ui/core/TextField';
-import VerifiedIcon from '@material-ui/icons/CheckSharp';

 // component
-import '../App.css';
+import Profile from '../components/profile/Profile';
+import Userline from '../Userline';
 import noImage from '../images/no-img.png';
-import Writing_Microblogs from '../Writing_Microblogs';
-const MyChip = styled(Chip)({
-  margin: 2,
-  color: "primary"
+import Posts from '../components/post/Posts';
+
+const PostCard = styled(Card)({
+  background: 'linear-gradient(45deg, #1da1f2 90%)',
+  border: 3,
+  borderRadius: 3,
+  height:325,
+  width: 345,
+  padding: '0 30px',
 });

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

-  handleDelete = topic => {
-    axios
-      .delete(`/deleteTopic/${topic.id}`)
-      .then(function() {
-        location.reload();
-      })
-      .catch(function(err) {
-        console.log(err);
-      });
-  };
-
-  handleAddCircle = () => {
-    axios
-      .post("/putTopic", {
-        topic: 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,
-          imageUrl: res.data.credentials.imageUrl,
-          verified: res.data.credentials.verified ? res.data.credentials.verified : false
+          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));
-
-    axios
-      .get("/getallPostsforUser")
+    axios.get('/getAllPosts')
      .then(res => {
-        console.log(res.data);
        this.setState({
          posts: res.data
        })
      })
      .catch(err => console.log(err));
  }
-
  render() {
-    let authenticated = this.props.user.authenticated;
-    let classes = this.props;
-
+    const classes = this.props;
    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>);
+      <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}
-            key={{ topic }.topic.id}
-            onDelete={key => this.handleDelete(topic)}
-          />
-        ) // 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 postMarkup = this.state.posts ? (
-      this.state.posts.map(post => 
-        <Card>
-          <CardContent>
-            <Typography>
-              {
-                this.state.imageUrl ? (<img src={this.state.imageUrl} height="250" width="250" />) : 
-                                      (<img src={noImage} height="50" width="50"/>)
-              }
-            </Typography>
-            <Typography variant="h7"><b>{post.userHandle}</b></Typography>
-            <Typography variant="body2" color={"textSecondary"}>{post.createdAt}</Typography>
-            <br />
-            <Typography variant="body1"><b>{post.microBlogTitle}</b></Typography>
-            <Typography variant="body2">{post.body}</Typography>
-            <br />
-            <Typography variant="body2"><b>Topics:</b> {post.microBlogTopics}</Typography>
-            <br />
-            <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
-          </CardContent>
-        </Card>
-      )
-    ) : (<p>My Posts</p>);
+      this.state.topics.map(topic => <MyChip 
+        label={{topic}.topic.topic}
+        onDelete={handleDelete}/>)
+    ) : (<p> loading topics...</p>);
+   
+    let posts = classes.data
+    let recentPostsMarkup = posts ? (
+      this.state.posts.map(post => <Posts key={post.postId} post={post}/>)
+    ) : ( <p> Loading... </p> );

    return (
-      <Grid container spacing={24}>
-        <Grid item sm={4} xs={8}>
-          {imageMarkup}
+      <Grid container spacing={16}>
+        <Grid item sm={8} xs={12}>
+          {recentPostsMarkup}
+        </Grid>
+        <Grid item sm={4} xs={12}>
+          <img src={noImage}/>
          {profileMarkup}
          {topicsMarkup}
-          <TextField
-          id="newTopic"
-          label="new topic"
-          defaultValue=""
-          margin="normal"
-          variant="outlined"
-          value={this.state.newTopic}
-          onChange={(event) => this.handleChange(event)}
-          />
-          <AddCircle
-            color="primary"
+          <MyChip
+            icon={<AddCircle />}
            clickable
-            onClick={this.handleAddCircle}
+            onClick={handleAddCircle}
          />
-          <br />
-          <Grid container direction="column">
-            <Grid item>
-              {
-                authenticated && 
-                <Button 
-                style={{width:150, marginBottom: 10, marginTop: 5}}
-                component={ Link } 
-                to='/edit' 
-                variant="outlined" 
-                color="primary"
-                >
-                  Edit Profile
-                </Button>}
-            </Grid>
-            <Grid item>
-              {
-                authenticated && 
-                this.state.profile === 'Admin' && 
-                <Button
-                style={{width:150}}
-                component={ Link } 
-                variant="outlined" 
-                color="primary"
-                
-                to='/verify'
-                >
-                  Verify Users
-                </Button>}
-            </Grid>
-          </Grid>
        </Grid>
-        <Grid item sm={4} xs={8}>
-          {postMarkup}
-        </Grid>
-        <Grid item sm={4} xs={8}>
-          <Writing_Microblogs />
-        </Grid>
-              
      </Grid>
    );
  }
 }

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

-user.propTypes = {
-  user: PropTypes.object.isRequired
-}
-
-export default connect(mapStateToProps)(user);
+export default user;
--- a/twistter-frontend/src/pages/verify.js
+++ b/twistter-frontend/src/pages/verify.js
@@ -1,153 +0,0 @@
-import React, { Component } from "react";
-import axios from "axios";
-import PropTypes from "prop-types";
-// TODO: Add a read-only '@' in the left side of the handle input
-// TODO: Add a cancel button, that takes the user back to their profile page
-
-// Material-UI stuff
-import Button from "@material-ui/core/Button";
-import { Link } from 'react-router-dom';
-import CircularProgress from "@material-ui/core/CircularProgress";
-import Grid from "@material-ui/core/Grid";
-import TextField from "@material-ui/core/TextField";
-import Typography from "@material-ui/core/Typography";
-import withStyles from "@material-ui/core/styles/withStyles";
-
-const styles = {
-  form: {
-    textAlign: "center"
-  },
-  textField: {
-    marginBottom: 30
-  },
-  pageTitle: {
-    // marginTop: 20,
-    marginBottom: 40
-  },
-  button: {
-    positon: "relative",
-    marginBottom: 10
-  },
-  progress: {
-    position: "absolute"
-  }
-};
-
-export class verify extends Component {
-
-  // Constructor for the state
-  constructor() {
-    super();
-    this.state = {
-      handle: "",
-      loading: false,
-      errors: {}
-    };
-  }
-
-//   // Runs whenever the submit button is clicked.
-  handleSubmit = (event) => {
-    event.preventDefault();
-    this.setState({
-      loading: true
-    });
-    const verifyHandle = {
-      user: this.state.handle
-    };
-      
-    axios
-      .post("/verifyUser", verifyHandle)
-      .then((res) => {
-        console.log(res);
-        this.setState({
-          loading: false
-        });
-        // this.props.history.push('/');
-        // TODO: Need to redirect user to their profile page
-      })
-      .catch((err) => {
-        console.log(err);
-        this.setState({
-          errors: err.response.data,
-          loading: false
-        });
-      });
-  };
-
-  // Updates the state whenever one of the textboxes changes.
-  // The key is the name of the textbox and the value is the
-  // value in the text box.
-  // Also sets errors to null of textboxes that have been edited
-  handleChange = (event) => {
-    this.setState({
-      [event.target.name]: event.target.value,
-      errors: {
-        [event.target.name]: null
-      }
-    });
-  };
-
-  render() {
-    const { classes } = this.props;
-    const { 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
shobhitm23	b45fc3640c	changed putPost function to see postID	2019-10-31 15:46:40 -04:00
shobhitm23	51fc965a90	changed variable name to postId	2019-10-31 15:29:54 -04:00
shobhitm23	a4b7f7a107	Added post.id in backend to display posts	2019-10-31 14:15:40 -04:00
Clayton Wilson	7341de742e	Fixing some issues with retrieving posts	2019-10-29 14:28:53 -04:00
shobhitm23	2fc37e3e34	Added link in index.js	2019-10-29 13:45:36 -04:00
shobhitm23	3f3a93be8c	Added getAllPosts	2019-10-28 14:02:55 -04:00
shobhitm23	d6a0b0b1bc	Displaying posts with image, time and content	2019-10-28 01:33:20 -04:00