diff options
Diffstat (limited to 'src/routes')
9 files changed, 22 insertions, 22 deletions
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte index 7d7958f1..9977cc76 100644 --- a/src/routes/(app)/[username]/receive/+page.svelte +++ b/src/routes/(app)/[username]/receive/+page.svelte @@ -39,7 +39,7 @@ $: refresh(data); let { invoice, id, subject, user, src } = data; let { - account_id, + aid, amount, hash, type, @@ -55,7 +55,7 @@ let refresh = async (data) => { ({ invoice, id, user, src } = data); ({ - account_id, + aid, amount, hash, type, @@ -235,7 +235,7 @@ </div> </div> - {#if account_id === user.id} + {#if aid === user.id} <div class="grid grid-cols-2 justify-around text-secondary"> <button class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center" diff --git a/src/routes/(app)/invoice/+page.server.ts b/src/routes/(app)/invoice/+page.server.ts index 98bbe8c3..7bac3f9b 100644 --- a/src/routes/(app)/invoice/+page.server.ts +++ b/src/routes/(app)/invoice/+page.server.ts @@ -3,18 +3,18 @@ import { error, redirect } from "@sveltejs/kit"; import type { Invoice } from "$lib/types"; export let load = async ({ cookies, parent }) => { - let account_id = cookies.get("account_id"); + let aid = cookies.get("aid"); let { subject, user, rates } = await parent(); let invoice: Invoice = { - account_id, + aid, rate: rates[user?.currency || subject?.currency], }; if (!user) user = subject; try { - invoice = await post("/invoice", { invoice, account_id, user }, auth(cookies)); + invoice = await post("/invoice", { invoice, aid, user }, auth(cookies)); } catch (e) { console.log(e); error(500, "Failed to generate invoice"); diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 321129a8..580456cd 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -40,7 +40,7 @@ $: refresh(data); let { invoice, id, subject, user, src } = data; let { - account_id, + aid, amount, hash, type, @@ -56,7 +56,7 @@ let refresh = async (data) => { ({ invoice, id, user, src } = data); ({ - account_id, + aid, amount, hash, type, @@ -236,7 +236,7 @@ </div> </div> - {#if account_id === user.id} + {#if aid === user.id} <div class="grid grid-cols-2 justify-around text-secondary"> <button class="hover:bg-primary my-auto flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center" diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte index e4510693..da2d041e 100644 --- a/src/routes/(app)/invoice/[id]/tip/+page.svelte +++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte @@ -59,7 +59,7 @@ $: refresh(data); let { invoice, id, user, rates } = data; let { - account_id, + aid, amount, hash, items, @@ -82,7 +82,7 @@ ({ invoice, id } = data); ({ - account_id, + aid, amount, hash, items, @@ -113,7 +113,7 @@ <div class="container px-4 max-w-lg text-center mx-auto"> <form method="POST" use:enhance class:invisible={submitting}> - <input type="hidden" name="account_id" value={account_id} /> + <input type="hidden" name="aid" value={aid} /> <input type="hidden" name="amount" value={amount} /> <input type="hidden" name="tip" value={tip} /> <input type="hidden" name="username" value={username} /> diff --git a/src/routes/(app)/logout/+page.server.ts b/src/routes/(app)/logout/+page.server.ts index 03dff6a8..374f244a 100644 --- a/src/routes/(app)/logout/+page.server.ts +++ b/src/routes/(app)/logout/+page.server.ts @@ -7,7 +7,7 @@ const opts = { export async function load({ cookies }) { let lang = cookies.get("lang"); - cookies.set("account_id", "", opts); + cookies.set("aid", "", opts); cookies.set("lang", "", opts); cookies.set("username", "", opts); cookies.set("token", "", opts); diff --git a/src/routes/(app)/payments/[...page]/+page.server.ts b/src/routes/(app)/payments/[...page]/+page.server.ts index 311d4435..f1818955 100644 --- a/src/routes/(app)/payments/[...page]/+page.server.ts +++ b/src/routes/(app)/payments/[...page]/+page.server.ts @@ -5,7 +5,7 @@ let limit = 25; export async function load({ cookies, depends, params }) { depends("app:payments"); - let account_id = cookies.get("account_id"); + let aid = cookies.get("aid"); let parts = params.page.split("/"); let start, end, page; @@ -17,7 +17,7 @@ export async function load({ cookies, depends, params }) { let offset = (page - 1) * limit; if (!start) start = Date.now() / 1000 - 24 * 60 * 60; - let url = `/payments?account_id=${account_id}&start=${ + let url = `/payments?aid=${aid}&start=${ start * 1000 }&limit=${limit}&offset=${offset}`; if (end) url += `&end=${end * 1000}`; diff --git a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts index d3b71d0a..a9b72787 100644 --- a/src/routes/(app)/send/bitcoin/[address]/+page.server.ts +++ b/src/routes/(app)/send/bitcoin/[address]/+page.server.ts @@ -1,7 +1,7 @@ import { auth, get } from "$lib/utils"; export async function load({ cookies }) { - let account_id = cookies.get("account_id"); - let { balance } = await get(`/account/${account_id}`, auth(cookies)); + let aid = cookies.get("aid"); + let { balance } = await get(`/account/${aid}`, auth(cookies)); return { balance }; } diff --git a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts index 6aee85b9..2b8fe37c 100644 --- a/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts +++ b/src/routes/(app)/send/bitcoin/[address]/[amount]/[...feeRate]/+page.server.ts @@ -2,16 +2,16 @@ import { fail, redirect } from "@sveltejs/kit"; import { auth, get, post, fd } from "$lib/utils"; export async function load({ params: { address, amount, feeRate }, cookies }) { - let account_id = cookies.get("account_id"); + let aid = cookies.get("aid"); try { let { fee, fees, inputs, ourfee, hex } = await post( "/bitcoin/fee", - { address, amount, feeRate, account_id }, + { address, amount, feeRate, aid }, auth(cookies) ); - let account = await get(`/account/${account_id}`, auth(cookies)); + let account = await get(`/account/${aid}`, auth(cookies)); return { account, diff --git a/src/routes/(app)/sent/+page.server.ts b/src/routes/(app)/sent/+page.server.ts index 9aeda733..a7c24fb8 100644 --- a/src/routes/(app)/sent/+page.server.ts +++ b/src/routes/(app)/sent/+page.server.ts @@ -1,7 +1,7 @@ import { get, auth } from "$lib/utils"; export let load = async ({ cookies }) => { - let account_id = cookies.get("account_id"); - let { payments } = await get(`/payments?account_id=${account_id}`, auth(cookies)); + let aid = cookies.get("aid"); + let { payments } = await get(`/payments?aid=${aid}`, auth(cookies)); return { payments }; }; |