From f7c1ad2b8eec0779409f4226685664b66fe93473 Mon Sep 17 00:00:00 2001 From: Alex <$(pass /github/email)> Date: Sun, 29 Sep 2024 21:26:48 +0200 Subject: [PATCH] add: Subscriptions receival --- frontend/src/hooks.server.js | 5 +++-- frontend/src/routes/+layout.js | 4 ++-- frontend/src/routes/+layout.server.js | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/hooks.server.js b/frontend/src/hooks.server.js index 6107f39..046ff59 100644 --- a/frontend/src/hooks.server.js +++ b/frontend/src/hooks.server.js @@ -27,7 +27,7 @@ export async function handle({ event, resolve }) { } // find the user based on the jwt - const userData = await response.json(); + const data = await response.json(); // Check if the server sent a new token const newToken = response.headers.get("Set-Cookie"); @@ -44,7 +44,8 @@ export async function handle({ event, resolve }) { } } - event.locals.user = userData; + event.locals.subscriptions = data.subscriptions; + event.locals.user = data.user; if (event.locals.user.date_of_birth) { event.locals.user.date_of_birth = event.locals.user.date_of_birth.split("T")[0]; diff --git a/frontend/src/routes/+layout.js b/frontend/src/routes/+layout.js index 88edb1d..4f93c98 100644 --- a/frontend/src/routes/+layout.js +++ b/frontend/src/routes/+layout.js @@ -1,5 +1,5 @@ /** @type {import('./$types').LayoutLoad} */ export async function load({ fetch, url, data }) { - const { user } = data; - return { fetch, url: url.pathname, user }; + const { user, subscriptions } = data; + return { fetch, url: url.pathname, user, subscriptions }; } diff --git a/frontend/src/routes/+layout.server.js b/frontend/src/routes/+layout.server.js index d76e6b4..256a373 100644 --- a/frontend/src/routes/+layout.server.js +++ b/frontend/src/routes/+layout.server.js @@ -2,5 +2,6 @@ export async function load({ locals }) { return { user: locals.user, + subscriptions: locals.subscriptions, }; }