aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/parse.ts7
-rw-r--r--src/routes/(app)/+layout.svelte47
-rw-r--r--src/routes/(app)/[username]/+layout.svelte48
-rw-r--r--src/routes/(app)/invoice/[id]/+layout.server.ts1
-rw-r--r--src/routes/(app)/invoice/[id]/paid/+page.svelte2
-rw-r--r--src/routes/(app)/send/bitcoin/[address]/+page.svelte6
-rw-r--r--src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte10
-rw-r--r--src/routes/(app)/send/invoice/[id]/+page.server.ts2
-rw-r--r--src/routes/(app)/send/invoice/[id]/+page.svelte4
-rw-r--r--src/routes/(app)/settings/[...tab]/+page.svelte6
10 files changed, 4 insertions, 129 deletions
diff --git a/src/lib/parse.ts b/src/lib/parse.ts
index 6995f207..5bf5ffb0 100644
--- a/src/lib/parse.ts
+++ b/src/lib/parse.ts
@@ -45,16 +45,9 @@ export default async (t, host) => {
// bitcoin
if (validate(t) || isLiquid(t)) {
- try {
- ({ id, user } = await get(`/invoice/${t}`));
- } catch (e) {
let r = `/send/bitcoin/${t}`;
if (amount) r += "/" + amount;
redirect(307, r);
- }
-
- if (user) redirect(307, `/pay/${user.username}`);
- else if (id) redirect(307, `/send/${id}`);
}
if (t.startsWith("cashu")) {
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 05ca0d0c..db14b046 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -23,17 +23,6 @@
export let data;
- onNavigate((navigation) => {
- if (!document.startViewTransition) return;
-
- return new Promise((resolve) => {
- document.startViewTransition(async () => {
- resolve();
- await navigation.complete;
- });
- });
- });
-
let { generate, rate, user, subject, token, rates } = data;
$: update(data);
@@ -124,39 +113,3 @@
{#if $invoice}
<Invoice {user} />
{/if}
-
-<style>
- @keyframes fade-in {
- from {
- opacity: 0;
- }
- }
-
- @keyframes fade-out {
- to {
- opacity: 0;
- }
- }
-
- @keyframes slide-from-right {
- from {
- transform: translateX(60px);
- }
- }
-
- @keyframes slide-to-left {
- to {
- transform: translateX(-60px);
- }
- }
-
- :root::view-transition-old(root) {
- animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
- 180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
- }
-
- :root::view-transition-new(root) {
- animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
- 180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
- }
-</style>
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index 98569f59..ce152831 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,17 +1,5 @@
<script>
- import { onNavigate } from "$app/navigation";
export let data;
-
- onNavigate((navigation) => {
- if (!document.startViewTransition) return;
-
- return new Promise((resolve) => {
- document.startViewTransition(async () => {
- resolve();
- await navigation.complete;
- });
- });
- });
</script>
<div class="content">
@@ -19,39 +7,3 @@
</div>
<slot name="fixed" />
-
-<style>
- @keyframes fade-in {
- from {
- opacity: 0;
- }
- }
-
- @keyframes fade-out {
- to {
- opacity: 0;
- }
- }
-
- @keyframes slide-from-right {
- from {
- transform: translateX(60px);
- }
- }
-
- @keyframes slide-to-left {
- to {
- transform: translateX(-60px);
- }
- }
-
- :root::view-transition-old(root) {
- animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
- 180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
- }
-
- :root::view-transition-new(root) {
- animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
- 180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
- }
-</style>
diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index 71f53e09..a00515a0 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -16,6 +16,7 @@ export async function load({ depends, params, url, parent }) {
!(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
!options
) {
+ console.log("YO")
redirect(307, `/send/invoice/${id}`);
}
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte
index df05f12b..80d5fe6e 100644
--- a/src/routes/(app)/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte
@@ -76,7 +76,7 @@
{/if}
</div>
-<a href={`/receive`}>
+<a href={`/`}>
<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
</a>
diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
index b656dc06..6b938c38 100644
--- a/src/routes/(app)/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/+page.svelte
@@ -24,12 +24,6 @@
};
</script>
-<a href="/send">
- <button type="button" class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
- <Icon icon="arrow-left" style="w-10" />
- </button>
-</a>
-
<div class="container px-4 max-w-xl mx-auto space-y-5 text-center">
<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t("payments.send")}</h1>
diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
index 1267a992..0630948c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.svelte
@@ -55,6 +55,7 @@
let key = child.derive(path);
let { privateKey, publicKey } = key;
let address = btc.getAddress("wpkh", privateKey, network);
+ console.log("ADDR", address)
tx.signIdx(privateKey, i);
}
tx.finalize();
@@ -112,15 +113,6 @@
let goBack = () => goto(`/send/bitcoin/${address}`);
</script>
-<button
- type="button"
- class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80"
- data-sveltekit-preload-data="false"
- on:click={goBack}
->
- <Icon icon="arrow-left" style="w-10" />
-</button>
-
<div
class="container px-4 max-w-xl mx-auto space-y-5 text-center no-transition"
>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.ts b/src/routes/(app)/send/invoice/[id]/+page.server.ts
index fa7d28dd..c31bcd7b 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.ts
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.ts
@@ -12,7 +12,7 @@ export async function load({ params: { id }, parent }) {
if (invoice.memoPrompt && invoice.memo === null)
redirect(307, `/invoice/${id}/memo`);
- if (invoice.user.username === user?.username)
+ if (invoice.account === user?.id)
error(500, { message: "Cannot send to self" });
if (!user) redirect(307, `/invoice/${id}`);
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 75e4e75a..4348e473 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -93,10 +93,6 @@
// });
</script>
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
- <Icon icon="arrow-left" style="w-10" />
-</button>
-
{#if form?.message}
<div class="text-red-600 text-center">
{form.message}
diff --git a/src/routes/(app)/settings/[...tab]/+page.svelte b/src/routes/(app)/settings/[...tab]/+page.svelte
index 7f4dc87e..df66dbd0 100644
--- a/src/routes/(app)/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/settings/[...tab]/+page.svelte
@@ -249,9 +249,3 @@
</button>
</div>
</form>
-
-<style>
- .settings {
- view-transition-name: settings;
- }
-</style>