-
- Downloads
Merge branch 'develop' into 'dev/monolith/split_services_hotel_and_user'
# Conflicts: # java/roomBooking/src/main/java/com/uva/monolith/services/users/controllers/UserController.java
No related branches found
No related tags found
Showing
- .gitignore 5 additions, 1 deletion.gitignore
- docker-compose.yml 12 additions, 12 deletionsdocker-compose.yml
- java/roomBooking/pom.xml 27 additions, 1 deletionjava/roomBooking/pom.xml
- java/roomBooking/src/main/java/com/uva/monolith/services/auth/AuthController.java 47 additions, 0 deletions...n/java/com/uva/monolith/services/auth/AuthController.java
- java/roomBooking/src/main/java/com/uva/monolith/services/auth/JwtAuthenticationFilter.java 121 additions, 0 deletions...m/uva/monolith/services/auth/JwtAuthenticationFilter.java
- java/roomBooking/src/main/java/com/uva/monolith/services/auth/LoginRequest.java 23 additions, 0 deletions...ain/java/com/uva/monolith/services/auth/LoginRequest.java
- java/roomBooking/src/main/java/com/uva/monolith/services/auth/SecurityConfig.java 44 additions, 0 deletions...n/java/com/uva/monolith/services/auth/SecurityConfig.java
- java/roomBooking/src/main/java/com/uva/monolith/services/bookings/controllers/BookingController.java 12 additions, 71 deletions...lith/services/bookings/controllers/BookingController.java
- java/roomBooking/src/main/java/com/uva/monolith/services/bookings/services/BookingService.java 88 additions, 0 deletions...a/monolith/services/bookings/services/BookingService.java
- java/roomBooking/src/main/java/com/uva/monolith/services/hotels/models/Hotel.java 20 additions, 1 deletion...n/java/com/uva/monolith/services/hotels/models/Hotel.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/controllers/UserController.java 1 addition, 0 deletions...a/monolith/services/users/controllers/UserController.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/controllers/UserService.java 36 additions, 0 deletions.../uva/monolith/services/users/controllers/UserService.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/models/Client.java 65 additions, 0 deletions...n/java/com/uva/monolith/services/users/models/Client.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/models/HotelManager.java 38 additions, 0 deletions.../com/uva/monolith/services/users/models/HotelManager.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/models/User.java 15 additions, 43 deletions...ain/java/com/uva/monolith/services/users/models/User.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/models/UserRol.java 1 addition, 1 deletion.../java/com/uva/monolith/services/users/models/UserRol.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/repositories/ClientRepository.java 10 additions, 0 deletions...onolith/services/users/repositories/ClientRepository.java
- java/roomBooking/src/main/java/com/uva/monolith/services/users/repositories/HotelManagerRepository.java 10 additions, 0 deletions...h/services/users/repositories/HotelManagerRepository.java
- java/services/auth/pom.xml 4 additions, 0 deletionsjava/services/auth/pom.xml
- java/services/auth/src/main/java/com/uva/authentication/api/UserAPI.java 33 additions, 2 deletions...uth/src/main/java/com/uva/authentication/api/UserAPI.java
Loading
Please register or sign in to comment