From 13ded49a1934f9afa171de440c82629c5818eac3 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 9 Nov 2022 23:57:21 -0800 Subject: camera button in menu --- src/routes/(app)/+layout.server.js | 12 ++++++++---- src/routes/(app)/[username]/+layout.server.js | 11 ++++++++--- src/routes/(app)/scan/+page.svelte | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src/routes/(app)') diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js index ee4c257e..64ebc3e2 100644 --- a/src/routes/(app)/+layout.server.js +++ b/src/routes/(app)/+layout.server.js @@ -7,8 +7,9 @@ export const { PUBLIC_BTC: btc } = env; export async function load({ cookies, locals, request, url, params }) { url.pathname; let token = cookies.get('token'); - let rates; - let subject; + let rate, + rates = { USD: 1 }, + subject; let { user } = locals; if (user) { @@ -21,8 +22,11 @@ export async function load({ cookies, locals, request, url, params }) { } } - let rate = await get('/rate'); - rates = await get('/rates'); + try { + rate = await get('/rate'); + rates = await get('/rates'); + } catch (e) { + } return { subject, user, token, rate, rates }; } diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index e875b5e6..a352fe45 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -1,5 +1,10 @@ import { get } from '$lib/utils'; +import { error } from '@sveltejs/kit'; -export let load = async ({ params: { username } }) => ({ - subject: await get(`/users/${username}`) -}); +export let load = async ({ params: { username } }) => { + try { + return { subject: await get(`/users/${username}`) }; + } catch (e) { + throw error(500, 'Unable to retrieve user account data'); + } +}; diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte index 4e06e1b5..9c96f1ae 100644 --- a/src/routes/(app)/scan/+page.svelte +++ b/src/routes/(app)/scan/+page.svelte @@ -25,7 +25,7 @@
-- cgit v1.2.3