From 5e964a18b0c57dccce586b1c2999e4ad66a526cd Mon Sep 17 00:00:00 2001
From: Rhys Nute <nuterd@cardiff.ac.uk>
Date: Sun, 3 Dec 2023 20:52:16 +0000
Subject: [PATCH] minor changes
---
src/main/resources/static/qr-scanner.html | 2 +-
.../resources/static/scripts/qr-script.js | 1 -
.../resources/static/scripts/qr-script.mjs | 25 +++++++++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/static/scripts/qr-script.mjs
diff --git a/src/main/resources/static/qr-scanner.html b/src/main/resources/static/qr-scanner.html
index 0a21dda5..16597255 100644
--- a/src/main/resources/static/qr-scanner.html
+++ b/src/main/resources/static/qr-scanner.html
@@ -6,7 +6,7 @@
<meta name="viewpoint" content="width-device-width, initial-scale=1.0">
<link rel="stylesheet" href="css/qrstyle.css">
<script src="https://unpkg.com/html5-qrcode"></script>
- <script type="module" src="scripts/qr-script.js"></script>
+ <script type="module" src="scripts/qr-script.mjs"></script>
<title>QR Code</title>
</head>
diff --git a/src/main/resources/static/scripts/qr-script.js b/src/main/resources/static/scripts/qr-script.js
index d75d9513..92ab7ddc 100644
--- a/src/main/resources/static/scripts/qr-script.js
+++ b/src/main/resources/static/scripts/qr-script.js
@@ -1,5 +1,4 @@
//qr-script file - R Nute
-import {Html5QrcodeScanner} from "html5-qrcode";
function domReady(fn){
if (
diff --git a/src/main/resources/static/scripts/qr-script.mjs b/src/main/resources/static/scripts/qr-script.mjs
new file mode 100644
index 00000000..d75d9513
--- /dev/null
+++ b/src/main/resources/static/scripts/qr-script.mjs
@@ -0,0 +1,25 @@
+//qr-script file - R Nute
+import {Html5QrcodeScanner} from "html5-qrcode";
+
+function domReady(fn){
+ if (
+ document.readyState === "complete" ||
+ document.readyState === "interactive"
+ ){
+ setTimeout(fn, 1000);
+ } else {
+ document.addEventListener("DOMContentLoaded", fn);
+ }
+}
+domReady(function (message){
+ //if QR code found
+ function onScanSuccess(decodeText, decodeResult){
+ alert("You have collected: " + decodeText, decodeResult);
+ }
+ let htmlscanner = new Html5QrcodeScanner(
+ "qr-code-reader",
+ { fps: 20, qrbos: 250}
+ );
+ htmlscanner.render(onScanSuccess);
+});
+
--
GitLab