mirror of
https://github.com/ClaytonWWilson/CS307-Team24.git
synced 2026-03-10 13:15:05 +00:00
Compare commits
165 Commits
branch-692
...
lastfix
| Author | SHA1 | Date | |
|---|---|---|---|
| 6f77d03e2d | |||
| da6e7436ea | |||
| e7afac9a19 | |||
|
|
9449d3544b | ||
| 4f2e07756d | |||
|
|
f2cf7542a8 | ||
| ff7677bfb3 | |||
| 978af53a74 | |||
| a0a522f1d2 | |||
|
|
988c807af2 | ||
|
|
01b449d01d | ||
| f30a9ae27c | |||
| a459e6581e | |||
|
|
b769ab930a | ||
|
|
116f97bf64 | ||
|
|
a4efc15d58 | ||
|
|
39613584e7 | ||
| a1f9a4bef3 | |||
| c85eeccd4c | |||
|
|
bb50e0fa5d | ||
|
|
f111553827 | ||
|
|
5e935f3508 | ||
|
|
80a2e1894c | ||
| 8acd29e842 | |||
| b402c96864 | |||
|
|
76792148cd | ||
|
|
a92681451f | ||
|
|
e3522876d7 | ||
|
|
c7859e0f0a | ||
|
|
aad9dc0273 | ||
|
|
30df98343e | ||
| 719294f0ed | |||
| fc9994d42e | |||
|
|
de72bd9223 | ||
| b85bee7cba | |||
| 76330fd234 | |||
| b007666317 | |||
| a0d2532c22 | |||
| 739b1cc92a | |||
| 57087a5ea3 | |||
|
|
3424a7d34f | ||
| 1aff5ba99b | |||
|
|
2bcf6bfcb3 | ||
|
|
bae2947003 | ||
|
|
96423cee8a | ||
| f9a45ffe07 | |||
|
|
17c7e989ef | ||
|
|
efecf3b02a | ||
|
|
8b4c32b81f | ||
|
|
323cb5bcee | ||
|
|
4a4733f593 | ||
|
|
35cec7abf3 | ||
|
|
6989091fb1 | ||
|
|
699ea23750 | ||
| 0bcfdcdd6c | |||
| 4e5b100968 | |||
| 374c4d45b0 | |||
| 7efed257f2 | |||
| 99ffbe52a4 | |||
|
|
856cb8630e | ||
| 0776728e73 | |||
| 77a3ba9f69 | |||
| 7a0a5725b7 | |||
| 79051f2243 | |||
| 94db3f451d | |||
| fd1718a1f4 | |||
| 7fd976d4cb | |||
| 72d099e05e | |||
|
|
f3fcd5ee8d | ||
|
|
7141bf9000 | ||
| ebca5192e0 | |||
|
|
acecf704dc | ||
|
|
56e836451d | ||
| 1747a29c2e | |||
| 041e53c36f | |||
| 2d426840c0 | |||
| 5b5e785142 | |||
| a4cce0b75e | |||
| 825c126c6c | |||
| 49a4d55f1e | |||
| b4f4dec9ca | |||
| f0c4a2974f | |||
| c26ff21b20 | |||
| 3092fabfd2 | |||
| 1a6aae6545 | |||
| 4abaa13b09 | |||
| 09a3ccd12d | |||
| f7058a520d | |||
| 1a02b53d0f | |||
| e4ea325fb8 | |||
|
|
6e32b25861 | ||
|
|
684ccd1a85 | ||
|
|
f0ddaa30b1 | ||
| 8244631d4d | |||
| 4d97afcb09 | |||
| 88064c55a3 | |||
| 7c7256acbd | |||
| cff0fd4e05 | |||
|
|
e218708e0a | ||
|
|
445c8b39de | ||
|
|
6e8b7f410a | ||
|
|
07a8f0b7bb | ||
|
|
54cd1c44a7 | ||
|
|
ca7f793d4c | ||
|
|
a36212c23d | ||
|
|
b83eb0c897 | ||
| fee2225745 | |||
| 0d8850c45d | |||
| f7ef0cb333 | |||
| 731e01c552 | |||
|
|
0c9778949a | ||
|
|
1a2af4e9bb | ||
|
|
c34f06f130 | ||
| 3814377817 | |||
|
|
9fff6ed81c | ||
| 445687cc54 | |||
| 331509da7f | |||
|
|
64cc9bd156 | ||
|
|
6a78d74930 | ||
|
|
4e817c9647 | ||
|
|
7976110e2b | ||
|
|
3da2449050 | ||
|
|
607ea3fd55 | ||
|
|
e8110d643f | ||
| e06cc614cb | |||
| 709df1492d | |||
|
|
c3091cc10a | ||
|
|
81749c19ce | ||
|
|
1ccc195036 | ||
|
|
0aaa9014b9 | ||
| 3d9266778d | |||
|
|
2de3da928a | ||
| 297619cacb | |||
|
|
42c53fdbc4 | ||
|
|
c8aa1fd050 | ||
| a59c2feb4a | |||
| 0f1cfe0393 | |||
| 63e917f54c | |||
| 2f5ec1c5ac | |||
| 19f8f70bf2 | |||
| 02197ee940 | |||
| 5507247a7f | |||
| 5560b6e13c | |||
| 19d78596b5 | |||
| 9372a092ad | |||
| 7a6ac8499c | |||
| 6149e15b35 | |||
| 80670d054e | |||
| 947e5b01a4 | |||
| 7cc8a3f11f | |||
| 7476833f0a | |||
| a2ed627f2b | |||
| bbbfc4b750 | |||
| 38df4ef087 | |||
| 2bd1c08c2c | |||
|
|
6924af58a7 | ||
| 3fa4cd7033 | |||
| ab07d45205 | |||
| 3c31db9bf5 | |||
| c96c77cd9f | |||
| fb6c1e3d98 | |||
| 3d875e2bde | |||
| 3001ec0b38 | |||
| e8a403f575 | |||
| 44d3450b10 |
@@ -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()
|
||||
|
||||
@@ -1212,10 +1212,7 @@ 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) => {
|
||||
|
||||
1153
twistter-frontend/package-lock.json
generated
1153
twistter-frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -45,5 +45,5 @@
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
|
||||
"proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
|
||||
}
|
||||
|
||||
@@ -57,28 +57,14 @@ 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: allPosts
|
||||
posts: res.data
|
||||
});
|
||||
})
|
||||
|
||||
.catch(err => console.log(err));
|
||||
|
||||
Promise.all([userPromise, postPromise])
|
||||
@@ -155,7 +141,7 @@ class Home extends Component {
|
||||
|
||||
console.log(hiddenBool);
|
||||
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") ? (
|
||||
this.state.posts.map(post => !post.hidden && this.state.following && this.state.following.includes(post.userHandle) ? (
|
||||
<Card className={classes.card} key={post.postId}>
|
||||
<CardContent>
|
||||
<Typography>
|
||||
@@ -204,7 +190,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>
|
||||
|
||||
Reference in New Issue
Block a user