234 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aaron Sun	5fa4caf0a3	Log in with username fully works now	2019-10-27 17:47:04 -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	0bbc453d54	Merge pull request #55 from ClaytonWWilson/delete_topic ... Delete topic	2019-10-27 00:10:56 -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	19780a1395	made userline not hardcoded	2019-10-26 17:06:42 -04:00
Aditya Sankaran	981795b288	writing microblogs not hardcoded anymore	2019-10-26 16:57:25 -04:00
Leon Liang	ec041732d9	reformat	2019-10-25 23:14:25 -04:00
Leon Liang	eb3766edb2	Merge pull request #54 from ClaytonWWilson/delete_topic ... added function to delete topic	2019-10-25 23:13:27 -04:00
Leon Liang	d9f6fb5d8e	added function to delete topic	2019-10-25 23:04:09 -04:00
Clayton Wilson	b31a571b29	Add followedTopics array on signup	2019-10-25 19:27:45 -04:00
Clayton Wilson	60f83da514	Merge pull request #47 from ClaytonWWilson/block_topics ... Fix login page loop bug	2019-10-25 15:31:12 -04:00
Clayton Wilson	41bcc78c3a	Fix login page loop bug	2019-10-25 15:20:10 -04:00
Clayton Wilson	f82f9984c6	Comment out axios.defaults.baseUrl	2019-10-25 14:33:23 -04:00
Aditya Sankaran	6335690046	Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24	2019-10-25 13:15:53 -04:00
Aditya Sankaran	9d1f987ac1	added userID property for posts	2019-10-25 13:15:17 -04:00
Leon Liang	b255006f7a	Merge pull request #45 from ClaytonWWilson/display_topic ... Display topic	2019-10-25 01:57:14 -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
Leon Liang	65ac1c7384	Merge pull request #43 from ClaytonWWilson/add_topic_user ... created functions retrieving all topics	2019-10-24 23:13:39 -04:00
Leon Liang	340d3537a6	created functions retrieving all topics	2019-10-24 23:13:03 -04:00
Leon Liang	de44f1eb89	Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24	2019-10-24 22:43:32 -04:00
Leon Liang	5405d96150	created function to add topic	2019-10-24 22:42:46 -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	de38339cad	Merge pull request #39 from ClaytonWWilson/profile_display ... Profile display: able to see from /user	2019-10-24 22:12:27 -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	6e9a86e5ce	changed getUser	2019-10-24 22:08:28 -04:00
Leon Liang	97650f6539	added axios baseURL	2019-10-24 22:08:09 -04:00
Leon Liang	4aa029c649	modified getUserDetails	2019-10-24 19:34:31 -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
Clayton Wilson	64c10cd172	Rename variable to make code more concise	2019-10-24 19:30:21 -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	b16c3eb50f	Merge pull request #33 from ClaytonWWilson/auth-backend-3 ... Auth backend 3	2019-10-24 17:09:58 -04:00
Leon Liang	79d23af3fc	Merge branch 'master' into auth-backend-3	2019-10-24 17:09:45 -04:00
Leon Liang	52bd8eed64	Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24	2019-10-24 17:07:29 -04:00
Leon Liang	ac28b3e19e	getUserDetails is now working	2019-10-24 17:06:44 -04:00
Leon Liang	570866ff40	getUserDetail returns only user handle	2019-10-24 16:27:22 -04:00
Leon Liang	bdad36957c	package lock	2019-10-24 16:25:29 -04:00
Leon Liang	e524bc2811	pass in fbAuth to getUserDetails	2019-10-24 16:25:19 -04:00
Leon Liang	714e6a4e07	new adminsdk	2019-10-24 16:24:56 -04:00
Leon Liang	cdbf0fcdc6	renew adminsdk	2019-10-24 16:24:33 -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
Clayton Wilson	de4018a6d2	Merge pull request #34 from ClaytonWWilson/edit-profile-fix ... Update fbAuth so the user data from firebase is stored in req.userData	2019-10-24 13:23:03 -04:00