@ozdao/prometheus-framework 0.2.243 → 0.2.245

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.243",
+  "version": "0.2.245",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/events/components/elements/ButtonCheck.vue

@@ -8,8 +8,8 @@
       <div class="zoom-ratio-wrapper" v-if="minZoomRatio !== undefined && maxZoomRatio !== undefined">
         <input type="range" :min="minZoomRatio" :max="maxZoomRatio" @input="setZoomRatio" />
       </div>
-      <Button @click="stopScan" class="stop-scan-button">Stop Scan</Button>
-      <Button v-if="isTorchAvailable" @click="toggleTorch" class="torch-button">
+      <Button @click="stopScan" class="bg-white t-black stop-scan-button">Stop Scan</Button>
+      <Button v-if="isTorchAvailable" @click="toggleTorch" class="bg-white torch-button">
         Toggle Torch
       </Button>
     </div>
@@ -43,6 +43,8 @@ onUnmounted(async () => {
   await stopScan()
 })
 
+const SCAN_TIMEOUT = 5000 // 5 секунд (можно изменить по вашему усмотрению)
+
 async function startScan() {
   try {
     const { camera } = await BarcodeScanner.checkPermissions()
@@ -54,7 +56,6 @@ async function startScan() {
     }
     document.querySelector('body')?.classList.add('barcode-scanner-active')
     document.querySelector('html')?.classList.add('barcode-scanner-active-html')
-    BarcodeScanner.hideBackground();
     isScanning.value = true
     await BarcodeScanner.addListener('barcodeScanned', async (result) => {
       if (!isProcessing.value) {
@@ -93,14 +94,22 @@ async function processBarcode(barcode) {
       throw new Error('Invalid barcode data')
     }
     console.log('barcode is', barcode)
+
     const response = await tickets.actions.update({ _id: barcode.rawValue, status: 'used', check: true })
     alert("Ticket checked. And it's all right!")
     emits('qrcodecheck')
+
+    // Устанавливаем таймаут перед следующим сканированием
+    setTimeout(() => {
+      isProcessing.value = false
+    }, SCAN_TIMEOUT)
+
   } catch (e) {
     console.error(e)
-    alert(`Ticket is not found, already used or deactivated!`)
-  } finally {
     isProcessing.value = false
+    alert(`Ticket is not found, already used or deactivated!`)
+    // Сбрасываем флаг isProcessing в случае ошибки, чтобы можно было попробовать снова
+    
   }
 }
 
@@ -122,7 +131,7 @@ async function toggleTorch() {
   left: 0;
   width: 100%;
   height: 100%;
-  background-color: rgba(0, 0, 0, 0.8);
+  background-color: rgba(0, 0, 0, 0);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -147,15 +156,14 @@ async function toggleTorch() {
 }
 
 /* Existing styles */
-/*body.barcode-scanner-active {
+body.barcode-scanner-active {
   visibility: hidden !important;
   background: transparent !important;
   --background: transparent;
   --ion-background-color: transparent;
-  opacity: 0; 
-}*/
+}
 
-/*html.barcode-scanner-active-html {
+html.barcode-scanner-active-html {
   background: transparent !important;
-}*/
+}
 </style>

package/src/modules/events/components/elements/ButtonCheck1.vue

@@ -1,107 +0,0 @@
-<template>
-  <div>
-    <Button @click="startScan" class="bg-main button-small radius-extra button">
-      Check Tickets
-    </Button>
-    <div v-if="isScanning" class="barcode-scanner-modal">
-      <!-- Add any UI elements for the scanner here -->
-      <Button @click="stopScan" class="stop-scan-button">Stop Scan</Button>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, onMounted, onUnmounted } from 'vue'
-import { BarcodeScanner } from '@capacitor-mlkit/barcode-scanning'
-import Button from '@pf/src/components/Button/Button.vue'
-import * as tickets from '@pf/src/modules/events/store/tickets'
-
-const emits = defineEmits(['qrcodecheck'])
-const error = ref('')
-const isScanning = ref(false)
-
-onMounted(async () => {
-  const { supported } = await BarcodeScanner.isSupported()
-  if (!supported) {
-    error.value = 'Barcode scanning is not supported on this device'
-  }
-})
-
-onUnmounted(async () => {
-  await BarcodeScanner.removeAllListeners()
-})
-
-async function startScan() {
-  try {
-    const { camera } = await BarcodeScanner.checkPermissions()
-    if (camera !== 'granted') {
-      const { camera: newStatus } = await BarcodeScanner.requestPermissions()
-      if (newStatus !== 'granted') {
-        throw new Error('Camera permission is required to scan barcodes')
-      }
-    }
-
-    document.querySelector('body')?.classList.add('barcode-scanner-active')
-    isScanning.value = true
-
-    await BarcodeScanner.addListener('barcodeScanned', async (result) => {
-      await processBarcode(result.barcode)
-    })
-
-    await BarcodeScanner.startScan()
-  } catch (e) {
-    error.value = e.message
-    alert(`Error: ${error.value}`)
-  }
-}
-
-async function stopScan() {
-  try {
-    document.querySelector('body')?.classList.remove('barcode-scanner-active')
-    isScanning.value = false
-    await BarcodeScanner.stopScan()
-    await BarcodeScanner.removeAllListeners()
-  } catch (e) {
-    error.value = e.message
-    alert(`Error stopping scan: ${error.value}`)
-  }
-}
-
-async function processBarcode(barcode) {
-  try {
-    if (!barcode) {
-      throw new Error('Troubles with barcode reading')
-    }
-    const response = await tickets.actions.update({ _id: barcode, status: 'used', check: true })
-    alert("Ticket checked. And it's all right!")
-  } catch (e) {
-    alert(`Ticket is not found, already used or deactivated!`)
-  } finally {
-    emits('qrcodecheck')
-    await stopScan()
-  }
-}
-</script>
-
-<style scoped>
-.barcode-scanner-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.8);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.stop-scan-button {
-  position: absolute;
-  bottom: 20px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-/* Existing styles can stay unchanged */
-</style>

package/src/modules/events/components/elements/ButtonCheck2.vue

@@ -1,76 +0,0 @@
-<template>
-  <div>
-    <Button :submit="startScan" class="bg-main button-small radius-extra button">
-      Check Tickets
-    </Button>
-    <Popup
-      title="Scan QR Code"
-      @close-popup="closePublicationPopup"
-      :isPopupOpen="isPublicationPopup"
-      class="w-max-30r h-max-30r t-left pd-big bg-white radius-big"
-    >
-      <h3 class="mn-b-small">Scan QR Code</h3>
-      <div class="h-max">
-        <!-- Scanning will be handled by Capacitor, so we don't need a visual component here -->
-      </div>
-    </Popup>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import { BarcodeScanner } from '@capacitor-mlkit/barcode-scanning'
-import Popup from '@pf/src/components/Popup/Popup.vue'
-import Button from '@pf/src/components/Button/Button.vue'
-import * as tickets from '@pf/src/modules/events/store/tickets'
-
-const emits = defineEmits(['qrcodecheck'])
-const isPublicationPopup = ref(false)
-const error = ref('')
-
-function openPublicationPopup() {
-  isPublicationPopup.value = true
-}
-
-function closePublicationPopup() {
-  isPublicationPopup.value = false
-}
-
-async function startScan() {
-  openPublicationPopup()
-  
-  try {
-    await BarcodeScanner.isSupported()
-    const { barcodes } = await BarcodeScanner.scan()
-    
-    if (barcodes.length > 0) {
-      await processBarcode(barcodes[0].rawValue)
-    } else {
-      throw new Error('No barcode detected')
-    }
-  } catch (e) {
-    error.value = e.message
-    alert(`Error: ${error.value}`)
-  } finally {
-    closePublicationPopup()
-  }
-}
-
-async function processBarcode(qrcode) {
-  try {
-    if (!qrcode) {
-      throw new Error('Troubles with qrcode reading')
-    }
-    const response = await tickets.actions.update({ _id: qrcode, status: 'used', check: true })
-    alert("Ticket checked. And it's all right!")
-  } catch (e) {
-    alert(`Ticket is not found, already used or deactivated!`)
-  } finally {
-    emits('qrcodecheck')
-  }
-}
-</script>
-
-<style scoped>
-/* Existing styles can stay unchanged */
-</style>