From 268d71cb57ff19382ff8834ca3406dda2f79343e Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 20 Dec 2022 17:41:40 -0800 Subject: new profile page --- src/routes/(app)/[username]/+layout.server.js | 1 + src/routes/(app)/[username]/+page.server.js | 15 +++- src/routes/(app)/[username]/+page.svelte | 105 ++++++++++++-------------- src/routes/(app)/feed/+page.svelte | 42 +---------- 4 files changed, 66 insertions(+), 97 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index a352fe45..035536aa 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -5,6 +5,7 @@ export let load = async ({ params: { username } }) => { try { return { subject: await get(`/users/${username}`) }; } catch (e) { + 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 1d07a1db..25835d8a 100644 --- a/src/routes/(app)/[username]/+page.server.js +++ b/src/routes/(app)/[username]/+page.server.js @@ -1,7 +1,18 @@ +import { get } from '$lib/utils'; import Qr from 'qrcode-base64'; export async function load({ params, url }) { - let text = `${encodeURI(params.username)}@${url.hostname}`; + let { username } = params; + let text = `${encodeURI(username)}@${url.hostname}`; let src = Qr.drawImg(text, { size: 300 }); - return { src, text }; + let events = []; + console.log("EV", events) + + try { + events = await get(`/${username}/events`); + } catch (e) { + console.log(e); + } + + return { events, src, text }; } diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte index 42e3dd3a..e8cd2d10 100644 --- a/src/routes/(app)/[username]/+page.svelte +++ b/src/routes/(app)/[username]/+page.svelte @@ -1,83 +1,78 @@ -
-
-

{subject.username}

+
+