diff --git a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java index 98c35594da947d261f6980b10a516a75b4583431..7a116a00878fbfa4afd796f094deee293ddbe1ec 100644 --- a/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java +++ b/src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java @@ -7,6 +7,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; //import jakarta.validation.Valid; @@ -21,8 +22,6 @@ public class LandmarksController { return modelAndView1; } - - @PostMapping("/landmarkSub") public ModelAndView landmarkSent(@Valid @ModelAttribute("landmarkData") Landmarks landmarks, BindingResult bindingResult, Model model ) { @@ -41,13 +40,15 @@ public class LandmarksController { } + } - } } + + diff --git a/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java b/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java deleted file mode 100644 index ba499c964988180a774b2f66ba7c18274ccfdd21..0000000000000000000000000000000000000000 --- a/src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java +++ /dev/null @@ -1,15 +0,0 @@ -package Team5.SmartTowns.trailcontrollers; - - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.servlet.ModelAndView; - -@Controller -public class DragonsTale { - @GetMapping("/dragonstale") - public ModelAndView getDragonsTale(){ - ModelAndView modelAndView = new ModelAndView("src/main/resources/templates/towns/trails/dragonstale/index.html"); - return modelAndView; - } -} diff --git a/src/main/java/Team5/SmartTowns/trails/Trail.java b/src/main/java/Team5/SmartTowns/trails/Trail.java index 81a8298177efc622eafff53e297eda6600cf5dd1..c4b4e3ca80caaf24a7940d2f930bf19e79fe357f 100644 --- a/src/main/java/Team5/SmartTowns/trails/Trail.java +++ b/src/main/java/Team5/SmartTowns/trails/Trail.java @@ -36,4 +36,8 @@ public class Trail { File imgFile = new File("src/main/resources/static/" + imgPath); return imgFile.exists() ? imgPath : notFoundPath; } + + public static List<Trail> getTrails() { + return trails; + } } diff --git a/src/main/java/Team5/SmartTowns/trails/TrailsController.java b/src/main/java/Team5/SmartTowns/trails/TrailsController.java index e78b8f721fcd7852db7bbd7b549d66c10ed09248..12540fcd9c6e42e75b9adf6ce81e73e9a0107e5f 100644 --- a/src/main/java/Team5/SmartTowns/trails/TrailsController.java +++ b/src/main/java/Team5/SmartTowns/trails/TrailsController.java @@ -35,4 +35,19 @@ public class TrailsController { return mv; } + + //Leave this, I'll create a thymeleaf redirect for multiple different trails, rather then just have one for each trail. + @GetMapping("/dragonstale") + public ModelAndView getDragonsTale(){ + ModelAndView modelAndView = new ModelAndView("towns/trails/dragonstale/index"); + return modelAndView; + } + //Same for this + + @GetMapping("/dragonstale/landmarkone") + public ModelAndView getLandmark(){ + ModelAndView modelAndView = new ModelAndView("towns/trails/dragonstale/trailcheckpoints/one/one"); + return modelAndView; +} + } diff --git a/src/main/resources/templates/fragments/landmarkInfoFrag.html b/src/main/resources/templates/fragments/landmarkInfoFrag.html new file mode 100644 index 0000000000000000000000000000000000000000..ef12db2ea01f1d2711213fba997dc8aa8634ad8e --- /dev/null +++ b/src/main/resources/templates/fragments/landmarkInfoFrag.html @@ -0,0 +1,13 @@ +<!-- TODO Develop each individual landmark for DragonsTrail --> +<!-- Each trail should have a preestablished set of landmarks --> + +<div th:fragment="landmarkInfoFrag" class="centre" id="landmarkList"> + <ul> + <li th:replace=""> Landmark 1 </li> + <li> Landmark 2 </li> + <li> Larkmark 3 </li> + <li> Larkmark 4 </li> + <li> Larkmark 5 </li> + <li> Larkmark 6 </li> + </ul> +</div> \ No newline at end of file diff --git a/src/main/resources/templates/towns/trails/dragonstale/index.html b/src/main/resources/templates/towns/trails/dragonstale/index.html index c9202cfdfe91be4b0d095abe1398e3a5f6e74c19..99122f59d7c39627fc2011b26a193fb484e653ea 100644 --- a/src/main/resources/templates/towns/trails/dragonstale/index.html +++ b/src/main/resources/templates/towns/trails/dragonstale/index.html @@ -15,15 +15,26 @@ <div class="centre"> <p> - Adventurers... embark through these mystical historical landmarks and scenery, to ultimately discover the lair of the dragon. + Adventurers... embark through mystical historical landmarks to ultimately discover the lair of the dragon. Legend has it that within this ominous lair, mighty dragons, guardians of ancient wisdom and treasures untold lay.... </p> </div> + <div class="centre"> + <!-- TO DO, --> + </div> + <div class="centre"> <h3>Begin your hunt!</h3> <button type="button" id="begin">Click here!</button> </div> +<script> + + document.getElementById("begin").addEventListener("click", function (){ + window.location.href = ("/dragonstale/landmarkone"); + }) + +</script> </body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/towns/trails/dragonstale/script.js b/src/main/resources/templates/towns/trails/dragonstale/script.js index 6708ae40acad145d586be407af2b29a4bba96eba..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/main/resources/templates/towns/trails/dragonstale/script.js +++ b/src/main/resources/templates/towns/trails/dragonstale/script.js @@ -1,8 +0,0 @@ -function onClick(){ - var beginButton = document.getElementById("begin"); - if (beginButton === true){ - - } - - -} \ No newline at end of file