Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29 from atusa17/PAN-54

Browse Source 
Pan 54
This commit is contained in:
dantanxiaotian
2019-05-02 13:16:13 -06:00
committed by GitHub
parent 766ba2753a 8c4bb72148
commit 1b88c00bbf
7 changed files with 264 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/edu/msudenver/tsp/website/Application.java
+1 -2
View File
@@ -6,11 +6,10 @@ import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication @SpringBootApplication
@ComponentScan("edu.msudenver.tsp") @ComponentScan("edu.msudenver.tsp")
public class Application { public class Application {
public static void main(String[] args) { public static void main(final String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java
+46
View File
@@ -0,0 +1,46 @@
package edu.msudenver.tsp.website.controller;
import edu.msudenver.tsp.services.UserService;
import edu.msudenver.tsp.services.dto.Account;
import edu.msudenver.tsp.website.forms.UserCreationForm;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
@Slf4j
@Controller
@AllArgsConstructor
@RequestMapping("/registration")
public class UserCreationController {
@Autowired
private final UserService userService;
@GetMapping({"/",""})
public ModelAndView createUserPage() {
LOG.info("Received request to display the user creation page: returning model with name 'User'");
return new ModelAndView("User");
}
@PostMapping({"/",""})
public String registerUser(@Validated final UserCreationForm userCreationForm, final Model model) {
model.addAttribute("username", userCreationForm.getUsername());
model.addAttribute("password", userCreationForm.getPassword());
model.addAttribute("emailAddress", userCreationForm.getEmailAddress());
LOG.info("Saving user {}...", userCreationForm);
final Account newUser = new Account();
newUser.setUsername(userCreationForm.getUsername());
newUser.setPassword(userCreationForm.getPassword());
userService.createAccount(newUser);
return "successfulRegistration";
}
}
src/main/java/edu/msudenver/tsp/website/forms/UserCreationForm.java
+30
View File
@@ -0,0 +1,30 @@
package edu.msudenver.tsp.website.forms;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Getter
@Setter
public class UserCreationForm {
@NotNull
@NotEmpty
private String username;
@NotNull
@NotEmpty
private String password;
@NotNull
@NotEmpty
private String confirmPassword;
@NotNull
@NotEmpty
private String emailAddress;
@NotNull
private boolean agreedToTerms;
}
src/main/webapp/WEB-INF/jsp/User.jsp
+147
View File
@@ -0,0 +1,147 @@
<%@ taglib prefix="th" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>User Creation</title>
<style type="text/css">
input {
padding: 0.25em 0.5em;
border: 0.125em solid hsl(30, 76%, 10%);
outline: none;
}
/* Show green borders when valid */
input[data-state="valid"] {
border-color: hsl(120, 76%, 50%);
}
/* Show red borders when filled, but invalid */
input[data-state="invalid"] {
border-color: hsl(0, 76%, 50%);
}
.error-messages {
display:none;
}
.error-messages[data-state="valid"] {
display:none;
}
.error-messages[data-state="invalid"] {
display:inline;
color: hsl(0, 76%, 50%);
}
</style>
<script type="text/javascript">
document.getElementById("submit").disabled = true;
function checkIDBeginsWith900(){
var userID = document.getElementById("userID");
var error = document.getElementById("errorUserID");
var IDValue = userID.value;
if(IDValue - 900000000 > 0) {
userID.dataset.state = 'valid';
error.dataset.state = 'valid';
} else {
userID.dataset.state = 'invalid';
error.dataset.state = 'invalid';
}
}
function checkValidUsername(){
var username = document.getElementById("username");
var error = document.getElementById("errorUsername");
var re = /^\w+$/;
if(re.test(username.value)){
username.dataset.state = 'valid';
error.dataset.state = 'valid';
} else {
username.dataset.state = 'invalid';
error.dataset.state = 'invalid';
}
}
function checkValidPassword(){
var password = document.getElementById("password");
var error = document.getElementById("errorPassword");
var re = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}$/;
if(re.test(password.value)){
password.dataset.state = 'valid';
error.dataset.state = 'valid';
} else {
password.dataset.state = 'invalid';
error.dataset.state = 'invalid';
}
}
function checkPasswordsMatch(){
var confirmPassword = document.getElementById("confirmPassword");
var password = document.getElementById("password");
var error = document.getElementById("errorConfirmPassword");
if(password.value === confirmPassword.value){
confirmPassword.dataset.state = 'valid';
error.dataset.state = 'valid';
} else {
confirmPassword.dataset.state = 'invalid';
error.dataset.state = 'invalid';
}
}
function checkAgreedToTerms(){
var agreedToTerms = document.getElementById("agreedToTerms");
var error = document.getElementById("errorAgreedToTerms");
if(agreedToTerms.checked === true){
error.dataset.state = 'valid';
document.getElementById("submit").disabled = false;
return true;
} else {
error.dataset.state = 'invalid';
document.getElementById("submit").disabled = true;
return false;
}
}
</script>
</head>
<body>
New User Registration:
<form method="post" action="" enctype="utf8">
<label for="username">Username:
<input type="text" name="username" id="username" onchange="checkValidUsername()"/>
<div class="error-messages" id="errorUsername">Username must contain only letters, numbers, and underscores</div>
</label>
<br>
<label for="password">Password:
<input type="text" name="password" id="password" onchange="checkValidPassword()"/>
<div class="error-messages" id="errorPassword">Password must be at least 8 characters long, including numbers, uppercase and lowercase letters.</div>
</label>
<br>
<label for="confirmPassword">Confirm Password:
<input type="text" name="confirmPassword" id="confirmPassword" onchange="checkPasswordsMatch()"/>
<div class="error-messages" id="errorConfirmPassword">Passwords do not match</div>
</label>
<br>
<label for="emailAddress">Email Address:
<input type="text" name="emailAddress" id="emailAddress" />
<div class="error-messages" id="errorEmailAddress">Invalid email address</div>
</label>
<br>
<label for="agreedToTerms">I agree to the terms and conditions.
<input type="checkbox" name="agreedToTerms" id="agreedToTerms" onclick="checkAgreedToTerms()"/>
<div class="error-messages" id="errorAgreedToTerms">You must agree to the terms and conditions in order to register.</div>
</label>
<br>
<input type="submit" id="submit" value="Submit" disabled="disabled"/>
</form>
</body>
</html>
src/main/webapp/WEB-INF/jsp/index.jsp
+1
View File
@@ -22,6 +22,7 @@
Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page. Click on this <strong><a href="/theorem/">link</a></strong> to visit theorem entering page.
<h4 class="text-center"><a href="/login">Sign In</a></h4> <h4 class="text-center"><a href="/login">Sign In</a></h4>
<h4 class="text-center"><a href="/registration">New here? Register</a></h4>
</div> </div>
</div> </div>
</body> </body>
src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp
+13
View File
@@ -0,0 +1,13 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>You're Registered!</title>
</head>
<body>
Thank you for joining!
<br><b>Username: </b><%= request.getParameter("username")%>
<br><b>Email Address: </b><%= request.getParameter("emailAddress")%>
<br><a href="/index">Return Home</a>
</body>
</html>
src/test/java/edu/msudenver/tsp/website/controller/UserCreationControllerTest.java
+26
View File
@@ -0,0 +1,26 @@
package edu.msudenver.tsp.website.controller;
import edu.msudenver.tsp.services.UserService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.web.servlet.ModelAndView;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
@RunWith(MockitoJUnitRunner.class)
public class UserCreationControllerTest {
private final UserService userService = mock(UserService.class);
private final UserCreationController userCreationController = new UserCreationController(userService);
@Test
public void testCreateUserPage() {
final ModelAndView modelAndView = userCreationController.createUserPage();
assertNotNull(modelAndView);
assertEquals("User", modelAndView.getViewName());
}
}