diff --git a/package.json b/package.json index 5f15f1815..00e1f0370 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "query-string": "^6.12.1", "react": "^16.8.3", "react-app-rewire-postcss": "^3.0.2", + "react-charts": "^2.0.0-beta.7", "react-copy-to-clipboard": "^5.0.1", "react-datasheet": "^1.4.1", "react-dom": "^16.8.3", diff --git a/src/App.css b/src/App.css index 6e24e137f..82025cd51 100755 --- a/src/App.css +++ b/src/App.css @@ -44,6 +44,10 @@ body { margin-top: 0px !important; } +.mt--10 { + margin-top: -10px !important; +} + .mr-0 { margin-right: 0px !important; } @@ -338,6 +342,10 @@ body { color: #676767 !important; } +.text-dark-grey { + color: #5e5e5e !important; +} + .text-black { color: #000000 !important; } @@ -538,6 +546,14 @@ body { height: 38px !important; } +.h-24 { + height: 24px !important; +} + +.h-220 { + height: 220px !important; +} + .small-inline { display: inline-block; padding-top: 10px; diff --git a/src/assets/s3.png b/src/assets/s3.png new file mode 100644 index 000000000..f89de6f6c Binary files /dev/null and b/src/assets/s3.png differ diff --git a/src/common/dateUtils.js b/src/common/dateUtils.js index 9e80462c9..c3838e479 100644 --- a/src/common/dateUtils.js +++ b/src/common/dateUtils.js @@ -1,5 +1,5 @@ // Reformat time to the "DD MMM YYYY" format like "12 Aug 2019" -export const longDate = (date) => { +export const longDate = date => { var mydate = new Date(date); var month = [ 'Jan', @@ -19,7 +19,7 @@ export const longDate = (date) => { return str; }; -export const toYearMonthDay = (isoDate) => { +export const toYearMonthDay = isoDate => { /* * Convert ISO8601 UTC datetime string to local datetime and format as * yyyy-mm-dd date string. @@ -39,3 +39,34 @@ export const toYearMonthDay = (isoDate) => { } return date; }; + +// Reformat time to the date and time format +export const dateTime = date => { + var mydate = new Date(date); + var month = [ + 'Jan', + 'Feb', + 'Mar', + 'Apr', + 'May', + 'Jun', + 'Jul', + 'Aug', + 'Sept', + 'Oct', + 'Nov', + 'Dec', + ][mydate.getMonth()]; + const weekday = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; + var str = + weekday[mydate.getDay()] + + ', ' + + month + + ' ' + + mydate.getUTCDate() + + ', ' + + mydate.getFullYear() + + ', ' + + mydate.toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'}); + return str; +}; diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js index a66948ebe..395f37b7c 100644 --- a/src/components/Header/Header.js +++ b/src/components/Header/Header.js @@ -277,6 +277,12 @@ const Header = ({location}) => {