diff --git a/frontend/src/components/resourcechart/resourcechart.js b/frontend/src/components/resourcechart/resourcechart.js index 66e9d22..010e659 100644 --- a/frontend/src/components/resourcechart/resourcechart.js +++ b/frontend/src/components/resourcechart/resourcechart.js @@ -5,9 +5,47 @@ import { import { useParams } from "react-router-dom"; +import CircularProgress from '@material-ui/core/CircularProgress'; +import Card from '@material-ui/core/Card'; +import CardContent from '@material-ui/core/CardContent'; +import Typography from '@material-ui/core/Typography'; +import { makeStyles } from '@material-ui/core/styles'; +import Grid from '@material-ui/core/Grid'; + +const useStyles = makeStyles((theme) => ({ + root: { + display: 'flex', + }, +})); + +const output = (data) => { + if (data === null) { + return ( + + ) + } else { + return ( + + + + + + + + + ) + } +} export default function ResourceChart(props) { - + const classes = useStyles(); const [data, setData] = React.useState(null); let { id } = useParams(); const loadData = async () => { @@ -24,21 +62,27 @@ export default function ResourceChart(props) { loadData(); } + + return ( - - - - - - - - +
+ + + + Resource Chart + + + + + + {output(data)} + + + + + +
+ + ); } diff --git a/frontend/src/components/selectResource/index.js b/frontend/src/components/selectResource/index.js index ab39ab9..9027869 100644 --- a/frontend/src/components/selectResource/index.js +++ b/frontend/src/components/selectResource/index.js @@ -1,14 +1,6 @@ import React from 'react'; import { makeStyles } from '@material-ui/core/styles'; -import Card from '@material-ui/core/Card'; -import CardContent from '@material-ui/core/CardContent'; -import Typography from '@material-ui/core/Typography'; import Grid from '@material-ui/core/Grid'; -import { Link } from 'react-router-dom'; -import Link1 from '@material-ui/core/Link'; -import ListItem from '@material-ui/core/ListItem'; -import ListItemText from '@material-ui/core/ListItemText'; -import CardMedia from '@material-ui/core/CardMedia'; import ResourceCard from './resourceCard';