diff --git a/package.json b/package.json
index 94faffb..1e15598 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "my-weekly-todo-list",
- "version": "1.110.7",
+ "version": "1.111.0",
"description": "A web-based weekly task management application that organizes to-dos and calendar events in a single, intuitive weekly view",
"main": "index.js",
"scripts": {
diff --git a/src/components/GridTaskBlock.tsx b/src/components/GridTaskBlock.tsx
index 451fbc1..44d89f8 100644
--- a/src/components/GridTaskBlock.tsx
+++ b/src/components/GridTaskBlock.tsx
@@ -341,6 +341,31 @@ export function GridTaskBlock({
setEditingTaskId(task.id);
}}
>
+ {(() => {
+ const pb = showPriorityIcons ? getPriorityBadge(task, priorityStyle, 11) : null;
+ const hasProject = !!(showProjectIcons && task.project);
+ if (!pb && !hasProject) return null;
+ return (
+
+ {pb && {pb.node}}
+ {hasProject && (() => {
+ const rawIcon = task.project!.icon || "";
+ const normalised = rawIcon.startsWith("fa") && rawIcon.length > 2 && rawIcon[2] === rawIcon[2].toUpperCase()
+ ? rawIcon.slice(2, 3).toLowerCase() + rawIcon.slice(3)
+ : rawIcon;
+ const found = allIcons.find(i => i.name === normalised || i.name === rawIcon);
+ if (found) {
+ return found.type === "fa"
+ ?
+ : ;
+ }
+ return task.project!.icon
+ ? {task.project!.icon}
+ : ;
+ })()}
+
+ );
+ })()}
{showTaskCheckboxes && (
)}
- {showPriorityIcons && (() => {
- const pb = getPriorityBadge(task, priorityStyle, 11);
- return pb ? (
-
- {pb.node}
-
- ) : null;
- })()}
- {showProjectIcons && task.project && (() => {
- const rawIcon = task.project!.icon || "";
- const normalised = rawIcon.startsWith("fa") && rawIcon.length > 2 && rawIcon[2] === rawIcon[2].toUpperCase()
- ? rawIcon.slice(2, 3).toLowerCase() + rawIcon.slice(3)
- : rawIcon;
- const found = allIcons.find(i => i.name === normalised || i.name === rawIcon);
- const iconStyle = { marginRight: "4px", verticalAlign: "middle" } as const;
- if (found) {
- return found.type === "fa"
- ?
- : ;
- }
- return task.project!.icon
- ? {task.project!.icon}
- : ;
- })()}{task.title}
+ {task.title}
{/* Subtask indicator */}
{task.subTasks && task.subTasks.length > 0 && (() => {
const completed = task.subTasks.filter(s => s.completed).length;
@@ -507,7 +509,7 @@ export function GridTaskBlock({
)}
- {weatherEnabled && (() => {
+ {(() => {
const provider = task.externalProvider
|| (task.externalId?.startsWith("synology::") ? "synology" : null);
if (!provider) return null;
@@ -533,27 +535,6 @@ export function GridTaskBlock({
)}
- {!weatherEnabled && (() => {
- const provider = task.externalProvider
- || (task.externalId?.startsWith("synology::") ? "synology" : null);
- if (!provider) return null;
- const iconMap: Record = {
- google: { icon: faGoogle, color: "#4285F4", label: "Google" },
- outlook: { icon: faMicrosoft, color: "#0078D4", label: "Microsoft" },
- apple: { icon: faApple, color: "#555", label: "Apple" },
- synology: { icon: faServer, color: "#007AFF", label: "Synology" },
- };
- const info = iconMap[provider];
- if (!info) return null;
- return (
-
-
-
- );
- })()}