From 56352a85fb3ec9e417026fa2067fe6c68afa9ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?=
 <kasper.rynning-tonnesen@knowit.no>
Date: Thu, 26 Mar 2020 16:02:00 +0100
Subject: [PATCH] Video stuff

---
 server.js                     |  4 +--
 src/ui/ScanToVinmonopolet.vue | 54 ++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/server.js b/server.js
index f727fd4..e70e07e 100644
--- a/server.js
+++ b/server.js
@@ -37,7 +37,7 @@ app.use(
       //vibrate: ["'none'"],
       payment: ["'none'"],
       microphone: ["'none'"],
-      camera: ["'none'"],
+      camera: ["'self'"],
       speaker: ["*"],
       syncXhr: ["'self'"]
       //notifications: ["'self'"]
@@ -102,4 +102,4 @@ app.use("/service-worker.js", function(req, res) {
   res.sendFile(path.join(__dirname, "public/sw/serviceWorker.js"));
 });
 
-server.listen(30030);
+server.listen(3000);
diff --git a/src/ui/ScanToVinmonopolet.vue b/src/ui/ScanToVinmonopolet.vue
index 5cbfdf6..ad676ac 100644
--- a/src/ui/ScanToVinmonopolet.vue
+++ b/src/ui/ScanToVinmonopolet.vue
@@ -6,63 +6,70 @@
 </template>
 
 <script>
-import { BrowserBarcodeReader } from '@zxing/library';
+import { BrowserBarcodeReader } from "@zxing/library";
 import { barcodeToVinmonopolet } from "@/api";
 
-export default {
+export default {
   name: "Scan to vinnopolet",
   data() {
     return {
       video: undefined,
       errorMessage: undefined
-    }
+    };
   },
   mounted() {
     if (navigator.mediaDevices == undefined) {
-      this.errorMessage = "Feil: Ingen kamera funnet."
-      return
+      this.errorMessage = "Feil: Ingen kamera funnet.";
+      return;
     }
 
     setTimeout(() => {
-      this.video = document.querySelector('video');
+      this.video = document.querySelector("video");
       this.scrollIntoView();
 
       const constraints = {
         audio: false,
         video: {
-          facingMode: { exact: "environment" }
+          facingMode: "environment"
         }
       };
 
-      navigator.mediaDevices.getUserMedia(constraints)
+      navigator.mediaDevices
+        .getUserMedia(constraints)
         .then(this.handleSuccess)
-        .catch(this.handleError)
-    }, 10)
+        .catch(this.handleError);
+    }, 10);
   },
   methods: {
     handleSuccess(stream) {
       this.video.classList.remove("hidden");
       this.video.srcObject = stream;
-      this.searchVideoForBarcode(this.video)
+      this.searchVideoForBarcode(this.video);
     },
     handleError(error) {
-      console.log('navigator.MediaDevices.getUserMedia error: ', error.message, error.name);
-      this.errorMessage = "Feil ved oppstart av kamera! Feilmelding: " + error.message
+      console.log(
+        "navigator.MediaDevices.getUserMedia error: ",
+        error.message,
+        error.name
+      );
+      this.errorMessage =
+        "Feil ved oppstart av kamera! Feilmelding: " + error.message;
     },
     searchVideoForBarcode(video) {
-      const codeReader = new BrowserBarcodeReader()
+      const codeReader = new BrowserBarcodeReader();
 
-      codeReader.decodeOnceFromVideoDevice(undefined, video)
+      codeReader
+        .decodeOnceFromVideoDevice(undefined, video)
         .then(result => {
-            barcodeToVinmonopolet(result.text)
-              .then(this.emitWineFromVinmonopolet)
-              .catch(this.catchVinmonopoletError)
-              .then(this.searchVideoForBarcode(video))
+          barcodeToVinmonopolet(result.text)
+            .then(this.emitWineFromVinmonopolet)
+            .catch(this.catchVinmonopoletError)
+            .then(this.searchVideoForBarcode(video));
         })
         .catch(err => console.error(err));
     },
     emitWineFromVinmonopolet(response) {
-      this.errorMessage = ""
+      this.errorMessage = "";
 
       this.$emit("wine", {
         name: response.name,
@@ -77,12 +84,13 @@ export default {
       this.errorMessage = "Feil! " + error.message || error;
     },
     scrollIntoView() {
-      window.scrollTo(0, 
+      window.scrollTo(
+        0,
         document.getElementById("addwine-title").offsetTop - 10
-      )
+      );
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>