From 0e47c928c3026a74e2dede3009b740d0b2141d2d Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 1 Nov 2022 13:33:14 -0700 Subject: prerender homepage --- src/routes/+layout.server.js | 3 +++ src/routes/+layout.svelte | 14 ++++++++------ src/routes/+page.server.js | 1 + src/routes/+page.svelte | 20 ++++++++++++++++++-- .../transactions/[...page]/+page.server.js | 2 +- src/routes/logout/+page.server.js | 2 +- src/routes/logout/done/+page.svelte | 9 --------- src/routes/scan/+page.svelte | 5 ++++- 8 files changed, 36 insertions(+), 20 deletions(-) delete mode 100644 src/routes/logout/done/+page.svelte (limited to 'src/routes') diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js index 6af13a06..6d1fc3e0 100644 --- a/src/routes/+layout.server.js +++ b/src/routes/+layout.server.js @@ -23,6 +23,9 @@ export async function load({ cookies, locals, request, url, params }) { if (user.username !== params.username) throw error(404, 'user not found'); } + if (['/login', '/register'].includes(url.pathname)) + throw redirect(307, `/${user.username}/dashboard`); + let account = user.accounts.find((a) => a.asset === btc && !a.pubkey); if (account) { let { id } = account; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 6b62ff4a..f1a81723 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,7 +2,7 @@ import { SvelteToast } from '@zerodevx/svelte-toast'; import '../app.css'; import { onDestroy, onMount } from 'svelte'; - import { connect, send } from '$lib/socket'; + import { close, connect, send } from '$lib/socket'; import { last, selectedRate, rate, user } from '$lib/store'; import { page } from '$app/stores'; import { browser } from '$app/environment'; @@ -25,6 +25,8 @@ $user = u; }; + $: $page.url.searchParams.get('logout') && close(); + $: $selectedRate = u && r * (rates[u.currency] / rates.USD); onMount(() => { @@ -59,11 +61,11 @@ coinos {/if} - {#if subject?.profile} - - {:else} - - {/if} + {#if subject?.profile} + + {:else} + + {/if} diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js index dd68c502..2c5d27db 100644 --- a/src/routes/+page.server.js +++ b/src/routes/+page.server.js @@ -1 +1,2 @@ +export const prerender = true; export let load = async ({ fetch }) => (await fetch('/locations')).json(); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 097278fb..e318ad3a 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -11,6 +11,8 @@ } from '$comp'; import { t } from '$lib/translations'; + import { close } from '$lib/socket'; + import { onMount } from 'svelte'; export let data; let { user } = data; @@ -27,8 +29,22 @@ ]; const faqIDs = ['cost', 'compatibility', 'safety']; + + onMount(async () => { + close(); + + try { + ({ locations } = await fetch('/locations').then((r) => r.json())); + } catch (e) { + console.log(e); + } + }); + + + +
@@ -76,9 +92,9 @@
-
+ {#if locations?.length} -
+ {/if}