wirking on global error display

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
2025-09-26 14:45:19 +02:00
parent 9c4c71f7dd
commit 2a6392cd2b
14 changed files with 113 additions and 116 deletions

View File

@@ -1,8 +1,9 @@
<script>
import { onMount } from 'svelte';
import { api } from '../../urls.svelte.js';
import { t } from '../../translations.svelte.js';
import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte';
import Editor from '../../Components/MarkdownEditor.svelte';
import Users from '../../Components/UserSelector.svelte';
@@ -24,7 +25,6 @@
url:null,
users:{}
});
let error = $state(null);
async function getCandidates(text){
const url = api('user/search');
@@ -34,13 +34,13 @@
body : text
});
if (resp.ok){
error = null;
yikes();
const input = await resp.json();
return Object.fromEntries(
Object.entries(input).map(([key, value]) => [key, value.name])
);
} else {
error = await resp.text();
error(await resp.text());
return {};
}
}
@@ -55,10 +55,10 @@
bookmarks = Object.values(merged).sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
loader.offset += loader.limit;
loader.active = false;
error = null;
yikes();
if (Object.keys(raw).length) onscroll(null); // when bookmarks were received, check whether they fill up the page
} else {
error = await resp.html();
error(await resp.html())
}
}
@@ -81,7 +81,7 @@
const bookmark = await resp.json();
bookmarks.unshift(bookmark);
} else {
error = await resp.text();
error(await resp.text());
}
}
@@ -102,9 +102,6 @@
<svelte:window {onscroll} />
<fieldset>
<legend>{t('Bookmarks')}</legend>
{#if error}
<span class="error">{error}</span>
{/if}
<label>
{t('URL')}
<input bind:value={new_bookmark.url} autofocus />
@@ -124,4 +121,4 @@
<Template {bookmark} />
{/each}
{/if}
</fieldset>
</fieldset>

View File

@@ -3,14 +3,14 @@
import Bookmark from './Template.svelte';
import { api } from '../../urls.svelte.js';
import { t } from '../../translations.svelte.js';
import { api } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte';
import Editor from '../../Components/MarkdownEditor.svelte';
import Editor from '../../Components/MarkdownEditor.svelte';
import Template from './Template.svelte';
let bookmark = $state(null);
let error = $state(null);
let { id } = $props();
async function load(){
@@ -18,15 +18,13 @@
const resp = await fetch(url,{credentials:'include'});
if (resp.ok){
bookmark = await resp.json();
yikes();
} else {
error = await resp.text();
error(await resp.text());
}
}
onMount(load);
</script>
{#if error}
<span class="error">{error}</span>
{/if}
<Template {bookmark} />