-
- Downloads
Merge branch 'issueSeven' into 'develop'
# Conflicts: # src/main/java/com/example/clientproject/web/controllers/HomeController.java # src/main/java/com/example/clientproject/web/controllers/SignInController.java
Branches
No related tags found
Showing
- src/main/java/com/example/clientproject/data/shops/Shops.java 1 addition, 1 deletion...main/java/com/example/clientproject/data/shops/Shops.java
- src/main/java/com/example/clientproject/services/BusinessRegisterSaver.java 8 additions, 2 deletions...example/clientproject/services/BusinessRegisterSaver.java
- src/main/java/com/example/clientproject/services/LinkUserShop.java 45 additions, 0 deletions...java/com/example/clientproject/services/LinkUserShop.java
- src/main/java/com/example/clientproject/services/registerUserServiceStatic.java 1 addition, 1 deletion...ple/clientproject/services/registerUserServiceStatic.java
- src/main/java/com/example/clientproject/web/controllers/BusinessDetails.java 42 additions, 0 deletions...xample/clientproject/web/controllers/BusinessDetails.java
- src/main/java/com/example/clientproject/web/controllers/Redirect.java 8 additions, 0 deletions...a/com/example/clientproject/web/controllers/Redirect.java
- src/main/java/com/example/clientproject/web/controllers/SignInController.java 5 additions, 3 deletions...ample/clientproject/web/controllers/SignInController.java
- src/main/java/com/example/clientproject/web/controllers/selectCategories/selectCategoriesControllers.java 0 additions, 4 deletions...rollers/selectCategories/selectCategoriesControllers.java
- src/main/java/com/example/clientproject/web/forms/BusinessRegisterForm.java 0 additions, 1 deletion...example/clientproject/web/forms/BusinessRegisterForm.java
- src/main/resources/database/Data Script/script.sql 31 additions, 31 deletionssrc/main/resources/database/Data Script/script.sql
- src/main/resources/database/Data Script/tablePopulator.py 4 additions, 2 deletionssrc/main/resources/database/Data Script/tablePopulator.py
- src/main/resources/static/js/favouriteBusiness.js 4 additions, 0 deletionssrc/main/resources/static/js/favouriteBusiness.js
- src/main/resources/templates/fragments/business_card.html 1 addition, 1 deletionsrc/main/resources/templates/fragments/business_card.html
- src/main/resources/templates/shopDetails.html 22 additions, 0 deletionssrc/main/resources/templates/shopDetails.html
Loading
Please register or sign in to comment