Code

Fix friends bug#159

Code

Open

somunachima wants to merge 102 commits intomakersacademy:mainmakersacademy/acebook-java-template:mainfrom davidsholoye:fix-friends-bugdavidsholoye/acebook-phoenixes:fix-friends-bugCopy head branch name to clipboard

Commits

Commits on Nov 14, 2023

• Initial commit - add test data

  xengeo

  committed
  830a95b

  Copy full SHA for 830a95b

• Update lombok version

  NatalieJClark

  committed
  07f7ab4

  Copy full SHA for 07f7ab4

• add route for users show page and html file for users show

  

  somunachima

  committed
  94c3e5f

  Copy full SHA for 94c3e5f

• write tests for users controller

  

  somunachima

  committed
  81cbd3c

  Copy full SHA for 81cbd3c

• Merge pull request #1 from davidsholoye/users_controller

  Show description for a924737
  davidsholoye

  authored
  a924737

  Copy full SHA for a924737

• Update post model fields and add sign up button

  NatalieJClark

  committed
  b4418a9

  Copy full SHA for b4418a9

• Merge pull request #2 from davidsholoye/navigation

  Show description for 6fd6da6
  NatalieJClark

  authored
  6fd6da6

  Copy full SHA for 6fd6da6

Commits on Nov 15, 2023

• update column types to bigint and complete comment model implementation

  xengeo

  committed
  51dd9c6

  Copy full SHA for 51dd9c6

• Merge pull request #3 from davidsholoye/add_comment_model

  Show description for 2546362
  xengeo

  authored
  2546362

  Copy full SHA for 2546362

• update V11 migration file for column type change

  xengeo

  committed
  6f562d9

  Copy full SHA for 6f562d9

• Merge pull request #4 from davidsholoye/add_comment_model

  Show description for b7f4cc6
  xengeo

  authored
  b7f4cc6

  Copy full SHA for b7f4cc6

Commits on Nov 16, 2023

• Add header and links to profile, friends and timeline. And signout

  davidsholoye

  committed
  533486a

  Copy full SHA for 533486a

• tested sign up features, checked for empty credentials

  xengeo

  committed
  95c4d7d

  Copy full SHA for 95c4d7d

• Merge pull request #5 from davidsholoye/signup-testing

  Show description for 3034112
  xengeo

  authored
  3034112

  Copy full SHA for 3034112

• Friend request system with errors

  davidsholoye

  committed
  a1227ea

  Copy full SHA for a1227ea

• posts appear by newest first

  xengeo

  committed
  41ffd26

  Copy full SHA for 41ffd26

• Merge pull request #6 from davidsholoye/order-posts

  Show description for e182e72
  xengeo

  authored
  e182e72

  Copy full SHA for e182e72

Commits on Nov 17, 2023

• add friend controller and friend model

  zakkariyaa

  committed
  1cbb2be

  Copy full SHA for 1cbb2be

• Add routes to friend controller and update model to be able to make a friend request from current user

  

  somunachima

  committed
  d40fdb2

  Copy full SHA for d40fdb2

• Merge changes with main

  

  somunachima

  committed
  bd2552f

  Copy full SHA for bd2552f

• Merge pull request #7 from davidsholoye/userControllerTesting

  Show description for ae1460e
  NatalieJClark

  authored
  ae1460e

  Copy full SHA for ae1460e

• Rename V12__alter_friends_table.sql to V13__alter_friends_table.sql

  Show description for 7eec94b
  xengeo

  authored
  7eec94b

  Copy full SHA for 7eec94b

• rename v12 and v13 to v12 and v14

  zakkariyaa

  committed
  920d81a

  Copy full SHA for 920d81a

• Merge pull request #8 from davidsholoye/fixdb

  Show description for 303c1e8
  zakkariyaa

  authored
  303c1e8

  Copy full SHA for 303c1e8

• Delete flyway versions

  NatalieJClark

  committed
  ef6da3e

  Copy full SHA for ef6da3e

• Add user_id to new post

  NatalieJClark

  committed
  b6359dc

  Copy full SHA for b6359dc

• Resolved conflicts

  NatalieJClark

  committed
  5c2da42

  Copy full SHA for 5c2da42

• fixed the logout issue by changing the anchor tag to form

  zakkariyaa

  committed
  1d57d36

  Copy full SHA for 1d57d36

• Resolved conflicts

  NatalieJClark

  committed
  f3d66d2

  Copy full SHA for f3d66d2

• Merge pull request #9 from davidsholoye/fix-logout-issue

  Show description for ea13863
  zakkariyaa

  authored
  ea13863

  Copy full SHA for ea13863

• Merge pull request #10 from davidsholoye/Assign_user_id_to_post

  Show description for cd880f1
  xengeo

  authored
  cd880f1

  Copy full SHA for cd880f1

• add migration file test users into authorities table

  xengeo

  committed
  c9ca0bf

  Copy full SHA for c9ca0bf

• Merge pull request #11 from davidsholoye/insert_users_into_authorities_table

  Show description for 3d7b663
  xengeo

  authored
  3d7b663

  Copy full SHA for 3d7b663

Commits on Nov 20, 2023

• display names of request users with buttons

  zakkariyaa

  committed
  d29d881

  Copy full SHA for d29d881

• Add comment and like buttons

  NatalieJClark

  committed
  b47fdb6

  Copy full SHA for b47fdb6

• backend accept or deny working

  zakkariyaa

  committed
  c74c088

  Copy full SHA for c74c088

• accept and deny fully functional

  zakkariyaa

  committed
  9181346

  Copy full SHA for 9181346

• make button text conditional

  zakkariyaa

  committed
  f6d82f7

  Copy full SHA for f6d82f7

• Comment button links to individual post page, and start to implement comment form to add comment

  xengeo

  committed
  091d4e4

  Copy full SHA for 091d4e4

• fix accept request and double confirmation issues

  zakkariyaa

  committed
  52c6c9d

  Copy full SHA for 52c6c9d

Commits on Nov 21, 2023

• Merge pull request #12 from davidsholoye/friend-request-backend

  Show description for af06f93
  zakkariyaa

  authored
  af06f93

  Copy full SHA for af06f93

• Merge pull request #13 from davidsholoye/comment_on_posts

  Show description for 05c1063
  xengeo

  authored
  05c1063

  Copy full SHA for 05c1063

• Add field to upload picture

  

  somunachima

  committed
  2381874

  Copy full SHA for 2381874

• trying to save a comment

  xengeo

  committed
  ae32ea4

  Copy full SHA for ae32ea4

• image upload in signup works

  zakkariyaa

  committed
  356fff6

  Copy full SHA for 356fff6

• posts showing with names and images

  zakkariyaa

  committed
  de7280a

  Copy full SHA for de7280a

Commits on Nov 22, 2023

• add comments progress.. sort of

  xengeo

  committed
  93dae21

  Copy full SHA for 93dae21

• fix image showing on profile

  zakkariyaa

  committed
  3625215

  Copy full SHA for 3625215

• Merge pull request #14 from davidsholoye/upload-pic

  Show description for 6c460a9
  zakkariyaa

  authored
  6c460a9

  Copy full SHA for 6c460a9

• Add CommentController

  NatalieJClark

  committed
  697452d

  Copy full SHA for 697452d

• add comment form is working!

  xengeo

  committed
  945069d

  Copy full SHA for 945069d

• Show user list of comments on post page

  NatalieJClark

  committed
  4a42347

  Copy full SHA for 4a42347

• Editing add comment test

  NatalieJClark

  committed
  08a9f4f

  Copy full SHA for 08a9f4f

• Merge branch 'main' into comment_on_posts

  NatalieJClark

  authored
  20beaf1

  Copy full SHA for 20beaf1

• Merge pull request #15 from davidsholoye/comment_on_posts

  Show description for 8df87ee
  NatalieJClark

  authored
  8df87ee

  Copy full SHA for 8df87ee

• Add CSS changes to the code

  davidsholoye

  committed
  cb76165

  Copy full SHA for cb76165

• Merge branch 'main' into css

  davidsholoye

  authored
  968faa0

  Copy full SHA for 968faa0

• Merge pull request #16 from davidsholoye/css

  Show description for 5050087
  davidsholoye

  authored
  5050087

  Copy full SHA for 5050087

• Made tests work

  NatalieJClark

  committed
  784b91b

  Copy full SHA for 784b91b

• fix bugs

  

  somunachima

  committed
  c06255b

  Copy full SHA for c06255b

• like functionality working and likes showing on page

  zakkariyaa

  committed
  022e160

  Copy full SHA for 022e160

• display username and photo next to comment

  xengeo

  committed
  e3f81fd

  Copy full SHA for e3f81fd

• Merge branch 'main' into comment_on_posts

  xengeo

  authored
  4753664

  Copy full SHA for 4753664

• Merge pull request #17 from davidsholoye/comment_on_posts

  Show description for e41e624
  xengeo

  authored
  e41e624

  Copy full SHA for e41e624

• tidy styling for show and index page

  

  somunachima

  committed
  7543439

  Copy full SHA for 7543439

• add posts to show page and more styling

  

  somunachima

  committed
  eb30f29

  Copy full SHA for eb30f29

Commits on Nov 23, 2023

• add posts to show page but only posts for that specific user

  

  somunachima

  committed
  1c4e6a3

  Copy full SHA for 1c4e6a3

• add posts to show page but only posts for that specific user

  

  somunachima

  committed
  71d1c92

  Copy full SHA for 71d1c92

• Merge branch 'main' into bug-fixes

  somunachima

  authored
  9edb05d

  Copy full SHA for 9edb05d

• Merge pull request #18 from davidsholoye/bug-fixes

  Show description for a65d0a3
  somunachima

  authored
  a65d0a3

  Copy full SHA for a65d0a3

• order comments by id and test

  xengeo

  committed
  87bd2f3

  Copy full SHA for 87bd2f3

• Merge pull request #19 from davidsholoye/order_comments

  Show description for 39996d6
  xengeo

  authored
  39996d6

  Copy full SHA for 39996d6

• display image and username next to post content on post/index.html

  xengeo

  committed
  43cfdb4

  Copy full SHA for 43cfdb4

• Merge pull request #20 from davidsholoye/display_username_image_on_post

  Show description for 6ee33d8
  xengeo

  authored
  6ee33d8

  Copy full SHA for 6ee33d8

• add more styling to timeline/posts index

  

  somunachima

  committed
  12d8a12

  Copy full SHA for 12d8a12

• Merge branch 'main' into timeline-css

  somunachima

  authored
  9175240

  Copy full SHA for 9175240

• Merge pull request #21 from davidsholoye/timeline-css

  Show description for 39677eb
  somunachima

  authored
  39677eb

  Copy full SHA for 39677eb

• add more styling to friends index page

  

  somunachima

  committed
  234aef9

  Copy full SHA for 234aef9

• Merge pull request #22 from davidsholoye/friends-css

  Show description for b99c6b5
  somunachima

  authored
  b99c6b5

  Copy full SHA for b99c6b5

• Made changes to the css

  davidsholoye

  committed
  b433901

  Copy full SHA for b433901

• add correct links to navbar to go to current user's profile page

  

  somunachima

  committed
  2361673

  Copy full SHA for 2361673

• Merge pull request #24 from davidsholoye/navbar-links

  Show description for bddf518
  somunachima

  authored
  bddf518

  Copy full SHA for bddf518

• Merge branch 'main' into css_changes

  davidsholoye

  authored
  47343c7

  Copy full SHA for 47343c7

• Merge pull request #23 from davidsholoye/css_changes

  Show description for 9f5e860
  davidsholoye

  authored
  9f5e860

  Copy full SHA for 9f5e860

• add correct links to navbar to go to current user's profile page

  

  somunachima

  committed
  3ab4d44

  Copy full SHA for 3ab4d44

• Merge pull request #25 from davidsholoye/check-navbar

  Show description for 92c8a01
  somunachima

  authored
  92c8a01

  Copy full SHA for 92c8a01

• like functionality + changes from main'

  zakkariyaa

  committed
  5594e77

  Copy full SHA for 5594e77

• Merge pull request #26 from davidsholoye/like-functionality

  Show description for 6f33b4d
  zakkariyaa

  authored
  6f33b4d

  Copy full SHA for 6f33b4d

• photo update works

  zakkariyaa

  committed
  9bf8f75

  Copy full SHA for 9bf8f75

• Fix broken tests

  NatalieJClark

  committed
  5a944d9

  Copy full SHA for 5a944d9

• Merge pull request #27 from davidsholoye/post-photo

  Show description for ddaed85
  zakkariyaa

  authored
  ddaed85

  Copy full SHA for ddaed85

• Merge branch 'main' into create_dockerfile

  NatalieJClark

  authored
  c3b2b5f

  Copy full SHA for c3b2b5f

• Merge pull request #28 from davidsholoye/create_dockerfile

  Show description for 9c0a21e
  NatalieJClark

  authored
  9c0a21e

  Copy full SHA for 9c0a21e

• Fix photo

  NatalieJClark

  committed
  04acabd

  Copy full SHA for 04acabd

• Fix photo

  NatalieJClark

  committed
  e9161f9

  Copy full SHA for e9161f9

• users can upload photos as posts

  zakkariyaa

  committed
  08cca0b

  Copy full SHA for 08cca0b

• merge with changes from main

  zakkariyaa

  committed
  8adb2c4

  Copy full SHA for 8adb2c4

• Merge pull request #29 from davidsholoye/post-photo2

  Show description for 685f920
  zakkariyaa

  authored
  685f920

  Copy full SHA for 685f920

• add styling to post-show

  

  somunachima

  committed
  c559c47

  Copy full SHA for c559c47

• Merge branch 'main' into posts-show-css

  somunachima

  authored
  ae783ab

  Copy full SHA for ae783ab

• Merge pull request #30 from davidsholoye/posts-show-css

  Show description for d576eb7
  somunachima

  authored
  d576eb7

  Copy full SHA for d576eb7

• fix bugs in friends

  

  somunachima

  committed
  64eed9b

  Copy full SHA for 64eed9b