Compare commits

..

14 Commits

Author SHA1 Message Date
Aaron Sun
5a7f80ab34 PROJECT COMPLETED!!!!! 2019-12-10 23:42:36 -05:00
Aaron Sun
db6b147c40 PROJECT COMPLETED!!!!! 2019-12-10 23:41:50 -05:00
Aaron Sun
e3593e2f29 Left-aligned the text in posts 2019-11-29 21:11:10 -08:00
Aaron Sun
4b440d28de Fixed a small bug in sorting userline posts 2019-11-29 20:17:21 -08:00
Aaron Sun
81593cee52 Posts are now sorted by date 2019-11-29 20:02:13 -08:00
Aaron Sun
1482830131 Pulled latest version from master and fixed all conflicts 2019-11-24 17:08:13 -08:00
Aaron Sun
ad0b21e629 Tested likes and shares via hardcode 2019-11-21 17:13:33 -05:00
Aaron Sun
e1343d503c Made the date in posts look prettier 2019-11-19 23:32:37 -05:00
Aaron Sun
54ba36abeb All done with only showing posts user is interested in 2019-11-19 12:25:55 -05:00
Aaron Sun
953d58ea12 Can filter posts via subcollection iteration but from only 1 user 2019-11-18 23:45:14 -05:00
Aaron Sun
b9ca0dc492 Modified code structure for filter posts 2019-11-18 22:17:33 -05:00
Aaron Sun
4d4b085a2b Can filter posts via hardcoded topics 2019-11-18 22:01:28 -05:00
Aaron Sun
1a2f269466 Filtered timeline posts to only followers 2019-11-17 22:36:52 -05:00
Aaron Sun
6184a22607 Fixed conflicts with Sprint 2 checkpoint and the most up-to-date version 2019-11-17 10:32:59 -05:00
12 changed files with 15 additions and 28 deletions

View File

@@ -1,14 +1,2 @@
# CS307-Team24 # 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>

View File

@@ -1,6 +1,5 @@
/* eslint-disable promise/catch-or-return */ /* eslint-disable promise/catch-or-return */
/* eslint-disable promise/always-return */ /* eslint-disable promise/always-return */
/* eslint-disable prefer-promise-reject-error */
const { admin, db } = require("../util/admin"); const { admin, db } = require("../util/admin");
const config = require("../util/config"); const config = require("../util/config");
@@ -867,10 +866,10 @@ oneWayCheck = (userA, userB) => {
if (dmRecipient === userB) { if (dmRecipient === userB) {
console.log(`You already have a DM with ${userB}`); console.log(`You already have a DM with ${userB}`);
// reject(new Error(`You already have a DM with ${userB}`)); // reject(new Error(`You already have a DM with ${userB}`));
let e = new Error(`You already have a DM with that user`); reject({
e.code = 400, code: 400,
e.message = `You already have a DM with that user` message: `You already have a DM with that user`
reject(e); });
return; return;
} }
}); });

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -2418,9 +2418,9 @@
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=" "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
}, },
"dayjs": { "dayjs": {
"version": "1.10.4", "version": "1.8.17",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.17.tgz",
"integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==" "integrity": "sha512-47VY/htqYqr9GHd7HW/h56PpQzRBSJcxIQFwqL3P20bMF/3az5c3PWdVY3LmPXFl6cQCYHL7c79b9ov+2bOBbw=="
}, },
"debug": { "debug": {
"version": "2.6.9", "version": "2.6.9",
@@ -4240,9 +4240,9 @@
} }
}, },
"hosted-git-info": { "hosted-git-info": {
"version": "2.8.9", "version": "2.8.4",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="
}, },
"html-comment-regex": { "html-comment-regex": {
"version": "1.1.2", "version": "1.1.2",
@@ -9793,9 +9793,9 @@
"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=" "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
}, },
"underscore": { "underscore": {
"version": "1.13.1", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
"integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
}, },
"union-value": { "union-value": {
"version": "1.0.1", "version": "1.0.1",

View File

@@ -45,5 +45,5 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "http://localhost:5001/twistter-e4649/us-central1/api" "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
} }