diff options
| author | Adam Soltys <[email protected]> | 2022-12-20 22:30:25 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-12-20 22:30:25 -0800 |
| commit | 615ab1d9086a028b6208dc9100593fb4feb734b9 (patch) | |
| tree | 6d263156aa00242a509b8976869a6f4107eb14fe /src/routes/(app) | |
| parent | 268d71cb57ff19382ff8834ca3406dda2f79343e (diff) | |
| download | coinos-ui-615ab1d9086a028b6208dc9100593fb4feb734b9.tar.gz coinos-ui-615ab1d9086a028b6208dc9100593fb4feb734b9.zip | |
prettier
Diffstat (limited to 'src/routes/(app)')
| -rw-r--r-- | src/routes/(app)/[username]/+layout.server.js | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/+page.server.js | 1 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/+page.svelte | 21 | ||||
| -rw-r--r-- | src/routes/(app)/feed/+page.svelte | 6 | ||||
| -rw-r--r-- | src/routes/(app)/login/+page.server.js | 2 |
5 files changed, 13 insertions, 19 deletions
diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index 035536aa..a907f7de 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -5,7 +5,7 @@ export let load = async ({ params: { username } }) => { try { return { subject: await get(`/users/${username}`) }; } catch (e) { - if (username.length === 64) return { subject: { username }} + if (username.length === 64) return { subject: { username } }; throw error(500, 'Unable to retrieve user account data'); } }; diff --git a/src/routes/(app)/[username]/+page.server.js b/src/routes/(app)/[username]/+page.server.js index 25835d8a..01dfab5a 100644 --- a/src/routes/(app)/[username]/+page.server.js +++ b/src/routes/(app)/[username]/+page.server.js @@ -6,7 +6,6 @@ export async function load({ params, url }) { let text = `${encodeURI(username)}@${url.hostname}`; let src = Qr.drawImg(text, { size: 300 }); let events = []; - console.log("EV", events) try { events = await get(`/${username}/events`); diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte index e8cd2d10..78d84653 100644 --- a/src/routes/(app)/[username]/+page.svelte +++ b/src/routes/(app)/[username]/+page.svelte @@ -55,18 +55,17 @@ </a> </div> {/if} - {:else} - <div class="w-full flex"> - <a href={`/${subject.username}/request`} 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"> - <Icon icon="support" style="mr-1" /> - <div>{$t('transactions.sendMessage')}</div> - </div> - </button> - </a> - </div> {/if} + <div class="w-full flex"> + <a href={`/${subject.username}/message`} 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"> + <Icon icon="support" style="mr-1" /> + <div>{$t('transactions.sendMessage')}</div> + </div> + </button> + </a> + </div> </div> </div> diff --git a/src/routes/(app)/feed/+page.svelte b/src/routes/(app)/feed/+page.svelte index 2bbadc64..2a92ff57 100644 --- a/src/routes/(app)/feed/+page.svelte +++ b/src/routes/(app)/feed/+page.svelte @@ -9,14 +9,10 @@ $: sorted = Object.values($events) .filter((ev) => ev?.pubkey) .sort((a, b) => b.seen - a.seen); - - let w; </script> -<svelte:window bind:innerWidth={w} /> - <div class="mb-20"> <div class="container w-full mx-auto text-lg px-4 md:max-w-2xl space-y-5"> - <Feed events={sorted} /> + <Feed events={sorted} /> </div> </div> diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js index 7009996c..4c4a957e 100644 --- a/src/routes/(app)/login/+page.server.js +++ b/src/routes/(app)/login/+page.server.js @@ -3,7 +3,7 @@ import { login } from '$lib/utils'; export const load = async ({ parent }) => { let { user } = await parent(); - if (user) throw redirect(307, `/${user.username}/dashboard`); + if (user?.pubkey) throw redirect(307, `/${user.username}/dashboard`); }; export const actions = { |