wirking on global error display
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -3,10 +3,10 @@
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
import { api } from '../../urls.svelte.js';
|
||||
import { error, yikes } from '../../warn.svelte';
|
||||
import { t } from '../../translations.svelte.js';
|
||||
|
||||
const router = useTinyRouter();
|
||||
let error = $state(null);
|
||||
let projects = $state(null);
|
||||
let companies = $state(null);
|
||||
let showClosed = $state(router.query.closed == "show");
|
||||
@@ -26,11 +26,12 @@
|
||||
});
|
||||
if (resp.ok){
|
||||
projects = await resp.json();
|
||||
yikes();
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,8 +45,9 @@
|
||||
if (resp.ok){
|
||||
var prj = await resp.json();
|
||||
projects[prj.id].status = prj.status;
|
||||
yikes();
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,9 +71,6 @@
|
||||
<title>Umbrella – {t('Projects')}</title>
|
||||
</svelte:head>
|
||||
|
||||
{#if error}
|
||||
<span class="error">{error}</span>
|
||||
{/if}
|
||||
<fieldset>
|
||||
<legend>
|
||||
{t('projects')}
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
import { onMount } from 'svelte';
|
||||
import { useTinyRouter } from 'svelte-tiny-router';
|
||||
|
||||
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 LineEditor from '../../Components/LineEditor.svelte';
|
||||
import MarkdownEditor from '../../Components/MarkdownEditor.svelte';
|
||||
@@ -14,7 +15,6 @@
|
||||
import TaskList from '../task/TaskList.svelte';
|
||||
|
||||
let { id } = $props();
|
||||
let error = $state(null);
|
||||
let estimated_time = $state({sum:0});
|
||||
let project = $state(null);
|
||||
let router = useTinyRouter();
|
||||
@@ -41,9 +41,9 @@
|
||||
if (resp.ok){
|
||||
const json = await resp.json();
|
||||
project.allowed_states[json.code] = json.name;
|
||||
error = null;
|
||||
yikes();
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,11 +89,10 @@
|
||||
const resp = await fetch(url,{credentials:'include'});
|
||||
if (resp.ok){
|
||||
project = await resp.json();
|
||||
// console.log(project);
|
||||
error = null;
|
||||
yikes();
|
||||
loadTasks();
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,9 +111,9 @@
|
||||
tasks = {};
|
||||
estimated_time.sum = 0;
|
||||
tasks = await resp.json();
|
||||
error = null;
|
||||
yikes();
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,11 +134,11 @@
|
||||
body : JSON.stringify(data)
|
||||
});
|
||||
if (resp.ok){
|
||||
error = null;
|
||||
yikes();
|
||||
project = await resp.json();
|
||||
return true;
|
||||
} else {
|
||||
error = await resp.text();
|
||||
error(await resp.text());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -162,10 +161,6 @@
|
||||
<title>Umbrella – {project?.name}</title>
|
||||
</svelte:head>
|
||||
|
||||
{#if error}
|
||||
<span class="error">{error}</span>
|
||||
{/if}
|
||||
|
||||
{#if project}
|
||||
<div class="project grid2">
|
||||
<div>{t('project')}</div>
|
||||
|
||||
Reference in New Issue
Block a user