Skip to content
Snippets Groups Projects
Commit 480581ed authored by John Watkins's avatar John Watkins
Browse files

Fixed heights of shops on dash

parent f651780b
Branches
No related tags found
1 merge request!114LoggingService service class, new method to add a log to the "Logs" table when...
...@@ -60,7 +60,7 @@ public class SignInController { ...@@ -60,7 +60,7 @@ public class SignInController {
System.out.println(bindingResult.getAllErrors()); System.out.println(bindingResult.getAllErrors());
return "registerbusiness.html"; return "registerbusiness.html";
} }
saveBusiness.save(new BusinessRegisterDTO(brf), jwtUtils.getLoggedInUserId(session).get()); saveBusiness.save(new BusinessRegisterDTO(brf), jwtUtils.getLoggedInUserId(session).get(), session);
return "redirect:/redirect?url=businessRegister"; return "redirect:/redirect?url=businessRegister";
} }
......
...@@ -37,7 +37,7 @@ public class BusinessFavouriter { ...@@ -37,7 +37,7 @@ public class BusinessFavouriter {
if(toggleFavourite.alreadyInDb(ufDTO)){ if(toggleFavourite.alreadyInDb(ufDTO)){
deleteFavourite.delete(ufDTO, session); deleteFavourite.delete(ufDTO, session);
}else{ }else{
saveFavourite.save(ufDTO); saveFavourite.save(ufDTO, session);
} }
return "OK"; return "OK";
}catch(Exception e){ }catch(Exception e){
......
...@@ -54,11 +54,11 @@ public class loginAPI { ...@@ -54,11 +54,11 @@ public class loginAPI {
(int) usersDTOOptional.get().getUserId(), (int) usersDTOOptional.get().getUserId(),
session); session);
// Log the successful login // Log the successful login
loggingService.logEvent( // loggingService.logEvent(
"Successful Login", // "Successful Login",
session, // session,
"Successful login for User with Id: " + usersDTOOptional.get().getUserId() // "Successful login for User with Id: " + (int) usersDTOOptional.get().getUserId()
); // );
} else { } else {
// Log the Failed login // Log the Failed login
loggingService.logEvent( loggingService.logEvent(
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
width: 320px; width: 320px;
padding: 0; padding: 0;
margin: 20px; margin: 20px;
min-height: 226px;
} }
.business_container .image{ .business_container .image{
...@@ -25,4 +26,8 @@ ...@@ -25,4 +26,8 @@
border-bottom-left-radius: 20px; border-bottom-left-radius: 20px;
width: 100%; width: 100%;
padding: 10px 15px; padding: 10px 15px;
display: flex;
flex-direction: column;
flex: 1;
justify-content: space-evenly;
} }
\ No newline at end of file
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
display: inline-flex; display: inline-flex;
flex-direction: row; flex-direction: row;
margin-right: 20px; margin-right: 20px;
min-height: 198px;
} }
.hidden{ .hidden{
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
padding: 10px 15px; padding: 10px 15px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around;
} }
.reward_card_img{ .reward_card_img{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment