Commit Graph

230 Commits

Author SHA1 Message Date
Leon Liang
e984afff74 modified profile.js 2019-10-22 18:26:21 -04:00
Aaron Sun
1b66f18dd5 Log in with username partially works 2019-10-22 16:50:38 -04:00
Leon Liang
dede04aa8e added dependency 2019-10-22 15:08:38 -04:00
Leon Liang
bb0343ab30 Remove redundant profile 2019-10-22 15:08:07 -04:00
Aaron Sun
7b8e40c7b0 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 2019-10-22 14:33:46 -04:00
c5942a6634
Merge pull request #31 from ClaytonWWilson/login-frontend
Comment out extra /user path declaration
2019-10-22 13:57:05 -04:00
e062ffbb41 Comment out extra /user path declaration 2019-10-22 13:17:43 -04:00
Aaron Sun
cb4885cadf Switched proxy back to cloud 2019-10-20 21:49:21 -04:00
Aaron Sun
d2032eef75 Login with username works now 2019-10-20 21:45:24 -04:00
adf3da4bb8
Merge pull request #29 from ClaytonWWilson/login-frontend
Login frontend
2019-10-11 18:24:13 -04:00
76ef3a6561 Fixing merge conflicts 2019-10-11 17:58:55 -04:00
b337277aa4 Fix login-frontend merge conflicts 2019-10-11 17:46:38 -04:00
f4b44c9654 Fix for Redux DevTools not being installed causing a crash 2019-10-11 17:35:21 -04:00
27efa858d5 Signup is working 2019-10-11 17:34:35 -04:00
00ed9d64c5 store.js 2019-10-10 14:13:04 -04:00
d1233e77ed Logout is working now : ) 2019-10-09 12:03:57 -04:00
bb6c7a07fc Register.js renamed to Signup.js 2019-10-07 21:00:52 -04:00
9eb4f603df Logout is working ^_^ 2019-10-07 20:46:28 -04:00
8179b51844 Before finishing authentication 2019-10-07 20:24:23 -04:00
Danny Voltz
f1e5c584e1 added alert 2019-10-03 12:00:58 -05:00
Leon Liang
c2ef222cf6
Merge pull request #28 from ClaytonWWilson/profile_display
Profile display
2019-10-03 11:53:31 -04:00
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