diff --git a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java index af9e10c..aa17bb5 100644 --- a/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java +++ b/backend/src/main/java/de/srsoftware/umbrella/backend/Application.java @@ -66,8 +66,8 @@ public class Application { var legacyApi = new LegacyApi(userModule.userDb(),config); var markdownApi = new MarkdownApi(userModule); var messageApi = new MessageApi(messageSystem); - var projectModule = new ProjectModule(config,companyModule); var tagModule = new TagModule(config,userModule); + var projectModule = new ProjectModule(config,companyModule,tagModule); var taskModule = new TaskModule(config,projectModule,tagModule); var timeModule = new TimeModule(config,taskModule); var webHandler = new WebHandler(); diff --git a/core/src/main/java/de/srsoftware/umbrella/core/Constants.java b/core/src/main/java/de/srsoftware/umbrella/core/Constants.java index ffe054c..c85e53b 100644 --- a/core/src/main/java/de/srsoftware/umbrella/core/Constants.java +++ b/core/src/main/java/de/srsoftware/umbrella/core/Constants.java @@ -67,6 +67,7 @@ public class Constants { public static final String PASSWORD = "password"; public static final String PERMISSION = "permission"; public static final String POST = "POST"; + public static final String PROJECT = "project"; public static final String PROJECT_ID = "project_id"; public static final String RECEIVERS = "receivers"; @@ -86,6 +87,7 @@ public class Constants { public static final String SUBJECT = "subject"; public static final String TABLE_SETTINGS = "settings"; + public static final String TAGS = "tags"; public static final String TEMPLATE = "template"; public static final String TEXT = "text"; public static final String THEME = "theme"; diff --git a/frontend/src/routes/project/Create.svelte b/frontend/src/routes/project/Create.svelte index 00ea7b4..e7e021e 100644 --- a/frontend/src/routes/project/Create.svelte +++ b/frontend/src/routes/project/Create.svelte @@ -5,19 +5,21 @@ import CompanySelector from '../../Components/CompanySelector.svelte'; import MarkdownEditor from '../../Components/MarkdownEditor.svelte'; - import Settings from './Settings.svelte'; - let showSettings = $state(false); - let ready = $derived(!!project.name.trim()) + import Tags from '../tags/TagList.svelte'; + let error = $state(null); + let ready = $derived(!!project.name.trim()) const router = useTinyRouter(); + let showSettings = $state(false); let project = $state({ name:'', description : { source : '', rendered : '' }, settings:{ show_closed:false - } + }, + tags: [] }); async function onsubmit(ev){ @@ -40,6 +42,11 @@ project.company_id = company.id; console.log(project); } + + function toggleSettings(ev){ + ev.preventDefault(); + showSettings = !showSettings; + }