user Feed

firebase.json

@@ -8,7 +8,6 @@
     },
     "functions": {
       "predeploy": [
-        "npm --prefix \"$RESOURCE_DIR\" run lint"
       ]
     },
     "hosting": {

functions/handlers/post.js

@@ -1,18 +1,20 @@
-/* eslint-disable prefer-arrow-callback */
 /* 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.user.handle,
+        userHandle: req.userData.handle,
         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
+        
     };
 
     admin.firestore().collection('posts').add(newPost)
@@ -23,48 +25,149 @@ exports.putPost = (req, res) => {
     })
     .catch((err) => {
         console.error(err);
-        return res.status(500).json({ error: 'something went wrong'});
+        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) => {
-    var post_query = admin.firestore().collection("posts").where("userHandle", "==", req.user.handle);
+    admin.firestore().collection('posts').where('userHandle', '==', req.userData.handle ).get()
-    post_query.get()
+    .then((data) => {
-    .then(function(myPosts) {
         let posts = [];
-        myPosts.forEach(function(doc) {
+        data.forEach(function(doc) {
             posts.push(doc.data());
         });
         return res.status(200).json(posts);
     })
-    .then(function() {
+    .catch((err) => {
-    res.status(200).send("Successfully retrieved all user's posts from database.");
+        console.error(err);
-    return;
+        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', '==')
 };

functions/handlers/topic.js

@@ -1,60 +1,53 @@
+/* eslint-disable promise/always-return */
 const { admin, db } = require("../util/admin");
 exports.putTopic = (req, res) => {
+
     const newTopic = {
         topic: req.body.topic
     };
 
-  admin
+    admin.firestore().collection('topics').add(newTopic)
-    .firestore()
+    .then((doc) => {
-    .collection("topics")
-    .add(newTopic)
-    .then(doc => {
         const resTopic = newTopic;
+        newTopic.topicId = doc.id;
         return res.status(200).json(resTopic);
     })
-    .catch(err => {
+    .catch((err) => {
         console.error(err);
-      return res.status(500).json({ error: "something is wrong" });
+        return res.status(500).json({ error: 'something is wrong'});
     });
 };
 
 exports.getAllTopics = (req, res) => {
-  admin
+    admin.firestore().collection('topics').get()
-    .firestore()
+    .then((data) => {
-    .collection("topics")
-    .get()
-    .then(data => {
         let topics = [];
         data.forEach(function(doc) {
-        topics.push({
+            topics.push(doc.data());
-          topic: doc.data().topic,
-          id: doc.id
-        });
         });
         return res.status(200).json(topics);
     })
-    .catch(err => {
+    .catch((err) => {
         console.error(err);
-      return res.status(500).json({ error: "Failed to fetch all topics." });
+        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
+    topic.get().then((doc) => {
-    .get()
-    .then(doc => {
         if (!doc.exists) {
-        return res.status(404).json({ error: "Topic not found" });
+            return res.status(404).json({error: 'Topic not found'});
         } else {
             return topic.delete();
         }
     })
     .then(() => {
-      return res.json({ message: "Topic successfully deleted!" });
+        res.json({ message: 'Topic successfully deleted!'});
     })
-    .catch(err => {
+    .catch((err) => {
         console.error(err);
-      return res.status(500).json({ error: "Failed to delete topic." });
+        return res.status(500).json({error: 'Failed to delete topic.'})
-    });
+    })
-};
+}

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,
@@ -54,7 +57,7 @@ exports.signup = (req, res) => {
 
   db.doc(`/users/${newUser.handle}`)
     .get()
-    .then(doc => {
+    .then((doc) => {
       if (doc.exists) {
         return res
           .status(400)
@@ -64,27 +67,26 @@ exports.signup = (req, res) => {
         .auth()
         .createUserWithEmailAndPassword(newUser.email, newUser.password);
     })
-    .then(data => {
+    .then((data) => {
       userId = data.user.uid;
       return data.user.getIdToken();
     })
-    .then(idToken => {
+    .then((idToken) => {
       token = idToken;
-      const defaultImageUrl = `https://firebasestorage.googleapis.com/v0/b/${config.storageBucket}/o/no-img.png?alt=media`;
       const userCred = {
         email: newUser.email,
         handle: newUser.handle,
         createdAt: newUser.createdAt,
         userId,
-        followedTopics: [],
+        followedTopics: []
-        imageUrl: defaultImageUrl
       };
+      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." });
@@ -96,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
   };
 
@@ -104,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;
-      })
-      .then(function() {
   firebase
     .auth()
     .signInWithEmailAndPassword(user.email, user.password)
-          .then(data => {
+    .then((data) => {
       return data.user.getIdToken();
     })
-          .then(token => {
+    .then((token) => {
       return res.status(200).json({ token });
     })
-          .catch(err => {
+    .catch((err) => {
       console.error(err);
-            if (
+      if (err.code === "auth/wrong-password" || err.code === "auth/invalid-email" || err.code === "auth/user-not-found") {
-              err.code === "auth/user-not-found" ||
-              err.code === "auth/invalid-email" ||
-              err.code === "auth/wrong-password"
-            ) {
         return res
           .status(403)
           .json({ general: "Invalid credentials. Please try again." });
       }
       return res.status(500).json({ error: err.code });
     });
+};
+
+//Deletes user account
+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) {
-        if (!doc.exists) {
+        res.status(500).send("Failed to remove user from database.", err);
-          return res
+      });*/
-            .status(403)
-            .json({ general: "Invalid credentials. Please try again." });
-        }
-        return res.status(500).send(err);
-      });
-  }
-  // Email/username field is username
-  else {
-    firebase
-      .auth()
-      .signInWithEmailAndPassword(user.email, user.password)
-      .then(data => {
-        return data.user.getIdToken();
-      })
-      .then(token => {
-        return res.status(200).json({ token });
-      })
-      .catch(err => {
-        console.error(err);
-        if (
-          err.code === "auth/user-not-found" ||
-          err.code === "auth/invalid-email" ||
-          err.code === "auth/wrong-password"
-        ) {
-          return res
-            .status(403)
-            .json({ general: "Invalid credentials. Please try again." });
-        }
-        return res.status(500).json({ error: err.code });
-      });
-  }
-};
 
-//Deletes user account and all associated data
+      //let ref = db.collection('users');
-exports.deleteUser = (req, res) => {
+      //let userDoc = ref.where('userId', '==', currentUser.uid).get();
-  // Get the profile image filename
+      //userDoc.ref.delete();
-  // `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;
+      currentUser.delete()
-  let errors = {};
+      .then(function() {
-
+        console.log("User successfully deleted.");
-  function thenFunction(data) {
+        res.status(200).send("Deleted user.");
-    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;
       })
-
+      .catch(function(err) {
-  let promises = [
+        console.log("Error deleting user.", err);
-    auth
+        res.status(500).send("Failed to delete user.");
-      .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 {
-  .catch((err) => {
+      console.log("Cannot get user.");
-    return res.status(500).json({error: err});
+      res.status(500).send("Cannot get user.");
-  })
+    }
+  });
 };
 
 // Returns all data in the database for the user who is currently signed in
@@ -277,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);
     });
@@ -288,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);
@@ -298,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({
+      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"
@@ -314,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 });
+        return res.status(200).json({userData});
     } else {
-        return res.status(400).json({ error: "User not found." });
+      return res.status(400).json({error: "User not found."})
-      }
+    }})
-    })
+    .catch((err) => {
-    .catch(err => {
       console.error(err);
       return res.status(500).json({ error: err.code });
     });
@@ -332,34 +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 });
+        return res.status(200).json({credentials});
     } else {
-        return res.status(400).json({ error: "User not found." });
+      return res.status(400).json({error: "User not found."})
-      }
+    }})
-    })
+    .catch((err) => {
-    .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." });
-    });
-};

functions/index.js

@@ -16,8 +16,7 @@ const {
   login,
   signup,
   deleteUser,
-  updateProfileInfo,
+  updateProfileInfo
-  getUserHandles
 } = require("./handlers/users");
 
 // Adds a user to the database and registers them in firebase with
@@ -30,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);
 
@@ -42,17 +41,22 @@ app.post("/updateProfileInfo", fbAuth, updateProfileInfo);
 
 app.get("/user", fbAuth, getAuthenticatedUser);
 
-// get user handles with search phase
-app.get("/getUserHandles", fbAuth, getUserHandles);
-
 /*------------------------------------------------------------------*
  *  handlers/post.js                                                *
  *------------------------------------------------------------------*/
-const { getallPostsforUser, getallPosts, putPost } = require("./handlers/post");
+const { getallPostsforUser, putPost, getPost, getallPostsforFeed, likePost, unlikePost, quotePost
+} = require("./handlers/post");
 
 app.get("/getallPostsforUser", fbAuth, getallPostsforUser);
 
-app.get("/getallPosts", getallPosts);
+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);
+
+
 
 // Adds one post to the database
 app.post("/putPost", fbAuth, putPost);
@@ -60,7 +64,11 @@ app.post("/putPost", fbAuth, putPost);
 /*------------------------------------------------------------------*
  *  handlers/topic.js                                                *
  *------------------------------------------------------------------*/
-const { putTopic, getAllTopics, deleteTopic } = require("./handlers/topic");
+const {
+  putTopic,
+  getAllTopics,
+  deleteTopic
+} = require("./handlers/topic");
 
 // add topic to database
 app.post("/putTopic", fbAuth, putTopic);

twistter-frontend/package-lock.json

@@ -121,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",
@@ -1419,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",
@@ -1704,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",
@@ -2228,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",
@@ -3092,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",
@@ -5290,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",
@@ -6998,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",
@@ -7134,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",
@@ -7162,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",
@@ -8155,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",
@@ -9720,6 +9895,11 @@
         "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",
@@ -9761,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",
@@ -9991,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",

twistter-frontend/package.json

@@ -8,16 +8,21 @@
     "@material-ui/styles": "^4.5.0",
     "@material-ui/system": "^4.5.0",
     "axios": "^0.19.0",
+    "bootstrap": "^4.3.1",
     "clsx": "^1.0.4",
     "create-react-app": "^3.1.2",
     "install": "^0.13.0",
     "jwt-decode": "^2.2.0",
     "node-pre-gyp": "^0.13.0",
     "react": "^16.9.0",
+    "react-bootstrap": "^1.0.0-beta.14",
     "react-dom": "^16.9.0",
+    "react-dropdown": "^1.6.4",
+    "react-modal": "^3.11.1",
     "react-redux": "^7.1.1",
     "react-router-dom": "^5.1.0",
     "react-scripts": "0.9.5",
+    "react-simple-dropdown": "^3.2.3",
     "redux": "^4.0.4",
     "redux-thunk": "^2.3.0",
     "typeface-roboto": "0.0.75"

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;

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;

twistter-frontend/src/App.js

@@ -6,15 +6,17 @@ import axios from "axios";
 import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
 import Navbar from "./components/layout/NavBar";
 import jwtDecode from "jwt-decode";
+import 'bootstrap/dist/css/bootstrap.min.css';
+import { Button } from 'react-bootstrap';
 
 // Redux
 import { Provider } from "react-redux";
 import store from "./redux/store";
-import MuiThemeProvider from "@material-ui/core/styles/MuiThemeProvider";
+import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
-import createMuiTheme from "@material-ui/core/styles/createMuiTheme";
+import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
-import themeObject from "./util/theme";
+import themeObject from './util/theme';
-import { SET_AUTHENTICATED } from "./redux/types";
+import { SET_AUTHENTICATED } from './redux/types';
-import { logoutUser, getUserData } from "./redux/actions/userActions";
+import { logoutUser, getUserData } from './redux/actions/userActions';
 
 // Components
 import AuthRoute from "./util/AuthRoute";
@@ -22,16 +24,17 @@ import AuthRoute from "./util/AuthRoute";
 // axios.defaults.baseURL = 'http://localhost:5006/twistter-e4649/us-central1/api';
 
 // Pages
-import home from "./pages/Home";
+import home from './pages/Home';
-import signup from "./pages/Signup";
+import signup from './pages/Signup';
-import login from "./pages/Login";
+import login from './pages/Login';
-import user from "./pages/user";
+import user from './pages/user';
-import logout from "./pages/Logout";
+import logout from './pages/Logout';
-import Delete from "./pages/Delete";
+import Delete from './pages/Delete';
-import writeMicroblog from "./Writing_Microblogs.js";
+import writeMicroblog from './Writing_Microblogs.js';
-import editProfile from "./pages/editProfile";
+import editProfile from './pages/editProfile';
-import userLine from "./Userline.js";
+import userLine from './Userline.js';
-import Search from "./pages/Search.js";
+
+import feed from './Feed.js';
 
 const theme = createMuiTheme(themeObject);
 
@@ -44,7 +47,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) {
@@ -53,35 +56,37 @@ 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} />
-                <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} />
+              <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="/search" component={Search} />
+              <Route exact path="/userline" component={userLine} /> 
-
-                <AuthRoute exact path="/" component={home} />
 
+              <AuthRoute exact path="/" component={home}/>
               </Switch>
             </div>
+
           </Router>
         </Provider>
       </MuiThemeProvider>

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;

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;

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

twistter-frontend/src/Writing_Microblogs.js

@@ -1,30 +1,36 @@
 import React, { Component } from "react";
-import { BrowserRouter as Router } from "react-router-dom";
+import { BrowserRouter as Router } from 'react-router-dom';
-import Route from "react-router-dom/Route";
+import Route from 'react-router-dom/Route';
-import axios from "axios";
+import axios from 'axios';
+
+
 
 class Writing_Microblogs extends Component {
+    
     constructor(props) {
         super(props);
         this.state = {
-      value: "",
+            value: '',
-      title: "",
+            title: '',
-      topics: "",
+            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);
+        
     }
 
     handleChange(event) {
-    this.setState({ title: event.target.value });
+        this.setState( {title: event.target.value });
     }
 
     handleChangeforTopics(event) {
-    this.setState({ topics: event.target.value });
+        this.setState( {topics: event.target.value});
     }
 
     handleSubmit(event) {
@@ -33,86 +39,60 @@ class Writing_Microblogs extends Component {
             body: this.state.value,  
             userImage: "bing-url",
             microBlogTitle: this.state.title,
-      microBlogTopics: this.state.topics.split(", ")
+            microBlogTopics: this.state.topics.split(', ')
-    };
+        }
         const headers = {
-      headers: { "Content-Type": "application/json" }
+            headers: { 'Content-Type': 'application/json'}
-    };
+        }
         
         axios
             .post("/putPost", postData, headers)
-      .then(res => {
+            .then((res) =>{
-        alert("Post was shared successfully!");
+                alert('Post was shared successfully!')
                 console.log(res.data);
             })
-      .catch(err => {
+            .catch((err) => {
-        alert("An error occured.");
+                alert('An error occured.');
                 console.error(err);
-      });
+            })
         event.preventDefault();
-    this.setState({ value: "", title: "", characterCount: 250, topics: "" });
+        this.setState({value: '', title: '',characterCount: 250, topics: ''})
     }
 
     handleChangeforPost(event) {
-    this.setState({ value: event.target.value });
+        this.setState({value: event.target.value })
     }
 
     handleChangeforCharacterCount(event) {
-    const charCount = event.target.value.length;
+        const charCount = event.target.value.length
-    const charRemaining = 250 - charCount;
+        const charRemaining = 250 - charCount
-    this.setState({ characterCount: charRemaining });
+        this.setState({characterCount: charRemaining })
+    
     }
 
     render() {
+        
+
         return (
             <div>
-        <div
+
-          style={{
+            <div style={{ width: "200px", height: "50px", marginTop: "180px", marginLeft: "50px" }}>         
-            width: "200px",
-            height: "50px",
-            marginTop: "180px",
-            marginLeft: "50px"
-          }}
-        >
              <form>
-            <textarea
+                    <textarea placeholder="Enter Microblog Title" value={this.state.title} required onChange={this.handleChange} cols={30} rows={1} />
-              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" }}>
+            <div style={{ width: "200px", height: "50px", marginLeft: "50px"}} >         
             <form>                    
-            <textarea
+                <textarea placeholder="Enter topics seperated by a comma" value={this.state.topics} required onChange={this.handleChangeforTopics} cols={40} rows={1} />
-              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" }}>
+             <div style={{ width: "200px", marginLeft: "50px"}}>        
                 <form onSubmit={this.handleSubmit}>
-            <textarea
+                    <textarea value={this.state.value} required maxLength="250" placeholder= "Write Microblog here..." 
-              value={this.state.value}
+                        onChange = { (e) => { this.handleChangeforPost(e); this.handleChangeforCharacterCount(e) } } cols={40} rows={20} />      
-              required
+                 <div style={{ fontSize: "14px", marginRight: "-100px"}} >
-              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"  }}>        
@@ -120,9 +100,13 @@ class Writing_Microblogs extends Component {
                  </div>
                 </form>
              </div>
+
              </div>
+            
         );
     }
+
+
 }
 
 export default Writing_Microblogs;

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 = {
@@ -32,7 +32,11 @@ const styles = {
     }
   };
 
-export class Navbar extends Component {
+
+
+
+  
+  export class Navbar extends Component {
       render() {
         const authenticated = this.props.user.authenticated;
         return (
@@ -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;

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 { logoutUser } from "../redux/actions/userActions";
-import { deleteUser } 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.logoutUser();
-    this.props.deleteUser();
     this.props.history.push('/');
   }
 
@@ -47,12 +45,10 @@ const mapStateToProps = (state) => ({
   user: state.user
 });
 
-//const mapActionsToProps = { logoutUser };
+const mapActionsToProps = { logoutUser };
-const mapActionsToProps = { deleteUser };
 
 Delete.propTypes = {
-  //logoutUser: PropTypes.func.isRequired,
+  logoutUser: PropTypes.func.isRequired,
-  deleteUser: PropTypes.func.isRequired,
   user: PropTypes.object.isRequired,
   classes: PropTypes.object.isRequired
 };

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" />
@@ -94,14 +32,6 @@ class Home extends Component {
       </div>
     );
     }
-}
+  }
 
-const mapStateToProps = (state) => ({
+export default Home;
-  user: state.user
-})
-
-Home.propTypes = {
-  user: PropTypes.object.isRequired
-}
-
-export default connect(mapStateToProps)(Home);

twistter-frontend/src/pages/Login.js

@@ -16,16 +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
-    border: ""
   },
   pageTitle: {
     // marginTop: 20,
@@ -37,15 +34,6 @@ const styles = {
   },
   progress: {
     position: "absolute"
-  },
-  p: {
-    fontFamily: "cursive",
-    backgroundColor:  "lightgrey",
-  },
-  div: {
-    borderRadius: "5px",
-    backgroundColor: "#f2f2f2",
-    padding: "20px",
   }
 };
 
@@ -116,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="h2" className={classes.pageTitle}>
-          <Typography variant="p" className={classes.pageTitle} fontFamily = "Georgia, serif">
+            Log in to Twistter
-            <b>Log in to Twistter</b>
-            <br></br>
           </Typography>
-          <br></br>
           <form noValidate onSubmit={this.handleSubmit}>
             <TextField
               id="email"

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;

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,
+    marginBottom: 30
-    //border: "1px solid #234",
-    display: "inline-block",
-    boxSizing: "border-box",
   },
   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="h2" className={classes.pageTitle}>
-          <Typography variant="p" className={classes.pageTitle}>
+            Create a new account
-            <b>Create a new account</b>
-            <br></br>
           </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"

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 />

twistter-frontend/src/pages/user.js

@@ -1,191 +1,117 @@
 /* eslint-disable */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
 import axios from 'axios';
-//import '../App.css';
+//import '../App.css';
-
+import { makeStyles, styled } from '@material-ui/core/styles';
-// Material UI and React Router
+import Grid from '@material-ui/core/Grid';
-import { makeStyles, styled } from "@material-ui/core/styles";
+import Card from '@material-ui/core/Card';
-import { Link } from 'react-router-dom';
-import Card from "@material-ui/core/Card";
 import CardMedia from '@material-ui/core/CardMedia';
 import CardContent from '@material-ui/core/CardContent';
-import Button from '@material-ui/core/Button';
+import Chip from '@material-ui/core/Chip';
-import Grid from "@material-ui/core/Grid";
+import Paper from '@material-ui/core/Paper';
-
-import Chip from "@material-ui/core/Chip";
 import Typography from "@material-ui/core/Typography";
-import AddCircle from "@material-ui/icons/AddCircle";
+import AddCircle from '@material-ui/icons/AddCircle';
-import TextField from "@material-ui/core/TextField";
 
 // 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 PostCard = styled(Card)({
+  background: 'linear-gradient(45deg, #1da1f2 90%)',
+  border: 3,
+  borderRadius: 3,
+  height:325,
+  width: 345,
+  padding: '0 30px',
+});
+
 const MyChip = styled(Chip)({
   margin: 2,
-  color: "primary"
+  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
-    topics: null,
-    newTopic: 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,
+          profile: res.data.credentials.handle
-          imageUrl: res.data.credentials.imageUrl
         });
       })
       .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")
-      .then(res => {
-        console.log(res.data);
-        this.setState({
-          posts: res.data
         })
       })
       .catch(err => console.log(err));
   }
-
   render() {
-    let authenticated = this.props.user.authenticated;
+    const classes = this.props;
-    let 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(
+      this.state.topics.map(topic => <MyChip 
-        topic => (
+        label={{topic}.topic.topic}
-          <MyChip
+        onDelete={handleDelete}/>)
-            label={{ topic }.topic.topic}
+    ) : (<p> loading topics...</p>);
-            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>);
 
     return (
-      <Grid container spacing={24}>
+      <Grid container spacing={16}>
-        <Grid item sm={4} xs={8}>
+        <Grid item sm={8} xs={12}>
-          {imageMarkup}
+          <p>Post</p>
+        </Grid>
+        <Grid item sm={4} xs={12}>
+          <img src={noImage}/>
           {profileMarkup}
           {topicsMarkup}
-          <TextField
+          <MyChip
-          id="newTopic"
+            icon={<AddCircle />}
-          label="new topic"
-          defaultValue=""
-          margin="normal"
-          variant="outlined"
-          value={this.state.newTopic}
-          onChange={(event) => this.handleChange(event)}
-          />
-          <AddCircle
-            color="primary"
             clickable
-            onClick={this.handleAddCircle}
+            onClick={handleAddCircle}
           />
-          <br />
-          {authenticated && <Button component={ Link } to='/edit'>Edit Profile Info</Button>}
         </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 = {
+export default user;
-  user: PropTypes.object.isRequired
-}
-
-export default connect(mapStateToProps)(user);