From 150f273bb2670f05592fee71347a12a95a4363d6 Mon Sep 17 00:00:00 2001 From: Connor <brockcc1@cardiff.ac.uk> Date: Tue, 12 Dec 2023 02:49:19 +0000 Subject: [PATCH] Added a dynamic Thymeleaf value that updates depending how many items are in the List to a HTML element. --- .../dragonstale/DragonsTaleController.java | 13 ++++--------- src/main/resources/static/css/dragonstaless.css | 12 +++++++++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java index 2bb14369..20ed064f 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 2f456a23..a1f17387 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; -- GitLab