6 Commits

Author SHA1 Message Date
4d572b55ca 0.6.8
All checks were successful
Deploy to Production / deploy (push) Successful in 13s
2026-02-28 17:51:40 +00:00
9822cab93e feat: restore QR code detection overlay in custom QrScanner 2026-02-28 17:50:29 +00:00
9409bd3e21 0.6.7
All checks were successful
Deploy to Production / deploy (push) Successful in 14s
2026-02-28 17:46:21 +00:00
346ded460a chore: remove wasm file from repo and add to gitignore 2026-02-28 17:45:21 +00:00
170539a62f 0.6.6
All checks were successful
Deploy to Production / deploy (push) Successful in 13s
2026-02-28 17:41:06 +00:00
cfc1785863 chore: cleanup unused code in QrScanner and remove vue-qrcode-reader dependency 2026-02-28 17:40:42 +00:00
5 changed files with 110 additions and 13 deletions

1
.gitignore vendored
View File

@@ -11,6 +11,7 @@ node_modules
dist dist
dist-ssr dist-ssr
*.local *.local
public/wasm
# Editor directories and files # Editor directories and files
.vscode/* .vscode/*

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "tools-app", "name": "tools-app",
"version": "0.6.5", "version": "0.6.8",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "tools-app", "name": "tools-app",
"version": "0.6.5", "version": "0.6.8",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"barcode-detector": "^3.1.0", "barcode-detector": "^3.1.0",

View File

@@ -1,7 +1,7 @@
{ {
"name": "tools-app", "name": "tools-app",
"private": true, "private": true,
"version": "0.6.5", "version": "0.6.8",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

Binary file not shown.

View File

@@ -19,6 +19,99 @@ let stream = null
let scanRafId = null let scanRafId = null
let barcodeDetector = null let barcodeDetector = null
const overlayCanvas = ref(null)
const paintDetections = (codes) => {
const canvas = overlayCanvas.value
const video = videoRef.value
if (!canvas || !video) return
const ctx = canvas.getContext('2d')
const { width, height } = canvas.getBoundingClientRect()
// Update canvas size if needed (to match CSS size)
if (canvas.width !== width || canvas.height !== height) {
canvas.width = width
canvas.height = height
}
ctx.clearRect(0, 0, width, height)
if (!codes || codes.length === 0) return
const vw = video.videoWidth
const vh = video.videoHeight
if (!vw || !vh) return
// Calculate object-fit: cover scaling
const videoRatio = vw / vh
const canvasRatio = width / height
let drawWidth, drawHeight, startX, startY
if (canvasRatio > videoRatio) {
// Canvas is wider than video (video cropped top/bottom)
drawWidth = width
drawHeight = width / videoRatio
startX = 0
startY = (height - drawHeight) / 2
} else {
// Canvas is taller than video (video cropped left/right)
drawHeight = height
drawWidth = height * videoRatio
startY = 0
startX = (width - drawWidth) / 2
}
const scale = drawWidth / vw
const isMirrored = isFront.value
// Styles
const styles = getComputedStyle(document.documentElement)
const accent = styles.getPropertyValue('--primary-accent').trim() || '#00f2fe'
ctx.lineWidth = 4
ctx.strokeStyle = accent
ctx.fillStyle = accent
codes.forEach(code => {
const points = code.cornerPoints
if (!points || points.length < 4) return
ctx.beginPath()
const transform = (p) => {
let x = p.x * scale + startX
let y = p.y * scale + startY
if (isMirrored) {
x = width - x
}
return { x, y }
}
const p0 = transform(points[0])
ctx.moveTo(p0.x, p0.y)
for (let i = 1; i < points.length; i++) {
const p = transform(points[i])
ctx.lineTo(p.x, p.y)
}
ctx.closePath()
ctx.stroke()
// Draw corners
points.forEach(p => {
const tp = transform(p)
ctx.beginPath()
ctx.arc(tp.x, tp.y, 4, 0, Math.PI * 2)
ctx.fill()
})
})
}
const updateVideoAspect = () => { const updateVideoAspect = () => {
if (videoRef.value && videoRef.value.videoWidth && videoRef.value.videoHeight) { if (videoRef.value && videoRef.value.videoWidth && videoRef.value.videoHeight) {
videoAspect.value = videoRef.value.videoWidth / videoRef.value.videoHeight videoAspect.value = videoRef.value.videoWidth / videoRef.value.videoHeight
@@ -142,6 +235,7 @@ const detectLoop = async () => {
try { try {
const codes = await barcodeDetector.detect(videoRef.value) const codes = await barcodeDetector.detect(videoRef.value)
paintDetections(codes)
if (codes.length > 0) { if (codes.length > 0) {
onDetect(codes) onDetect(codes)
} }
@@ -228,20 +322,10 @@ const onDetect = (detectedCodes) => {
processCodes(validCodes) processCodes(validCodes)
} }
const onCameraOn = async () => {} // Removed
const ensureFrontMirror = () => {} // Removed
const startFrontMirrorObserver = () => {} // Removed
const stopFrontMirrorObserver = () => {} // Removed
watch(facingMode, () => { watch(facingMode, () => {
startScan() startScan()
}) })
const paintDetections = () => {} // Removed, we don't paint detections on video anymore (too complex without overlay canvas)
const onError = (err) => { const onError = (err) => {
if (err.name === 'NotAllowedError') { if (err.name === 'NotAllowedError') {
error.value = 'Camera permission denied' error.value = 'Camera permission denied'
@@ -394,6 +478,8 @@ const isUrl = (string) => {
muted muted
></video> ></video>
<canvas ref="overlayCanvas" class="scan-overlay-canvas"></canvas>
<div v-if="error" class="error-overlay"> <div v-if="error" class="error-overlay">
<p>{{ error }}</p> <p>{{ error }}</p>
<button @click="startScan" class="retry-btn">Retry</button> <button @click="startScan" class="retry-btn">Retry</button>
@@ -550,6 +636,16 @@ const isUrl = (string) => {
transform: scaleX(-1); transform: scaleX(-1);
} }
.scan-overlay-canvas {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
pointer-events: none;
z-index: 5;
}
/* front mirror canvas removed */ /* front mirror canvas removed */
.error-overlay { .error-overlay {