diff --git a/src/main/java/edu/msudenver/tsp/website/Application.java b/src/main/java/edu/msudenver/tsp/website/Application.java index a07a4a0..dbbbb00 100644 --- a/src/main/java/edu/msudenver/tsp/website/Application.java +++ b/src/main/java/edu/msudenver/tsp/website/Application.java @@ -3,11 +3,18 @@ package edu.msudenver.tsp.website; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication(scanBasePackages = "edu.msudenver.tsp") +@SpringBootApplication public class Application { public static void main(final String[] args) { SpringApplication.run(Application.class, args); } + /* + @Bean + @Autowired + public UserService userService(@Autowired final RestService restService) { + return new UserService(restService); + } + */ } diff --git a/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java b/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java index 6f76376..2636314 100644 --- a/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java +++ b/src/main/java/edu/msudenver/tsp/website/controller/UserCreationController.java @@ -1,11 +1,8 @@ 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; @@ -19,7 +16,7 @@ import org.springframework.web.servlet.ModelAndView; @AllArgsConstructor @RequestMapping("/createuser") public class UserCreationController { - @Autowired private final UserService userService; + //@Autowired private final UserService userService; @GetMapping({"/",""}) public ModelAndView createUserPage() { @@ -29,21 +26,24 @@ public class UserCreationController { @PostMapping({"/",""}) public String registerUser(@Validated final UserCreationForm userCreationForm, final Model model) { - model.addAttribute("userID", userCreationForm.getUserID()); + //model.addAttribute("userID", userCreationForm.getUserID()); model.addAttribute("username", userCreationForm.getUsername()); model.addAttribute("password", userCreationForm.getPassword()); - model.addAttribute("confirmPassword", userCreationForm.getConfirmPassword()); + //model.addAttribute("confirmPassword", userCreationForm.getConfirmPassword()); model.addAttribute("emailAddress", userCreationForm.getEmailAddress()); - model.addAttribute("firstName", userCreationForm.getFirstName()); - model.addAttribute("lastName", userCreationForm.getLastName()); - model.addAttribute("referrer", userCreationForm.getReferrer()); - model.addAttribute("TnCAgreement", userCreationForm.isAgreedToTerms()); + //model.addAttribute("firstName", userCreationForm.getFirstName()); + //model.addAttribute("lastName", userCreationForm.getLastName()); + //model.addAttribute("referrer", userCreationForm.getReferrer()); + //model.addAttribute("TnCAgreement", userCreationForm.isAgreedToTerms()); + LOG.info("Saving user {}...", userCreationForm); + + /* final Account newUser = new Account(); newUser.setUsername(userCreationForm.getUsername()); newUser.setPassword(userCreationForm.getPassword()); userService.createAccount(newUser); - + */ return "successfulRegistration"; } diff --git a/src/main/java/edu/msudenver/tsp/website/controller/ValidationExceptionHandler.java b/src/main/java/edu/msudenver/tsp/website/controller/ValidationExceptionHandler.java new file mode 100644 index 0000000..f31e18f --- /dev/null +++ b/src/main/java/edu/msudenver/tsp/website/controller/ValidationExceptionHandler.java @@ -0,0 +1,5 @@ +package edu.msudenver.tsp.website.controller; + +public class ValidationExceptionHandler { + +} diff --git a/src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp b/src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp index 75a3148..4f33f12 100644 --- a/src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp +++ b/src/main/webapp/WEB-INF/jsp/successfulRegistration.jsp @@ -4,10 +4,7 @@