OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code improvements

Browse Source
This commit is contained in:
shamoon 2024-10-11 22:47:36 -07:00
parent a5a62e501b
commit fe8922196c
No known key found for this signature in database
2 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/widgets/vikunja/component.jsx
View File

@ -9,14 +9,10 @@ export default function Component({ service }) {
const { widget } = service; const { widget } = service;
const { data: projectsData, error: projectsError } = useWidgetAPI(widget, "projects"); const { data: projectsData, error: projectsError } = useWidgetAPI(widget, "projects");
const { data: tasksData, error: tasksError } = useWidgetAPI(widget, "tasks", { const { data: tasksData, error: tasksError } = useWidgetAPI(widget, "tasks");
filter: "done=false&&percent_done<1",
sort_by: "due_date",
});
if (projectsError || tasksError) { if (projectsError || tasksError) {
const vikunjaError = projectsError ?? tasksError; return <Container service={service} error={projectsError ?? tasksError} />;
return <Container service={service} error={vikunjaError} />;
} }
if (!projectsData || !tasksData) { if (!projectsData || !tasksData) {
@ -30,52 +26,42 @@ export default function Component({ service }) {
); );
} }
const projects = projectsData.filter((project) => project.id > 0); const projects = projectsData.filter((project) => project.id);
const tasks7d = tasksData.filter( const vikunjaDefaultDueDate = new Date("0001-01-01T00:00:00Z");
(task) => const oneWeekFromNow = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
new Date(task.dueDate).getTime() > new Date("0001-01-01T00:00:00Z").getTime() && const tasksWithDueDate = tasksData.filter((task) => task.dueDate > vikunjaDefaultDueDate);
new Date(task.dueDate).getTime() <= new Date(Date.now() + 604800000), const tasks7d = tasksWithDueDate.filter((task) => task.dueDate <= oneWeekFromNow);
); const tasksOverdue = tasksWithDueDate.filter((task) => task.dueDate <= new Date(Date.now()));
const tasksInProgress = tasksData.filter((task) => task.inProgress);
const overdue = tasksData.filter(
(task) =>
new Date(task.dueDate).getTime() > new Date("0001-01-01T00:00:00Z").getTime() &&
new Date(task.dueDate).getTime() <= new Date(Date.now()),
);
const inProgress = tasksData.filter((task) => task.inProgress === true);
return ( return (
<> <>
<Container service={service}> <Container service={service}>
<Block label="vikunja.projects" value={t("common.number", { value: projects.length })} /> <Block label="vikunja.projects" value={t("common.number", { value: projects.length })} />
<Block label="vikunja.tasks7d" value={t("common.number", { value: tasks7d.length })} /> <Block label="vikunja.tasks7d" value={t("common.number", { value: tasks7d.length })} />
<Block label="vikunja.tasksOverdue" value={t("common.number", { value: overdue.length })} /> <Block label="vikunja.tasksOverdue" value={t("common.number", { value: tasksOverdue.length })} />
<Block label="vikunja.tasksInProgress" value={t("common.number", { value: inProgress.length })} /> <Block label="vikunja.tasksInProgress" value={t("common.number", { value: tasksInProgress.length })} />
</Container> </Container>
{widget.enableTaskList && {widget.enableTaskList &&
tasksData tasksWithDueDate.slice(0, 5).map((task) => (
?.filter((task) => new Date(task.dueDate).getTime() > new Date("0001-01-01T00:00:00Z").getTime()) <div
.slice(0, 5) key={task.id}
.map((task) => ( className="text-theme-700 dark:text-theme-200 relative h-5 rounded-md bg-theme-200/50 dark:bg-theme-900/20 m-1 px-1 flex"
<div >
key={task.id} <div className="text-xs z-10 self-center ml-2 relative h-4 grow mr-2">
className="text-theme-700 dark:text-theme-200 relative h-5 rounded-md bg-theme-200/50 dark:bg-theme-900/20 m-1 px-1 flex" <div className="absolute w-full h-4 whitespace-nowrap text-ellipsis overflow-hidden text-left">
> {task.title}
<div className="text-xs z-10 self-center ml-2 relative h-4 grow mr-2">
<div className="absolute w-full h-4 whitespace-nowrap text-ellipsis overflow-hidden text-left">
{task.title}
</div>
</div>
<div className="self-center text-xs flex justify-end mr-1.5 pl-1 z-10 text-ellipsis overflow-hidden whitespace-nowrap">
{t("common.relativeDate", {
value: task.dueDate,
formatParams: { value: { style: "narrow", numeric: "auto" } },
})}
</div> </div>
</div> </div>
))} <div className="self-center text-xs flex justify-end mr-1.5 pl-1 z-10 text-ellipsis overflow-hidden whitespace-nowrap">
{t("common.relativeDate", {
value: task.dueDate,
formatParams: { value: { style: "narrow", numeric: "auto" } },
})}
</div>
</div>
))}
</> </>
); );
} }

5
src/widgets/vikunja/widget.js
View File

@ -10,14 +10,13 @@ const widget = {
endpoint: "projects", endpoint: "projects",
}, },
tasks: { tasks: {
endpoint: "tasks/all", endpoint: "tasks/all?filter=done%3Dfalse&sort_by=due_date",
params: ["filter", "sort_by"],
map: (data) => map: (data) =>
asJson(data).map((task) => ({ asJson(data).map((task) => ({
id: task.id, id: task.id,
title: task.title, title: task.title,
priority: task.priority, priority: task.priority,
dueDate: task.due_date, dueDate: new Date(task.due_date),
inProgress: task.percent_done > 0 && task.percent_done < 1, inProgress: task.percent_done > 0 && task.percent_done < 1,
})), })),
}, },