diff --git a/.gitignore b/.gitignore index 32a3545e..922ae81a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ target/ database/hsqldb/build/ database/hsqldb/data/ database/hsqldb/doc/ -database/hsqldb/lib/ database/hsqldb/src/ database/hsqldb/testrun/ diff --git a/database/hsqldb/lib/hsqldb-osgi-jdk8.jar b/database/hsqldb/lib/hsqldb-osgi-jdk8.jar new file mode 100644 index 00000000..f2ef7fbc Binary files /dev/null and b/database/hsqldb/lib/hsqldb-osgi-jdk8.jar differ diff --git a/database/hsqldb/lib/hsqldb.jar b/database/hsqldb/lib/hsqldb.jar new file mode 100644 index 00000000..13387392 Binary files /dev/null and b/database/hsqldb/lib/hsqldb.jar differ diff --git a/database/hsqldb/lib/javax.servlet-api-3.1.0.jar b/database/hsqldb/lib/javax.servlet-api-3.1.0.jar new file mode 100644 index 00000000..6b14c3d2 Binary files /dev/null and b/database/hsqldb/lib/javax.servlet-api-3.1.0.jar differ diff --git a/database/hsqldb/lib/sqltool-jdk8.jar b/database/hsqldb/lib/sqltool-jdk8.jar new file mode 100644 index 00000000..4988d3a5 Binary files /dev/null and b/database/hsqldb/lib/sqltool-jdk8.jar differ diff --git a/database/hsqldb/lib/sqltool.jar b/database/hsqldb/lib/sqltool.jar new file mode 100644 index 00000000..a30b4d53 Binary files /dev/null and b/database/hsqldb/lib/sqltool.jar differ diff --git a/src/main/java/com/uniovi/controllers/PlayersController.java b/src/main/java/com/uniovi/controllers/PlayersController.java index 87eb3ea7..ddd9a561 100644 --- a/src/main/java/com/uniovi/controllers/PlayersController.java +++ b/src/main/java/com/uniovi/controllers/PlayersController.java @@ -34,11 +34,11 @@ public String showRegistrationForm(Model model){ if (model.containsAttribute("user")) { model.addAttribute("user", model.getAttribute("user")); - return "/player/signup"; + return "player/signup"; } model.addAttribute("user", new PlayerDto()); - return "/player/signup"; + return "player/signup"; } @PostMapping("/signup") @@ -58,7 +58,7 @@ public String registerUserAccount(@Valid @ModelAttribute("user") PlayerDto user, if(result.hasErrors()){ model.addAttribute("user", user); - return "/player/signup"; + return "player/signup"; } playerService.addNewPlayer(user); @@ -76,11 +76,11 @@ public String showLoginForm(Model model, @RequestParam(value = "error", required if (SecurityConfig.isAuthenticated()) return "redirect:/home"; - return "/player/login"; + return "player/login"; } @GetMapping("/home") public String home(Model model, Principal principal) { - return "/player/home"; + return "player/home"; } }