Merge remote-tracking branch 'origin/main' into businesses
# Conflicts: # src/main/resources/data.sql # src/main/resources/schema.sql # src/main/resources/templates/fragments/Templating.html
Showing
- build.gradle 7 additions, 1 deletionbuild.gradle
- src/main/java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java 6 additions, 7 deletions.../java/Team5/SmartTowns/rewards/RewardsRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/security/SecurityConfiguration.java 51 additions, 0 deletions...java/Team5/SmartTowns/security/SecurityConfiguration.java
- src/main/java/Team5/SmartTowns/users/NewUser.java 26 additions, 0 deletionssrc/main/java/Team5/SmartTowns/users/NewUser.java
- src/main/java/Team5/SmartTowns/users/User.java 1 addition, 2 deletionssrc/main/java/Team5/SmartTowns/users/User.java
- src/main/java/Team5/SmartTowns/users/UserController.java 66 additions, 16 deletionssrc/main/java/Team5/SmartTowns/users/UserController.java
- src/main/java/Team5/SmartTowns/users/UserRepository.java 6 additions, 3 deletionssrc/main/java/Team5/SmartTowns/users/UserRepository.java
- src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java 54 additions, 14 deletionssrc/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
- src/main/resources/application.properties 1 addition, 0 deletionssrc/main/resources/application.properties
- src/main/resources/data.sql 52 additions, 0 deletionssrc/main/resources/data.sql
- src/main/resources/schema.sql 113 additions, 0 deletionssrc/main/resources/schema.sql
- src/main/resources/static/css/login.css 372 additions, 0 deletionssrc/main/resources/static/css/login.css
- src/main/resources/static/css/style.css 70 additions, 193 deletionssrc/main/resources/static/css/style.css
- src/main/resources/static/css/userProfile.css 0 additions, 408 deletionssrc/main/resources/static/css/userProfile.css
- src/main/resources/static/css/userProfile2.css 25 additions, 41 deletionssrc/main/resources/static/css/userProfile2.css
- src/main/resources/static/scripts/login.js 66 additions, 44 deletionssrc/main/resources/static/scripts/login.js
- src/main/resources/static/scripts/userPage.js 3 additions, 3 deletionssrc/main/resources/static/scripts/userPage.js
- src/main/resources/static/sql/user-data.sql 7 additions, 0 deletionssrc/main/resources/static/sql/user-data.sql
- src/main/resources/static/sql/user-progress-data.sql 7 additions, 0 deletionssrc/main/resources/static/sql/user-progress-data.sql
- src/main/resources/templates/allTrails/allTrails.html 1 addition, 1 deletionsrc/main/resources/templates/allTrails/allTrails.html
Loading
Please register or sign in to comment