Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User list 2 #159

Open
wants to merge 109 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
c5b564b
created frontend route for /profile, placeholder page for profile
Jamiepod1 Nov 26, 2024
415dc63
removed console.log()
Jamiepod1 Nov 26, 2024
dc0cdc6
changed file names
Jamiepod1 Nov 26, 2024
0a270d8
Added component ProtectedRoute, prevents access without logging in. W…
Jamiepod1 Nov 26, 2024
3546b30
Merge pull request #1 from RussellColes/jamie
Jamiepod1 Nov 26, 2024
f75d82b
Added navbar, updated logoutbutton component.
pat-shannon Nov 26, 2024
bd02e54
Attempted package-lock fix
pat-shannon Nov 26, 2024
9b51ea9
remove package.json, package-lock.json
Jamiepod1 Nov 26, 2024
80bfac6
remove package.json, package-lock.json
Jamiepod1 Nov 26, 2024
abe0cf3
gitignore fix
pat-shannon Nov 26, 2024
ae3fd00
Merge pull request #3 from RussellColes/jamie
Jamiepod1 Nov 26, 2024
e61d3bc
Merge branch 'main' into patrick
RussellColes Nov 26, 2024
836ef6f
added 2 images and updated trello link in REA
RussellColes Nov 26, 2024
226d16f
Merge pull request #4 from RussellColes/patrick
Jamiepod1 Nov 27, 2024
3d8c1c2
Merge pull request #5 from RussellColes/Russell
RussellColes Nov 27, 2024
54c2f74
Added post and new post jsx files in components
Ali0k Nov 27, 2024
5dd8d65
Merge pull request #6 from RussellColes/Ali
pat-shannon Nov 27, 2024
412f4ff
sign up form additions
Fpike Nov 27, 2024
d42a78d
Merge pull request #7 from RussellColes/signup
Fpike Nov 27, 2024
ed2f4dd
sign up photo additions
Fpike Nov 27, 2024
0b056de
Added NewPost component, tests (incomplete)
pat-shannon Nov 27, 2024
b8a8cac
added working tests, NewPost component, updated FeedPage refresh logi…
Jamiepod1 Nov 28, 2024
aa383cc
Merge pull request #8 from RussellColes/1
Jamiepod1 Nov 28, 2024
445a6dd
fixed sign up page
Fpike Nov 28, 2024
5b2a180
Merge pull request #9 from RussellColes/image-upload
pat-shannon Nov 28, 2024
0c82373
made a get route
Ali0k Nov 28, 2024
cb08503
Merge pull request #10 from RussellColes/userRoute
Ali0k Nov 28, 2024
9420f95
comment out GET /profile route while function not defined, updated te…
Jamiepod1 Nov 28, 2024
bda2589
GET /users method for getting own user details, all tests pass, we ar…
Jamiepod1 Nov 28, 2024
148aac9
photo additions
Fpike Nov 28, 2024
47c1d4e
Merge pull request #12 from RussellColes/photo
RussellColes Nov 28, 2024
83024ee
Merge pull request #11 from RussellColes/get-user-details
pat-shannon Nov 28, 2024
edaab7b
Fixed cannot login?? moved tokenChecker validation to within users.js…
Jamiepod1 Nov 28, 2024
a9e9cd8
frontend photo upload additions
Fpike Nov 29, 2024
dba2e88
Merge pull request #13 from RussellColes/get-user-details
RussellColes Nov 29, 2024
71e8eb7
Merge pull request #14 from RussellColes/photo
RussellColes Nov 29, 2024
eb7495e
name displays on profile page, removed some comments
Jamiepod1 Nov 29, 2024
caf300b
Merge pull request #15 from RussellColes/profile-name
RussellColes Nov 29, 2024
b3569a1
Accidently added sort feed
Jamiepod1 Nov 29, 2024
c9ce717
photo display additions
Fpike Nov 29, 2024
d860a60
Merge pull request #16 from RussellColes/sort
RussellColes Nov 29, 2024
b85ea7a
Merge pull request #17 from RussellColes/photo
Fpike Nov 29, 2024
882fefb
Completed profile uploads! added mechanism to get photo after uploadi…
Jamiepod1 Nov 29, 2024
00ab8bd
Merge pull request #18 from RussellColes/profile-photo-complete
RussellColes Nov 30, 2024
6ac38c1
Started adding like functionality
pat-shannon Dec 2, 2024
30fce22
CHanged post schema, create post creates user_id
Jamiepod1 Dec 2, 2024
7fdec66
Merge pull request #19 from RussellColes/user-data-in-posts
RussellColes Dec 2, 2024
90baf60
changed comments
Jamiepod1 Dec 2, 2024
a18e06e
altered getAllPosts to add firstname lastname to response json
Jamiepod1 Dec 2, 2024
319909f
Merge pull request #20 from RussellColes/get-user-details-on-posts
Jamiepod1 Dec 2, 2024
5b5435c
Added photo url to getPosts so that front end can make a request to g…
Jamiepod1 Dec 2, 2024
93c2b85
Merge pull request #21 from RussellColes/post-shows-photos
RussellColes Dec 2, 2024
cc3e8d8
Finished like functionality - now displays
pat-shannon Dec 2, 2024
9ba04b5
prevents submitting an empty string and introduces character limit
Ali0k Dec 2, 2024
1965abb
added default photo
Jamiepod1 Dec 2, 2024
7df18cd
Merge branch 'main' into es
RussellColes Dec 2, 2024
4021e5f
Merge pull request #22 from RussellColes/es
Jamiepod1 Dec 2, 2024
6c307c1
Like button (nearly) works
pat-shannon Dec 2, 2024
3b5c389
default photo shows if you havent't uploaded a photo
Jamiepod1 Dec 2, 2024
c0773e3
Merge branch 'main' into temp
RussellColes Dec 2, 2024
0fb4a88
Merge pull request #23 from RussellColes/temp
Jamiepod1 Dec 2, 2024
dc4ed97
Merge pull request #24 from RussellColes/default-photo
RussellColes Dec 2, 2024
c7473c1
fixed posts
Jamiepod1 Dec 2, 2024
1b4e790
Merge pull request #25 from RussellColes/bug-fix-posts
Jamiepod1 Dec 2, 2024
05f4fbf
changed photo schema, can now change profile photo
Jamiepod1 Dec 2, 2024
3650eae
Merge pull request #26 from RussellColes/update-profile-photo
RussellColes Dec 2, 2024
dd04c1d
Added likes to createPost
pat-shannon Dec 2, 2024
60dc600
Merge pull request #27 from RussellColes/like-button-display
RussellColes Dec 2, 2024
10a05b9
changing profile photo deletes old photo in uploads directory
Jamiepod1 Dec 2, 2024
cfc7e37
Like Button, likes display fully functional, displays correctly
pat-shannon Dec 3, 2024
297a25f
Username functionality added and some inital bits commented out for d…
RussellColes Dec 3, 2024
a6b24b4
Merge pull request #28 from RussellColes/update-profile-photo
pat-shannon Dec 3, 2024
4c25069
Merge pull request #29 from RussellColes/like-button-display
pat-shannon Dec 3, 2024
51bbb27
Merge pull request #30 from RussellColes/username-implementation
pat-shannon Dec 3, 2024
5a2bfce
firstname and lastname now link to other-profile-page
RussellColes Dec 3, 2024
1da130a
styling
Fpike Dec 3, 2024
365509a
Merge pull request #31 from RussellColes/other-profile-page
Jamiepod1 Dec 3, 2024
319b943
Co-authored-by: Russell Coles <RussellColes@users.noreply.github.com>
Fpike Dec 3, 2024
3c1afc4
images displaying correctly on profile pages
RussellColes Dec 3, 2024
a0dde0d
Merge pull request #32 from RussellColes/other-profile-page
Jamiepod1 Dec 3, 2024
e8950f3
Profile link in NavBar directs to correct profile page with photo sho…
RussellColes Dec 3, 2024
1e1d4bf
Merge pull request #33 from RussellColes/navbar-profile-link-update
Jamiepod1 Dec 4, 2024
fe047d8
added delete post function
Ali0k Dec 4, 2024
bcbaf6f
styling additions
Fpike Dec 4, 2024
1e9d61a
Merge branch 'main' into delete
Ali0k Dec 4, 2024
e052aa8
Update PhotoDisplay.jsx
Jamiepod1 Dec 4, 2024
b1a3b10
Merge pull request #34 from RussellColes/delete
pat-shannon Dec 4, 2024
bde2c4f
Merge branch 'main' into styling
RussellColes Dec 4, 2024
200cc4a
Merge pull request #35 from RussellColes/styling
Jamiepod1 Dec 4, 2024
66b78ae
Added profile feed, only displays posts by user whose profile we are on
pat-shannon Dec 4, 2024
87948cd
Merge branch 'main' into profile-feed
Jamiepod1 Dec 4, 2024
9deeb47
Merge pull request #36 from RussellColes/profile-feed
RussellColes Dec 4, 2024
d3634f6
fixed bug, photo upload reloads feed
Jamiepod1 Dec 4, 2024
9679bd8
Merge pull request #37 from RussellColes/bug-fix
pat-shannon Dec 4, 2024
80ccead
conditional rendering for post delete button
RussellColes Dec 4, 2024
ef2d755
Merge pull request #38 from RussellColes/conditional-rendering-post-d…
pat-shannon Dec 4, 2024
57f97ce
Protecting posts on profile page, added following functionality
pat-shannon Dec 4, 2024
fe12dac
Merge branch 'main' into feed-filtering
pat-shannon Dec 4, 2024
bc7d96e
Merge pull request #39 from RussellColes/feed-filtering
RussellColes Dec 4, 2024
63928e5
Finished feed stuff
pat-shannon Dec 4, 2024
19d2c8f
Merge pull request #40 from RussellColes/final-feed-changes
RussellColes Dec 4, 2024
22c3ffd
user list
Fpike Dec 4, 2024
f5b7a26
Merge branch 'main' into user-list
Fpike Dec 4, 2024
29e1f9e
Merge pull request #41 from RussellColes/user-list
RussellColes Dec 4, 2024
055479f
Navbar conditional rendering
RussellColes Dec 5, 2024
0894484
Merge pull request #42 from RussellColes/navbar-improvements
Jamiepod1 Dec 5, 2024
bb17a97
Like button and delete buttons are now icons - updated package-lock, …
pat-shannon Dec 5, 2024
4f7547b
Merge pull request #43 from RussellColes/icon-styling
RussellColes Dec 5, 2024
4d1246a
user list links
Fpike Dec 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove package.json, package-lock.json
  • Loading branch information
Jamiepod1 committed Nov 26, 2024
commit 80bfac6da17a1573067a2a6ab791c032d46029df
Loading