Commit Graph

183 Commits

Author SHA1 Message Date
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