108 Commits

Author	SHA1	Message	Date
Leon Liang	e73b2d02f3	Merge branch 'master' into delete_topic	2019-10-31 14:44:03 -04:00
Leon Liang	50bc73870b	delete topic fully works	2019-10-31 14:32:54 -04:00
Aaron Sun	d3a77afe43	Pulled and merged the latest code from master	2019-10-29 14:02:56 -04:00
Leon Liang	b20408c144	delete topic	2019-10-28 21:38:32 -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
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
Leon Liang	1c81ae1663	show user's profile image	2019-10-27 00:09:17 -04:00
Leon Liang	c356dd18fa	added UI allowing topic creation	2019-10-27 00:08:38 -04:00
Aditya Sankaran	981795b288	writing microblogs not hardcoded anymore	2019-10-26 16:57:25 -04:00
Clayton Wilson	41bcc78c3a	Fix login page loop bug	2019-10-25 15:20:10 -04:00
Leon Liang	f13580c727	display topics under profile	2019-10-25 01:56:07 -04:00
Leon Liang	4ec560de75	made logo background transparent	2019-10-25 00:00:43 -04:00
Clayton Wilson	0e6af081fa	Merge pull request #42 from ClaytonWWilson/update-navbar ... Update navbar	2019-10-24 22:41:04 -04:00
Clayton Wilson	021e25de86	Make NavBar display login/signup/logout correctly	2019-10-24 22:38:42 -04:00
Leon Liang	a498b4748f	Merge branch 'master' into profile_display	2019-10-24 22:12:02 -04:00
Leon Liang	4200c05ca1	added profile display	2019-10-24 22:08:49 -04:00
Leon Liang	97650f6539	added axios baseURL	2019-10-24 22:08:09 -04:00
Clayton Wilson	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
Leon Liang	37cce6c828	deleted profile.js	2019-10-24 17:48:39 -04:00
Leon Liang	bcaf0920a6	deleted staticProfile	2019-10-24 17:45:41 -04:00
Leon Liang	79d23af3fc	Merge branch 'master' into auth-backend-3	2019-10-24 17:09:45 -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
Aaron Sun	45f88861c8	Delete Account works on the UI now	2019-10-23 18:08:42 -04:00
Aaron Sun	ad853923c8	Delete Account on UI can log the user out	2019-10-23 17:18:52 -04:00
Leon Liang	e984afff74	modified profile.js	2019-10-22 18:26:21 -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
Clayton Wilson	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
Clayton Wilson	76ef3a6561	Fixing merge conflicts	2019-10-11 17:58:55 -04:00
Clayton Wilson	b337277aa4	Fix login-frontend merge conflicts	2019-10-11 17:46:38 -04:00
Clayton Wilson	f4b44c9654	Fix for Redux DevTools not being installed causing a crash	2019-10-11 17:35:21 -04:00
Clayton Wilson	27efa858d5	Signup is working	2019-10-11 17:34:35 -04:00
Clayton Wilson	00ed9d64c5	store.js	2019-10-10 14:13:04 -04:00
Clayton Wilson	d1233e77ed	Logout is working now : )	2019-10-09 12:03:57 -04:00
Clayton Wilson	bb6c7a07fc	Register.js renamed to Signup.js	2019-10-07 21:00:52 -04:00
Clayton Wilson	9eb4f603df	Logout is working ^_^	2019-10-07 20:46:28 -04:00
Clayton Wilson	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
Clayton Wilson	4a5c404be3	Merge branch 'master' into login-frontend	2019-10-03 11:39:38 -04:00
Clayton Wilson	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