diff --git a/packages/webapp/package.json b/packages/webapp/package.json index fe21b6b9..f2a78a58 100644 --- a/packages/webapp/package.json +++ b/packages/webapp/package.json @@ -47,6 +47,7 @@ "@material-ui/lab": "^4.0.0-alpha.57", "@reduxjs/toolkit": "^1.5.0", "axios": "^0.14.0", + "moment": "^2.29.1", "react": "^17.0.0", "react-dom": "^17.0.0", "react-google-recaptcha": "^2.1.0", @@ -57,4 +58,4 @@ "react-router-dom": "^5.2.0", "styled-components": "^5.1.7" } -} \ No newline at end of file +} diff --git a/packages/webapp/public/favicon.ico b/packages/webapp/public/favicon.ico index f6952bc3..955c5116 100644 Binary files a/packages/webapp/public/favicon.ico and b/packages/webapp/public/favicon.ico differ diff --git a/packages/webapp/public/manifest.json b/packages/webapp/public/manifest.json index 8552adfe..e1d4f3f9 100644 --- a/packages/webapp/public/manifest.json +++ b/packages/webapp/public/manifest.json @@ -3,7 +3,7 @@ "name": "WiseMapping", "icons": [{ "src": "favicon.ico", - "sizes": "256x256 192x192 128x128 96x96 64x64 32x32 24x24 16x16", + "sizes": "64x64 32x32 24x24 16x16", "type": "image/x-icon" }, { diff --git a/packages/webapp/src/components/maps-page/maps-list/index.tsx b/packages/webapp/src/components/maps-page/maps-list/index.tsx index e297b41c..25c03242 100644 --- a/packages/webapp/src/components/maps-page/maps-list/index.tsx +++ b/packages/webapp/src/components/maps-page/maps-list/index.tsx @@ -26,6 +26,7 @@ import ActionChooser, { ActionType } from '../action-chooser'; import ActionDispatcher from '../action-dispatcher'; import { InputBase, Link } from '@material-ui/core'; import SearchIcon from '@material-ui/icons/Search'; +import moment from 'moment' function descendingComparator(a: T, b: T, orderBy: keyof T) { @@ -60,18 +61,17 @@ function stableSort(array: T[], comparator: (a: T, b: T) => number) { } interface HeadCell { - disablePadding: boolean; id: keyof MapInfo; label?: string; numeric: boolean; - style: CSSProperties; + style?: CSSProperties; } const headCells: HeadCell[] = [ - { id: 'name', numeric: false, disablePadding: true, label: 'Name', style: {} }, - { id: 'labels', numeric: false, disablePadding: true, style: {} }, - { id: 'creator', numeric: false, disablePadding: false, label: 'Creator', style: {} }, - { id: 'modified', numeric: true, disablePadding: false, label: 'Modified', style: { width: '50px' } } + { id: 'name', numeric: false, label: 'Name' }, + { id: 'labels', numeric: false }, + { id: 'creator', numeric: false, label: 'Creator', style: { width: '60px' } }, + { id: 'modified', numeric: true, label: 'Modified', style: { width: '30px' } } ]; interface EnhancedTableProps { @@ -366,13 +366,15 @@ export const MapsList = () => { {row.labels} - + {row.creator} - {row.modified} + + {moment("20200704T120854").fromNow()} +