Browse Source

Tidy up auth logic in routes

pull/1455/head
Andrew Kingston 5 years ago
parent
commit
e29df9f45c
  1. 2
      packages/builder/src/components/login/LoginForm.svelte
  2. 7
      packages/builder/src/pages/_layout.svelte

2
packages/builder/src/components/login/LoginForm.svelte

@ -18,7 +18,7 @@
username, username,
password, password,
}) })
notifications.success("Logged in successfully.") notifications.success("Logged in successfully")
$goto("../portal") $goto("../portal")
} catch (err) { } catch (err) {
console.error(err) console.error(err)

7
packages/builder/src/pages/_layout.svelte

@ -8,12 +8,11 @@
onMount(async () => { onMount(async () => {
await admin.init() await admin.init()
await auth.checkAuth()
if (!$admin?.checklist?.adminUser) { if (!$admin?.checklist?.adminUser) {
$goto("./admin") $goto("./admin")
} else {
await auth.checkAuth()
checked = true
} }
checked = true
}) })
$: { $: {
@ -23,6 +22,6 @@
} }
</script> </script>
{#if $admin.checklist} {#if checked}
<slot /> <slot />
{/if} {/if}

Loading…
Cancel
Save