From 4da0f6a736be1e41154f5b64eea0f6da012cbcd0 Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Fri, 3 Apr 2020 14:26:06 +0200 Subject: [PATCH] update ProjectPage Layout --- client/src/components/FileCollection.tsx | 49 +++++++++++------------- client/src/components/UserHeader.tsx | 3 +- client/src/pages/ProjectPage.tsx | 2 +- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/client/src/components/FileCollection.tsx b/client/src/components/FileCollection.tsx index f1738c8..4f25ec3 100644 --- a/client/src/components/FileCollection.tsx +++ b/client/src/components/FileCollection.tsx @@ -5,9 +5,7 @@ import ListItem from "@material-ui/core/ListItem"; import ListItemText from "@material-ui/core/ListItemText"; import ListItemAvatar from "@material-ui/core/ListItemAvatar"; import Avatar from "@material-ui/core/Avatar"; -import ImageIcon from "@material-ui/icons/Image"; import WorkIcon from "@material-ui/icons/Work"; -import BeachAccessIcon from "@material-ui/icons/BeachAccess"; import { AppFile } from "../types/AppFile"; type IProps = { @@ -29,18 +27,18 @@ export const FileCollection: FC = ({ files, filterText }) => { const classes = useStyles(); return ( - {files.length === 0 ? ( - - ) : ( - files - .filter( - f => - f.name.toLowerCase().includes(filterText.toLowerCase()) || - f.format.toLowerCase().includes(filterText.toLowerCase()) - ) - .map((file: AppFile) => ) - )} - + {files.length === 0 ? ( + + ) : ( + files + .filter( + f => + f.name.toLowerCase().includes(filterText.toLowerCase()) || + f.format.toLowerCase().includes(filterText.toLowerCase()) + ) + .map((file: AppFile) => ) + )} + ); }; @@ -51,18 +49,15 @@ type IFProps = { export const FileEntry: FC = ({ file }) => { return ( - - - - - - - + + + + + + + ); }; - - - - - - diff --git a/client/src/components/UserHeader.tsx b/client/src/components/UserHeader.tsx index 1a6a460..e20555c 100644 --- a/client/src/components/UserHeader.tsx +++ b/client/src/components/UserHeader.tsx @@ -1,8 +1,7 @@ import React, { FC } from "react"; import { Header } from "../components/Header"; import { UserAvatar } from "./UserAvatar"; -import { Grid, makeStyles, createStyles, Theme } from "@material-ui/core"; -import classes from "*.module.css"; +import { Grid, makeStyles, Theme } from "@material-ui/core"; interface IProps { fullName: string; diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx index 707b06b..6f09d7b 100644 --- a/client/src/pages/ProjectPage.tsx +++ b/client/src/pages/ProjectPage.tsx @@ -32,7 +32,7 @@ export const ProjectPage: FC = ({ viewModel }) => { ticketsTotalCount, remainingDays, files, - activities, + // activities, allProjects } = viewModel;