Skip to content
Snippets Groups Projects
Commit a51942b0 authored by Joshua Gill's avatar Joshua Gill
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents 8e94d922 a17a59f5
No related branches found
No related tags found
1 merge request!114LoggingService service class, new method to add a log to the "Logs" table when...
......@@ -21,5 +21,5 @@ public class SignUpForm {
private String newUserEmail;
@Size(min=7,max=15,message="Password must be between 7 and 15 characters")
private String newUserPassword;
private String userProfilePicture = "";
private String userProfilePicture = "imgs/defaultProfilePicture.jpg";
}
src/main/resources/static/imgs/defaultProfilePicture.jpg

13.7 KiB

src/main/resources/static/imgs/uploaded/0a18d08f_3bb2_4903_b1c7_d81246373cf1.png

70.3 KiB

......@@ -26,7 +26,7 @@
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" th:inline="text">
[['Hi ' + ${loggedInUser.getUserFirstName()} + '!']]
<div class="nav_profile_img" style="background-image: url('imgs/profile.jpg')"></div>
<div class="nav_profile_img" th:style="'background-image: url(\''+${loggedInUser.getUserProfilePicture()}+'\')'"></div>
</a>
<div class="navbar-dropdown is-right">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment