diff --git a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java index 2bb14369e3e26cc61b9ce652b5c94cb7e452b9d2..20ed064fb0ee0cb4f7903870d0523af2cd8e0d2a 100644 --- a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java +++ b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java @@ -21,8 +21,10 @@ public class DragonsTaleController { @GetMapping("/dragonstale") public ModelAndView getDragonsTale(){ List<Landmarks> landmarksList = landmarksDragonstrail; + int landmarksListSize = landmarksDragonstrail.size(); modelAndView = new ModelAndView("/dragonstale/index"); modelAndView.addObject("landmarksList", landmarksList); + modelAndView.addObject("getListSize", landmarksListSize); return modelAndView; } @@ -33,16 +35,9 @@ public class DragonsTaleController { return modelAndView; } -// @GetMapping("/{trailID}/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(@PathVariable Optional<Integer> trailID){ -// ModelAndView modelAndView = new ModelAndView("/dragonstale/index"); -// //Can we extract the pathvariable in a JS function? -// return modelAndView; -// } - - - + //Create another controller that directs to the given DragonsTale..Trail.. and updates the users account accordingly. +// This code is to be used // @GetMapping("dragonstale/{qrCode}/{id}") // public String qrCodeCheck(@PathVariable Optional<String> qrCode, @PathVariable Optional<Integer> id){ // if (qrCode.isPresent()){ diff --git a/src/main/resources/static/css/dragonstaless.css b/src/main/resources/static/css/dragonstaless.css index 2f456a23299e5296a53d8c37f48d93345fe84a9a..a1f173879870d2a4e6d35ed8bd2073d3c80ae9c0 100644 --- a/src/main/resources/static/css/dragonstaless.css +++ b/src/main/resources/static/css/dragonstaless.css @@ -1,4 +1,4 @@ -.centre{ +body{ display: flex; flex-direction: column; text-align: center; @@ -8,6 +8,16 @@ background-color: #927BB7; } +.dropdown{ + background-color: coral; + color: white; + padding: 20px; + font-size: 16px; + border: none; + cursor: pointer; +} + + .landmarkName{ font-weight: bold; text-align: left;