Merge branch 'main' of...
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
Showing
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/User.java 2 additions, 0 deletions...ain/java/uk/ac/cf/spring/demo/sports/Userdetail/User.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserController.java 28 additions, 41 deletions...k/ac/cf/spring/demo/sports/Userdetail/UserController.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java 2 additions, 0 deletions...a/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java 10 additions, 1 deletion.../ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java
- src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java 70 additions, 0 deletions.../java/uk/ac/cf/spring/demo/sports/Userdetail/userDao.java
- src/main/resources/static/css/UserCenter.css 10 additions, 0 deletionssrc/main/resources/static/css/UserCenter.css
- src/main/resources/static/html/UserCenter.html 46 additions, 0 deletionssrc/main/resources/static/html/UserCenter.html
- src/main/resources/static/js/UserCenter.js 38 additions, 0 deletionssrc/main/resources/static/js/UserCenter.js
- src/main/resources/templates/Usercenter/Usercenter.html 2 additions, 0 deletionssrc/main/resources/templates/Usercenter/Usercenter.html
Loading
Please register or sign in to comment