diff --git a/package-lock.json b/package-lock.json index 6c5f486..b651be5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,11 +21,13 @@ "lucide-svelte": "^0.383.0", "mode-watcher": "^0.3.0", "paneforge": "^0.0.4", + "qrious": "^4.0.2", "svelte-sonner": "^0.3.24", "sveltekit-superforms": "^2.14.0", "tailwind-merge": "^2.3.0", "tailwind-variants": "^0.2.1", "vaul-svelte": "^0.3.1", + "webln": "^0.3.2", "zod": "^3.23.8" }, "devDependencies": { @@ -1235,6 +1237,14 @@ "tailwindcss": ">=3.0.0 || insiders" } }, + "node_modules/@types/chrome": { + "version": "0.0.74", + "resolved": "https://registry.npmjs.org/@types/chrome/-/chrome-0.0.74.tgz", + "integrity": "sha512-hzosS5CkQcIKCgxcsV2AzbJ36KNxG/Db2YEN/erEu7Boprg+KpMDLBQqKFmSo+JkQMGqRcicUyqCowJpuT+C6A==", + "dependencies": { + "@types/filesystem": "*" + } + }, "node_modules/@types/cookie": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", @@ -1245,6 +1255,19 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" }, + "node_modules/@types/filesystem": { + "version": "0.0.36", + "resolved": "https://registry.npmjs.org/@types/filesystem/-/filesystem-0.0.36.tgz", + "integrity": "sha512-vPDXOZuannb9FZdxgHnqSwAG/jvdGM8Wq+6N4D/d80z+D4HWH+bItqsZaVRQykAn6WEVeEkLm2oQigyHtgb0RA==", + "dependencies": { + "@types/filewriter": "*" + } + }, + "node_modules/@types/filewriter": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/@types/filewriter/-/filewriter-0.0.33.tgz", + "integrity": "sha512-xFU8ZXTw4gd358lb2jw25nxY9QAgqn2+bKKjKOYfNCzN4DKCFetK7sPtrlpg66Ywe3vWY9FNxprZawAh9wfJ3g==" + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -3306,6 +3329,11 @@ "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==", "optional": true }, + "node_modules/qrious": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz", + "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==" + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -4449,6 +4477,14 @@ "node": ">= 8" } }, + "node_modules/webln": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/webln/-/webln-0.3.2.tgz", + "integrity": "sha512-YYT83aOCLup2AmqvJdKtdeBTaZpjC6/JDMe8o6x1kbTYWwiwrtWHyO//PAsPixF3jwFsAkj5DmiceB6w/QSe7Q==", + "dependencies": { + "@types/chrome": "^0.0.74" + } + }, "node_modules/websocket": { "version": "1.0.35", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz", diff --git a/package.json b/package.json index fa4c5ef..fc24314 100644 --- a/package.json +++ b/package.json @@ -48,11 +48,13 @@ "lucide-svelte": "^0.383.0", "mode-watcher": "^0.3.0", "paneforge": "^0.0.4", + "qrious": "^4.0.2", "svelte-sonner": "^0.3.24", "sveltekit-superforms": "^2.14.0", "tailwind-merge": "^2.3.0", "tailwind-variants": "^0.2.1", "vaul-svelte": "^0.3.1", + "webln": "^0.3.2", "zod": "^3.23.8" } } diff --git a/src/components/AddProductToRocket.svelte b/src/components/AddProductToRocket.svelte index 475aa52..2662b9c 100644 --- a/src/components/AddProductToRocket.svelte +++ b/src/components/AddProductToRocket.svelte @@ -1,51 +1,92 @@ - Make Available for Purchase + Make Available for Purchase Make this product available to customers @@ -65,14 +106,24 @@ -
+
- +
- +
diff --git a/src/components/CreateNewProduct.svelte b/src/components/CreateNewProduct.svelte index 4b1affb..fa5ceb6 100644 --- a/src/components/CreateNewProduct.svelte +++ b/src/components/CreateNewProduct.svelte @@ -42,7 +42,7 @@ console.log(e.rawEvent()) e.publish().then((x) => { console.log(x); - //goto(`${base}/rockets/${getRocketURL(e)}`); + goto(`${base}/rockets/${getRocketURL(e)}`); }); } diff --git a/src/components/CreateNewRocket.svelte b/src/components/CreateNewRocket.svelte index f45e3e4..52af642 100644 --- a/src/components/CreateNewRocket.svelte +++ b/src/components/CreateNewRocket.svelte @@ -31,6 +31,8 @@ //todo validate d tag e.tags.push(["d", name]) e.tags.push(["ruleset", "334000"]) + e.tags.push(["ignition", "this"]) + e.tags.push(["parent", "this"]) e.publish().then((x)=>{ console.log(x) goto(`${base}/rockets/${getRocketURL(e)}`) diff --git a/src/components/PayNow.svelte b/src/components/PayNow.svelte index 0fe5ddf..aec83d3 100644 --- a/src/components/PayNow.svelte +++ b/src/components/PayNow.svelte @@ -1,31 +1,42 @@ Buy Now - Buy {product.getMatchingTags("name")[0][1]} from {rocket.dTag} now! + Buy {product.getMatchingTags('name')[0][1]} from {rocket.dTag} now! {#if !currentUser} @@ -37,9 +48,10 @@ {/if} Pay now with Lightning - - + + + test diff --git a/src/routes/rockets/[ignition]/+page.svelte b/src/routes/rockets/[ignition]/+page.svelte index 87becd7..6043e22 100644 --- a/src/routes/rockets/[ignition]/+page.svelte +++ b/src/routes/rockets/[ignition]/+page.svelte @@ -32,7 +32,7 @@ //warn user that this information is probably out of date and let them reroute to get the latest } - if (rIgnitionOrActual.length == 64 && rName && rPubkey) { + if (rName && rPubkey) { //the user wants the latest valid state of this rocket rocketEvents = $ndk.storeSubscribe( [{ '#d': [rName], authors: [rPubkey], kinds: [31108 as number] },