From 59b74034e6dac850f13eafb737034937505d321f Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 4 Oct 2022 22:12:34 -0700 Subject: fix wide screen avatar position --- src/components/AppHeader.svelte | 7 ++++++- src/routes/+layout.server.js | 1 + src/routes/[username]/settings/+page.svelte | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index dc266abc..caf7aafc 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -7,9 +7,14 @@ import { page } from '$app/stores'; export let data; - export let avatarPosition = 'left-[calc(50vw-64px)] bottom-[-64px]'; + export let avatarPosition = 'left-[calc(50vw-64px)] md:left-[calc(15vw-48px)] bottom-[-64px]'; let { subject, user } = data; + $: update(data); + let update = (data) => ({ subject, user } = data); + + $: updateUser(user); + let updateUser = () => console.log("USER", user); const menuButtons = [ { stringID: 'nav.dashboard', icon: 'dash', goto: 'dashboard' }, diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js index 84e5ce5c..e9b01593 100644 --- a/src/routes/+layout.server.js +++ b/src/routes/+layout.server.js @@ -18,6 +18,7 @@ export async function load({ cookies, request, url, params }) { if (token && token !== 'undefined') { try { + console.log("GETTING USER"); user = await get('/me', auth(cookies)); } catch (e) { throw redirect(307, '/logout'); diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte index abad0ee7..05531f9f 100644 --- a/src/routes/[username]/settings/+page.svelte +++ b/src/routes/[username]/settings/+page.svelte @@ -10,11 +10,11 @@ import { avatarUpload, bannerUpload } from '$lib/store'; import { upload } from '$lib/upload'; - export let data; + export let data, form; let { user, rates, token } = data; $: update(data); - let update = () => ({ user, rates } = data); + let update = () => ({ user, rates, token } = data); let tab = 'account'; -- cgit v1.2.3