diff --git a/package-lock.json b/package-lock.json index 16efd44..02040d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "donetick", - "version": "0.1.78", + "version": "0.1.82", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "donetick", - "version": "0.1.78", + "version": "0.1.82", "dependencies": { "@emotion/react": "^11.11.3", "@emotion/styled": "^11.11.0", @@ -17,6 +17,7 @@ "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "dotenv": "^16.4.5", + "esm": "^3.2.25", "fuse.js": "^7.0.0", "js-cookie": "^3.0.5", "moment": "^2.30.1", @@ -4320,9 +4321,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001635", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001635.tgz", - "integrity": "sha512-34NOwyGFZxFoIOFNoLPP08eHzaCN+3wJFKx4Vph0XpidU1tRxB0p3Q2etIbOj0W8TYeuXkYsMCcyjV1+phBzxQ==", + "version": "1.0.30001688", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz", + "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==", "funding": [ { "type": "opencollective", @@ -4336,7 +4337,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", @@ -5256,6 +5258,15 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esm": { + "version": "3.2.25", + "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", + "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", diff --git a/package.json b/package.json index acf57ae..caba390 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "donetick", "private": true, - "version": "0.1.82", + "version": "0.1.83", "type": "module", "lint-staged": { "*.{js,jsx,ts,tsx}": [ @@ -29,6 +29,7 @@ "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "dotenv": "^16.4.5", + "esm": "^3.2.25", "fuse.js": "^7.0.0", "js-cookie": "^3.0.5", "moment": "^2.30.1", diff --git a/src/utils/Fetcher.jsx b/src/utils/Fetcher.jsx index 0bdeb21..75c8190 100644 --- a/src/utils/Fetcher.jsx +++ b/src/utils/Fetcher.jsx @@ -59,6 +59,12 @@ const GetChores = () => { headers: HEADERS(), }) } +const GetArchivedChores = () => { + return Fetch(`${API_URL}/chores/archived`, { + method: 'GET', + headers: HEADERS(), + }) +} const GetChoreByID = id => { return Fetch(`${API_URL}/chores/${id}`, { @@ -356,6 +362,7 @@ export { DeleteThing, GetAllCircleMembers, GetAllUsers, + GetArchivedChores, GetChoreByID, GetChoreDetailById, GetChoreHistory, diff --git a/src/views/ChoreEdit/ChoreEdit.jsx b/src/views/ChoreEdit/ChoreEdit.jsx index 958ab08..6bfefa5 100644 --- a/src/views/ChoreEdit/ChoreEdit.jsx +++ b/src/views/ChoreEdit/ChoreEdit.jsx @@ -169,6 +169,9 @@ const ChoreEdit = () => { return true } + const handleDueDateChange = e => { + setDueDate(e.target.value) + } const HandleSaveChore = () => { setAttemptToSave(true) if (!HandleValidateChore()) { @@ -386,12 +389,15 @@ const ChoreEdit = () => { a.userId == item.id) != null} + checked={assignees.find(a => a.userId == item.userId) != null} onClick={() => { - if (assignees.find(a => a.userId == item.id)) { - setAssignees(assignees.filter(i => i.userId !== item.id)) + if (assignees.some(a => a.userId === item.userId)) { + const newAssignees = assignees.filter( + a => a.userId !== item.userId, + ) + setAssignees(newAssignees) } else { - setAssignees([...assignees, { userId: item.id }]) + setAssignees([...assignees, { userId: item.userId }]) } }} overlay @@ -431,10 +437,10 @@ const ChoreEdit = () => { ?.filter(p => assignees.find(a => a.userId == p.userId)) .map((item, index) => (