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 |
|
Aaron Sun
|
71b6965830
|
Modified code for posts in homes
|
2019-10-02 20:45:45 -04:00 |
|
Aaron Sun
|
893cad7e7e
|
Can successfully register and login in UI
|
2019-10-02 20:40:46 -04:00 |
|
|
|
8f949f14be
|
Fix caseSensitive error and moment import
|
2019-10-02 18:00:29 -04:00 |
|
|
|
5df28e0e77
|
Still working on Auth State
|
2019-10-02 17:53:20 -04:00 |
|
Leon Liang
|
15f106ed1a
|
added theme.js
|
2019-10-02 15:10:02 -04:00 |
|
Aditya Sankaran
|
b7f0eba7a9
|
finished rendering userline for user and changed character limit for writing microblogs
|
2019-10-02 14:59:18 -04:00 |
|
|
|
dcd03d7888
|
Login frontend complete
|
2019-10-02 00:49:51 -04:00 |
|
|
|
88310714b2
|
Merge branch 'master' into edit-profile-frontend
|
2019-10-01 21:01:02 -04:00 |
|
|
|
c218081759
|
Making everything look pretty
|
2019-10-01 20:39:21 -04:00 |
|
asankaran35
|
16973fb340
|
Merge pull request #19 from ClaytonWWilson/user-line
added entering topics field and database call for adding topics when …
|
2019-10-01 19:16:02 -04:00 |
|
Aditya Sankaran
|
9d4f175a49
|
added entering topics field and database call for adding topics when writing microblog
|
2019-10-01 19:07:57 -04:00 |
|
Leon Liang
|
f627b91543
|
change case sensitive file name
|
2019-10-01 19:04:03 -04:00 |
|
Leon Liang
|
2e157b9088
|
Merge branch 'master' into file_org
|
2019-10-01 19:00:19 -04:00 |
|
Leon Liang
|
89e8942624
|
file organization for twistter frontend
|
2019-10-01 18:54:26 -04:00 |
|
Leon Liang
|
b9909c1616
|
move home.js and so on into according folders
|
2019-10-01 18:44:49 -04:00 |
|
Danny Voltz
|
fadb0f0399
|
added logout support
|
2019-10-01 17:34:19 -05:00 |
|
Danny Voltz
|
931929061f
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-10-01 17:30:39 -05:00 |
|
Danny Voltz
|
8eb0872d16
|
logout ui
|
2019-10-01 17:27:52 -05:00 |
|
|
|
76caf4de12
|
Merge branch 'master' into edit-profile-frontend
|
2019-10-01 16:54:13 -04:00 |
|
Leon Liang
|
101d9918e5
|
Changes to navigation bar
|
2019-10-01 14:43:41 -04:00 |
|
|
|
5116a705bc
|
Save before trying to fix master.
|
2019-10-01 14:32:27 -04:00 |
|
Aditya Sankaran
|
311e8b3716
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-10-01 14:03:37 -04:00 |
|
Aditya Sankaran
|
754c2f2d75
|
added get request userline function
|
2019-10-01 14:03:15 -04:00 |
|
Aaron Sun
|
13b57eedc6
|
Merge branch 'master' of https://github.com/ClaytonWWilson/CS307-Team24
|
2019-10-01 13:57:44 -04:00 |
|
Leon Liang
|
60d1d76839
|
Added nav bar
|
2019-10-01 12:56:34 -04:00 |
|
|
|
721aeeb350
|
Edit Profile front-end finished and connected to back-end
|
2019-09-30 23:39:35 -04:00 |
|
Aaron Sun
|
4517bc6756
|
Reconciled with new pull from master
|
2019-09-30 23:22:09 -04:00 |
|
|
|
696b00e304
|
Edit profile front-end almost finished.
|
2019-09-30 22:30:29 -04:00 |
|
Aaron Sun
|
b1cfcda948
|
Clean baseline
|
2019-09-30 22:26:28 -04:00 |
|
Aditya Sankaran
|
55dc62e57e
|
connected backend to frontend for writing microblogs
|
2019-09-30 18:06:23 -04:00 |
|
|
|
0f127521ca
|
Added edit page.
|
2019-09-30 00:04:06 -04:00 |
|
Aditya Sankaran
|
b1faacd312
|
backend and frontend connect in progress
|
2019-09-29 19:07:35 -04:00 |
|
Aditya Sankaran
|
cbf9b94248
|
added home router page
|
2019-09-28 14:07:52 -04:00 |
|
Leon Liang
|
015f1c1e9f
|
change the location of logo.png so that it displays correctly
|
2019-09-27 21:59:57 -04:00 |
|
Leon Liang
|
cc1ce1bfc9
|
Merge branch 'master' into user_subscription
|
2019-09-27 21:40:39 -04:00 |
|
Leon Liang
|
1306c1654a
|
restructure files
|
2019-09-27 19:35:33 -04:00 |
|
Leon Liang
|
5caea0871e
|
Modularize code and added NavBar component
|
2019-09-27 19:34:42 -04:00 |
|
asankaran35
|
8a5b115666
|
Merge pull request #11 from ClaytonWWilson/write_microblogs
writing and posting microblog
|
2019-09-27 12:52:05 -04:00 |
|
Aditya Sankaran
|
56b9bf86db
|
writing and posting microblog
|
2019-09-27 12:50:45 -04:00 |
|
Leon Liang
|
e961379e3f
|
added new files for structural purpose
|
2019-09-26 13:59:39 -04:00 |
|
Leon Liang
|
d703843277
|
added Navbar, profile and post skeleton
|
2019-09-26 13:58:26 -04:00 |
|
Leon Liang
|
70037a5342
|
added folders to organize files
|
2019-09-26 01:54:51 -04:00 |
|
Leon Liang
|
8fa03700b1
|
Refactored and organized files based on functionality
|
2019-09-26 01:49:19 -04:00 |
|
Aaron Sun
|
e2883a04c5
|
In the process of linking backend and UI
|
2019-09-24 14:38:13 -04:00 |
|
Aaron Sun
|
6f94623d0c
|
Modified the code structure for the auth UI
|
2019-09-24 08:38:02 -04:00 |
|
Aaron Sun
|
6341100061
|
Added frontend
|
2019-09-19 14:30:02 -04:00 |
|
