From 95fa11e6057ab99e2ffb62e4e428ad1a5073d5fc Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Fri, 3 Apr 2020 14:23:37 +0200 Subject: [PATCH] update ProjectPage Layout --- client/src/components/FileCollection.tsx | 2 -- client/src/pages/ProjectPage.tsx | 31 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/client/src/components/FileCollection.tsx b/client/src/components/FileCollection.tsx index 69237df..f1738c8 100644 --- a/client/src/components/FileCollection.tsx +++ b/client/src/components/FileCollection.tsx @@ -28,7 +28,6 @@ const useStyles = makeStyles((theme: Theme) => export const FileCollection: FC = ({ files, filterText }) => { const classes = useStyles(); return ( - {files.length === 0 ? ( @@ -42,7 +41,6 @@ export const FileCollection: FC = ({ files, filterText }) => { .map((file: AppFile) => ) )} - ); }; diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx index 000603e..707b06b 100644 --- a/client/src/pages/ProjectPage.tsx +++ b/client/src/pages/ProjectPage.tsx @@ -3,16 +3,22 @@ import ProjectVM from "../VM/ProjectVM"; import { Header } from "../components/Header"; import { AvatarList } from "../components/AvatarList"; import { ProgressBar } from "../components/ProgressBar"; -import { TabRouter } from "../components/TabRouter"; import { FloatingButton } from "../components/FloatingButton"; import { UsersModal } from "../components/UsersModal"; -import { Container, Grid } from "@material-ui/core"; +import { Container, Grid, makeStyles, Theme } from "@material-ui/core"; import { ProjectTabPanel } from "../components/ProjectTabPanel"; interface IProps { viewModel: ProjectVM; } +const useStyles = makeStyles((theme: Theme) => ({ + root: { + margin: theme.spacing(1), + flexGrow: 1 + } +})); + export const ProjectPage: FC = ({ viewModel }) => { const { // id, @@ -33,9 +39,13 @@ export const ProjectPage: FC = ({ viewModel }) => { const tabNames: string[] = ["Tickets", "Files"]; //, "Activity"]; const [showModal, setShowModal] = useState(false); + const classes = useStyles(); + return ( -
+
+
+
= ({ viewModel }) => { - - +
+ +