rename pay route

9 files changed, 18 insertions, 16 deletions

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 731f0260..6f68c41a 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -132,7 +132,7 @@
                 {/each}
               </ul>
               <hr class="my-4" />
-              <a href="/"
+              <a href="/?stay=true"
                 ><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a
               >
             </div>
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index d750e86c..5752491b 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -152,7 +152,7 @@
       {#if !subject.anon && subject.username !== user?.username && !subject.hidepay}
         <a
           href={user
-            ? `/send/${subject.username}`
+            ? `/pay/${subject.username}`
             : `/${subject.username}/receive`}
           class="contents"
           id="payButton"
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js
index f8e271f9..d173594a 100644
--- a/src/routes/(app)/[username]/address/+page.server.js
+++ b/src/routes/(app)/[username]/address/+page.server.js
@@ -5,6 +5,6 @@ export async function load({ cookies, params, parent }) {
   let user = (await parent()).subject;
   let rates = await get("/rates");
   let invoice = { type: "bitcoin" };
-  let { hash } = await post(`/invoice`, { invoice, user }, auth(cookies));
-  redirect(307, `/${user.username}/invoice/${hash}`);
+  let { id } = await post(`/invoice`, { invoice, user }, auth(cookies));
+  redirect(307, `/${user.username}/invoice/${id}`);
 }
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/pay/[username]/[...amount]/+page.server.js
index 884e3eee..884e3eee 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.server.js
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
index e9273647..ab8a3add 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
@@ -15,7 +15,7 @@
   export let form;
 
   let { subject, rate, rates, user } = data;
-  let currency = user.currency || subject.currency || "USD";
+  let currency = user?.currency || subject?.currency || "USD";
   let next;
 
   let amount = form?.amount || data.amount;
@@ -25,25 +25,25 @@
     hash,
     amountFiat = 0;
 
-  $: r = rate || rates[user.currency || subject.currency];
+  $: r = rate || rates[user?.currency || subject?.currency];
 
   let setAmount = async () => {
     amount = a;
     amountFiat = parseFloat(af).toFixed(2);
     rate = fiat ? (sats * amountFiat) / amount : r;
 
-    ({ hash } = await post(`/${subject.username}/invoice`, {
+    let id;
+    ({ id, hash } = await post(`/${subject.username}/invoice`, {
       invoice: {
         amount,
-        hash: "internal",
         rate: rates[subject.currency],
         prompt: subject.prompt,
-        type: "internal",
+        type: "lightning",
       },
       user: subject,
     }));
 
-    goto(`/${subject.username}/invoice/${hash}`);
+    goto(`/${subject.username}/invoice/${id}`);
   };
 
   let loading;
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index 061eb35f..3e8623eb 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -53,7 +53,7 @@ let parse = async (t, host) => {
       redirect(307, r);
     }
 
-    if (user) redirect(307, `/send/${user.username}`);
+    if (user) redirect(307, `/pay/${user.username}`);
     else if (id) redirect(307, `/send/${id}`);
   }
 
@@ -63,7 +63,7 @@ let parse = async (t, host) => {
     if (user.anon) user = null;
   } catch (e) {}
 
-  if (user) redirect(307, `/send/user/${t}`);
+  if (user) redirect(307, `/pay/${t}`);
 
   let fund;
   try {
@@ -78,7 +78,7 @@ let parse = async (t, host) => {
     invoice = await get(`/invoice/${t}`);
   } catch (e) {}
 
-  if (invoice) redirect(307, `/send/invoice/${invoice.hash}`);
+  if (invoice) redirect(307, `/send/invoice/${invoice.id}`);
 };
 
 export async function load({ cookies, params, request, url }) {
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 71db4e55..f9267105 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -93,7 +93,7 @@
       </h1>
       <div>
         {#each contacts as c}
-          <a href={`/send/${c.username}`}>
+          <a href={`/pay/${c.username}`}>
             <div
               class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl"
             >
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index 5d1688fc..aebac694 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -40,6 +40,7 @@ export let load = async ({ cookies, request, url }) => {
     host,
     pathname,
     i18n: { locale, route: pathname },
+    user,
     translations: translations.get(),
   };
 };
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index 904e543d..f22ddff1 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -1,4 +1,5 @@
-// export const prerender = true;
-export let load = async () => {
+import { redirect } from "@sveltejs/kit";
+
+export let load = async ({ parent, url }) => {
   return { faqs: ["cost", "compatibility", "safety", "pos", "bitcoin"] };
 };