Merge branch 'develop' into 'issueThirtyFour'
# Conflicts: # src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java
Showing
- src/main/java/com/example/clientproject/data/events/Events.java 23 additions, 0 deletions...in/java/com/example/clientproject/data/events/Events.java
- src/main/java/com/example/clientproject/data/events/EventsRepo.java 19 additions, 0 deletions...ava/com/example/clientproject/data/events/EventsRepo.java
- src/main/java/com/example/clientproject/data/logs/Logs.java 43 additions, 0 deletionssrc/main/java/com/example/clientproject/data/logs/Logs.java
- src/main/java/com/example/clientproject/data/logs/LogsRepo.java 43 additions, 0 deletions...in/java/com/example/clientproject/data/logs/LogsRepo.java
- src/main/java/com/example/clientproject/data/rewards/Rewards.java 4 additions, 0 deletions.../java/com/example/clientproject/data/rewards/Rewards.java
- src/main/java/com/example/clientproject/data/rewards/RewardsRepo.java 11 additions, 2 deletions...a/com/example/clientproject/data/rewards/RewardsRepo.java
- src/main/java/com/example/clientproject/data/users/Users.java 1 addition, 0 deletions...main/java/com/example/clientproject/data/users/Users.java
- src/main/java/com/example/clientproject/service/LoggingService.java 65 additions, 0 deletions...ava/com/example/clientproject/service/LoggingService.java
- src/main/java/com/example/clientproject/service/Utils/JWTUtils.java 22 additions, 2 deletions...ava/com/example/clientproject/service/Utils/JWTUtils.java
- src/main/java/com/example/clientproject/services/GetStampBoardIdFromRewardId.java 29 additions, 0 deletions...e/clientproject/services/GetStampBoardIdFromRewardId.java
- src/main/java/com/example/clientproject/services/UserStampBoardService.java 13 additions, 2 deletions...example/clientproject/services/UserStampBoardService.java
- src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java 24 additions, 4 deletions...xample/clientproject/web/controllers/BusinessDetails.java
- src/main/java/com/example/clientproject/web/restControllers/UpdateUserStampPosition.java 124 additions, 0 deletions...tproject/web/restControllers/UpdateUserStampPosition.java
- src/main/resources/database/Data Script/script.sql 75 additions, 73 deletionssrc/main/resources/database/Data Script/script.sql
- src/main/resources/database/WeekFourERD.png 0 additions, 0 deletionssrc/main/resources/database/WeekFourERD.png
- src/main/resources/database/schema.sql 48 additions, 0 deletionssrc/main/resources/database/schema.sql
- src/main/resources/static/css/viewShop.css 46 additions, 0 deletionssrc/main/resources/static/css/viewShop.css
- src/main/resources/static/js/selectCategories.js 3 additions, 3 deletionssrc/main/resources/static/js/selectCategories.js
- src/main/resources/static/js/viewShop.js 52 additions, 2 deletionssrc/main/resources/static/js/viewShop.js
- src/main/resources/templates/admin.html 1 addition, 1 deletionsrc/main/resources/templates/admin.html
Loading
Please register or sign in to comment