Compare commits

..

173 Commits

Author SHA1 Message Date
dependabot[bot]
b45e670564 Bump ajv from 6.10.2 to 6.12.6 in /functions
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.2 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.10.2...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 20:02:03 +00:00
DreamCoder23
b9cbd610a9 Update README.md 2020-10-11 23:17:34 -07:00
daabbf80f6 Actually fix deploy error 2019-12-06 14:58:51 -05:00
f9acefaafb Fixed deploy error 2019-12-06 14:55:01 -05:00
948eff32c2 Fix 2019-12-06 14:26:42 -05:00
6de219505a Fix admin alert posts displaying 2019-12-06 14:25:05 -05:00
7132a2ab45 Fix error in getOtherUsersPosts 2019-12-06 14:10:17 -05:00
5474543af4 add catch in addSubscription 2019-12-06 13:56:48 -05:00
6f77d03e2d Add back verify button for Admin 2019-12-06 13:51:21 -05:00
da6e7436ea Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-12-06 13:35:32 -05:00
e7afac9a19 Fix post topics being added to followed topics list 2019-12-06 13:35:28 -05:00
Aditya Sankaran
9449d3544b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-12-06 13:06:52 -05:00
4f2e07756d tell the user if they aren't following anybody 2019-12-06 13:04:59 -05:00
Aditya Sankaran
f2cf7542a8 fix 2019-12-06 13:04:43 -05:00
ff7677bfb3 Merge pull request #113 from ClaytonWWilson/admin-delete
Admin delete
2019-12-06 12:56:40 -05:00
978af53a74 Merge pull request #114 from ClaytonWWilson/temp-branch
Display disabled DMs as red and fix errors in login and signup
2019-12-06 12:53:57 -05:00
a0a522f1d2 Display disabled DMs as red and fix errors in login and signup 2019-12-06 12:53:27 -05:00
Aditya Sankaran
988c807af2 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-12-06 12:27:00 -05:00
Aditya Sankaran
01b449d01d separated list of topics by comma and space 2019-12-06 12:26:29 -05:00
f30a9ae27c Fix merge errors, but posts are not displaying on home.js 2019-12-06 12:07:36 -05:00
a459e6581e Merge branch 'master' into admin-delete 2019-12-06 11:45:50 -05:00
Leon Liang
b769ab930a Merge pull request #112 from ClaytonWWilson/fix_unfollow
Fix unfollow
2019-12-06 02:28:42 -05:00
Leon Liang
116f97bf64 fixed topic.id bug 2019-12-06 02:26:01 -05:00
Leon Liang
a4efc15d58 allow follow topic only when following user 2019-12-06 02:23:28 -05:00
Leon Liang
39613584e7 fixed unfollow user and topics 2019-12-06 02:17:52 -05:00
a1f9a4bef3 Fixing errors on the otherUsers page 2019-12-05 21:39:38 -05:00
c85eeccd4c Display formatted time on otherUser page 2019-12-05 21:16:46 -05:00
Leon Liang
bb50e0fa5d Merge pull request #111 from ClaytonWWilson/filter_timeli
fixed up add subscription method
2019-12-05 19:25:44 -05:00
Leon Liang
f111553827 fixed up add subscription method 2019-12-05 19:24:50 -05:00
Aditya Sankaran
5e935f3508 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-12-05 19:20:50 -05:00
Aditya Sankaran
80a2e1894c sorted posts chronologically everywhere 2019-12-05 19:20:05 -05:00
8acd29e842 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-12-05 19:14:47 -05:00
b402c96864 Fixing DMs with users who have them disabled 2019-12-05 19:13:00 -05:00
asankaran35
76792148cd Merge pull request #110 from ClaytonWWilson/chronological
can sort posts chronologically in userline and formatted topics listi…
2019-12-05 18:56:18 -05:00
Aditya Sankaran
a92681451f syntax error 2019-12-05 18:54:43 -05:00
Aditya Sankaran
e3522876d7 can sort posts chronologically in userline and formatted topics listing for each post 2019-12-05 18:50:29 -05:00
Leon Liang
c7859e0f0a Merge pull request #109 from ClaytonWWilson/finalfix
fixed user and topic relationship. allow add topic directly
2019-12-05 17:25:53 -05:00
Leon Liang
aad9dc0273 Merge branch 'master' into finalfix 2019-12-05 17:25:19 -05:00
Leon Liang
30df98343e added user post tuple 2019-12-05 17:22:55 -05:00
719294f0ed Fix DM code layout 2019-12-05 16:13:56 -05:00
fc9994d42e fixed circular progress on home 2019-12-05 13:47:10 -05:00
Leon Liang
de72bd9223 added alert to user's page 2019-12-05 13:45:58 -05:00
b85bee7cba Fix merge issue 2019-12-05 13:41:24 -05:00
76330fd234 Merge pull request #108 from ClaytonWWilson/send-microblog-loading
Send microblog loading
2019-12-05 13:38:53 -05:00
b007666317 Merge branch 'master' into send-microblog-loading 2019-12-05 13:38:04 -05:00
a0d2532c22 Add circular progress to home page 2019-12-05 13:35:19 -05:00
739b1cc92a Add circular progress to other user page 2019-12-05 13:22:29 -05:00
57087a5ea3 Add circular progress to user page 2019-12-05 13:08:59 -05:00
Leon Liang
3424a7d34f Merge pull request #107 from ClaytonWWilson/finalfix
filter by followed user
2019-12-05 13:02:52 -05:00
1aff5ba99b Add circular progress to writing_microblogs 2019-12-05 12:56:05 -05:00
Leon Liang
2bcf6bfcb3 filter by followed user 2019-12-05 12:48:26 -05:00
Danny Voltz
bae2947003 Merge branch 'admin-delete' of https://github.com/ClaytonWWilson/CS307-Team24 into admin-delete:x 2019-12-05 12:25:19 -05:00
Danny Voltz
96423cee8a Admin User Stories 2019-12-05 12:12:25 -05:00
f9a45ffe07 Merge pull request #84 from ClaytonWWilson/dms
Direct Messages
2019-12-04 22:47:50 -05:00
Aditya Sankaran
17c7e989ef cleared modal for quoting when hitting cancel button 2019-12-04 19:37:53 -05:00
Aditya Sankaran
efecf3b02a fixed stuff 2019-12-04 18:48:08 -05:00
Aditya Sankaran
8b4c32b81f syntax error 2019-12-04 18:20:28 -05:00
Aditya Sankaran
323cb5bcee Revert "module fuse and syntax errors fixed"
This reverts commit 4a4733f593.
2019-12-04 18:15:37 -05:00
Aditya Sankaran
4a4733f593 module fuse and syntax errors fixed 2019-12-04 18:09:36 -05:00
asankaran35
35cec7abf3 Merge pull request #106 from ClaytonWWilson/likes
Likes
2019-12-04 17:42:03 -05:00
asankaran35
6989091fb1 Merge branch 'master' into likes 2019-12-04 17:41:28 -05:00
Aditya Sankaran
699ea23750 quoting fix 2019-12-04 17:16:41 -05:00
0bcfdcdd6c Fix deploy error 2019-12-04 17:10:26 -05:00
4e5b100968 Fix merge issues and change layout of NavBar 2019-12-04 16:57:56 -05:00
374c4d45b0 Merge branch 'master' into dms 2019-12-04 15:56:42 -05:00
7efed257f2 Merge pull request #105 from ClaytonWWilson/display-profile-images-on-posts
Posts on Home now display profile images
2019-12-04 15:37:59 -05:00
99ffbe52a4 Posts on Home now display profile images 2019-12-04 15:37:09 -05:00
Aditya Sankaran
856cb8630e readded post.js. got deleted for some reason 2019-12-04 14:42:43 -05:00
0776728e73 Merge pull request #60 from ClaytonWWilson/edit-profile-image-upload
Edit profile image upload
2019-12-04 00:31:07 -05:00
77a3ba9f69 Fix merge issues 2019-12-04 00:30:23 -05:00
7a0a5725b7 Merge branch 'master' into edit-profile-image-upload 2019-12-04 00:02:03 -05:00
79051f2243 Error checking and deleting old profile image 2019-12-03 23:46:04 -05:00
94db3f451d Merge pull request #104 from ClaytonWWilson/fix-warnings
Fix warnings
2019-12-03 20:55:55 -05:00
fd1718a1f4 Fixing more errors 2019-12-03 20:54:54 -05:00
7fd976d4cb Merge branch 'master' into fix-warnings 2019-12-03 20:34:08 -05:00
72d099e05e Fixing errors and warnings 2019-12-03 20:26:31 -05:00
Leon Liang
f3fcd5ee8d Merge pull request #103 from ClaytonWWilson/others_topic
changed color if user is following the same topic
2019-12-03 19:16:17 -05:00
Leon Liang
7141bf9000 changed color if user is following the same topic 2019-12-03 19:15:23 -05:00
ebca5192e0 Change storageBucket to variable 2019-12-03 18:20:20 -05:00
Leon Liang
acecf704dc Merge pull request #102 from ClaytonWWilson/otheruser_posts
display posts on other user's page
2019-12-03 18:14:40 -05:00
Leon Liang
56e836451d display posts on other user's page 2019-12-03 18:11:10 -05:00
1747a29c2e Fix not image not uploading when deployed 2019-12-03 17:47:09 -05:00
041e53c36f Merge pull request #101 from ClaytonWWilson/confirm-delete
Confirm delete
2019-12-03 16:40:00 -05:00
2d426840c0 Add @ next to handle on editProfile 2019-12-03 16:37:57 -05:00
5b5e785142 Changed the path of the editProfile page 2019-12-03 16:37:04 -05:00
a4cce0b75e Circular progress when the editProfile page is loading 2019-12-03 16:26:54 -05:00
825c126c6c Delete asks you to confirm 2019-12-03 16:26:16 -05:00
49a4d55f1e Rename edit class to editProfile to be more descriptive 2019-12-03 14:04:40 -05:00
b4f4dec9ca Merge pull request #93 from ClaytonWWilson/fix-login-loading
Display loading icon when the user logs in or signs up
2019-12-03 13:50:55 -05:00
f0c4a2974f Fix mismatched parenthesis 2019-12-03 13:49:37 -05:00
c26ff21b20 Merge branch 'master' into fix-login-loading 2019-12-03 13:44:12 -05:00
3092fabfd2 Merge pull request #85 from ClaytonWWilson/microblogs-material-ui
Changing Writing_Microblogs to Material-UI and other UI tweaks
2019-12-03 13:35:27 -05:00
1a6aae6545 Fixed mismatched parenthesis 2019-12-03 13:33:48 -05:00
4abaa13b09 Merge branch 'master' into microblogs-material-ui 2019-12-03 13:24:36 -05:00
09a3ccd12d Merge branch 'master' into dms 2019-12-03 13:21:30 -05:00
f7058a520d Merge pull request #99 from ClaytonWWilson/improve-search
Improved speed of search and made it fuzzy search
2019-12-03 13:19:53 -05:00
1a02b53d0f Improved speed of search and made it fuzzy search 2019-12-03 00:54:06 -05:00
e4ea325fb8 Liking posts with Redux and Material UI 2019-12-02 20:18:44 -05:00
Leon Liang
6e32b25861 Merge pull request #98 from ClaytonWWilson/fix_follow
add topics when publish new post
2019-12-02 18:39:09 -05:00
Leon Liang
684ccd1a85 Merge branch 'master' into fix_follow 2019-12-02 18:38:54 -05:00
Leon Liang
f0ddaa30b1 add topics when publish new post 2019-12-02 18:31:33 -05:00
8244631d4d Fix some code after merge 2019-12-02 16:40:22 -05:00
4d97afcb09 Merge branch 'master' into microblogs-material-ui 2019-12-02 16:29:52 -05:00
88064c55a3 Merge branch 'master' into dms 2019-12-02 16:21:26 -05:00
7c7256acbd Fixed having multiple return statements in post.js 2019-12-02 15:47:26 -05:00
cff0fd4e05 DMs are deleted when the delete function runs 2019-12-02 15:46:13 -05:00
Leon Liang
e218708e0a Merge pull request #95 from ClaytonWWilson/fix_follow
Fix follow
2019-12-02 00:08:07 -05:00
Leon Liang
445c8b39de allow delete without refreshing page 2019-12-02 00:00:25 -05:00
Aditya Sankaran
6e8b7f410a saved liked posts 2019-12-01 15:55:53 -05:00
Aditya Sankaran
07a8f0b7bb userline frontend shows quoted posts 2019-11-30 18:23:46 -05:00
Aditya Sankaran
54cd1c44a7 edited userline database function 2019-11-30 18:11:33 -05:00
Aditya Sankaran
ca7f793d4c likeCount updating auto 2019-11-30 16:50:20 -05:00
Aditya Sankaran
a36212c23d quoting mblogs userline 2019-11-30 12:16:30 -05:00
Aditya Sankaran
b83eb0c897 saved states of post for each user 2019-11-29 20:18:51 -05:00
fee2225745 Disable or enable Direct Messages 2019-11-27 23:06:25 -05:00
0d8850c45d Comment out logging in fbAuth.js 2019-11-27 21:53:02 -05:00
f7ef0cb333 Fix DM message content overflowing 2019-11-27 21:52:14 -05:00
731e01c552 Comment out some lines in users.js that were throwing errors 2019-11-27 21:51:16 -05:00
asankaran35
0c9778949a Merge pull request #94 from ClaytonWWilson/engage_microblog
Engage microblog
2019-11-27 21:09:32 -05:00
asankaran35
1a2af4e9bb Merge branch 'master' into engage_microblog 2019-11-27 21:08:55 -05:00
Aditya Sankaran
c34f06f130 formatted feed and userline 2019-11-27 20:57:42 -05:00
3814377817 Display loading icon when the user logs in or signs up 2019-11-25 13:55:03 -05:00
Leon Liang
9fff6ed81c changed status code for follow/unfollow 2019-11-22 18:23:49 -05:00
445687cc54 Automatically display new Direct Messages 2019-11-22 18:21:52 -05:00
331509da7f Direct Messages sending DMs 2019-11-22 16:44:53 -05:00
Leon Liang
64cc9bd156 Merge pull request #91 from ClaytonWWilson/fix_profile
Fix profile
2019-11-21 20:21:24 -05:00
Leon Liang
6a78d74930 simplified backend get/remove topic function 2019-11-21 20:20:54 -05:00
Leon Liang
4e817c9647 integrated backend change, added pointer cursor 2019-11-21 20:09:47 -05:00
Leon Liang
7976110e2b modified function to add/delete topic only from user 2019-11-21 19:59:04 -05:00
Leon Liang
3da2449050 change topic display to user-specific topics 2019-11-21 18:10:44 -05:00
Leon Liang
607ea3fd55 Merge pull request #83 from ClaytonWWilson/edit-profile-linking
Changing profile page layout
2019-11-21 17:58:56 -05:00
Aditya Sankaran
e8110d643f finished quoting microblogs 2019-11-21 15:42:43 -05:00
e06cc614cb Dynamic front-end adding new DM channels 2019-11-20 20:48:49 -05:00
709df1492d Changed how back-end DMs worked 2019-11-20 20:32:11 -05:00
Leon Liang
c3091cc10a Merge pull request #90 from ClaytonWWilson/auto_complete
completed search page and redirect to user profile page
2019-11-19 22:31:52 -05:00
Leon Liang
81749c19ce completed search page and redirect to user profile page 2019-11-19 22:30:15 -05:00
Aditya Sankaran
1ccc195036 liking and unliking work 2019-11-19 21:09:07 -05:00
Leon Liang
0aaa9014b9 Merge pull request #88 from ClaytonWWilson/user_page
User page
2019-11-19 19:22:48 -05:00
3d9266778d Direct Messages can use redux for creating new DM channels 2019-11-19 19:04:25 -05:00
Leon Liang
2de3da928a added UI for follow and unfollow other user 2019-11-19 19:03:28 -05:00
297619cacb Tweaking DM back-end functions 2019-11-19 19:02:13 -05:00
Leon Liang
42c53fdbc4 Add profile image, topics for other user page 2019-11-19 15:56:39 -05:00
Leon Liang
c8aa1fd050 Added page to display other users' profile 2019-11-19 13:57:24 -05:00
a59c2feb4a Fix sorting so empty DM channels go to the bottom of the list 2019-11-19 01:30:00 -05:00
0f1cfe0393 Front-end layout mostly completed 2019-11-19 01:18:20 -05:00
63e917f54c Fixed the sorting of messages 2019-11-15 15:20:39 -05:00
2f5ec1c5ac Basic style for direct messages 2019-11-12 23:50:53 -05:00
19f8f70bf2 Fixing DMList errors 2019-11-08 18:48:00 -05:00
02197ee940 Sending Direct Messages 2019-11-08 17:54:56 -05:00
5507247a7f Create a new DM channel between two users 2019-11-08 11:42:46 -05:00
5560b6e13c Refactor DM enabled checking to make it re-usable 2019-11-06 01:01:50 -05:00
19d78596b5 Check for DMs enabled or disabled 2019-11-05 22:43:29 -05:00
9372a092ad Fix edit profile button link 2019-11-05 17:43:19 -05:00
7a6ac8499c fix merge 2019-11-05 17:38:11 -05:00
6149e15b35 Profile page kinda works on mobile 2019-11-05 17:35:16 -05:00
80670d054e Main layout of profile page 2019-11-05 17:19:28 -05:00
947e5b01a4 Converted tabs back to spaces 2019-11-05 17:16:34 -05:00
7cc8a3f11f Fixing up profile UI 2019-11-05 17:04:33 -05:00
7476833f0a Main layout of profile page 2019-11-05 16:32:16 -05:00
a2ed627f2b Back-end for getting all the DMs for a user 2019-11-04 13:21:47 -05:00
bbbfc4b750 Editprofile move button positions 2019-11-03 21:10:57 -05:00
38df4ef087 Added styles and spaced cards 2019-11-03 15:29:39 -05:00
2bd1c08c2c Writing_Microblogs to Material-UI and UI improvements 2019-11-03 15:17:14 -05:00
Danny Voltz
6924af58a7 progress for admin delete 2019-11-01 15:40:26 -05:00
3fa4cd7033 Changing writing microblogs to Material-UI 2019-11-01 13:02:37 -04:00
ab07d45205 Fix loading on image upload, so it waits for new image 2019-11-01 10:12:54 -04:00
3c31db9bf5 Converted tabs back to spaces 2019-10-29 23:02:36 -04:00
c96c77cd9f Debugging upload issues 2019-10-29 15:00:21 -04:00
fb6c1e3d98 Image upload edit some return messages 2019-10-29 12:40:38 -04:00
3d875e2bde Fixing up profile UI 2019-10-28 23:25:12 -04:00
3001ec0b38 Merge branch 'master' into edit-profile-image-upload 2019-10-27 23:46:15 -04:00
e8a403f575 Delete old profile image 2019-10-27 23:43:35 -04:00
44d3450b10 Profile image upload frontend and backend finished 2019-10-27 18:06:47 -04:00
5 changed files with 1170 additions and 26 deletions

View File

@@ -1,2 +1,2 @@
# CS307-Team24
CS307 Team 24 Twistter website.
CS307 Team 24 Twistter website

View File

@@ -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;
}
});

View File

@@ -518,15 +518,23 @@
}
},
"ajv": {
"version": "6.10.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
"version": "6.12.6",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
"dev": true,
"requires": {
"fast-deep-equal": "^2.0.1",
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
},
"dependencies": {
"fast-deep-equal": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
}
}
},
"ansi-escapes": {
@@ -673,6 +681,14 @@
"readable-stream": "~1.0.32"
}
},
"busboy": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/busboy/-/busboy-0.3.1.tgz",
"integrity": "sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw==",
"requires": {
"dicer": "0.3.0"
}
},
"bytebuffer": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
@@ -1396,12 +1412,6 @@
"tmp": "^0.0.33"
}
},
"fast-deep-equal": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
"dev": true
},
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",

File diff suppressed because it is too large Load Diff

View File

@@ -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"
}