diff --git a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java b/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
index 381ccf04293b752f03e2eb743ba820c186b277dd..27eb07a2f7c5458556b22cf4c50c65a4e26478fe 100644
--- a/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
+++ b/src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
@@ -40,6 +40,6 @@ public class Landmarks {
this.landmarkName = landmarkName;
this.landmarkDescription = landmarkDescription;
this.landmarkLocation = landmarkLocation; }
-
+ // ? URl check
}
diff --git a/src/main/java/Team5/SmartTowns/trails/TrailsController.java b/src/main/java/Team5/SmartTowns/trails/TrailsController.java
index 0b9b8f6c7f241a88b31b38598378fe1ab1b6ab4c..37548995b1168ad0b046f4017690bd16498cc0c0 100644
--- a/src/main/java/Team5/SmartTowns/trails/TrailsController.java
+++ b/src/main/java/Team5/SmartTowns/trails/TrailsController.java
@@ -4,14 +4,12 @@ package Team5.SmartTowns.trails;
import Team5.SmartTowns.Landmarks.Landmarks;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import static Team5.SmartTowns.Landmarks.Landmarks.landmarksDragonstrail;
@@ -46,5 +44,15 @@ public class TrailsController {
return modelAndView;
}
+
+// //
+// @GetMapping("dragonstale/{qrCode}/{id}")
+// public String qrCodeCheck(@PathVariable Optional<String> qrCode, @PathVariable Optional<Integer> id){
+// if (qrCode.isPresent() && id.isPresent()){
+// //Check if ID is present, if do this, if not dfo that.
+//
+// }
+// }
+
}
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index e40208ba343bab8aeb675e792a3566fd0e573028..d3bcf1927af425cf2fb76b026757081d1c5af951 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -54,4 +54,7 @@ insert into badgeprogress (userID, badgeID, progress) value ('2', '2', '70');
delete from stickerprogress;
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '1', true);
insert into stickerprogress (userID, stickerID, hasSticker) value ('1', '3', true);
-insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '2', true);
\ No newline at end of file
+insert into stickerprogress (userID, stickerID, hasSticker) value ('2', '2', true);
+
+insert into dragonstale (landmarkID, landmarkName, landmarkDescription) value (1, 'A scent of...Dragon', 'The Dragon has been spotted near by, find the QR code to continue');
+insert into dragonstale (landmarkID, landmarkName, landmarkDescription) value (2, 'They''ve been found!', 'Don''t let them escape, find the next QR code to continue!');
\ No newline at end of file
diff --git a/src/main/resources/static/images/QRAllTrails.png b/src/main/resources/static/images/QRAllTrails.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed1d4465b3c286eba618b9a459b5a35295bacc8d
Binary files /dev/null and b/src/main/resources/static/images/QRAllTrails.png differ
diff --git a/src/main/resources/static/qr-scanner.html b/src/main/resources/static/qr-scanner.html
index 707177753131b459e600b8699294bddefc4e73b1..2e93c18b5decfdb0f2b2f3e390e87dd9a8600661 100644
--- a/src/main/resources/static/qr-scanner.html
+++ b/src/main/resources/static/qr-scanner.html
@@ -14,6 +14,8 @@
</head>
<body>
+ <header th:insert="towns/Templating.html :: header"></header>
+
<div class="container">
<h1>Scan location QR code</h1>
<div class="section">
@@ -21,5 +23,7 @@
</div>
</div>
</div>
+
+ <div th:insert="towns/Templating.html :: footer"></div>
</body>
</html>
diff --git a/src/main/resources/static/scripts/qr-script.js b/src/main/resources/static/scripts/qr-script.js
index 8a80c70e5720ff59670edf1794dbbbedc4cc19fe..ff2bbf82d70a4bbf152239e568ccc7052b4c8438 100644
--- a/src/main/resources/static/scripts/qr-script.js
+++ b/src/main/resources/static/scripts/qr-script.js
@@ -15,6 +15,7 @@ domReady(function (message){
function onScanSuccess(decodeText, decodeResult){
alert("You have collected: " + decodeText, decodeResult);
// Open the result, what methods are available through the HTML5 Qr scanner node package?
+ window.open(decodeText);
// Record the result, see above.
// Get user and tie to user account, intergrate with database, retrieving and storing under user info.
}