Commit Graph

196 Commits

Author SHA1 Message Date
Leon Liang
2de3da928a added UI for follow and unfollow other user 2019-11-19 19:03:28 -05:00
Leon Liang
42c53fdbc4 Add profile image, topics for other user page 2019-11-19 15:56:39 -05:00
Leon Liang
c8aa1fd050 Added page to display other users' profile 2019-11-19 13:57:24 -05:00
9372a092ad Fix edit profile button link 2019-11-05 17:43:19 -05:00
7a6ac8499c fix merge 2019-11-05 17:38:11 -05:00
6149e15b35 Profile page kinda works on mobile 2019-11-05 17:35:16 -05:00
80670d054e Main layout of profile page 2019-11-05 17:19:28 -05:00
947e5b01a4 Converted tabs back to spaces 2019-11-05 17:16:34 -05:00
7cc8a3f11f Fixing up profile UI 2019-11-05 17:04:33 -05:00
7476833f0a Main layout of profile page 2019-11-05 16:32:16 -05:00
bbbfc4b750 Editprofile move button positions 2019-11-03 21:10:57 -05:00
38df4ef087 Added styles and spaced cards 2019-11-03 15:29:39 -05:00
2bd1c08c2c Writing_Microblogs to Material-UI and UI improvements 2019-11-03 15:17:14 -05:00
Danny Voltz
6924af58a7 progress for admin delete 2019-11-01 15:40:26 -05:00
903ea35662 Fix indents 2019-11-01 16:19:54 -04:00
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
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
f4bedea2c7
Merge branch 'master' into verify-profile 2019-11-01 13:40:30 -04:00
3fa4cd7033 Changing writing microblogs to Material-UI 2019-11-01 13:02:37 -04:00
ab07d45205 Fix loading on image upload, so it waits for new image 2019-11-01 10:12:54 -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
ce984df437
Merge branch 'master' into auth-backend-3 2019-10-31 16:09:17 -04:00
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
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
3c31db9bf5 Converted tabs back to spaces 2019-10-29 23:02:36 -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
3d875e2bde Fixing up profile UI 2019-10-28 23:25:12 -04:00
Leon Liang
b20408c144 delete topic 2019-10-28 21:38:32 -04:00
3001ec0b38
Merge branch 'master' into edit-profile-image-upload 2019-10-27 23:46:15 -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
44d3450b10 Profile image upload frontend and backend finished 2019-10-27 18:06:47 -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
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
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
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
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
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
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
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
Aditya Sankaran
64657fa3af fixed login and register. working on frontend now 2019-10-03 09:29:22 -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