Skip to content

Commit 7131582

Browse files
adding some error messages for login page
1 parent b37f240 commit 7131582

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/main/java/com/example/treaders/controller/AllController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ public String Login(){
5858
public String authenticate(@RequestParam String email, @RequestParam String password,Model model){
5959
UserFormat user = UserRepo.findByEmail(email);
6060
if(user == null){
61-
model.addAttribute("errorMessage", "User doesn't exist");
61+
model.addAttribute("errorEmailMessage", "Email doesn't exist");
6262
return "login";
6363
}
6464
if(user!=null && passwordEncoder.matches(password,user.getPassword())){
6565
UserLoggedIn = true;
6666
UserName = user.getUsername();
6767
return "redirect:/home";
6868
}else{
69-
model.addAttribute("errorMessage", "Wrong password");
69+
model.addAttribute("errorPasswordMessage", "Wrong password");
7070
return "login";
7171
}
7272
}
@@ -96,14 +96,14 @@ public String Signup(){
9696
public String addNewUser(@RequestParam String email,@RequestParam String username, @RequestParam String password,Model model){
9797
UserFormat user=new UserFormat();
9898
if(UserRepo.findByEmail(email)!=null){
99-
model.addAttribute("errorMessage","This email already exists");
99+
model.addAttribute("errorEmailMessage","This email already exists");
100100
return "signup";
101101
}
102102
user.setEmail(email);
103103
user.setUsername(username);
104104
String regex = "^(?=.*[A-Z])(?=.*[a-z])(?=.*\\d)(?=.*[@#]).+$";
105105
if(!password.matches(regex)){
106-
model.addAttribute("errorMessage", "Password must be at least 6 characters long and include at least one capital letter and one special character (@, #, or $).");
106+
model.addAttribute("errorPasswordMessage", "Password must be at least 6 characters long and include at least one capital letter and one special character (@, #, or $).");
107107
model.addAttribute("email", email);
108108
model.addAttribute("username", username);
109109
return "signup";

src/main/resources/templates/login.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ <h2>Login</h2>
1212
<form action="/authenticate" method="post" id="loginForm">
1313
<div class="message"></div>
1414
<input type="text" name="email" placeholder="Email Id" required>
15+
<div th:if="${errorEmailMessage != null}" th:text="${errorEmailMessage}" class="error"></div>
1516
<input type="password" name="password" placeholder="Password" required>
1617
<!-- Display the error message if there is one -->
17-
<div th:if="${errorMessage != null}" th:text="${errorMessage}" class="error"></div>
18+
<div th:if="${errorPasswordMessage != null}" th:text="${errorPasswordMessage}" class="error"></div>
1819
<input type="submit" value="Login">
1920
</form>
2021
<p class="signup-text">New user? Sign up <a href="/signup">here</a>.</p>

src/main/resources/templates/signup.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ <h2>Sign Up</h2>
1313
<form action="/newuser" method="post" id="signupForm">
1414
<div class="message"></div>
1515
<input type="email" name="email" placeholder="Email Id" required>
16+
<div th:if="${errorEmailMessage != null}" th:text="${errorEmailMessage}" class="error"></div>
1617
<input type="text" name="username" placeholder="User Name" required>
1718
<input type="password" name="password" placeholder="Password" required>
1819
<!-- Display the error message if there is one -->
19-
<div th:if="${errorMessage != null}" th:text="${errorMessage}" class="error"></div>
20+
<div th:if="${errorPasswordMessage != null}" th:text="${errorPasswordMessage}" class="error"></div>
2021
<input type="submit" value="Sign Up">
2122
</form>
2223
<p class="login-link">Already have an account? <a href="/">Login</a></p>

0 commit comments

Comments
 (0)