diff --git a/README.md b/README.md index 416e763..2ac4cd8 100644 --- a/README.md +++ b/README.md @@ -50,3 +50,4 @@ - [ ] think about public/private DTO's constructor, getters and setters - [x] write dtos without circular dependencies - [ ] use dtoRequest for PutProjects +- [ ] render avatarlist after UserModal Update diff --git a/client/src/components/HorizontalCard.tsx b/client/src/components/HorizontalCard.tsx index f9b7f2c..aea8283 100644 --- a/client/src/components/HorizontalCard.tsx +++ b/client/src/components/HorizontalCard.tsx @@ -6,13 +6,13 @@ interface IProps { title: string; remainingDays: string; validateTicket: (event: MouseEvent) => void; - archiveTicket: (event: MouseEvent) => void; + // archiveTicket: (event: MouseEvent) => void; } export const HorizontalCard: FC = ({ title, remainingDays, - archiveTicket, + // archiveTicket, validateTicket }) => { return ( @@ -34,11 +34,11 @@ export const HorizontalCard: FC = ({ check - + {/* archive - + */} diff --git a/client/src/components/TabRouter.tsx b/client/src/components/TabRouter.tsx index 3b3915e..7bdd438 100644 --- a/client/src/components/TabRouter.tsx +++ b/client/src/components/TabRouter.tsx @@ -7,6 +7,7 @@ import { AppFile } from "../types/AppFile"; import { Route, useRouteMatch, Redirect } from "react-router-dom"; import { ActivityList } from "./ActivityList"; import { Activity } from "../types/Activity"; +import { NewTicketModal } from "./NewTicketModal"; interface IProps { tickets: Ticket[]; @@ -26,6 +27,7 @@ export const TabRouter: FC = ({ return ( <>
+ {}} show={true} /> diff --git a/client/src/components/TicketList.tsx b/client/src/components/TicketList.tsx index d1be3c3..43ac75a 100644 --- a/client/src/components/TicketList.tsx +++ b/client/src/components/TicketList.tsx @@ -3,6 +3,9 @@ import { Ticket } from "../types/Ticket"; import { FloatingButton } from "./FloatingButton"; import { HorizontalCard } from "./HorizontalCard"; import { FilterBar } from "./FilterBar"; +import { put } from "../utils/http"; +import { HttpResponse } from "../types/HttpResponse"; +import { Constants } from "../utils/Constants"; type TicketListProps = { tickets: Ticket[]; @@ -13,8 +16,8 @@ export const TicketList: FC = ({ tickets }) => { const clearFilterText: (e: MouseEvent) => void = (e: MouseEvent) => { setFilterText(""); }; - const archiveTicket = () => {}; - const validateTicket = () => {}; + // const archiveTicket = () => {}; + const onClick: (e: MouseEvent) => void = (e: MouseEvent) => { e.preventDefault(); }; @@ -42,16 +45,24 @@ export const TicketList: FC = ({ tickets }) => {
    {tickets - .filter(t => - t.title.toLowerCase().includes(filterText.toLowerCase()) + .filter( + t => + t.status !== "Done" && + t.title.toLowerCase().includes(filterText.toLowerCase()) ) .map((t: Ticket) => (
  • { + e.preventDefault(); + await put>( + `${Constants.ticketsURI}/${t.id}/closed`, + {} + ); + }} + // archiveTicket={archiveTicket} />
  • ))} diff --git a/client/src/components/UsersModal.tsx b/client/src/components/UsersModal.tsx index 99e8c53..ee13f25 100644 --- a/client/src/components/UsersModal.tsx +++ b/client/src/components/UsersModal.tsx @@ -37,15 +37,14 @@ export const UsersModal: FC = ({ e: FormEvent ) => { e.preventDefault(); - - const response: HttpResponse = await patch( + await patch( `${Constants.projectsURI}/${id}/members`, - members + members.map(m => m.id) ); - console.log(response); + handleClose(); }; - console.log(allUsers); + useEffect(() => {}); return (
    diff --git a/client/src/components/UsersModalEntry.tsx b/client/src/components/UsersModalEntry.tsx index f571285..301439a 100644 --- a/client/src/components/UsersModalEntry.tsx +++ b/client/src/components/UsersModalEntry.tsx @@ -9,7 +9,6 @@ interface IProps { } export const UsersModalEntry: FC = ({ user, setMembers, members }) => { - console.log(members); const match: (id: string) => boolean = (id: string) => { return Boolean(members.find(m => m.id === id)); };