diff options
| author | Adam Soltys <[email protected]> | 2023-03-28 22:45:56 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-03-28 22:45:56 -0700 |
| commit | b51467da14e6a3def3ce12681b5222bf49484cd5 (patch) | |
| tree | 2d962032f97dd9def3f77a31e4786e6c37e70f55 /src | |
| parent | 7da52f0ce5465262bbd809e979edd245668cd0b6 (diff) | |
| download | coinos-ui-b51467da14e6a3def3ce12681b5222bf49484cd5.tar.gz coinos-ui-b51467da14e6a3def3ce12681b5222bf49484cd5.zip | |
prettier
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/samples.js | 2 | ||||
| -rw-r--r-- | src/lib/translations/lang.json | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/+layout.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/payments/[...page]/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/reset/+server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/admin/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/payment/[id]/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/send/invoice/[id]/+page.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/send/invoice/[id]/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/support/+page.svelte | 34 | ||||
| -rw-r--r-- | src/routes/(static)/docs/+page.svelte | 6 |
12 files changed, 32 insertions, 34 deletions
diff --git a/src/lib/samples.js b/src/lib/samples.js index 159ecf6c..14d9e4e0 100644 --- a/src/lib/samples.js +++ b/src/lib/samples.js @@ -40,5 +40,5 @@ export default { "received":0 "created":1677537428134 }`, - socketAuth: `echo '{"type":"login","data":{"username":"user","password":"password"}}' | websocat -n https://coinos.io/ws` + socketAuth: `echo '{"type":"login","data":{"username":"user","password":"password"}}' | websocat -n https://coinos.io/ws` }; diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json index fd25a359..cbf1ce4a 100644 --- a/src/lib/translations/lang.json +++ b/src/lib/translations/lang.json @@ -5,5 +5,5 @@ "de": "Deutsch", "pt": "Português", "zh": "中国人", - "fa": "فارسی " + "fa": "فارسی " } diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 6dfde23a..006bbf72 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -134,7 +134,7 @@ {/if} {#if user && user.username !== subject.username && subject.pubkey} - <div class="w-full flex"> + <div class="w-full flex"> <a href={`/${subject.username}/messages`} class="mx-auto"> <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> <div class="mx-auto flex"> diff --git a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte index c0b504f8..e93114cd 100644 --- a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte +++ b/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte @@ -93,7 +93,7 @@ }; $: currency = user?.currency || invoice.currency; - $: rate = invoice.rate * (rates[currency] / rates[invoice.currency]); + $: rate = invoice.rate * (rates[currency] / rates[invoice.currency]); $: tip = Math.round((amount / 100) * tipPercent); diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index 7756bd34..744b35ec 100644 --- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -148,10 +148,10 @@ <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4"> <div class="whitespace-nowrap my-auto"> <div class="font-bold" class:text-red-800={p.amount < 0}> - {f((Math.abs(p.amount)) * (p.rate / sats), p.currency)} + {f(Math.abs(p.amount) * (p.rate / sats), p.currency)} {#if p.tip} <span class="text-sm text-secondary"> - +{Math.round(p.tip/Math.abs(p.amount) * 100)}% + +{Math.round((p.tip / Math.abs(p.amount)) * 100)}% </span> {/if} </div> diff --git a/src/routes/(app)/[username]/reset/+server.js b/src/routes/(app)/[username]/reset/+server.js index 73d3d849..52fff367 100644 --- a/src/routes/(app)/[username]/reset/+server.js +++ b/src/routes/(app)/[username]/reset/+server.js @@ -4,7 +4,7 @@ import { auth, post } from '$lib/utils'; export async function POST({ cookies, request, params }) { let { username } = params; let r = await request.json(); - let { password } = r; + let { password } = r; let result = await post('/reset', { password, username }, auth(cookies)); return json(result); } diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte index 831b0284..529d2f77 100644 --- a/src/routes/(app)/admin/+page.svelte +++ b/src/routes/(app)/admin/+page.svelte @@ -1,5 +1,5 @@ <script> - import { post } from "$lib/utils"; + import { post } from '$lib/utils'; export let data; let reset = (username) => post(`/${username}/reset`, { password }); let { users } = data; diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte index 8168208d..9e61cbd6 100644 --- a/src/routes/(app)/payment/[id]/+page.svelte +++ b/src/routes/(app)/payment/[id]/+page.svelte @@ -57,9 +57,9 @@ <span class="text-lg text-secondary">Tip</span> <div> {f(fiat(tip, rate), currency)} -({Math.round((tip * 100) / Math.abs(a))}%) + ({Math.round((tip * 100) / Math.abs(a))}%) <span class="text-secondary text-lg"> - ⚡️{s(tip)} + ⚡️{s(tip)} </span> </div> </div> diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js index 50e72d94..4cbbb03f 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.server.js +++ b/src/routes/(app)/send/invoice/[id]/+page.server.js @@ -7,7 +7,7 @@ export async function load({ params: { id }, parent, url }) { let { amount, address, - currency, + currency, hash, rate, prompt, diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte index d2471891..befbf019 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.svelte +++ b/src/routes/(app)/send/invoice/[id]/+page.svelte @@ -10,7 +10,7 @@ export let form; let { address, rate, payreq, recipient, tip, rates, user } = data; - let { currency } = user; + let { currency } = user; let amount = form?.amount || data.amount; let a, @@ -26,7 +26,7 @@ let loading; let submit = () => (loading = true); - $: rate = data.rate * (rates[user.currency] / rates[data.currency]); + $: rate = data.rate * (rates[user.currency] / rates[data.currency]); $: update(form); let update = () => { diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte index cdc9d25c..b2f82e89 100644 --- a/src/routes/(app)/support/+page.svelte +++ b/src/routes/(app)/support/+page.svelte @@ -15,33 +15,31 @@ let email; let message; let sent; - let recaptchaSiteKey = '6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM'; + let recaptchaSiteKey = '6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM'; let submit = (e) => { e.preventDefault(); grecaptcha.ready(() => { - grecaptcha - .execute(recaptchaSiteKey, { action: 'submit' }) - .then((token) => - post('/support', { username: user?.username, email, message, token }) - .then(() => (sent = true)) - .catch(() => fail('problem submitting')) - ); + grecaptcha.execute(recaptchaSiteKey, { action: 'submit' }).then((token) => + post('/support', { username: user?.username, email, message, token }) + .then(() => (sent = true)) + .catch(() => fail('problem submitting')) + ); }); }; onDestroy(() => { - const nodeBadge = document.querySelector('.grecaptcha-badge'); - if (nodeBadge) { - document.body.removeChild(nodeBadge.parentNode); - } + const nodeBadge = document.querySelector('.grecaptcha-badge'); + if (nodeBadge) { + document.body.removeChild(nodeBadge.parentNode); + } - const scriptSelector = - "script[src='https://www.google.com/recaptcha/api.js?render=" + recaptchaSiteKey + "']"; - const script = document.querySelector(scriptSelector); - if (script) { - script.remove(); - } + const scriptSelector = + "script[src='https://www.google.com/recaptcha/api.js?render=" + recaptchaSiteKey + "']"; + const script = document.querySelector(scriptSelector); + if (script) { + script.remove(); + } }); </script> diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte index a22e789a..b06636c2 100644 --- a/src/routes/(static)/docs/+page.svelte +++ b/src/routes/(static)/docs/+page.svelte @@ -63,9 +63,9 @@ <Code sample="invoice" /> - <p>Sample response</p> + <p>Sample response</p> <Code sample="invoiceResponse" /> - <p>You can check the <b>received</b> field to see how many satoshis have been paid so far</p> + <p>You can check the <b>received</b> field to see how many satoshis have been paid so far</p> <h2 class="text-2xl">GET /invoice/:hash</h2> <p class="text-secondary"> @@ -94,6 +94,6 @@ <h2 class="text-2xl">Websocket API</h2> <p class="text-secondary">Subscribe to real time rates and payments</p> - <div>Authenticate</div> + <div>Authenticate</div> <Code sample="socketAuth" /> </div> |
