diff --git a/svelte-ui/src/App.svelte b/svelte-ui/src/App.svelte
index cceda48..a938c2c 100644
--- a/svelte-ui/src/App.svelte
+++ b/svelte-ui/src/App.svelte
@@ -11,9 +11,6 @@
import TaskAddForm from "./forms/TaskAddForm.svelte";
import TaskEditForm from "./forms/TaskEditForm.svelte";
import TaskDeleteForm from "./forms/TaskDeleteForm.svelte";
- import ItemAddForm from "./forms/ItemAddForm.svelte";
- import ItemEditForm from "./forms/ItemEditForm.svelte";
- import ItemDeleteForm from "./forms/ItemDeleteForm.svelte";
import GroupForm from "./forms/GroupForm.svelte";
import GoalForm from "./forms/GoalForm.svelte";
import LogForm from "./forms/LogForm.svelte";
@@ -25,6 +22,7 @@
import Menu from "./components/Menu.svelte";
import authStore from "./stores/auth";
+import ItemForm from "./forms/ItemForm.svelte";
onMount(() => {
authStore.check()
@@ -53,9 +51,9 @@
-
-
-
+
+
+
diff --git a/svelte-ui/src/components/ItemEntry.svelte b/svelte-ui/src/components/ItemEntry.svelte
index 0bb8ed3..bad51df 100644
--- a/svelte-ui/src/components/ItemEntry.svelte
+++ b/svelte-ui/src/components/ItemEntry.svelte
@@ -19,8 +19,8 @@
}
});
- $: mdItemEdit = {name: "item.edit", item, group};
- $: mdItemDelete = {name: "item.delete", item, group};
+ $: mdItemEdit = {name: "item.edit", item: {...item, group}};
+ $: mdItemDelete = {name: "item.delete", item: {...item, group}};
diff --git a/svelte-ui/src/forms/GoalForm.svelte b/svelte-ui/src/forms/GoalForm.svelte
index 1897492..da25e55 100644
--- a/svelte-ui/src/forms/GoalForm.svelte
+++ b/svelte-ui/src/forms/GoalForm.svelte
@@ -2,15 +2,10 @@
import stuffLogClient from "../clients/stufflog";
import Modal from "../components/Modal.svelte";
import modalStore from "../stores/modal";
- import goalStore, { fpGoalStore } from "../stores/goal";
- import groupStore from "../stores/goal";
- import IconSelect from "../components/IconSelect.svelte";
- import { DEFAULT_ICON } from "../external/icons";
- import type { IconName } from "../external/icons";
import type { GoalResult } from "../models/goal";
- import projectStore, { fpProjectStore } from "../stores/project";
-import { formatFormTime, nextMonth } from "../utils/time";
-import GroupSelect from "../components/GroupSelect.svelte";
+ import { formatFormTime, nextMonth } from "../utils/time";
+ import GroupSelect from "../components/GroupSelect.svelte";
+ import markStale from "../stores/markStale";
export let deletion = false;
export let creation = false;
@@ -57,8 +52,7 @@ import GroupSelect from "../components/GroupSelect.svelte";
endTime: new Date(endTime),
groupId, name, description, amount,
}).then(() => {
- goalStore.markStale();
- fpGoalStore.markStale();
+ markStale("goal");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
@@ -67,8 +61,7 @@ import GroupSelect from "../components/GroupSelect.svelte";
})
} else if (deletion) {
stuffLogClient.deleteGoal(goal.id).then(() => {
- goalStore.markStale();
- fpGoalStore.markStale();
+ markStale("goal");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
@@ -81,8 +74,7 @@ import GroupSelect from "../components/GroupSelect.svelte";
endTime: new Date(endTime),
name, description, amount,
}).then(() => {
- goalStore.markStale();
- fpGoalStore.markStale();
+ markStale("goal");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
diff --git a/svelte-ui/src/forms/GroupForm.svelte b/svelte-ui/src/forms/GroupForm.svelte
index 56ce111..c3eacc1 100644
--- a/svelte-ui/src/forms/GroupForm.svelte
+++ b/svelte-ui/src/forms/GroupForm.svelte
@@ -2,13 +2,11 @@
import stuffLogClient from "../clients/stufflog";
import Modal from "../components/Modal.svelte";
import modalStore from "../stores/modal";
- import goalStore, { fpGoalStore } from "../stores/goal";
- import groupStore from "../stores/group";
import IconSelect from "../components/IconSelect.svelte";
import { DEFAULT_ICON } from "../external/icons";
import type { IconName } from "../external/icons";
import type { GroupResult } from "../models/group";
-import projectStore, { fpProjectStore } from "../stores/project";
+ import markStale from "../stores/markStale";
export let deletion = false;
export let creation = false;
@@ -42,7 +40,7 @@ import projectStore, { fpProjectStore } from "../stores/project";
stuffLogClient.createGroup({
name, description, icon,
}).then(() => {
- groupStore.markStale();
+ markStale("group");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
@@ -51,7 +49,7 @@ import projectStore, { fpProjectStore } from "../stores/project";
})
} else if (deletion) {
stuffLogClient.deleteGroup(group.id).then(() => {
- groupStore.markStale();
+ markStale("group");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
@@ -62,11 +60,7 @@ import projectStore, { fpProjectStore } from "../stores/project";
stuffLogClient.updateGroup(group.id, {
name, description, icon,
}).then(() => {
- groupStore.markStale();
- goalStore.markStale();
- fpGoalStore.markStale();
- projectStore.markStale();
- fpProjectStore.markStale();
+ markStale("group", "goal", "project", "task");
modalStore.close();
}).catch(err => {
error = err.message ? err.message : err.toString();
diff --git a/svelte-ui/src/forms/ItemAddForm.svelte b/svelte-ui/src/forms/ItemAddForm.svelte
deleted file mode 100644
index 9f81bcd..0000000
--- a/svelte-ui/src/forms/ItemAddForm.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/svelte-ui/src/forms/ItemDeleteForm.svelte b/svelte-ui/src/forms/ItemDeleteForm.svelte
deleted file mode 100644
index 35a88ac..0000000
--- a/svelte-ui/src/forms/ItemDeleteForm.svelte
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/svelte-ui/src/forms/ItemEditForm.svelte b/svelte-ui/src/forms/ItemEditForm.svelte
deleted file mode 100644
index 71e2f60..0000000
--- a/svelte-ui/src/forms/ItemEditForm.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/svelte-ui/src/forms/ItemForm.svelte b/svelte-ui/src/forms/ItemForm.svelte
new file mode 100644
index 0000000..d84bed3
--- /dev/null
+++ b/svelte-ui/src/forms/ItemForm.svelte
@@ -0,0 +1,95 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/svelte-ui/src/stores/modal.ts b/svelte-ui/src/stores/modal.ts
index 5074eed..9b85583 100644
--- a/svelte-ui/src/stores/modal.ts
+++ b/svelte-ui/src/stores/modal.ts
@@ -1,7 +1,7 @@
import { writable } from "svelte/store";
import type { GoalResult } from "../models/goal";
import type { GroupResult } from "../models/group";
-import type Item from "../models/item";
+import type { ItemResult } from "../models/item";
import type { LogResult } from "../models/log";
import type { ProjectResult } from "../models/project";
import type { TaskResult } from "../models/task";
@@ -21,8 +21,8 @@ export type ModalData =
| { name: "group.edit", group: GroupResult }
| { name: "group.delete", group: GroupResult }
| { name: "item.add", group: GroupResult }
- | { name: "item.edit", item: Item, group: GroupResult }
- | { name: "item.delete", item: Item, group: GroupResult }
+ | { name: "item.edit", item: ItemResult }
+ | { name: "item.delete", item: ItemResult }
| { name: "goal.add" }
| { name: "goal.edit", goal: GoalResult }
| { name: "goal.delete", goal: GoalResult }