diff options
author | Marius David Wieschollek <passwords.public@mdns.eu> | 2020-12-30 00:59:21 +0300 |
---|---|---|
committer | Marius David Wieschollek <passwords.public@mdns.eu> | 2020-12-30 00:59:21 +0300 |
commit | a5979be913c36716db4d1f885420afb7ce6f1c29 (patch) | |
tree | 1cfd1abcb4fe04da4f5af95c4d46e7e787b991ac /src/vue | |
parent | 93479ed2eb5c170138cdf61e4aa0152aea616483 (diff) |
Fix Firefox Android issues
Signed-off-by: Marius David Wieschollek <passwords.public@mdns.eu>
Diffstat (limited to 'src/vue')
-rw-r--r-- | src/vue/Components/Passlink/Action/ScanQr.vue | 60 |
1 files changed, 37 insertions, 23 deletions
diff --git a/src/vue/Components/Passlink/Action/ScanQr.vue b/src/vue/Components/Passlink/Action/ScanQr.vue index 69091ad..fd6c23f 100644 --- a/src/vue/Components/Passlink/Action/ScanQr.vue +++ b/src/vue/Components/Passlink/Action/ScanQr.vue @@ -1,19 +1,19 @@ <template> <div class="passlink-scan-qr"> <translate class="scan-instructions" say="PasslinkScanInstructions"/> - <qrcode-stream :torch="true" class="qr-code-scanner" @decode="checkQrCode" @init="onInit"/> + <qrcode-stream :torch="false" class="qr-code-scanner" @decode="checkQrCode" @init="onInit"/> <translate class="scan-status" :say="status"/> </div> </template> <script> - import {QrcodeCapture, QrcodeDropZone, QrcodeStream} from 'vue-qrcode-reader'; + import {QrcodeStream} from 'vue-qrcode-reader'; import Translate from '@vue/Components/Translate'; import Passlink from '@js/App/Passlink'; import ErrorManager from '@js/Manager/ErrorManager'; export default { - components: {Translate, QrcodeStream, QrcodeDropZone, QrcodeCapture}, + components: {Translate, QrcodeStream}, data() { return { @@ -33,9 +33,11 @@ } }, async onInit(promise) { + alert(Promise.toSource()); try { await promise; } catch(error) { + ErrorManager.logError(error); this.status = `Qr${error.name}`; } } @@ -44,28 +46,40 @@ </script> <style lang="scss"> - .passlink-scan-qr { - .qr-code-scanner { - max-width : 640px; - max-height : 640px; - width : 90vw; - height : 90vw; - margin : 0 auto; - } +.passlink-scan-qr { + .qr-code-scanner { + max-width : 640px; + max-height : 640px; + width : 90vw; + height : 90vw; + margin : 0 auto; + } - .scan-status, - .scan-instructions { - max-width : 640px; - width : 90vw; - margin : 1rem auto; - font-weight : bold; - text-align : center; - display : block; - } + .scan-status, + .scan-instructions { + max-width : 640px; + width : 90vw; + margin : 1rem auto; + font-weight : bold; + text-align : center; + display : block; + } - .scan-status { - margin : 1rem auto; - font-weight : normal; + .scan-status { + margin : 1rem auto; + font-weight : normal; + } +} + +body.mobile { + .passlink-scan-qr { + display : flex; + flex-direction : column; + height : 100vh; + + .qr-code-scanner { + flex-grow : 1; } } +} </style>
\ No newline at end of file |