126 Commits

Author	SHA1	Message	Date
Clayton Wilson	903ea35662	Fix indents	2019-11-01 16:19:54 -04:00
Clayton Wilson	e644498108	Merge pull request #67 from ClaytonWWilson/verify-profile ... Users can be verified and have a check mark displayed on their profiles	2019-11-01 16:11:53 -04:00
Clayton Wilson	97bc9c4fb1	Verify users front-end	2019-11-01 16:11:02 -04:00
Shobhit Makhija	f2dac314e5	Merge pull request #74 from ClaytonWWilson/Beautify ... Fixing UI	2019-11-01 15:39:57 -04:00
shobhitm23	d3bfd8b5f3	Fixing UI	2019-11-01 15:36:22 -04:00
Clayton Wilson	f4bedea2c7	Merge branch 'master' into verify-profile	2019-11-01 13:40:30 -04:00
Leon Liang	f60c045483	Merge branch 'master' into search_page	2019-10-31 16:57:22 -04:00
Leon Liang	1842eef2f8	added search page	2019-10-31 16:54:34 -04:00
Clayton Wilson	ce984df437	Merge branch 'master' into auth-backend-3	2019-10-31 16:09:17 -04:00
Clayton Wilson	112988c8fb	Add '@' to profile handle	2019-10-31 15:46:33 -04:00
Leon Liang	35e5cf8e9d	revert changes that I f ed up	2019-10-31 15:11:16 -04:00
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
Clayton Wilson	ca1d86acf1	Users can be verified and have a check mark displayed on their profiles	2019-10-31 13:56:40 -04:00
Aaron Sun	da14700987	Fixed a small bug with the Delete Account button	2019-10-30 18:15:01 -04:00
Aaron Sun	26afabe709	All posts from db can now show on home page timeline	2019-10-30 18:04:35 -04:00
Aaron Sun	a61c296ddf	Made the posts look prettier	2019-10-30 16:12:53 -04:00
Aaron Sun	1337071bec	UI can now display all features of a post	2019-10-30 15:07:19 -04:00
Aaron Sun	cd19364efc	Can now display post body on profile page	2019-10-30 11:40:44 -04:00
Aaron Sun	6db14e3868	Improved the profile page format	2019-10-29 19:39:11 -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