diff --git a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java index ab99931aebc9847805baa2c5bbf47a8a3c49a293..9066b1239a40d42aeaca7293c05a37529b5eaff5 100644 --- a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java +++ b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java @@ -36,12 +36,12 @@ public class DragonsTaleController { return modelAndView; } - @GetMapping("/dragonstale/{landmarkID}") - public Integer getDTLandmarkID(@RequestParam(value="landmarkID") int landmark){ - Integer idCounter = 0; - modelAndView = new ModelAndView("/dragonstale/{landmarkID}") - .addObject() //All your doing is retrieving the information from the database giving it to a string variable. - } +// @GetMapping("/dragonstale/{landmarkID}") +// public Integer getDTLandmarkID(@RequestParam(value="landmarkID") int landmark){ +// Integer idCounter = 0; +// modelAndView = new ModelAndView("/dragonstale/{landmarkID}") +// .addObject() //All your doing is retrieving the information from the database giving it to a string variable. +// } //Create another controller that directs to the given DragonsTale..Trail.. and updates the users account accordingly. diff --git a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java index ea7e02a4a0a229d14a9d40fe3996be6aa1adba40..f87b13aa37b413b9bb284b7cb14b6924b0aad75c 100644 --- a/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java +++ b/src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java @@ -13,18 +13,18 @@ public class DragonsTaleJDBC implements DragonsTaleRepository{ private RowMapper<User> userMapper; - @Override - public Map<Long, Boolean> getDTCompletion(int landmarkID){ - //Be conscious of sql injections here. - String sql = "SELECT userid, trailID, completedOrNot FROM dtprogress WHERE landmarkID = ?"; - int dtQuery = jdbc.query(sql, landmarkID); - //Query it twice to extract the given parameters, then use these parameters in a loop to query the completion. - List<Map<String, Integer>> query = jdbc.query(sql, id); - - Map<Long, Boolean> dtProgress = new HashMap<>(); - for (Map<String, Object> result : dtQuery) { - dtProgress.put((Long)result.get("stickerID"), (boolean)result.get("hasSticker")); - } - return dtProgress; - } +// @Override +// public Map<Long, Boolean> getDTCompletion(int landmarkID){ +// //Be conscious of sql injections here. +// String sql = "SELECT userid, trailID, completedOrNot FROM dtprogress WHERE landmarkID = ?"; +// int dtQuery = jdbc.query(sql, landmarkID); +// //Query it twice to extract the given parameters, then use these parameters in a loop to query the completion. +// List<Map<String, Integer>> query = jdbc.query(sql, id); +// +// Map<Long, Boolean> dtProgress = new HashMap<>(); +// for (Map<String, Object> result : dtQuery) { +// dtProgress.put((Long)result.get("stickerID"), (boolean)result.get("hasSticker")); +// } +// return dtProgress; +// } } diff --git a/src/main/resources/static/css/dragonstaless.css b/src/main/resources/static/css/dragonstaless.css index edfb9a8a86cd7cfe2ae9d237a7c69a64f1e160c3..0c88dc15d9e76c475ed782229815851007b342bc 100644 --- a/src/main/resources/static/css/dragonstaless.css +++ b/src/main/resources/static/css/dragonstaless.css @@ -8,14 +8,33 @@ body{ background-color: #927BB7; } -.dropdown{ +.dropdown button{ background-color: coral; color: white; - padding: 20px; + padding: 25px; font-size: 16px; border: none; cursor: pointer; } + +.dropdown a{ + display: block; + color: #393433; + text-decoration: none; + padding: 10px 15px; +} + +.dropdown .content{ + position: absolute; + background-color: #D3B69C; + min-width:100px; +} + +.dropdown:hover .content{ + display: block; +} + + .images{ max-width:100%; height:auto; diff --git a/src/main/resources/static/scripts/DTscript.js b/src/main/resources/static/scripts/DTscript.js index 7536b6ced2bb9c6dc78e3f99aafbabf2d9627874..493a76c7fac0f3b835839ca5c8e5a3b84b924a2b 100644 --- a/src/main/resources/static/scripts/DTscript.js +++ b/src/main/resources/static/scripts/DTscript.js @@ -1,3 +1,4 @@ var getQR = function (){ + // document.getElementById("qrCodeScanner").style.cursor = "pointer"; window.location.href = "/QRScan"; } \ 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 20f23105ec4f697486ec25f40978d0b2bca2822b..c6219c8aacc3a976e7bdcf5a25bc053824e5ad22 100644 --- a/src/main/resources/templates/dragonstale/index.html +++ b/src/main/resources/templates/dragonstale/index.html @@ -30,7 +30,7 @@ <div class="dropdown"> <button class="dropdownButton">There are <span th:text="${getListSize}"> Size of List </span> adventures in this journey! </button> <ul th:each="item : ${landmarksList}" id="tabBox"> - <li> + <li class="content"> <a id="#" href="#landmarkTabLink" th:text="${item.landmarkName}"> Landmark Tab</a> <button id="qrCodeScanner" onclick="getQR()">Click here to scan a QR code for: <span th:text="${item.landmarkName}">Landmark Name Here</span></button> </li>