Commit Graph

309 Commits

Author SHA1 Message Date
Leon Liang
3cbcb5054c Modifed user.js using grid displaying 2019-10-03 11:46:50 -04:00
6deb15d9d4
Merge pull request #27 from ClaytonWWilson/login-frontend
Login frontend
2019-10-03 11:42:10 -04:00
4a5c404be3
Merge branch 'master' into login-frontend 2019-10-03 11:39:38 -04:00
7841fa1798 Fix warning 2019-10-03 11:23:28 -04:00
Leon Liang
bac2cd7719 modified app.css to adjust the app background 2019-10-03 11:06:14 -04:00
f14e8bd970 Redux saves user data on login 2019-10-03 10:58:45 -04:00
Danny Voltz
14e09d88ea Fixed merge issue 2019-10-03 09:41:47 -05:00
c241455c4b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-03 10:20:12 -04:00
4c1459d890 Renamed edit.js to editProfile.js because it makes more sense 2019-10-03 09:47:07 -04:00
asankaran35
c14263988e
Merge pull request #25 from ClaytonWWilson/fix
fixed login and register. should be working on frontend now
2019-10-03 09:31:19 -04:00
Aditya Sankaran
64657fa3af fixed login and register. working on frontend now 2019-10-03 09:29:22 -04:00
Leon Liang
d072a5ff95
Merge pull request #24 from ClaytonWWilson/profile_display
Profile display
2019-10-02 23:30:05 -04:00
Leon Liang
9c0dac507f Light blue color scheme 2019-10-02 23:29:05 -04:00
Leon Liang
5168de65c1 Merge branch 'master' into profile_display 2019-10-02 23:24:21 -04:00
Leon Liang
2536547c63 Theming 2019-10-02 23:21:30 -04:00
Leon Liang
42a07ffa5e resolved merge conflict in app.css 2019-10-02 23:10:12 -04:00
Leon Liang
7558602a90 Added post card 2019-10-02 23:08:34 -04:00
8de496826a Testing login backend 2019-10-02 22:53:31 -04:00
Aditya Sankaran
3b682bae18 Revert "Can successfully register and login in UI"
This reverts commit 893cad7e7e.

reverting commit
2019-10-02 21:38:23 -04:00
Aditya Sankaran
5acc7a64e0 Revert "Modified code for posts in homes"
This reverts commit 71b6965830.

   reversing commit
2019-10-02 21:35:23 -04:00
Aaron Sun
71b6965830 Modified code for posts in homes 2019-10-02 20:45:45 -04:00
Aaron Sun
893cad7e7e Can successfully register and login in UI 2019-10-02 20:40:46 -04:00
8f949f14be Fix caseSensitive error and moment import 2019-10-02 18:00:29 -04:00
5df28e0e77 Still working on Auth State 2019-10-02 17:53:20 -04:00
Danny Voltz
39098e917f pull 2019-10-02 16:37:10 -05:00
Danny Voltz
29c07a9b14 commit 2019-10-02 16:24:01 -05:00
Leon Liang
15f106ed1a added theme.js 2019-10-02 15:10:02 -04:00
asankaran35
e110bdd47a
Merge pull request #21 from ClaytonWWilson/user-line-posts
finished rendering userline for user and changed character limit for …
2019-10-02 15:01:00 -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
878bb28a71
Merge pull request #20 from ClaytonWWilson/edit-profile-frontend
Edit profile frontend
2019-10-01 21:01:29 -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
Leon Liang
f627b91543 change case sensitive file name 2019-10-01 19:04:03 -04:00
Leon Liang
ec6e41d16f
Merge pull request #18 from ClaytonWWilson/file_org
File org for twistter-frontend js files
2019-10-01 19:00:40 -04:00
Leon Liang
2e157b9088
Merge branch 'master' into file_org 2019-10-01 19:00:19 -04:00
Leon Liang
89e8942624 file organization for twistter frontend 2019-10-01 18:54:26 -04:00
Leon Liang
b9909c1616 move home.js and so on into according folders 2019-10-01 18:44:49 -04:00
Danny Voltz
fadb0f0399 added logout support 2019-10-01 17:34:19 -05:00
Danny Voltz
931929061f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-01 17:30:39 -05:00
Danny Voltz
8eb0872d16 logout ui 2019-10-01 17:27:52 -05: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
967e66313b
Merge pull request #17 from ClaytonWWilson/edit-profile-frontend
Edit profile frontend
2019-10-01 16:56:58 -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