api proxy

5 files changed, 26 insertions, 30 deletions

diff --git a/src/components/AppForm.svelte b/src/components/AppForm.svelte
index 86338a11..295fd6b6 100644
--- a/src/components/AppForm.svelte
+++ b/src/components/AppForm.svelte
@@ -57,7 +57,7 @@
 
   let del = async () => {
     try {
-      await post(`/post/apps/delete`, { pubkey });
+      await post(`/api/apps/delete`, { pubkey });
       goto("/settings/nostr");
     } catch (e: any) {
       fail(e.message);
diff --git a/src/components/Event.svelte b/src/components/Event.svelte
index c08bd452..eef48868 100644
--- a/src/components/Event.svelte
+++ b/src/components/Event.svelte
@@ -21,11 +21,11 @@
       const body = new FormData();
 
       if (!user) return goto(`/register?redirect=${$page.url.pathname}`);
-      let request = await post("/post/zapRequest", { amount, id });
-      let { pr: payreq } = await post("/post/zap", {
+      let request = await post("/api/zapRequest", { amount, id });
+      let { pr: payreq } = await post("/api/zap", {
         event: await sign(request),
       });
-      await post("/post/payments", { amount, payreq });
+      await post("/api/payments", { amount, payreq });
     } catch (e: any) {
       console.log(e);
       fail(e.message);
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index eee43621..10f5d8f3 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -255,12 +255,19 @@
   <div class="space-y-5 w-full">
     <div class="text-center">
       <div class="text-5xl md:text-6xl font-semibold tracking-widest flex justify-center">
-        <div class="my-auto" class:text-5xl={!fiat}>
-          <span class:hidden={!fiat}>
+        <button
+          type="button"
+          class="my-auto cursor-pointer select-none"
+          class:text-5xl={!fiat}
+          aria-label="Swap currency display"
+          onclick={(e) => { e.preventDefault(); e.stopPropagation(); swap(); }}
+        >
+          {#if fiat}
             {#if position === "before"}{symbol}{/if}
-          </span>
-          <PhLightningFill width="48" class="text-yellow-300" />
-        </div>
+          {:else}
+            <PhLightningFill width="48" class="text-yellow-300" />
+          {/if}
+        </button>
 
         <!-- contenteditable input -->
         <div
@@ -287,26 +294,15 @@
           bind:this={element}
         ></div>
 
-        {#if fiat && position === "after"}{symbol}{/if}
+        {#if fiat && position === "after"}
+          <button
+            type="button"
+            class="cursor-pointer select-none"
+            aria-label="Swap currency display"
+            onclick={(e) => { e.preventDefault(); e.stopPropagation(); swap(); }}
+          >{symbol}</button>
+        {/if}
       </div>
-
-      <!-- swap button -->
-      <button
-        type="button"
-        class="flex items-center justify-center text-2xl cursor-pointer mx-auto select-none"
-        aria-label="Swap currency display"
-        onclick={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          swap();
-        }}
-      >
-        <span class="flex items-center" class:hidden={!fiat}>
-          <PhLightningFill width="48" class="text-yellow-300" />
-          {s(amount, locale)}
-        </span>
-        <span class:hidden={fiat}>{f(amountFiat, currency, locale)}</span>
-      </button>
     </div>
 
     <div class="grid grid-cols-3 gap-2 w-full mx-auto">
diff --git a/src/components/Password.svelte b/src/components/Password.svelte
index ab1b7d9d..7651d5a1 100644
--- a/src/components/Password.svelte
+++ b/src/components/Password.svelte
@@ -13,7 +13,7 @@
   let submit = async (e) => {
     e.preventDefault();
     try {
-      let res = await post("/password", { password });
+      let res = await post("/api/password", { password });
       $passwordPrompt = false;
       $pw = password;
     } catch (e) {
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index da0c6aeb..c8ead368 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -27,7 +27,7 @@
     if (p?.length !== 6) return;
     let result;
     try {
-      result = await post("/pin", { pin: hashPin(p) });
+      result = await post("/api/pin", { pin: hashPin(p) });
     } catch (e) {
       console.log("Pin check failed", e);
     }