From 4c758fdbc4c75d78832372ec584150c2fff05ad6 Mon Sep 17 00:00:00 2001 From: Connor <brockcc1@cardiff.ac.uk> Date: Thu, 14 Dec 2023 01:39:34 +0000 Subject: [PATCH] Added an option to view all given landmarks, set up a JS function to send browser to the URL path and controller to pick it up. --- .../SmartTowns/dragonstale/DragonsTaleController.java | 6 ++++++ src/main/resources/static/scripts/DTscript.js | 8 ++++++-- .../resources/templates/dragonstale/alllandmarks.html | 10 ++++++++++ src/main/resources/templates/dragonstale/index.html | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/templates/dragonstale/alllandmarks.html diff --git a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java index 9066b123..01aae702 100644 --- a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java +++ b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java @@ -29,6 +29,12 @@ public class DragonsTaleController { return modelAndView; } + @GetMapping("/allDTLandmarks") + public ModelAndView getAllLandmarksDT(){ + modelAndView = new ModelAndView("/dragonstale/alllandmarks"); + return modelAndView; + } + @GetMapping ("/QRScan") //In here, we could use trailID as a string variable and use it to track what trail the user clicked from. public ModelAndView getQRScanner(){ modelAndView = new ModelAndView("fragments/qr-scanner"); diff --git a/src/main/resources/static/scripts/DTscript.js b/src/main/resources/static/scripts/DTscript.js index b791445e..ed97cd7c 100644 --- a/src/main/resources/static/scripts/DTscript.js +++ b/src/main/resources/static/scripts/DTscript.js @@ -4,6 +4,10 @@ var getQR = function (){ } function toggleDropDown(){ - var dropdownList = document.getElementById("dropdownList") - dropdownList.style.display = (dropdownList.style.display === "block") ? "none" : "block" + var dropdownList = document.getElementById("dropdownList"); + dropdownList.style.display = (dropdownList.style.display === "block") ? "none" : "block"; +} + +function routeToAllLandmarks(){ + window.location.href="/allDTLandmarks"; } \ No newline at end of file diff --git a/src/main/resources/templates/dragonstale/alllandmarks.html b/src/main/resources/templates/dragonstale/alllandmarks.html new file mode 100644 index 00000000..ab6095a0 --- /dev/null +++ b/src/main/resources/templates/dragonstale/alllandmarks.html @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <title>The Dragons Path.</title> +</head> +<body> + <h1> Testing </h1> +</body> +</html> \ No newline at end of file diff --git a/src/main/resources/templates/dragonstale/index.html b/src/main/resources/templates/dragonstale/index.html index 1745a9e2..001f6e47 100644 --- a/src/main/resources/templates/dragonstale/index.html +++ b/src/main/resources/templates/dragonstale/index.html @@ -46,7 +46,7 @@ <div> <h3> Begin or Continue your hunt!</h3> - <button type="button" id="begin">Click here!</button> + <button type="button" id="begin" onclick="routeToAllLandmarks()">Click here!</button> </div> <div th:insert="fragments/Templating.html :: footer"></div> </body> -- GitLab