aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2022-10-31 11:41:16 -0700
committerAdam Soltys <[email protected]>2022-10-31 11:41:16 -0700
commit59ccb2dd1763e31424ebf04f3fefb2ba4f82bdc2 (patch)
tree37f810ea95f4f1ea64d1b2edaa7b73990fad1992
parent9272a67b9841db5e6370ed0d76ee093085981cf3 (diff)
downloadcoinos-ui-59ccb2dd1763e31424ebf04f3fefb2ba4f82bdc2.tar.gz
coinos-ui-59ccb2dd1763e31424ebf04f3fefb2ba4f82bdc2.zip
prettier
-rw-r--r--docker-compose.yml12
-rw-r--r--src/components/Tip.svelte12
-rw-r--r--src/lib/socket.js2
-rw-r--r--src/routes/+layout.svelte8
-rw-r--r--src/routes/[username]/+page.svelte11
-rw-r--r--src/routes/[username]/receive/+page.svelte2
-rw-r--r--src/routes/[username]/settings/+page.svelte4
-rw-r--r--src/routes/[username]/transactions/[...page]/+page.server.js3
-rw-r--r--src/routes/[username]/transactions/[...page]/+page.svelte10
-rw-r--r--src/routes/scan/+page.svelte2
-rw-r--r--static/manifest.json30
-rw-r--r--static/manifest.webmanifest62
12 files changed, 81 insertions, 77 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index d6bd8700..ace944bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,13 +8,13 @@ services:
- '3121:3121'
environment:
NODE_ENV: production
- ORIGIN: "${ORIGIN}"
+ ORIGIN: '${ORIGIN}'
PORT: 3121
- PUBLIC_COINOS_URL: "${PUBLIC_COINOS_URL}"
- PUBLIC_BTC: "${PUBLIC_BTC}"
- PUBLIC_SOCKET: "${PUBLIC_SOCKET}"
- STRIPE: "${STRIPE}"
- LAUNCH: "${LAUNCH}"
+ PUBLIC_COINOS_URL: '${PUBLIC_COINOS_URL}'
+ PUBLIC_BTC: '${PUBLIC_BTC}'
+ PUBLIC_SOCKET: '${PUBLIC_SOCKET}'
+ STRIPE: '${STRIPE}'
+ LAUNCH: '${LAUNCH}'
extra_hosts:
- host.docker.internal:host-gateway
networks:
diff --git a/src/components/Tip.svelte b/src/components/Tip.svelte
index c915da80..7e2df7f4 100644
--- a/src/components/Tip.svelte
+++ b/src/components/Tip.svelte
@@ -6,7 +6,15 @@
import { tick } from 'svelte';
import { goto } from '$app/navigation';
- export let amountFiat, showMobileTip, tipPercent, tipAmount, amount, currency, tip, username, rate;
+ export let amountFiat,
+ showMobileTip,
+ tipPercent,
+ tipAmount,
+ amount,
+ currency,
+ tip,
+ username,
+ rate;
const tipAmounts = ['No thanks', '10%', '15%', '20%'];
let showCustomAmount;
@@ -150,7 +158,7 @@
on:input={(e) => handleCustomTipAmount(e)}
class="pl-10"
placeholder="Custom amount"
- autofocus
+ autofocus
/>
<button
type="submit"
diff --git a/src/lib/socket.js b/src/lib/socket.js
index 1ed90f0b..df20fdd8 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -16,7 +16,7 @@ export const send = (type, data) => {
export const messages = (data) => ({
rate() {
- last.set(Date.now());
+ last.set(Date.now());
rate.set(data);
},
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 1cdf2a69..11562264 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -41,7 +41,7 @@
let lost, timer;
let count = () => {
- lost = (Date.now() - $last) > 10000
+ lost = Date.now() - $last > 10000;
if (lost) connect(token);
send('heartbeat');
timer = setTimeout(count, 5000);
@@ -53,9 +53,9 @@
<SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
{#if lost}
-<div class="fixed bottom-12 right-12 text-red-600 bg-white z-50 px-4 py-2 rounded-full border">
- Lost connection to server, try refreshing
-</div>
+ <div class="fixed bottom-12 right-12 text-red-600 bg-white z-50 px-4 py-2 rounded-full border">
+ Lost connection to server, try refreshing
+ </div>
{/if}
<main data-sveltekit-prefetch>
diff --git a/src/routes/[username]/+page.svelte b/src/routes/[username]/+page.svelte
index 4dc4ee63..298af55b 100644
--- a/src/routes/[username]/+page.svelte
+++ b/src/routes/[username]/+page.svelte
@@ -75,15 +75,16 @@
class="cursor-pointer w-[292px] md:w-[342px] h-[342px] border border-lightgrey rounded-3xl flex p-5 justify-center items-center relative mx-auto"
/>
-
- <div
- class="bg-primary font-semibold rounded-xl text-sm p-3 flex justify-between items-center"
- >
+ <div class="bg-primary font-semibold rounded-xl text-sm p-3 flex justify-between items-center">
<span class="mx-auto">{lightningAddress}</span>
<button class="hover:opacity-80" on:click={() => copy(lightningAddress)}>
<Icon icon="copy" style="ml-2" />
</button>
</div>
- <p class="text-center">This is a re-usable <a href="https://lightningaddress.com/" class="underline" target="_blank">lightning address</a></p>
+ <p class="text-center">
+ This is a re-usable <a href="https://lightningaddress.com/" class="underline" target="_blank"
+ >lightning address</a
+ >
+ </p>
</div>
</div>
diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte
index 7425740a..3ae831c6 100644
--- a/src/routes/[username]/receive/+page.svelte
+++ b/src/routes/[username]/receive/+page.svelte
@@ -24,7 +24,7 @@
: 'opacity-100 hover:opacity-80'}"
disabled={!amount}
>
- Next
+ Next
</button>
</div>
</form>
diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte
index 1451846b..86705b1d 100644
--- a/src/routes/[username]/settings/+page.svelte
+++ b/src/routes/[username]/settings/+page.svelte
@@ -1,5 +1,5 @@
<script>
- import { onMount } from "svelte";
+ import { onMount } from 'svelte';
import { fly } from 'svelte/transition';
import { enhance } from '$app/forms';
import Account from './_account.svelte';
@@ -57,7 +57,7 @@
loading = false;
};
-let loaded;
+ let loaded;
onMount(() => setTimeout(() => (loaded = true), 50));
</script>
diff --git a/src/routes/[username]/transactions/[...page]/+page.server.js b/src/routes/[username]/transactions/[...page]/+page.server.js
index 1151d412..c484909c 100644
--- a/src/routes/[username]/transactions/[...page]/+page.server.js
+++ b/src/routes/[username]/transactions/[...page]/+page.server.js
@@ -11,7 +11,7 @@ export async function load({ cookies, params, request }) {
if (parts.length === 3) [start, end, page] = parts;
if (!parseInt(page)) page = 1;
- let offset = (page-1) * limit;
+ let offset = (page - 1) * limit;
let url = `/payments?v2=true&limit=${limit}&offset=${offset}`;
if (start) url += `&start=${start}`;
@@ -20,6 +20,5 @@ export async function load({ cookies, params, request }) {
let { total, transactions } = await get(url, auth(cookies));
let pages = new Array(Math.ceil(total / limit));
-
return { total, transactions, page, pages, start, end };
}
diff --git a/src/routes/[username]/transactions/[...page]/+page.svelte b/src/routes/[username]/transactions/[...page]/+page.svelte
index 71314e88..dd58509a 100644
--- a/src/routes/[username]/transactions/[...page]/+page.svelte
+++ b/src/routes/[username]/transactions/[...page]/+page.svelte
@@ -34,8 +34,8 @@
$: $page && ($newPayment = false);
$: $newPayment && invalidate(`/users/${user.username}`);
- $: path = $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/'));
- $: console.log(path)
+ $: path = $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/'));
+ $: console.log(path);
let csv = () => {
const keys = ['hash', 'updatedAt', 'rate', 'currency', 'amount', 'fee', 'tip'];
@@ -100,11 +100,7 @@
<div class="flex flex-wrap justify-center mb-8">
{#if pages.length > 1}
{#each pages as _, i}
- <a
- class="mr-1 last:mr-0"
- href={`${path}/${i + 1}`}
- class:active={parseInt(p) === i + 1}
- >
+ <a class="mr-1 last:mr-0" href={`${path}/${i + 1}`} class:active={parseInt(p) === i + 1}>
<div class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center">
{i + 1}
</div>
diff --git a/src/routes/scan/+page.svelte b/src/routes/scan/+page.svelte
index 79dbe7b0..13053d7e 100644
--- a/src/routes/scan/+page.svelte
+++ b/src/routes/scan/+page.svelte
@@ -7,7 +7,7 @@
let scanner, vid;
onMount(() => {
- scanner = new QrScanner(vid, ({ data }) => goto(`/send/${data}`), {
+ scanner = new QrScanner(vid, ({ data }) => goto(`/send/${data}`), {
highlightScanRegion: true,
highlightCodeOutline: true
});
diff --git a/static/manifest.json b/static/manifest.json
index ba1383ab..3ce34fb8 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -1,17 +1,17 @@
{
- "short_name": "coinos",
- "name": "coinos",
- "icons": [
- {
- "src": "/icons/coinos.png",
- "type": "image/webp",
- "sizes": "1024x1024",
- "purpose": "any maskable"
- }
- ],
- "start_url": "/",
- "background_color": "#000000",
- "display": "standalone",
- "scope": "/",
- "theme_color": "#000000"
+ "short_name": "coinos",
+ "name": "coinos",
+ "icons": [
+ {
+ "src": "/icons/coinos.png",
+ "type": "image/webp",
+ "sizes": "1024x1024",
+ "purpose": "any maskable"
+ }
+ ],
+ "start_url": "/",
+ "background_color": "#000000",
+ "display": "standalone",
+ "scope": "/",
+ "theme_color": "#000000"
}
diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest
index de84394a..f77d93c7 100644
--- a/static/manifest.webmanifest
+++ b/static/manifest.webmanifest
@@ -1,32 +1,32 @@
{
- "theme_color": "#fff",
- "background_color": "#000",
- "display": "fullscreen",
- "scope": "/",
- "start_url": "/",
- "name": "Coinos",
- "description": "Bitcoin web wallet",
- "short_name": "Coinos",
- "icons": [
- {
- "src": "/icon-192x192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "/icon-256x256.png",
- "sizes": "256x256",
- "type": "image/png"
- },
- {
- "src": "/icon-384x384.png",
- "sizes": "384x384",
- "type": "image/png"
- },
- {
- "src": "/icon-512x512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ]
-} \ No newline at end of file
+ "theme_color": "#fff",
+ "background_color": "#000",
+ "display": "fullscreen",
+ "scope": "/",
+ "start_url": "/",
+ "name": "Coinos",
+ "description": "Bitcoin web wallet",
+ "short_name": "Coinos",
+ "icons": [
+ {
+ "src": "/icon-192x192.png",
+ "sizes": "192x192",
+ "type": "image/png"
+ },
+ {
+ "src": "/icon-256x256.png",
+ "sizes": "256x256",
+ "type": "image/png"
+ },
+ {
+ "src": "/icon-384x384.png",
+ "sizes": "384x384",
+ "type": "image/png"
+ },
+ {
+ "src": "/icon-512x512.png",
+ "sizes": "512x512",
+ "type": "image/png"
+ }
+ ]
+}