Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
eden-lane committed Feb 1, 2024
1 parent 6272983 commit 4a36e9f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
12 changes: 8 additions & 4 deletions src/components/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,14 @@ const App = () => {
{event.data.task?.title}
</Title>
<div>
{format((dates.startDateTime || event.startDateTime)!, "HH:mm")}
{" - "}
{format((dates.endDateTime || event.endDateTime)!, "HH:mm")} (
{`${d} ${h} ${m}`.trim()})
{event.startDateTime && event.endDateTime && (
<>
{format((dates.startDateTime || event.startDateTime)!, "HH:mm")}
{" - "}
{format((dates.endDateTime || event.endDateTime)!, "HH:mm")} (
{`${d} ${h} ${m}`.trim()})
</>
)}
</div>
</EventBlock>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/App/TasksList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Text } from "../Text";
import { Status, type TProject, type TTask } from "./types";
import { TaskStatus } from "../TaskStatus/TaskStatus";
import CaseImg from "../../../public/emoji/case.png";
import ManImg from '../../../public/emoji/man.png';
import { useDrag } from "react-dnd";
import { getEmptyImage } from "react-dnd-html5-backend";
import { TASK } from "./DragLayer";
Expand Down Expand Up @@ -36,7 +37,7 @@ export const TasksList = (props: TasksListProps) => {
<Group
key={key}
title={key}
icon={CaseImg.src}
icon={key === "Work" ? CaseImg.src : ManImg.src}
tasks={value}
projects={props.projects}
/>
Expand Down

0 comments on commit 4a36e9f

Please sign in to comment.