diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/Account.svelte | 8 | ||||
| -rw-r--r-- | src/components/AppHeader.svelte | 10 | ||||
| -rw-r--r-- | src/locales/en.json | 6 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/+layout.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/receive/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/invoice/[id]/+page.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/receive/[...token]/+page.svelte | 12 | ||||
| -rw-r--r-- | src/routes/(app)/send/[...text]/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/settings/[...tab]/_pos.svelte | 23 |
9 files changed, 23 insertions, 46 deletions
diff --git a/src/components/Account.svelte b/src/components/Account.svelte index d4a89556..458f67c6 100644 --- a/src/components/Account.svelte +++ b/src/components/Account.svelte @@ -14,7 +14,7 @@ </script> <a href={`/payments`} class="block" on:click={setAccount}> - <div class="p-8 space-y-5 bg-primary rounded-2xl border"> + <div class="py-4 px-2 space-y-5 bg-primary rounded-2xl border"> <div class="flex"> <Balance {balance} {user} {rate} /> {#if seed} @@ -26,10 +26,10 @@ {/if} </div> - <div class="flex flex-wrap gap-1 justify-center w-full text-xl"> + <div class="flex gap-1 justify-center w-full text-xl"> <a href={`/invoice`} class="contents" on:click={setAccount}> <button - class="rounded-2xl border py-5 px-6 hover:opacity-80 flex grow bg-white" + class="rounded-2xl border py-5 px-4 hover:opacity-80 flex grow bg-white" > <div class="mx-auto flex gap-2"> <Icon icon="receive" style="w-8" /> @@ -40,7 +40,7 @@ <a href={`/scan`} class="contents" on:click={setAccount}> <button - class="rounded-2xl border py-5 px-6 hover:opacity-80 flex shrink bg-white" + class="rounded-2xl border py-5 px-4 hover:opacity-80 flex shrink bg-white" > <div class="mx-auto flex gap-2"> <Icon icon="camera" style="w-8" /> diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index b777e0b5..cc521e93 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -19,11 +19,11 @@ }, { key: "nav.support", icon: "support", href: `/support` }, { key: "nav.map", icon: "map", href: `/map` }, - { - key: "nav.messages", - icon: "message", - href: `/messages`, - }, + // { + // key: "nav.messages", + // icon: "message", + // href: `/messages`, + // }, { key: "nav.merch", icon: "shop", href: `https://coinosmerch.com` }, { key: "nav.signOut", icon: "logout", href: `/logout` }, ]; diff --git a/src/locales/en.json b/src/locales/en.json index 1d875536..35a75db2 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -167,7 +167,7 @@ "messages": "Messages", "funds": "Funds", "map": "Map", - "merch": "Swag", + "merch": "Shop", "profile": "Profile", "startInSeconds": "Start in Seconds", "account": "Account", @@ -333,8 +333,8 @@ "mint": "Mint", "ecash": "Ecash", "memo": "Notes", - "voucherText": "Enter an ecash or lnurlw code", - "createEcash": "Mint e-cash", + "voucherText": "Enter an ecash token or lnurlw code", + "createEcash": "Mint ecash", "tips": "Tips", "options": "options", "bump": "Bump fee", diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index 111fdeb6..7046b7cd 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -82,7 +82,7 @@ <div class="container mx-auto w-full px-4 flex flex-wrap lg:flex-nowrap"> <div class="hidden lg:block lg:w-[280px] xl:w-[360px]" /> <div - class="w-full lg:w-[280px] xl:w-[360px] lg:absolute space-y-5 left-20 mx-auto mb-5" + class="w-full lg:w-[280px] xl:w-[360px] lg:absolute space-y-2 left-20 mx-auto" > <button type="button" on:click={toggleDetails} class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"> <div class="my-auto break-words">{display || username}</div> diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte index 9977cc76..11587211 100644 --- a/src/routes/(app)/[username]/receive/+page.svelte +++ b/src/routes/(app)/[username]/receive/+page.svelte @@ -275,7 +275,7 @@ class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center" > <img src="/images/cash.png" class="w-8 my-auto" /> - <div class="my-auto text-lg">E-cash</div> + <div class="my-auto text-lg">Ecash</div> </button> </a> {/if} diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 580456cd..5ef9e5e5 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -276,7 +276,7 @@ class="hover:bg-primary flex gap-1 sm:gap-2 py-3 px-2 sm:px-5 justify-center" > <img src="/images/cash.png" class="w-8 my-auto" /> - <div class="my-auto text-lg">E-cash</div> + <div class="my-auto text-lg">Ecash</div> </button> </a> {/if} diff --git a/src/routes/(app)/receive/[...token]/+page.svelte b/src/routes/(app)/receive/[...token]/+page.svelte index 7ff93fa9..988c1e6c 100644 --- a/src/routes/(app)/receive/[...token]/+page.svelte +++ b/src/routes/(app)/receive/[...token]/+page.svelte @@ -31,7 +31,7 @@ <div class="container px-4 max-w-lg mx-auto space-y-5 mt-20"> <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold"> - {$t("payments.voucher")} + {$t("user.dashboard.receive")} </h1> <form method="POST" use:enhance class="space-y-2 text-xl"> @@ -51,7 +51,7 @@ name="text" placeholder={$t("payments.voucherText")} on:keypress={keypress} - class="w-full p-4 border rounded-xl h-48 text-xl" + class="w-full p-4 border rounded-xl h-32 text-xl" bind:value={text} on:paste={() => (pasted = true)} autocapitalize="none" @@ -62,19 +62,19 @@ <a href="/scan" class="w-full"> <button type="button" - class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center" + class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-1" > - <Icon icon="camera" style="mr-2 w-6 my-auto" /> + <Icon icon="camera" style="w-8 my-auto" /> <div class="my-auto">{$t("user.send.scan")}</div> </button> </a> <button type="button" - class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center" + class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-1" on:click={paste} > - <Icon icon="paste" style="mr-2 w-6 my-auto" /> + <Icon icon="paste" style="w-8 my-auto" /> <div class="my-auto">{$t("user.send.paste")}</div> </button> </div> diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte index be7fc664..faa4a766 100644 --- a/src/routes/(app)/send/[...text]/+page.svelte +++ b/src/routes/(app)/send/[...text]/+page.svelte @@ -63,7 +63,7 @@ <a href="/scan" class="w-full"> <button type="button" - class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2" + class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-2" > <Icon icon="camera" style="w-8 my-auto" /> <div class="my-auto">{$t("user.send.scan")}</div> @@ -72,7 +72,7 @@ <button type="button" - class="flex border rounded-2xl px-6 py-5 font-bold hover:opacity-80 w-full bg-primary justify-center gap-2" + class="flex border rounded-2xl px-5 py-4 hover:opacity-80 w-full justify-center gap-2" on:click={paste} > <Icon icon="paste" style="w-8 my-auto" /> diff --git a/src/routes/(app)/settings/[...tab]/_pos.svelte b/src/routes/(app)/settings/[...tab]/_pos.svelte index 6a1c92a1..dcfcbe44 100644 --- a/src/routes/(app)/settings/[...tab]/_pos.svelte +++ b/src/routes/(app)/settings/[...tab]/_pos.svelte @@ -63,17 +63,6 @@ </div> <div> - <label for="memoPrompt" class="font-bold mb-1 block" - >{$t("user.settings.memoPrompt")}</label - > - <textarea - name="memoPrompt" - placeholder={$t("user.settings.memoPromptPlaceholder")} - bind:value={user.memoPrompt} - /> -</div> - -<div> <div class="flex justify-between items-center"> <span class="font-bold">{$t("user.settings.notifications")}</span> <Toggle id="notify" bind:value={user.notify} /> @@ -95,18 +84,6 @@ <div> <div class="flex justify-between items-center"> - <span class="font-bold">{$t("user.settings.publishNip5")}</span> - <Toggle id="nip5" bind:value={user.nip5} /> - </div> - <p class="text-secondary mt-1 w-9/12"> - {$t("user.settings.nip5a")} - <span class="font-bold">{user.username}@{$page.url.host}</span> - {$t("user.settings.nip5b")} - </p> -</div> - -<div> - <div class="flex justify-between items-center"> <span class="font-bold">{$t("user.settings.autoWithdraw")}</span> <Toggle id="autowithdraw" bind:value={user.autowithdraw} /> </div> |