Merge branch 'feature/ASDCBA-000-ui' into sub-task/ASDCBA-000-ui-QOL
# Conflicts: # src/main/resources/database.sqlite
Branches sub-task/ASDCBA-000-ui-QOL
Showing
- Veil_Veilig.iml 10 additions, 4 deletionsVeil_Veilig.iml
- pom.xml 6 additions, 0 deletionspom.xml
- src/main/java/nl/han/aim/asd/veilveilig/core/application/dtos/UserDTO.java 1 addition, 1 deletion...han/aim/asd/veilveilig/core/application/dtos/UserDTO.java
- src/main/java/nl/han/aim/asd/veilveilig/modules/infrastructure/bootstrapapi/BootstrapService.java 1 addition, 1 deletion...modules/infrastructure/bootstrapapi/BootstrapService.java
- src/main/java/nl/han/aim/asd/veilveilig/modules/infrastructure/localstorage/UserDAOImpl.java 2 additions, 0 deletions...ilig/modules/infrastructure/localstorage/UserDAOImpl.java
- src/main/java/nl/han/aim/asd/veilveilig/modules/infrastructure/ui/builder/AuctionCreationBuilder.java 3 additions, 13 deletions...les/infrastructure/ui/builder/AuctionCreationBuilder.java
- src/main/java/nl/han/aim/asd/veilveilig/modules/infrastructure/ui/builder/LotCreationBuilder.java 53 additions, 21 deletions...modules/infrastructure/ui/builder/LotCreationBuilder.java
- src/main/java/nl/han/aim/asd/veilveilig/modules/infrastructure/ui/builder/auctionspupopwindow/CreateAuctionPopup.java 54 additions, 15 deletions...re/ui/builder/auctionspupopwindow/CreateAuctionPopup.java
- src/main/resources/database.sqlite 0 additions, 0 deletionssrc/main/resources/database.sqlite
- src/main/resources/sql/ddl.sql 3 additions, 3 deletionssrc/main/resources/sql/ddl.sql
- src/test/java/nl/han/aim/asd/veilveilig/core/application/usecases/AccountServiceIntegrationTest.java 176 additions, 0 deletions...e/application/usecases/AccountServiceIntegrationTest.java
- src/test/java/nl/han/aim/asd/veilveilig/modules/infrastructure/bootstrapapi/BootstrapServiceIntegrationTest.java 63 additions, 0 deletions...ructure/bootstrapapi/BootstrapServiceIntegrationTest.java
- src/test/java/nl/han/aim/asd/veilveilig/modules/infrastructure/bootstrapapi/TestBootstrapService.java 0 additions, 59 deletions...les/infrastructure/bootstrapapi/TestBootstrapService.java
- src/test/resources/hibernate.cfg.xml 19 additions, 10 deletionssrc/test/resources/hibernate.cfg.xml
Please register or sign in to comment