diff --git a/client/src/components/FilterBar.tsx b/client/src/components/FilterBar.tsx index fc9cb9c..c42c1be 100644 --- a/client/src/components/FilterBar.tsx +++ b/client/src/components/FilterBar.tsx @@ -1,5 +1,9 @@ import React, { FC, ChangeEvent, MouseEvent } from "react"; import { useRouteMatch } from "react-router-dom"; +import { createStyles, makeStyles, Theme } from "@material-ui/core/styles"; +import TextField from "@material-ui/core/TextField"; +import { Grid } from "@material-ui/core"; +// import { AccountCircle, FilterList, FilterListSharp } from "@material-ui/icons"; type IProps = { filterText: string; @@ -7,35 +11,42 @@ type IProps = { clearFilterText: (e: MouseEvent) => void; }; +const useStyles = makeStyles((theme: Theme) => + createStyles({ + root: { + "& > *": { + margin: theme.spacing(1), + width: "25ch" + } + }, + margin: { + margin: theme.spacing(1) + } + }) +); + export const FilterBar: FC = ({ filterText, - handleChange, - clearFilterText + handleChange + // clearFilterText }) => { const { url } = useRouteMatch(); const placeholder: string = url.split("/")[3] || "users"; + const classes = useStyles(); return ( - <> -
-
- + + + - - - close - -
-
- + + + ); }; diff --git a/client/src/components/ProjectList.tsx b/client/src/components/ProjectList.tsx index cd7cb93..da5671e 100644 --- a/client/src/components/ProjectList.tsx +++ b/client/src/components/ProjectList.tsx @@ -6,6 +6,7 @@ import { put } from "../utils/http"; import { Constants } from "../utils/Constants"; import { HttpResponse } from "../types/HttpResponse"; import { Project } from "../types/Project"; +import { Container, Typography, Grid } from "@material-ui/core"; type IProps = { projects: Project[]; @@ -28,14 +29,20 @@ export const ProjectList: FC = ({ projects }) => { ); return ( <> -
-

Projects

- -
+ + + + Projects + + + + + +
    {filteredTickets.length === 0 ? (