Compare commits
14 Commits
b0cb52f0b3
...
branch-692
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a7f80ab34 | ||
|
|
db6b147c40 | ||
|
|
e3593e2f29 | ||
|
|
4b440d28de | ||
|
|
81593cee52 | ||
|
|
1482830131 | ||
|
|
ad0b21e629 | ||
|
|
e1343d503c | ||
|
|
54ba36abeb | ||
|
|
953d58ea12 | ||
|
|
b9ca0dc492 | ||
|
|
4d4b085a2b | ||
|
|
1a2f269466 | ||
|
|
6184a22607 |
14
README.md
@@ -1,14 +1,2 @@
|
||||
# CS307-Team24
|
||||
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>
|
||||
CS307 Team 24 Twistter website.
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/* 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");
|
||||
@@ -867,10 +866,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}`));
|
||||
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);
|
||||
reject({
|
||||
code: 400,
|
||||
message: `You already have a DM with that user`
|
||||
});
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
|
Before Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 184 KiB |
|
Before Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 42 KiB |
18
twistter-frontend/package-lock.json
generated
@@ -2418,9 +2418,9 @@
|
||||
"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
|
||||
},
|
||||
"dayjs": {
|
||||
"version": "1.10.7",
|
||||
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
|
||||
"integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
|
||||
"version": "1.8.17",
|
||||
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.17.tgz",
|
||||
"integrity": "sha512-47VY/htqYqr9GHd7HW/h56PpQzRBSJcxIQFwqL3P20bMF/3az5c3PWdVY3LmPXFl6cQCYHL7c79b9ov+2bOBbw=="
|
||||
},
|
||||
"debug": {
|
||||
"version": "2.6.9",
|
||||
@@ -9793,9 +9793,9 @@
|
||||
"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE="
|
||||
},
|
||||
"underscore": {
|
||||
"version": "1.13.2",
|
||||
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz",
|
||||
"integrity": "sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="
|
||||
"version": "1.9.1",
|
||||
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
|
||||
"integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
|
||||
},
|
||||
"union-value": {
|
||||
"version": "1.0.1",
|
||||
@@ -9913,9 +9913,9 @@
|
||||
}
|
||||
},
|
||||
"url-parse": {
|
||||
"version": "1.5.10",
|
||||
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
|
||||
"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
|
||||
"version": "1.4.7",
|
||||
"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
|
||||
"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
|
||||
"requires": {
|
||||
"querystringify": "^2.1.1",
|
||||
"requires-port": "^1.0.0"
|
||||
|
||||
@@ -45,5 +45,5 @@
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
|
||||
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
|
||||
}
|
||||
|
||||