Merge branch '72-as-a-user-i-want-to-have-a-page-to-upload-and-share-photos-so-that-another-user-can-see-my' into 'main'

Resolve "As a user, I want to have a page to upload and share  photos so that another user can see my stories."

Closes #72

See merge request !53

Merge branch '71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by' into 'main'

Resolve "As an administrator, I want to generate the matches automatically so that players are divided by the program"

Closes #71

See merge request !54

Merge remote-tracking branch 'origin/71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by' into 71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by

Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 72-as-a-user-i-want-to-have-a-page-to-upload-and-share-photos-so-that-another-user-can-see-my

# Conflicts:
#	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
#	src/main/resources/schema.sql
#	src/main/resources/static/html/ranking.html

Resolve issue 70

Closes #26, #69, and #60

See merge request !49

Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts

# Conflicts:
#	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java

# Conflicts:
#	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserController.java
#	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java
#	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java

Merge branch '60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can' into 'main'

Resolve "As a user, I want to view and edit my personal information on my profile page so  that I can manage and update my details"

Closes #60

See merge request !33

Merge remote-tracking branch 'origin/60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can' into 60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can

Merge branch '69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts' into 'main'

Resolve"As a user, I want a rules page with a search bar and three links (each link to the rules of Darts, Pool, and Table Tennis), so that I can quickly search for and navigate to the rules of the sport I am interested in."

See merge request !34

Merge branch 'main' into '60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can'

# Conflicts:
#   src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java
#   src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
#   src/main/resources/static/html/UserCenter.html

Merge branch '69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts' into 'main'

Resolve "As a user, I want a rules page with a search bar and three links (each link to the rules of Darts, Pool, and Table Tennis), so that I can quickly search for and navigate to the rules of the sport I am interested in."

Closes #69

See merge request !32

Resolve"As a user, I want a rules page with a search bar and three links (each link to the rules of Darts, Pool, and Table Tennis), so that I can quickly search for and navigate to the rules of the sport I am interested in."

See merge request !31

This reverts merge request !30

update new function-rules

Closes #26

See merge request !30