ruidy/ticket_manager
1
0
Fork 0
mirror of https://github.com/rjNemo/ticket_manager synced 2026-06-06 00:36:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update ProjectPage Layout

Browse source
This commit is contained in:
Ruidy Nemausat 2020-04-03 14:26:06 +02:00
parent 95fa11e605
commit 4da0f6a736
3 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
client/src/components/FileCollection.tsx
View file

@ -5,9 +5,7 @@ import ListItem from "@material-ui/core/ListItem";
import ListItemText from "@material-ui/core/ListItemText"; import ListItemText from "@material-ui/core/ListItemText";
import ListItemAvatar from "@material-ui/core/ListItemAvatar"; import ListItemAvatar from "@material-ui/core/ListItemAvatar";
import Avatar from "@material-ui/core/Avatar"; import Avatar from "@material-ui/core/Avatar";
import ImageIcon from "@material-ui/icons/Image";
import WorkIcon from "@material-ui/icons/Work"; import WorkIcon from "@material-ui/icons/Work";
import BeachAccessIcon from "@material-ui/icons/BeachAccess";
import { AppFile } from "../types/AppFile"; import { AppFile } from "../types/AppFile";
type IProps = { type IProps = {
@ -29,18 +27,18 @@ export const FileCollection: FC<IProps> = ({ files, filterText }) => {
const classes = useStyles(); const classes = useStyles();
return ( return (
<List className={classes.root}> <List className={classes.root}>
{files.length === 0 ? ( {files.length === 0 ? (
<FileEntry /> <FileEntry />
) : ( ) : (
files files
.filter( .filter(
f => f =>
f.name.toLowerCase().includes(filterText.toLowerCase()) || f.name.toLowerCase().includes(filterText.toLowerCase()) ||
f.format.toLowerCase().includes(filterText.toLowerCase()) f.format.toLowerCase().includes(filterText.toLowerCase())
) )
.map((file: AppFile) => <FileEntry file={file} key={file.id} />) .map((file: AppFile) => <FileEntry file={file} key={file.id} />)
)} )}
</List> </List>
); );
}; };
@ -51,18 +49,15 @@ type IFProps = {
export const FileEntry: FC<IFProps> = ({ file }) => { export const FileEntry: FC<IFProps> = ({ file }) => {
return ( return (
<ListItem> <ListItem>
<ListItemAvatar> <ListItemAvatar>
<Avatar> <Avatar>
<WorkIcon /> <WorkIcon />
</Avatar> </Avatar>
</ListItemAvatar> </ListItemAvatar>
<ListItemText primary={file ? file.name : "Add your first file"} secondary={`${file ? file.size : 0}kb ${file ? file.format : "pdf"}`} /> <ListItemText
</ListItem> primary={file ? file.name : "Add your first file"}
secondary={`${file ? file.size : 0}kb ${file ? file.format : "pdf"}`}
/>
</ListItem>
); );
}; };

3
client/src/components/UserHeader.tsx
View file

@ -1,8 +1,7 @@
import React, { FC } from "react"; import React, { FC } from "react";
import { Header } from "../components/Header"; import { Header } from "../components/Header";
import { UserAvatar } from "./UserAvatar"; import { UserAvatar } from "./UserAvatar";
import { Grid, makeStyles, createStyles, Theme } from "@material-ui/core"; import { Grid, makeStyles, Theme } from "@material-ui/core";
import classes from "*.module.css";
interface IProps { interface IProps {
fullName: string; fullName: string;

2
client/src/pages/ProjectPage.tsx
View file

@ -32,7 +32,7 @@ export const ProjectPage: FC<IProps> = ({ viewModel }) => {
ticketsTotalCount, ticketsTotalCount,
remainingDays, remainingDays,
files, files,
activities, // activities,
allProjects allProjects
} = viewModel; } = viewModel;