diff options
| author | Adam Soltys <[email protected]> | 2022-09-27 11:50:35 -0700 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2022-09-27 11:50:35 -0700 |
| commit | 1754ccd174e9f66e1ec04a1eb71b307e8108f8f3 (patch) | |
| tree | da68d25270d4d3710453e3fbce8fd4fa8ed47084 | |
| parent | 0a784689a171fc5455a8a82e63feba241ba29174 (diff) | |
| download | coinos-ui-1754ccd174e9f66e1ec04a1eb71b307e8108f8f3.tar.gz coinos-ui-1754ccd174e9f66e1ec04a1eb71b307e8108f8f3.zip | |
launch page redirects
| -rw-r--r-- | src/components/RegisterOrLogin.svelte | 8 | ||||
| -rw-r--r-- | src/routes/+layout.server.js | 2 | ||||
| -rw-r--r-- | src/routes/launch/+page.svelte | 1 | ||||
| -rw-r--r-- | src/routes/register/+page.server.js | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index b40700ad..88fe62e6 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -1,4 +1,5 @@ <script> + import { browser } from "$app/environment"; import { page } from '$app/stores'; import { tick } from 'svelte'; import { Icon } from '$comp'; @@ -22,9 +23,12 @@ signIn: '/login' }[pageID]; - $: if ($user) goto(`/${username}/receive`); + // TODO: move to server side + $: if (browser && $user) goto(`/${$user.username}/receive`); - let focus = (el) => setTimeout(() => el.focus()); + let focus = (el) => setTimeout(() => el.focus()); + + console.log("REDIRECT STORE", $redirect) </script> <div class="pt-10"> diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js index 77ca7eaa..3ebf8be2 100644 --- a/src/routes/+layout.server.js +++ b/src/routes/+layout.server.js @@ -19,7 +19,7 @@ export async function load({ request, setHeaders, url, params }) { try { user = await get('/me', { accept: 'application/json', authorization: `Bearer ${token}` }); } catch (e) { - throw redirect(301, '/logout'); + throw redirect(307, '/logout'); } if (protectedRoutes.find((p) => url.pathname.match(p))) { diff --git a/src/routes/launch/+page.svelte b/src/routes/launch/+page.svelte index ee788101..599d981a 100644 --- a/src/routes/launch/+page.svelte +++ b/src/routes/launch/+page.svelte @@ -5,6 +5,7 @@ let { user } = data; $: link = user ? '/launch/purchase' : '/register'; $redirect = '/launch/purchase'; + console.log("set redirect", $redirect) </script> <div class="flex mt-20 px-8"> diff --git a/src/routes/register/+page.server.js b/src/routes/register/+page.server.js index f337a5ea..4f34f403 100644 --- a/src/routes/register/+page.server.js +++ b/src/routes/register/+page.server.js @@ -3,7 +3,10 @@ import { post, login } from '$lib/utils'; export async function POST({ request, setHeaders }) { let form = Object.fromEntries(await request.formData()); let { username, password, redirect } = form; - await post('/register', { user: { username, password } }); + + console.log("REDIRECT", redirect); + let user = { username, password }; + await post('/register', { user }); await login(user, setHeaders); return { location: redirect || `/${user.username}/dashboard` }; |