Merge branch...
Merge branch '50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged' into 'main' Resolve "As a client I want gamification of the badges, so that users remain engaged." Closes #50 See merge request !26
Showing
- build.gradle 2 additions, 1 deletionbuild.gradle
- src/main/java/Team5/SmartTowns/Data/DatabaseController.java 4 additions, 9 deletionssrc/main/java/Team5/SmartTowns/Data/DatabaseController.java
- src/main/java/Team5/SmartTowns/Data/user.java 0 additions, 12 deletionssrc/main/java/Team5/SmartTowns/Data/user.java
- src/main/java/Team5/SmartTowns/rewards/BadgesRepository.java 9 additions, 0 deletionssrc/main/java/Team5/SmartTowns/rewards/BadgesRepository.java
- src/main/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java 33 additions, 0 deletions...n/java/Team5/SmartTowns/rewards/BadgesRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/rewards/Sticker.java 11 additions, 0 deletionssrc/main/java/Team5/SmartTowns/rewards/Sticker.java
- src/main/java/Team5/SmartTowns/rewards/StickersRepository.java 9 additions, 0 deletions...ain/java/Team5/SmartTowns/rewards/StickersRepository.java
- src/main/java/Team5/SmartTowns/rewards/StickersRepositoryJDBC.java 33 additions, 0 deletions...java/Team5/SmartTowns/rewards/StickersRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/users/User.java 4 additions, 1 deletionsrc/main/java/Team5/SmartTowns/users/User.java
- src/main/java/Team5/SmartTowns/users/UserController.java 40 additions, 35 deletionssrc/main/java/Team5/SmartTowns/users/UserController.java
- src/main/java/Team5/SmartTowns/users/UserRepository.java 12 additions, 0 deletionssrc/main/java/Team5/SmartTowns/users/UserRepository.java
- src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java 69 additions, 0 deletionssrc/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
- src/main/resources/data.sql 27 additions, 4 deletionssrc/main/resources/data.sql
- src/main/resources/schema.sql 38 additions, 1 deletionsrc/main/resources/schema.sql
- src/main/resources/static/css/userProfile.css 136 additions, 3 deletionssrc/main/resources/static/css/userProfile.css
- src/main/resources/static/scripts/login.js 49 additions, 0 deletionssrc/main/resources/static/scripts/login.js
- src/main/resources/templates/rewards/login.html 48 additions, 0 deletionssrc/main/resources/templates/rewards/login.html
- src/main/resources/templates/rewards/userProfile.html 8 additions, 11 deletionssrc/main/resources/templates/rewards/userProfile.html
Loading
Please register or sign in to comment