From 8ebe09a0d46b0945159f8bfd7d747f1252910082 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Fri, 27 Sep 2024 19:31:43 +0200 Subject: [PATCH] Set default value for markdown preview and improve error for collab --- web-app/src/lib/components/WebsiteEditor.svelte | 5 ++++- .../routes/(authenticated)/account/+page.svelte | 6 ++++++ .../[websiteId]/collaborators/+page.server.ts | 4 ++++ web-app/src/routes/+layout.svelte | 14 ++++++++++---- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/web-app/src/lib/components/WebsiteEditor.svelte b/web-app/src/lib/components/WebsiteEditor.svelte index 639cb06..267831d 100644 --- a/web-app/src/lib/components/WebsiteEditor.svelte +++ b/web-app/src/lib/components/WebsiteEditor.svelte @@ -65,7 +65,10 @@ {#if fullPreview} {:else} - {@html md(previewContent.value, Object.keys($page.params).length > 1 ? true : false)} + {@html md( + previewContent.value || "Write some markdown content to see a live preview here", + Object.keys($page.params).length > 1 ? true : false + )} {/if} diff --git a/web-app/src/routes/(authenticated)/account/+page.svelte b/web-app/src/routes/(authenticated)/account/+page.svelte index c465b2e..d089728 100644 --- a/web-app/src/routes/(authenticated)/account/+page.svelte +++ b/web-app/src/routes/(authenticated)/account/+page.svelte @@ -66,3 +66,9 @@ + + diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts b/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts index c574301..0854363 100644 --- a/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts +++ b/web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.server.ts @@ -41,6 +41,10 @@ export const actions: Actions = { ) ).data; + if (!user) { + return { success: false, message: "Specified user could not be found" }; + } + return await apiRequest(fetch, `${API_BASE_PREFIX}/collab`, "POST", { body: { website_id: params.websiteId, diff --git a/web-app/src/routes/+layout.svelte b/web-app/src/routes/+layout.svelte index 0f96940..7f3e807 100644 --- a/web-app/src/routes/+layout.svelte +++ b/web-app/src/routes/+layout.svelte @@ -42,12 +42,12 @@