ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 13:15:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 340d3537a6 created functions retrieving all topics Leon Liang 2019-10-24 23:13:03 -04:00
  • de44f1eb89 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 Leon Liang 2019-10-24 22:43:32 -04:00
  • 5405d96150 created function to add topic Leon Liang 2019-10-24 22:42:46 -04:00
  • 0e6af081fa Merge pull request #42 from ClaytonWWilson/update-navbar Clayton Wilson 2019-10-24 22:41:04 -04:00
  • 021e25de86 Make NavBar display login/signup/logout correctly Clayton Wilson 2019-10-24 22:38:42 -04:00
  • de38339cad Merge pull request #39 from ClaytonWWilson/profile_display Leon Liang 2019-10-24 22:12:27 -04:00
  • a498b4748f Merge branch 'master' into profile_display Leon Liang 2019-10-24 22:12:02 -04:00
  • 4200c05ca1 added profile display Leon Liang 2019-10-24 22:08:49 -04:00
  • 6e9a86e5ce changed getUser Leon Liang 2019-10-24 22:08:28 -04:00
  • 97650f6539 added axios baseURL Leon Liang 2019-10-24 22:08:09 -04:00
  • 4aa029c649 modified getUserDetails Leon Liang 2019-10-24 19:34:31 -04:00
  • 1b3ac4d05a Merge pull request #35 from ClaytonWWilson/edit-profile-fix Clayton Wilson 2019-10-24 19:32:05 -04:00
  • 64c10cd172 Rename variable to make code more concise Clayton Wilson 2019-10-24 19:30:21 -04:00
  • 37cce6c828 deleted profile.js Leon Liang 2019-10-24 17:48:39 -04:00
  • bcaf0920a6 deleted staticProfile Leon Liang 2019-10-24 17:45:41 -04:00
  • b16c3eb50f Merge pull request #33 from ClaytonWWilson/auth-backend-3 Leon Liang 2019-10-24 17:09:58 -04:00
  • 79d23af3fc Merge branch 'master' into auth-backend-3 Leon Liang 2019-10-24 17:09:45 -04:00
  • 52bd8eed64 Merge branch 'master' of github.com:ClaytonWWilson/CS307-Team24 Leon Liang 2019-10-24 17:07:29 -04:00
  • ac28b3e19e getUserDetails is now working Leon Liang 2019-10-24 17:06:44 -04:00
  • 570866ff40 getUserDetail returns only user handle Leon Liang 2019-10-24 16:27:22 -04:00
  • bdad36957c package lock Leon Liang 2019-10-24 16:25:29 -04:00
  • e524bc2811 pass in fbAuth to getUserDetails Leon Liang 2019-10-24 16:25:19 -04:00
  • 714e6a4e07 new adminsdk Leon Liang 2019-10-24 16:24:56 -04:00
  • cdbf0fcdc6 renew adminsdk Leon Liang 2019-10-24 16:24:33 -04:00
  • 8f5020f881 Fixing editProfile bugs and making the database storage more efficient Clayton Wilson 2019-10-24 15:44:53 -04:00
  • eea2f56b49 Code for removing user from db still in progress (commented out) Aaron Sun 2019-10-24 15:27:20 -04:00
  • de4018a6d2 Merge pull request #34 from ClaytonWWilson/edit-profile-fix Clayton Wilson 2019-10-24 13:23:03 -04:00
  • b17fb1f3f0 Update fbAuth so the user data from firebase is stored in req.userData Clayton Wilson 2019-10-23 23:16:43 -04:00
  • a7d34eca09 Status working page shobhitm23 2019-10-23 22:11:52 -04:00
  • 45f88861c8 Delete Account works on the UI now Aaron Sun 2019-10-23 18:08:42 -04:00
  • ad853923c8 Delete Account on UI can log the user out Aaron Sun 2019-10-23 17:18:52 -04:00
  • bc0b2549b4 Delete user backend code works Aaron Sun 2019-10-22 20:45:48 -04:00
  • e984afff74 modified profile.js Leon Liang 2019-10-22 18:26:21 -04:00
  • 1b66f18dd5 Log in with username partially works Aaron Sun 2019-10-22 16:50:38 -04:00
  • dede04aa8e added dependency Leon Liang 2019-10-22 15:08:38 -04:00
  • bb0343ab30 Remove redundant profile Leon Liang 2019-10-22 15:08:07 -04:00
  • 7b8e40c7b0 Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Aaron Sun 2019-10-22 14:33:46 -04:00
  • c5942a6634 Merge pull request #31 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-22 13:57:05 -04:00
  • e062ffbb41 Comment out extra /user path declaration Clayton Wilson 2019-10-22 13:17:43 -04:00
  • d476cbc893 Test 2 commit shobhitm23 2019-10-22 00:08:13 -04:00
  • 80e01714d8 Test Commit shobhitm23 2019-10-22 00:06:57 -04:00
  • cb4885cadf Switched proxy back to cloud Aaron Sun 2019-10-20 21:49:21 -04:00
  • d2032eef75 Login with username works now Aaron Sun 2019-10-20 21:45:24 -04:00
  • adf3da4bb8 Merge pull request #29 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-11 18:24:13 -04:00
  • 76ef3a6561 Fixing merge conflicts Clayton Wilson 2019-10-11 17:58:55 -04:00
  • b337277aa4 Fix login-frontend merge conflicts Clayton Wilson 2019-10-11 17:46:38 -04:00
  • f4b44c9654 Fix for Redux DevTools not being installed causing a crash Clayton Wilson 2019-10-11 17:35:21 -04:00
  • 27efa858d5 Signup is working Clayton Wilson 2019-10-11 17:34:35 -04:00
  • 00ed9d64c5 store.js Clayton Wilson 2019-10-10 14:13:04 -04:00
  • d1233e77ed Logout is working now : ) Clayton Wilson 2019-10-09 12:03:57 -04:00
  • bb6c7a07fc Register.js renamed to Signup.js Clayton Wilson 2019-10-07 21:00:52 -04:00
  • 9eb4f603df Logout is working ^_^ Clayton Wilson 2019-10-07 20:46:28 -04:00
  • 8179b51844 Before finishing authentication Clayton Wilson 2019-10-07 20:24:23 -04:00
  • f1e5c584e1 added alert Danny Voltz 2019-10-03 12:00:58 -05:00
  • c2ef222cf6 Merge pull request #28 from ClaytonWWilson/profile_display Leon Liang 2019-10-03 11:53:31 -04:00
  • 3cbcb5054c Modifed user.js using grid displaying Leon Liang 2019-10-03 11:46:50 -04:00
  • 6deb15d9d4 Merge pull request #27 from ClaytonWWilson/login-frontend Clayton Wilson 2019-10-03 11:42:10 -04:00
  • 4a5c404be3 Merge branch 'master' into login-frontend Clayton Wilson 2019-10-03 11:39:38 -04:00
  • 7841fa1798 Fix warning Clayton Wilson 2019-10-03 11:23:28 -04:00
  • bac2cd7719 modified app.css to adjust the app background Leon Liang 2019-10-03 11:06:14 -04:00
  • f14e8bd970 Redux saves user data on login Clayton Wilson 2019-10-03 10:58:45 -04:00
  • c241455c4b Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Clayton Wilson 2019-10-03 10:20:12 -04:00
  • 14e09d88ea Fixed merge issue danny Danny Voltz 2019-10-03 09:41:47 -05:00
  • 4c1459d890 Renamed edit.js to editProfile.js because it makes more sense Clayton Wilson 2019-10-03 09:47:07 -04:00
  • c14263988e Merge pull request #25 from ClaytonWWilson/fix asankaran35 2019-10-03 09:31:19 -04:00
  • 64657fa3af fixed login and register. working on frontend now fix Aditya Sankaran 2019-10-03 09:29:22 -04:00
  • d072a5ff95 Merge pull request #24 from ClaytonWWilson/profile_display Leon Liang 2019-10-02 23:30:05 -04:00
  • 9c0dac507f Light blue color scheme Leon Liang 2019-10-02 23:29:05 -04:00
  • 5168de65c1 Merge branch 'master' into profile_display Leon Liang 2019-10-02 23:24:21 -04:00
  • 2536547c63 Theming Leon Liang 2019-10-02 23:21:30 -04:00
  • 42a07ffa5e resolved merge conflict in app.css Leon Liang 2019-10-02 23:10:12 -04:00
  • 7558602a90 Added post card Leon Liang 2019-10-02 23:08:34 -04:00
  • 8de496826a Testing login backend Clayton Wilson 2019-10-02 22:53:31 -04:00
  • 3b682bae18 Revert "Can successfully register and login in UI" Aditya Sankaran 2019-10-02 21:38:23 -04:00
  • 5acc7a64e0 Revert "Modified code for posts in homes" Aditya Sankaran 2019-10-02 21:35:23 -04:00
  • bf0c4c78ee Added basic backend implementation to get posts based on topics remotes/origin/posts shobhitm23 2019-10-02 21:11:11 -04:00
  • 51fb554133 Adding Single Post shobhitm23 2019-10-02 21:02:51 -04:00
  • 71b6965830 Modified code for posts in homes Aaron Sun 2019-10-02 20:45:45 -04:00
  • 893cad7e7e Can successfully register and login in UI Aaron Sun 2019-10-02 20:40:46 -04:00
  • b1f5ddaa49 Ran npm install to get all deps from package.json shobhitm23 2019-10-02 20:15:44 -04:00
  • 8f949f14be Fix caseSensitive error and moment import Clayton Wilson 2019-10-02 18:00:29 -04:00
  • 5df28e0e77 Still working on Auth State Clayton Wilson 2019-10-02 17:53:20 -04:00
  • 39098e917f pull Danny Voltz 2019-10-02 16:37:10 -05:00
  • 29c07a9b14 commit Danny Voltz 2019-10-02 16:24:01 -05:00
  • 15f106ed1a added theme.js Leon Liang 2019-10-02 15:10:02 -04:00
  • e110bdd47a Merge pull request #21 from ClaytonWWilson/user-line-posts asankaran35 2019-10-02 15:01:00 -04:00
  • b7f0eba7a9 finished rendering userline for user and changed character limit for writing microblogs Aditya Sankaran 2019-10-02 14:59:18 -04:00
  • dcd03d7888 Login frontend complete Clayton Wilson 2019-10-02 00:49:51 -04:00
  • 878bb28a71 Merge pull request #20 from ClaytonWWilson/edit-profile-frontend Clayton Wilson 2019-10-01 21:01:29 -04:00
  • 88310714b2 Merge branch 'master' into edit-profile-frontend Clayton Wilson 2019-10-01 21:01:02 -04:00
  • c218081759 Making everything look pretty Clayton Wilson 2019-10-01 20:39:21 -04:00
  • 16973fb340 Merge pull request #19 from ClaytonWWilson/user-line asankaran35 2019-10-01 19:16:02 -04:00
  • 9d4f175a49 added entering topics field and database call for adding topics when writing microblog Aditya Sankaran 2019-10-01 19:07:57 -04:00
  • f627b91543 change case sensitive file name Leon Liang 2019-10-01 19:04:03 -04:00
  • ec6e41d16f Merge pull request #18 from ClaytonWWilson/file_org Leon Liang 2019-10-01 19:00:40 -04:00
  • 2e157b9088 Merge branch 'master' into file_org Leon Liang 2019-10-01 19:00:19 -04:00
  • 89e8942624 file organization for twistter frontend Leon Liang 2019-10-01 18:54:26 -04:00
  • b9909c1616 move home.js and so on into according folders Leon Liang 2019-10-01 18:44:49 -04:00
  • fadb0f0399 added logout support Danny Voltz 2019-10-01 17:34:19 -05:00
  • 931929061f Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24 Danny Voltz 2019-10-01 17:30:39 -05:00