Merge pull request #338 from CodeForPhilly/front-end-cleanup

Front end cleanup
CodeForPhilly · Jun 1, 2021 · a4444b3 · a4444b3
2 parents 42028df + 428155e
commit a4444b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/client/src/pages/DataView360/View/View360.js b/src/client/src/pages/DataView360/View/View360.js
@@ -8,7 +8,8 @@ import {
     Button,
     Grid,
     Backdrop,
-    CircularProgress, Box, Typography
+    CircularProgress, 
+    Typography
 } from '@material-ui/core';
 
 import _ from 'lodash';

diff --git a/src/client/src/pages/DataView360/View/components/CollapsibleTable.js b/src/client/src/pages/DataView360/View/components/CollapsibleTable.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import Box from '@material-ui/core/Box';
 import Collapse from '@material-ui/core/Collapse';
@@ -31,10 +30,16 @@ function getAnimalAge(epochTime) {
     return moment().diff(dateOfBirth, 'years');
 }
 
+function showAnimalAge(epochTime) {
+    const age = getAnimalAge(epochTime)
+    return (age === 1) ? `${age} year` : `${age} years`
+}
+
 function Row(props) {
     const [open, setOpen] = React.useState(false);
     const classes = useRowStyles();
     const { row, events } = props;
+    const photo = row.Photos[0]
     return (
         <React.Fragment>
             <TableRow className={classes.root}>
@@ -48,8 +53,8 @@ function Row(props) {
                 </TableCell>
                 <TableCell align="center">{row.Type}</TableCell>
                 <TableCell align="center">{row.Breed}</TableCell>
-                <TableCell align="center">{getAnimalAge(row.DOBUnixTime)}</TableCell>
-                <TableCell align="center">{<img src={row.Photos[0]} alt="animal" style={{ "maxWidth": "100px" }} />}</TableCell>
+                <TableCell align="center">{showAnimalAge(row.DOBUnixTime)}</TableCell>
+                <TableCell align="center">{<img src={photo} alt="animal" style={{ "maxWidth": "100px" }} />}</TableCell>
             </TableRow>
             <TableRow>
                 <TableCell style={{ paddingBottom: 0, paddingTop: 0 }} colSpan={6}>
@@ -62,7 +67,7 @@ function Row(props) {
                                 <TableHead>
                                     <TableRow>
                                         <TableCell align="center">Subtype</TableCell>
-                                        <TableCell align="center">Time</TableCell>
+                                        <TableCell align="center">Date</TableCell>
                                         <TableCell align="center">Type</TableCell>
                                         <TableCell align="center">User</TableCell>
                                     </TableRow>

diff --git a/src/client/src/pages/DataView360/View/components/VolunteerActivity.js b/src/client/src/pages/DataView360/View/components/VolunteerActivity.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import {
     Paper,
-    Typography,
     Table,
     TableContainer,
     TableHead,
@@ -11,11 +10,8 @@ import {
     Container,
 } from '@material-ui/core';
 import { withStyles } from '@material-ui/core/styles';
-import _ from 'lodash';
 import moment from 'moment';
-import Grid from "@material-ui/core/Grid";
 import EmojiPeopleIcon from '@material-ui/icons/EmojiPeople';
-import TimelineIcon from '@material-ui/icons/Timeline';
 import DataTableHeader from './DataTableHeader';
 
 const customStyles = theme => ({