Merge branch 'main' of...
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
Showing
- src/main/java/uk/ac/cf/spring/demo/exception/ResourceNotFoundException.java 8 additions, 0 deletions...c/cf/spring/demo/exception/ResourceNotFoundException.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/User.java 0 additions, 15 deletions...ain/java/uk/ac/cf/spring/demo/sports/Userdetail/User.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserController.java 0 additions, 50 deletions...k/ac/cf/spring/demo/sports/Userdetail/UserController.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java 0 additions, 23 deletions...a/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java 0 additions, 42 deletions.../ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/Userform.java 0 additions, 17 deletions...java/uk/ac/cf/spring/demo/sports/Userdetail/Userform.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java 0 additions, 70 deletions.../java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java
- src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityUtils.java 48 additions, 0 deletions...a/uk/ac/cf/spring/demo/sports/security/SecurityUtils.java
- src/main/java/uk/ac/cf/spring/demo/user/CustomUserDetailsService.java 35 additions, 0 deletions...a/uk/ac/cf/spring/demo/user/CustomUserDetailsService.java
- src/main/java/uk/ac/cf/spring/demo/user/UserRepository.java 83 additions, 1 deletionsrc/main/java/uk/ac/cf/spring/demo/user/UserRepository.java
- src/main/java/uk/ac/cf/spring/demo/user/controller/LoginController.java 38 additions, 0 deletions...uk/ac/cf/spring/demo/user/controller/LoginController.java
- src/main/java/uk/ac/cf/spring/demo/user/controller/UserController.java 58 additions, 0 deletions.../uk/ac/cf/spring/demo/user/controller/UserController.java
- src/main/resources/static/css/backGroundUser.css 42 additions, 0 deletionssrc/main/resources/static/css/backGroundUser.css
- src/main/resources/static/css/login.css 1 addition, 1 deletionsrc/main/resources/static/css/login.css
- src/main/resources/static/css/matchDetail.css 2 additions, 2 deletionssrc/main/resources/static/css/matchDetail.css
- src/main/resources/static/css/matchSchedule.css 6 additions, 1 deletionsrc/main/resources/static/css/matchSchedule.css
- src/main/resources/static/css/register.css 1 addition, 0 deletionssrc/main/resources/static/css/register.css
- src/main/resources/static/html/UserCenter.html 0 additions, 1 deletionsrc/main/resources/static/html/UserCenter.html
- src/main/resources/static/html/backGroundUser.html 46 additions, 0 deletionssrc/main/resources/static/html/backGroundUser.html
- src/main/resources/static/html/login.html 2 additions, 1 deletionsrc/main/resources/static/html/login.html
Loading
Please register or sign in to comment