diff --git a/core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java b/core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java index 096e324..100841e 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java @@ -2,9 +2,7 @@ package de.srsoftware.umbrella.core.api; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; -import de.srsoftware.umbrella.core.model.Project; import de.srsoftware.umbrella.core.model.Task; - import java.util.Collection; import java.util.HashMap; import java.util.List; diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 6619c5b..6317c5e 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -4,6 +4,7 @@ import { user } from './user.svelte.js'; import { Router, Route } from 'svelte-tiny-router'; import AddDoc from "./routes/document/Add.svelte"; + import AddTask from "./routes/task/Add.svelte"; import Callback from "./routes/user/OidcCallback.svelte"; import DocList from "./routes/document/List.svelte"; import EditService from "./routes/user/EditService.svelte"; @@ -50,6 +51,7 @@ + diff --git a/frontend/src/Components/MarkdownEditor.svelte b/frontend/src/Components/MarkdownEditor.svelte index 53fd619..a7e6802 100644 --- a/frontend/src/Components/MarkdownEditor.svelte +++ b/frontend/src/Components/MarkdownEditor.svelte @@ -2,8 +2,14 @@ import { activeField } from './field_sync.svelte.js'; import { t } from '../translations.svelte.js'; - let { editable = false, value = $bindable(null), onSet = (newVal) => {} } = $props(); - let editing = $state(false); + let { + editable = true, + editing = false, + value = $bindable({source:null,rendered:null}), + onSet = (newVal) => {} + } = $props(); + + //let editing = $state(false); let editValue = $state({source:value.source,rendered:value.rendered}); diff --git a/frontend/src/routes/project/View.svelte b/frontend/src/routes/project/View.svelte index e9fcc83..9bca291 100644 --- a/frontend/src/routes/project/View.svelte +++ b/frontend/src/routes/project/View.svelte @@ -1,12 +1,14 @@ + + +
+ Add Task + + + + + + + {#if project} + + + + + {/if} + + + + + +
+ {t('name')} + + +
+ {t('project')} + + {project.name} +
+ {t('description')} + + +
+
\ No newline at end of file diff --git a/frontend/src/urls.svelte.js b/frontend/src/urls.svelte.js new file mode 100644 index 0000000..cd685d6 --- /dev/null +++ b/frontend/src/urls.svelte.js @@ -0,0 +1,3 @@ +export function api(rel_path){ + return `${location.protocol}//${location.host.replace('5173','8080')}/api/${rel_path}`; +} \ No newline at end of file diff --git a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java index 8475176..0ad868a 100644 --- a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java +++ b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java @@ -14,7 +14,6 @@ import static java.net.HttpURLConnection.HTTP_OK; import com.sun.net.httpserver.HttpExchange; import de.srsoftware.configuration.Configuration; -import de.srsoftware.tools.Mappable; import de.srsoftware.tools.Path; import de.srsoftware.tools.SessionToken; import de.srsoftware.umbrella.core.BaseHandler; diff --git a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java index 7fa69f9..30673fb 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java @@ -13,7 +13,6 @@ import static java.lang.System.Logger.Level.WARNING; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.*; - import java.sql.Connection; import java.sql.SQLException; import java.util.Collection; diff --git a/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java b/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java index 21cc9fc..07897cf 100644 --- a/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java +++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java @@ -5,7 +5,6 @@ package de.srsoftware.umbrella.task; import de.srsoftware.umbrella.core.exceptions.UmbrellaException; import de.srsoftware.umbrella.core.model.Permission; import de.srsoftware.umbrella.core.model.Task; - import java.util.Map; public interface TaskDb {