diff options
| author | Adam Soltys <[email protected]> | 2024-01-03 20:20:10 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2024-01-03 20:20:10 -0800 |
| commit | 2de78ad3fe44cceacec0e1f096fea38da8ac3e1d (patch) | |
| tree | 133920dfc7d168dd0c72328356a7bf7b517c64c2 | |
| parent | 8d23c2500cdaf85bcb458c35544fe20b8830839c (diff) | |
| download | coinos-ui-2de78ad3fe44cceacec0e1f096fea38da8ac3e1d.tar.gz coinos-ui-2de78ad3fe44cceacec0e1f096fea38da8ac3e1d.zip | |
enable nfc
| -rw-r--r-- | src/routes/(app)/+layout.svelte | 32 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.server.js | 4 | ||||
| -rw-r--r-- | src/routes/(app)/send/invoice/[id]/+page.svelte | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 0480fd79..cb3e284d 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -55,22 +55,22 @@ let locktime = user && user.locktime ? user.locktime : 300; expireTimer = setTimeout(expirePin, locktime * 1000); - // if (window.NDEFReader) { - // try { - // $ndef = new NDEFReader(); - // await $ndef.scan(); - // - // $ndef.addEventListener('readingerror', (e) => { - // console.log('nfc error', e); - // }); - // - // $ndef.addEventListener('reading', ({ message, serialNumber }) => { - // goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`); - // }); - // } catch (error) { - // console.log('Argh! ' + error); - // } - // } + if (window.NDEFReader && user.nfc) { + try { + $ndef = new NDEFReader(); + await $ndef.scan(); + + $ndef.addEventListener('readingerror', (e) => { + console.log('nfc error', e); + }); + + $ndef.addEventListener('reading', ({ message, serialNumber }) => { + goto(`/send/${message}`); + }); + } catch (error) { + console.log('Argh! ' + error); + } + } } }); diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js index a6b0c54d..ef05be16 100644 --- a/src/routes/(app)/send/[...text]/+page.server.js +++ b/src/routes/(app)/send/[...text]/+page.server.js @@ -33,11 +33,11 @@ let parse = async (t, host) => { if (t.includes("/fund")) redirect(307, t.substring(t.indexOf("/fund"))); + // lightning + if (t.toLowerCase().startsWith("lightning:")) t = t.toLowerCase().replace("lightning:", ""); if (t.toLowerCase().startsWith("lnurl")) redirect(307, `/ln/${t}`); if (t.includes(":")) t = t.split(":")[1]; - // lightning - if (t.toLowerCase().startsWith("lightning:")) t = t.toLowerCase().replace("lightning:", ""); if (t.toLowerCase().startsWith("ln")) { try { ({ id } = await get(`/invoice/${t}`)); diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte index c2163a81..e857f717 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.svelte +++ b/src/routes/(app)/send/invoice/[id]/+page.svelte @@ -57,7 +57,7 @@ }; // onMount(async () => { - // if (browser && window.NDEFReader) { + // if (browser && window.NDEFReader && user.nfc) { // try { // let ndef = new NDEFReader(); // await ndef.scan(); |