diff --git a/README.md b/README.md index 1a08cc7..7be337c 100644 --- a/README.md +++ b/README.md @@ -57,3 +57,4 @@ - [ ] Query project members in UserPage - [ ] Query progression info in UserPage - [ ] Add info fields in New Ticket Form +- [ ] Filter users in Users Modal diff --git a/client/src/components/Cards/TicketCard.tsx b/client/src/components/Cards/TicketCard.tsx index 5447449..f7e2597 100644 --- a/client/src/components/Cards/TicketCard.tsx +++ b/client/src/components/Cards/TicketCard.tsx @@ -20,7 +20,7 @@ const TicketCard: FC = ({ return ( - Due{" "} + Due in{" "} {remainingDays ? ( getRemainingdays(remainingDays) ) : ( diff --git a/client/src/components/Modals/UsersModal.tsx b/client/src/components/Modals/UsersModal.tsx index f697635..4b915f9 100644 --- a/client/src/components/Modals/UsersModal.tsx +++ b/client/src/components/Modals/UsersModal.tsx @@ -12,7 +12,6 @@ import Avatar from "@material-ui/core/Avatar"; import { Modal } from "./Modal"; import { AvatarList } from "../Avatars/AvatarList"; import { FilterBar } from "../FilterBar"; -import { UsersModalEntry } from "./UsersModalEntry"; import { User } from "../../types/User"; import { patch } from "../../utils/http"; import { Constants } from "../../utils/Constants"; diff --git a/client/src/components/Progress/ProgressInfo.tsx b/client/src/components/Progress/ProgressInfo.tsx index 17f741a..eaaf028 100644 --- a/client/src/components/Progress/ProgressInfo.tsx +++ b/client/src/components/Progress/ProgressInfo.tsx @@ -34,7 +34,7 @@ export const ProgressInfo: FC = ({ {tasksDone}/{tasksTotalCount} - Due {remainingDays} days + Due in {remainingDays} days );