Merge 4ff93b0b87 into d1f42aa5cd

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

README.md

@@ -1,2 +1,14 @@
 # CS307-Team24
-CS307 Team 24 Twistter website.
+CS307 Team 24 Twistter website
+
+### Images
+<p>
+  <img alt="00.png" src="./screenshots/00.png" width="1000">
+  <img alt="01.png" src="./screenshots/01.png" width="1000">
+  <img alt="02.png" src="./screenshots/02.png" width="1000">
+  <img alt="03.png" src="./screenshots/03.png" width="1000">
+  <img alt="04.png" src="./screenshots/04.png" width="1000">
+  <img alt="05.png" src="./screenshots/05.png" width="1000">
+  <img alt="06.png" src="./screenshots/06.png" width="1000">
+  <img alt="07.png" src="./screenshots/07.png" width="1000">
+</p>

functions/handlers/post.js

@@ -178,10 +178,10 @@ exports.getOtherUsersPosts = (req, res) => {
     .collection("posts")
     .where("userHandle", "==", req.body.handle);
     
-    post_query += admin
-    .firestore()
-    .collection("posts")
-    .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
+    // post_query += admin
+    // .firestore()
+    // .collection("posts")
+    // .where("microBlogTitle", "==", "Alert").where("userHandle", "==", "Admin");
 
   post_query
     .get()

functions/handlers/users.js

@@ -1,5 +1,6 @@
 /* eslint-disable promise/catch-or-return */
 /* eslint-disable promise/always-return */
+/* eslint-disable prefer-promise-reject-error */
 
 const { admin, db } = require("../util/admin");
 const config = require("../util/config");
@@ -866,10 +867,10 @@ oneWayCheck = (userA, userB) => {
             if (dmRecipient === userB) {
               console.log(`You already have a DM with ${userB}`);
               // reject(new Error(`You already have a DM with ${userB}`));
-              reject({
-                code: 400,
-                message: `You already have a DM with that user`
-              });
+              let e = new Error(`You already have a DM with that user`);
+              e.code = 400,
+              e.message = `You already have a DM with that user`
+              reject(e);
               return;
             }
           });
@@ -1212,7 +1213,10 @@ exports.addSubscription = (req, res) => {
         return res.status(500).json({ err });
       });
     // return res.status(200).json({ message: "ok" });
-  });
+  })
+  .catch((error) => {
+    return res.status(400).json({message: "That user doesn't exist", error});
+  })
 };
 
 exports.getSubs = (req, res) => {

twistter-frontend/src/Writing_Microblogs.js

@@ -84,23 +84,23 @@ class Writing_Microblogs extends Component {
         console.error(err);
       });
     console.log(postData.microBlogTopics);
-    let topicPromises = [];
-    postData.microBlogTopics.forEach(topic => {
-      topicPromises.push(axios
-        .post("/putTopic", {
-          following: topic
-        })
-        .then(res => {
-          console.log(res.data);
-        })
-        .catch(err => {
-          console.error(err);
-        })
-      )
-    });
+    // let topicPromises = [];
+    // postData.microBlogTopics.forEach(topic => {
+    //   topicPromises.push(axios
+    //     .post("/putTopic", {
+    //       following: topic
+    //     })
+    //     .then(res => {
+    //       console.log(res.data);
+    //     })
+    //     .catch(err => {
+    //       console.error(err);
+    //     })
+    //   )
+    // });
     event.preventDefault();
-    topicPromises.push(postPromise);
-    Promise.all(topicPromises)
+    // topicPromises.push(postPromise);
+    Promise.all([postPromise])
       .then(() => {
         this.setState({ 
           value: "", 

twistter-frontend/src/pages/Home.js

@@ -57,14 +57,28 @@ class Home extends Component {
       })
       .catch(err => console.log(err));
 
+    let allPosts;
     let postPromise = axios
       .get("/getallPosts")
       .then(res => {
         // console.log(res.data);
+        // this.setState({
+        //   posts: res.data
+        // });
+        allPosts = res.data;
+        // console.log(allPosts)
+        return axios.get("/getAlert")
+      })
+      .then((res) => {
+        // console.log(res.data)
+        // res.data.forEach((adminAlert) => {
+        //   allPosts.push(adminAlert);
+        // })
         this.setState({
-          posts: res.data
+          posts: allPosts
         });
       })
+
       .catch(err => console.log(err));
 
     Promise.all([userPromise, postPromise])
@@ -140,9 +154,8 @@ class Home extends Component {
     }
 
     console.log(hiddenBool);
-    let postMarkup = this.state.posts ? (
-// <<<<<<< admin-delete
-      this.state.posts.map(post => !post.hidden && this.state.following && this.state.following.includes(post.userHandle) ? (
+    let postMarkup = this.state.posts ? ( this.state.following === undefined || this.state.following === null ? <Typography>You aren't following anybody right now</Typography> :
+      this.state.posts.map(post => !post.hidden && this.state.following && (this.state.following.includes(post.userHandle) || post.userHandle === "Admin") ? (
             <Card className={classes.card} key={post.postId}>
               <CardContent>
                 <Typography>
@@ -191,7 +204,7 @@ class Home extends Component {
 
                 {/* <button>Quote</button> */}
 
-                <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography>
+                {/* <Typography variant="body2" color={"textSecondary"}>Likes {post.likeCount} Comments {post.commentCount}</Typography> */}
                 
               </CardContent>
             </Card>
@@ -199,18 +212,6 @@ class Home extends Component {
               <p></p>
             )
     )
-// =======
-//       this.state.posts.map(post =>
-//         this.state.following ? (
-//           this.state.following.includes(post.userHandle) ? (
-//           ) : (
-//             <p></p>
-//           )
-//         ) : (
-//           <p></p>
-//         )
-// >>>>>>> master
-      
     ) : (
       <p>Loading post...</p>
     );

twistter-frontend/src/pages/directMessages.js

@@ -83,6 +83,10 @@ const styles = {
 		wordBreak: "break-all",
 		color: 'black'
 	},
+	dmRecentMessageDisabled: {
+		wordBreak: "break-all",
+		color: 'red'
+	},
 	dmListItemContainer: {
 		height: 100
 	},
@@ -105,7 +109,7 @@ const styles = {
 		fontSize: 20,
 		backgroundColor: '#1da1f2',
 		width: 300
-	},
+  },
 	messagesGrid: {
 		// // margin: "auto"
 		// height: "auto",
@@ -426,9 +430,15 @@ export class directMessages extends Component {
 								<Typography
 									className={
 										this.state.selectedChannel && this.state.selectedChannel.dmId === channel.dmId ? (
-											classes.dmRecentMessageSelected
+                      channel.hasDirectMessagesEnabled ? 
+                        classes.dmRecentMessageSelected
+                      :
+                        classes.dmRecentMessageDisabled
 										) : (
-											classes.dmRecentMessageUnselected
+                      channel.hasDirectMessagesEnabled ?
+                        classes.dmRecentMessageUnselected
+                      :
+                        classes.dmRecentMessageDisabled
 										)
 									}
 								>

twistter-frontend/src/pages/otherUser.js

@@ -312,7 +312,7 @@ class user extends Component {
             <Typography variant="body2">{post.body}</Typography>
             <br />
             <Typography variant="body2">
-              <b>Topics:</b> {post.microBlogTopics}
+              <b>Topics:</b> {post.microBlogTopics.join(", ")}
             </Typography>
             <br />
             <Typography variant="body2" color={"textSecondary"}>

twistter-frontend/src/pages/user.js

@@ -269,6 +269,15 @@ class user extends Component {
       </Link>
     ) : null;
 
+    let verifyButtonMarkup = this.state.profile === "Admin" ?
+      <Link to="/verify">
+        <Button className={classes.button} variant="outlined" color="primary">
+          Verify Users
+        </Button>
+      </Link>
+    :
+      null
+
     return (
       this.state.loading ? <CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress> :
       <div>
@@ -278,6 +287,7 @@ class user extends Component {
             <Grid container>
               <Grid item sm>
                 {editButtonMarkup}
+                {verifyButtonMarkup}
               </Grid>
               <Grid item sm>
                 {/* <Grid container direction="column"> */}

twistter-frontend/src/redux/actions/userActions.js

@@ -36,6 +36,7 @@ export const getUserData = () => (dispatch) => {
 
 // Sends login data to firebase and sets the user data in Redux
 export const loginUser = (loginData, history) => (dispatch) => {
+    dispatch({type: CLEAR_ERRORS});
     dispatch({ type: LOADING_UI });
     axios
       .post("/login", loginData)
@@ -57,6 +58,7 @@ export const loginUser = (loginData, history) => (dispatch) => {
 
 // Sends signup data to firebase and sets the user data in Redux
 export const signupUser = (newUserData, history) => (dispatch) => {
+    dispatch({type: CLEAR_ERRORS});
     dispatch({ type: LOADING_UI });
     axios
       .post("/signup", newUserData)