diff --git a/.gitmodules b/.gitmodules index d77bb82..f5b8383 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "external/base64.js"] path = external/base64.js url = https://gist.github.com/72c423f727d395eeaa09697058238727.git +[submodule "external/qr-scanner"] + path = external/qr-scanner + url = https://github.com/nimiq/qr-scanner.git diff --git a/camera/static/js/qr-scanner-worker.min.js b/camera/static/js/qr-scanner-worker.min.js new file mode 120000 index 0000000..8da3b75 --- /dev/null +++ b/camera/static/js/qr-scanner-worker.min.js @@ -0,0 +1 @@ +../../../external/qr-scanner-binaryData/qr-scanner-worker.min.js \ No newline at end of file diff --git a/camera/static/js/qr-scanner-worker.min.js.map b/camera/static/js/qr-scanner-worker.min.js.map new file mode 120000 index 0000000..5cd9ba7 --- /dev/null +++ b/camera/static/js/qr-scanner-worker.min.js.map @@ -0,0 +1 @@ +../../../external/qr-scanner/qr-scanner-worker.min.js.map \ No newline at end of file diff --git a/camera/static/js/qr-scanner.min.js b/camera/static/js/qr-scanner.min.js new file mode 120000 index 0000000..8af7735 --- /dev/null +++ b/camera/static/js/qr-scanner.min.js @@ -0,0 +1 @@ +../../../external/qr-scanner/qr-scanner.min.js \ No newline at end of file diff --git a/camera/static/js/qr-scanner.min.js.map b/camera/static/js/qr-scanner.min.js.map new file mode 120000 index 0000000..236821c --- /dev/null +++ b/camera/static/js/qr-scanner.min.js.map @@ -0,0 +1 @@ +../../../external/qr-scanner/qr-scanner.min.js.map \ No newline at end of file diff --git a/camera/templates/index.html b/camera/templates/index.html index ce71419..be256b6 100644 --- a/camera/templates/index.html +++ b/camera/templates/index.html @@ -113,10 +113,11 @@ form label { -
@@ -125,9 +126,12 @@ form label { +