From a80fbe90d0fb7f82ea06a212ab304fd5062f10d2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Dec 2023 07:51:08 -0800 Subject: change pwa landing page to /start --- src/routes/start/+server.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/routes/start/+server.js (limited to 'src/routes/start/+server.js') diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js new file mode 100644 index 00000000..49474c36 --- /dev/null +++ b/src/routes/start/+server.js @@ -0,0 +1,13 @@ +import { auth, get } from "$lib/utils"; +import { redirect } from "@sveltejs/kit"; + +export async function GET({ cookies }) { + let token = cookies.get("token"); + let user; + if (token) { + user = await get("/me", auth(cookies)); + throw redirect(307, `/${user.username}`); + } + + throw redirect(307, "/"); +} -- cgit v1.2.3 From a81b289d4c05fdc95fce1e0764c3e49ab8d1c9c7 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Dec 2023 09:33:41 -0800 Subject: check user cookie --- src/routes/start/+server.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/routes/start/+server.js') diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js index 49474c36..872d9bcb 100644 --- a/src/routes/start/+server.js +++ b/src/routes/start/+server.js @@ -2,11 +2,9 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function GET({ cookies }) { - let token = cookies.get("token"); - let user; - if (token) { - user = await get("/me", auth(cookies)); - throw redirect(307, `/${user.username}`); + let token = cookies.get("user"); + if (user) { + throw redirect(307, `/${user}/receive`); } throw redirect(307, "/"); -- cgit v1.2.3 From 5933fe57b91f4a60ce934417fa967f6b0fa65cc0 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Dec 2023 09:35:16 -0800 Subject: fix --- src/routes/start/+server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/routes/start/+server.js') diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js index 872d9bcb..c351df70 100644 --- a/src/routes/start/+server.js +++ b/src/routes/start/+server.js @@ -2,7 +2,7 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function GET({ cookies }) { - let token = cookies.get("user"); + let user = cookies.get("user"); if (user) { throw redirect(307, `/${user}/receive`); } -- cgit v1.2.3 From 62a813a07abde15de106446e9eff15009922bd11 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 5 Dec 2023 09:44:31 -0800 Subject: username cookie --- src/routes/(app)/[username]/+layout.server.js | 7 ++++++- src/routes/start/+server.js | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/routes/start/+server.js') diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js index 0e962173..3b25b3b5 100644 --- a/src/routes/(app)/[username]/+layout.server.js +++ b/src/routes/(app)/[username]/+layout.server.js @@ -1,11 +1,16 @@ import { get } from "$lib/utils"; import { error } from "@sveltejs/kit"; -export let load = async ({ depends, params: { username } }) => { +export let load = async ({ cookies, depends, params: { username } }) => { depends("app:user"); try { let subject = await get(`/users/${username}`); + + let expires = new Date(); + expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60); + cookies.set("username", username, { path: "/", expires }); + return { subject }; } catch (e) { throw error(500, "Unable to retrieve user account data"); diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js index c351df70..e5d93497 100644 --- a/src/routes/start/+server.js +++ b/src/routes/start/+server.js @@ -2,9 +2,9 @@ import { auth, get } from "$lib/utils"; import { redirect } from "@sveltejs/kit"; export async function GET({ cookies }) { - let user = cookies.get("user"); - if (user) { - throw redirect(307, `/${user}/receive`); + let username = cookies.get("username"); + if (username) { + throw redirect(307, `/${username}/receive`); } throw redirect(307, "/"); -- cgit v1.2.3