Commit Graph

183 Commits

Author SHA1 Message Date
e8a403f575 Delete old profile image 2019-10-27 23:43:35 -04:00
Aaron Sun
657277bcad Username and user id now show in post data 2019-10-27 23:11:24 -04:00
Aaron Sun
d69828ef7f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 into auth-backend-3 2019-10-27 20:48:15 -04:00
44d3450b10 Profile image upload frontend and backend finished 2019-10-27 18:06:47 -04:00
Aaron Sun
5fa4caf0a3 Log in with username fully works now 2019-10-27 17:47:04 -04:00
Aaron Sun
fd226b454e Delete users fully works now 2019-10-27 14:46:31 -04:00
Leon Liang
97998a8f09 merge changes 2019-10-27 13:24:53 -04:00
Leon Liang
13a1401759 Reformat code 2019-10-27 02:53:12 -04:00
Leon Liang
e236ceeb4b
Merge branch 'master' into delete_topic 2019-10-27 00:10:38 -04:00
Aditya Sankaran
19780a1395 made userline not hardcoded 2019-10-26 17:06:42 -04:00
Aditya Sankaran
981795b288 writing microblogs not hardcoded anymore 2019-10-26 16:57:25 -04:00
Leon Liang
ec041732d9 reformat 2019-10-25 23:14:25 -04:00
Leon Liang
eb3766edb2
Merge pull request #54 from ClaytonWWilson/delete_topic
added function to delete topic
2019-10-25 23:13:27 -04:00
Leon Liang
d9f6fb5d8e added function to delete topic 2019-10-25 23:04:09 -04:00
b31a571b29
Add followedTopics array on signup 2019-10-25 19:27:45 -04:00
Aditya Sankaran
9d1f987ac1 added userID property for posts 2019-10-25 13:15:17 -04:00
Leon Liang
340d3537a6 created functions retrieving all topics 2019-10-24 23:13:03 -04:00
Leon Liang
de44f1eb89 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 2019-10-24 22:43:32 -04:00
Leon Liang
5405d96150 created function to add topic 2019-10-24 22:42:46 -04:00
0e6af081fa
Merge pull request #42 from ClaytonWWilson/update-navbar
Update navbar
2019-10-24 22:41:04 -04:00
Leon Liang
a498b4748f
Merge branch 'master' into profile_display 2019-10-24 22:12:02 -04:00
Leon Liang
6e9a86e5ce changed getUser 2019-10-24 22:08:28 -04:00
Leon Liang
4aa029c649 modified getUserDetails 2019-10-24 19:34:31 -04:00
1b3ac4d05a
Merge pull request #35 from ClaytonWWilson/edit-profile-fix
Fixing editProfile bugs and making the database storage more efficient
2019-10-24 19:32:05 -04:00
64c10cd172 Rename variable to make code more concise 2019-10-24 19:30:21 -04:00
Leon Liang
79d23af3fc
Merge branch 'master' into auth-backend-3 2019-10-24 17:09:45 -04:00
Leon Liang
52bd8eed64 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 2019-10-24 17:07:29 -04:00
Leon Liang
ac28b3e19e getUserDetails is now working 2019-10-24 17:06:44 -04:00
Leon Liang
570866ff40 getUserDetail returns only user handle 2019-10-24 16:27:22 -04:00
Leon Liang
e524bc2811 pass in fbAuth to getUserDetails 2019-10-24 16:25:19 -04:00
Clayton Wilson
8f5020f881 Fixing editProfile bugs and making the database storage more efficient 2019-10-24 15:44:53 -04:00
Aaron Sun
eea2f56b49 Code for removing user from db still in progress (commented out) 2019-10-24 15:27:20 -04:00
Clayton Wilson
b17fb1f3f0 Update fbAuth so the user data from firebase is stored in req.userData 2019-10-23 23:16:43 -04:00
Aaron Sun
ad853923c8 Delete Account on UI can log the user out 2019-10-23 17:18:52 -04:00
Aaron Sun
bc0b2549b4 Delete user backend code works 2019-10-22 20:45:48 -04:00
Aaron Sun
1b66f18dd5 Log in with username partially works 2019-10-22 16:50:38 -04:00
Aaron Sun
d2032eef75 Login with username works now 2019-10-20 21:45:24 -04:00
27efa858d5 Signup is working 2019-10-11 17:34:35 -04:00
4a5c404be3
Merge branch 'master' into login-frontend 2019-10-03 11:39:38 -04:00
f14e8bd970 Redux saves user data on login 2019-10-03 10:58:45 -04:00
8de496826a Testing login backend 2019-10-02 22:53:31 -04:00
Aditya Sankaran
b7f0eba7a9 finished rendering userline for user and changed character limit for writing microblogs 2019-10-02 14:59:18 -04:00
dcd03d7888 Login frontend complete 2019-10-02 00:49:51 -04:00
88310714b2
Merge branch 'master' into edit-profile-frontend 2019-10-01 21:01:02 -04:00
c218081759 Making everything look pretty 2019-10-01 20:39:21 -04:00
asankaran35
16973fb340
Merge pull request #19 from ClaytonWWilson/user-line
added entering topics field and database call for adding topics when …
2019-10-01 19:16:02 -04:00
Aditya Sankaran
9d4f175a49 added entering topics field and database call for adding topics when writing microblog 2019-10-01 19:07:57 -04:00
07e9271132 Removing hard-coded user info. 2019-10-01 17:30:18 -04:00
724adc9b0b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 17:02:05 -04:00
b711521b4b Fix unnecessary escape deploy error. 2019-10-01 17:01:59 -04:00
76caf4de12
Merge branch 'master' into edit-profile-frontend 2019-10-01 16:54:13 -04:00
eb945fa0cf Finished fixing login and signup backend. 2019-10-01 16:31:37 -04:00
c5bec46b52 Fix fbAuth function not extracting 'Bearer ' 2019-10-01 16:08:53 -04:00
cc98fa7884 Fixed index.js and refactored it. 2019-10-01 15:27:24 -04:00
Aditya Sankaran
311e8b3716 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 14:03:37 -04:00
Aditya Sankaran
754c2f2d75 added get request userline function 2019-10-01 14:03:15 -04:00
Aaron Sun
13b57eedc6 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 13:57:44 -04:00
Leon Liang
e273b1474b Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24
added Navigation bar
2019-10-01 12:45:10 -04:00
Leon Liang
022f440cb9 added Navigation bar to home page 2019-10-01 12:44:47 -04:00
Aaron Sun
4517bc6756 Reconciled with new pull from master 2019-09-30 23:22:09 -04:00
Aaron Sun
201f5d8949 Reconciled my code with master 2019-09-30 23:04:37 -04:00
696b00e304 Edit profile front-end almost finished. 2019-09-30 22:30:29 -04:00
asankaran35
d298843268
Merge branch 'master' into userline 2019-09-30 18:23:21 -04:00
Aditya Sankaran
55dc62e57e connected backend to frontend for writing microblogs 2019-09-30 18:06:23 -04:00
90442fe3cd Fixing 'firebase deploy' errors and warnings 2019-09-29 23:59:36 -04:00
929216c05e Changed naming from FBAuth to fbAuth 2019-09-29 22:06:51 -04:00
dc498a3a1d
Add comments to fbAuth.js 2019-09-29 21:56:59 -04:00
f4ef1ee8e1
Wrong filename 2019-09-29 21:52:25 -04:00
ce8ee36354
Fixed missing bracket 2019-09-29 21:46:18 -04:00
Clayton Wilson
7f2d6a3a1e
Merge branch 'master' into edit-profile-info 2019-09-29 21:33:41 -04:00
d05f87c7a7 Made edit profile data validation more robust. 2019-09-29 21:01:06 -04:00
Aditya Sankaran
b1faacd312 backend and frontend connect in progress 2019-09-29 19:07:35 -04:00
15f976398a Code refactoring 2019-09-29 01:35:06 -04:00
262e59df65 Disabled the feed route rewrite and small fixes. 2019-09-28 22:42:26 -04:00
Leon Liang
cc1ce1bfc9
Merge branch 'master' into user_subscription 2019-09-27 21:40:39 -04:00
5642b685bc Finished functionality of backend edit profile functions 2019-09-27 16:28:00 -04:00
Leon Liang
70037a5342 added folders to organize files 2019-09-26 01:54:51 -04:00
Leon Liang
8fa03700b1 Refactored and organized files based on functionality 2019-09-26 01:49:19 -04:00
Clayton Wilson
bcdd452aa8 Start of the edit profile functions. 2019-09-23 22:58:06 -04:00
Clayton Wilson
709af8007d Added the FBAuth middleman function for authentication. 2019-09-23 21:18:33 -04:00
Leon Liang
0c08eb8f78 Set up Express for API calls. 2019-09-19 15:41:38 -04:00
Leon Liang
c716d47254 Added functions Helloworld and getUsername for testing 2019-09-12 16:23:45 -04:00
ClaytonWWilson
d0b32835ac Firebase Init files 2019-09-12 14:33:13 -04:00