diff --git a/api/server.js b/api/server.js index 22d16f1..d1b6007 100644 --- a/api/server.js +++ b/api/server.js @@ -6,14 +6,14 @@ const app = express() app.use(express.json()) app.use(express.urlencoded({ extended: true })) -app.delete("/api/v1/tasks/:pk", (req, res) => { +app.delete("/api/v1/tasks/:uuid", (req, res) => { res.status(200).end() }) -app.patch("/api/v1/tasks/:pk", (req, res) => { - const {pk} = req.params +app.patch("/api/v1/tasks/:uuid", (req, res) => { + const {uuid} = req.params const completed = req.body.completed === "true" - res.status(200).json({pk, completed}) + res.status(200).json({uuid, completed}) }) app.listen(port, host, () => { diff --git a/package.json b/package.json index e9795e9..0339c93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tasktracker-bootstrap", - "version": "1.0.0", + "version": "1.0.4", "description": "Task tracker site bootstrap5 templates", "private": true, "scripts": { diff --git a/src/js/tasks.js b/src/js/tasks.js index e090058..beca808 100644 --- a/src/js/tasks.js +++ b/src/js/tasks.js @@ -1,10 +1,12 @@ -const swapTaskListCompletedStatus = ({pk, completed}) => { - const element = document.getElementById(pk) +const swapTaskListCompletedStatus = ({uuid, completed}) => { + console.debug("swap task list completed status") + const element = document.getElementById(uuid) if (element) element.setAttribute("data-task-completed", completed) } const swapTaskDetailedCompletedStatus = ({completed}) => { + console.debug("swap task detail completed status") const element = document.querySelector("h1#summary") if (!element) return @@ -20,6 +22,7 @@ const swapTaskDetailedCompletedStatus = ({completed}) => { const updateListActionButton = (element, completed) => { + console.debug("update list action button") element.classList.remove("bi-arrow-repeat", "bi-check-lg") if (completed) { element.classList.add("bi-arrow-repeat") @@ -30,6 +33,7 @@ const updateListActionButton = (element, completed) => { const updateDetailActionButton = (element, completed) => { + console.debug("update detail action button") element.classList.remove("btn-outline-warning", "btn-outline-success") if (completed) { element.classList.add("btn-outline-warning") @@ -42,6 +46,7 @@ const updateDetailActionButton = (element, completed) => { const swapTaskPatchButton = ({element, completed}) => { + console.debug("swap task patch button") element.setAttribute("hx-vals", `js:{completed:${!completed}}`) if (element.matches("i[role=button]")) updateListActionButton(element, completed) if (element.matches("button.btn")) updateDetailActionButton(element, completed) diff --git a/src/scss/list.scss b/src/scss/list.scss index d13a469..41c0427 100644 --- a/src/scss/list.scss +++ b/src/scss/list.scss @@ -19,17 +19,17 @@ $list-img-max-size: 5rem; [aria-label=TaskActions] { .disabled { - pointer-events: none; - color: var(--bs-secondary-color); + pointer-events: none !important; + color: var(--bs-secondary-color) !important; } } // action buttons - [data-task-action=patch] { + [hx-patch] { color: var(--bs-success); } - [data-task-action=delete] { + [hx-delete] { color: var(--bs-danger); } } @@ -40,7 +40,7 @@ $list-img-max-size: 5rem; text-decoration: line-through !important; } - [data-task-action=patch] { + [hx-patch] { color: var(--bs-warning) } } diff --git a/src/views/partials/list_main.hbs b/src/views/partials/list_main.hbs index 620c3ec..7f76ca2 100644 --- a/src/views/partials/list_main.hbs +++ b/src/views/partials/list_main.hbs @@ -52,6 +52,19 @@ assignee_first_name="Toby" assignee_last_name="Mugwort" completed=true + can_edit=false + }} + {{>list_task + pk="0b329fae-3b4f-45ca-bd50-5312c8bc4fe2" + summary="When the shark waves for jamaica, all comrades mark salty, weird woodchucks." + description="The yardarm sails with courage, fight the reef before it whines. + amnesty, faith, and malaria. undead, coal-black mainlands darkly drink a cloudy, lively gold. + yo-ho-ho, never fear a cockroach. the plank burns with fight, crush the brig until it sings. + Tobaccos whine from amnesties like fine shipmates?" + assignee_image="https://i.pravatar.cc/?u=WilcomeBrownlock@teleworm.us" + assignee_first_name="Wilcome" + assignee_last_name="Brownlock" + completed=true can_edit=true }} diff --git a/src/views/partials/profile_main.hbs b/src/views/partials/profile_main.hbs index 75b8dc0..5631b8d 100644 --- a/src/views/partials/profile_main.hbs +++ b/src/views/partials/profile_main.hbs @@ -9,64 +9,25 @@
avatar
-
- -
-