brian/wanderer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

front end fixes

Browse Source
This commit is contained in:
Christian Beutel
2025-03-17 02:09:00 +01:00
parent 07ff8807fe
commit d23444c799
36 changed files with 328 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/routes/api/v1/auth/oauth/+server.ts
View File

@@ -12,10 +12,10 @@ export async function GET(event: RequestEvent) {
try {
const r = await pb.collection('users').listAuthMethods();
for (const provider of r.authProviders) {
for (const provider of r.oauth2.providers) {
const imageURL = `${env.PUBLIC_POCKETBASE_URL}/_/images/oauth2/${provider.name}.svg`
provider['img' as keyof typeof provider] = await imageUrlToBase64(imageURL, event.fetch);
provider['url' as keyof typeof provider] = `${provider.authUrl}${redirectURL}`
provider['url' as keyof typeof provider] = `${provider.authURL}${redirectURL}`
}
return json(r)
} catch (e: any) {

2
web/src/routes/api/v1/files/[collection]/[record]/[file]/+server.ts
View File

@@ -21,7 +21,7 @@ export async function GET(event: RequestEvent) {
parts.push(encodeURIComponent(safeParams.data.record));
parts.push(encodeURIComponent(safeParams.data.file));
let fileURL = pb.buildUrl(parts.join("/"));
let fileURL = pb.buildURL(parts.join("/"));
try {
const r = await event.fetch(fileURL)

2
web/src/routes/api/v1/list/+server.ts
View File

@@ -8,7 +8,7 @@ export async function GET(event: RequestEvent) {
try {
const r = await list<List>(event, Collection.lists);
for (const t of r.items) {
if (!t.author || !pb.authStore.model) {
if (!t.author || !pb.authStore.record) {
continue;
}
if (!t.expand) {

2
web/src/routes/api/v1/summit-log/+server.ts
View File

@@ -9,7 +9,7 @@ export async function GET(event: RequestEvent) {
const r = await list<SummitLog>(event, Collection.summit_logs);
for (const t of r.items) {
if (!t.author || !pb.authStore.model) {
if (!t.author || !pb.authStore.record) {
continue;
}
if (!t.expand) {

2
web/src/routes/api/v1/trail/+server.ts
View File

@@ -9,7 +9,7 @@ export async function GET(event: RequestEvent) {
const r = await list<Trail>(event, Collection.trails);
for (const t of r.items) {
if (!t.author || !pb.authStore.model) {
if (!t.author || !pb.authStore.record) {
continue;
}
if (!t.expand) {

2
web/src/routes/api/v1/trail/[id]/+server.ts
View File

@@ -8,7 +8,7 @@ export async function GET(event: RequestEvent) {
try {
const r = await show<Trail>(event, Collection.trails)
if (pb.authStore.model) {
if (pb.authStore.record) {
if (!r.expand) {
r.expand = {} as any
}

4
web/src/routes/api/v1/trail/bounding-box/+server.ts
View File

@@ -4,7 +4,7 @@ import { handleError } from '$lib/util/api_util';
import { error, json, type RequestEvent } from '@sveltejs/kit';
export async function GET(event: RequestEvent) {
if (!pb.authStore.model) {
if (!pb.authStore.record) {
return json({
max_lat: 0,
min_lat: 0,
@@ -13,7 +13,7 @@ export async function GET(event: RequestEvent) {
});
}
try {
const r = await pb.collection('trails_bounding_box').getOne<TrailBoundingBox>(pb.authStore.model!.id)
const r = await pb.collection('trails_bounding_box').getOne<TrailBoundingBox>(pb.authStore.record!.id)
return json(r)
} catch (e: any) {
throw handleError(e);

4
web/src/routes/api/v1/trail/filter/+server.ts
View File

@@ -4,7 +4,7 @@ import { handleError } from '$lib/util/api_util';
import { error, json, type RequestEvent } from '@sveltejs/kit';
export async function GET(event: RequestEvent) {
if (!pb.authStore.model) {
if (!pb.authStore.record) {
return json({
min_distance: 0,
max_distance: 20000,
@@ -15,7 +15,7 @@ export async function GET(event: RequestEvent) {
});
}
try {
const r = await pb.collection('trails_filter').getOne<TrailFilterValues>(pb.authStore.model!.id)
const r = await pb.collection('trails_filter').getOne<TrailFilterValues>(pb.authStore.record!.id)
return json(r)
} catch (e: any) {
throw handleError(e);

4
web/src/routes/api/v1/trail/recommend/+server.ts
View File

@@ -10,7 +10,7 @@ export async function GET(event: RequestEvent) {
const searchParams = Object.fromEntries(event.url.searchParams);
const safeSearchParams = TrailRecommendSchema.parse(searchParams);
const r = await event.fetch(pb.buildUrl("/trail/recommend?" + new URLSearchParams({
const r = await event.fetch(pb.buildURL("/trail/recommend?" + new URLSearchParams({
size: safeSearchParams.size?.toString() ?? ""
})));
@@ -23,7 +23,7 @@ export async function GET(event: RequestEvent) {
const result: Trail[] = await r.json();
for (const t of result) {
if (!t.author || !pb.authStore.model) {
if (!t.author || !pb.authStore.record) {
continue;
}
if (!t.expand) {

4
web/src/routes/api/v1/user/[id]/+server.ts
View File

@@ -23,9 +23,9 @@ export async function POST(event: RequestEvent) {
const safeData = UserUpdateSchema.parse(data);
if (safeData.email && safeData.email != pb.authStore.model!.email) {
if (safeData.email && safeData.email != pb.authStore.record!.email) {
const r = await pb.collection('users').requestEmailChange(safeData.email);
pb.authStore.model!.email = safeData.email;
pb.authStore.record!.email = safeData.email;
}
const r = await pb.collection('users').update<User>(safeParams.id, safeData)
if (safeData.password) {

22
web/src/routes/login/+page.svelte
View File

@@ -15,21 +15,19 @@
import { type AuthProviderInfo } from "pocketbase";
import { _ } from "svelte-i18n";
import { z } from "zod";
import type { PageProps } from "./$types";
let loading: boolean = $state(false);
const authProviders = page.data.authMethods.authProviders;
let { data: pageData }: PageProps = $props();
const authProviders = pageData.authMethods.oauth2.providers;
let loginLabel = $state("");
if (
page.data.authMethods.usernamePassword &&
page.data.authMethods.emailPassword
) {
if (pageData.authMethods.password) {
loginLabel = `${$_("username")}/${$_("email")}`;
}else if (pageData.authMethods.password) {
loginLabel = `${$_("username")}/${$_("email")}`;
} else if (page.data.authMethods.usernamePassword) {
loginLabel = `${$_("username")}`;
} else if (page.data.authMethods.emailPassword) {
loginLabel = `${$_("email")}`;
}
const { form, errors, data } = createForm<User>({
@@ -100,7 +98,7 @@
<LogoTextTwoLineLight></LogoTextTwoLineLight>
{/if}
<h4 class="text-xl font-semibold">{$_("slogan")}</h4>
{#if page.data.authMethods.usernamePassword || page.data.authMethods.emailPassword}
{#if page.data.authMethods.password}
<div class="space-y-6 w-80">
<TextField
name="username"
@@ -147,13 +145,13 @@
<div class="w-80 space-y-4">
{#each authProviders as provider}
<a
href={provider.url}
href={(provider as any).url}
class="btn-secondary inline-flex min-w-full justify-center"
onclick={() => setProvider(provider)}
>
<img
class="w-5 aspect-square mr-4"
src={provider.img}
src={(provider as any).img}
alt="Provider logo"
/>
Login with {provider.displayName}

2
web/src/routes/trail/edit/[id]/+page.ts
View File

@@ -10,7 +10,7 @@ export const load: Load = async ({ params, fetch }) => {
return error(400, "Bad Request")
}
const categories = await categories_index(fetch)
const lists = await lists_index({ q: "", author: pb.authStore.model?.id ?? "" }, 1, -1, fetch)
const lists = await lists_index({ q: "", author: pb.authStore.record?.id ?? "" }, 1, -1, fetch)
let trail: Trail;
if (params.id === "new") {