diff --git a/client/src/components/qrCodeScanner.tsx b/client/src/components/qrCodeScanner.tsx index 83573b533..1539df63e 100644 --- a/client/src/components/qrCodeScanner.tsx +++ b/client/src/components/qrCodeScanner.tsx @@ -13,12 +13,12 @@ const QRCodeScannerModal: React.FC = () => { const onScan = (result: string) => { // Check for the spoolman ID format - const match = result.match(/^web\+spoolman:s-(?[0-9]+)$/); + const match = result.match(/^web\+spoolman:s-(?[0-9]+)$/i); if (match && match.groups) { setVisible(false); navigate(`/spool/show/${match.groups.id}`); } - const fullURLmatch = result.match(/^https?:\/\/[^/]+\/spool\/show\/(?[0-9]+)$/); + const fullURLmatch = result.match(/^https?:\/\/[^/]+\/spool\/show\/(?[0-9]+)$/i); if (fullURLmatch && fullURLmatch.groups) { setVisible(false); navigate(`/spool/show/${fullURLmatch.groups.id}`); diff --git a/client/src/pages/printing/qrCodePrintingDialog.tsx b/client/src/pages/printing/qrCodePrintingDialog.tsx index bea241d10..6cef67966 100644 --- a/client/src/pages/printing/qrCodePrintingDialog.tsx +++ b/client/src/pages/printing/qrCodePrintingDialog.tsx @@ -110,7 +110,7 @@ const QRCodePrintingDialog: React.FC = ({ - {useHTTPUrl ? `${baseUrlRoot}/spool/show/{id}` : `web+spoolman:s-{id}`} + {useHTTPUrl ? `${baseUrlRoot}/spool/show/{id}` : `WEB+SPOOLMAN:S-{id}`} )} diff --git a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx index 5c91db75e..3e145b300 100644 --- a/client/src/pages/printing/spoolQrCodePrintingDialog.tsx +++ b/client/src/pages/printing/spoolQrCodePrintingDialog.tsx @@ -300,7 +300,7 @@ Spool Weight: {filament.spool_weight} g } items={items.map((spool) => ({ - value: useHTTPUrl ? `${baseUrlRoot}/spool/show/${spool.id}` : `web+spoolman:s-${spool.id}`, + value: useHTTPUrl ? `${baseUrlRoot}/spool/show/${spool.id}` : `WEB+SPOOLMAN:S-${spool.id}`, label: (