diff --git a/package-lock.json b/package-lock.json index db7f96ff2..1517a0d3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,6 @@ "react-copy-to-clipboard": "^5.0.3", "react-dom": "^16.13.1", "react-ga": "^2.7.0", - "react-grid-system": "^6.4.2", "react-places-autocomplete": "^7.2.1", "react-redux": "^7.2.0", "react-router": "^5.2.0", @@ -28262,14 +28261,6 @@ "react-resizable": "1.x" } }, - "node_modules/react-grid-system": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/react-grid-system/-/react-grid-system-6.4.2.tgz", - "integrity": "sha512-zQxczLIAUyFfXJOySQlQEptwZj65hxyoEvS+siTupFW76a3AKUhqrhMJ90xKDcSCF9jb9D71zjoPw13Xe1+EKA==", - "dependencies": { - "prop-types": "^15.7.2" - } - }, "node_modules/react-icon-base": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-icon-base/-/react-icon-base-2.1.0.tgz", @@ -60278,14 +60269,6 @@ "react-resizable": "1.x" } }, - "react-grid-system": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/react-grid-system/-/react-grid-system-6.4.2.tgz", - "integrity": "sha512-zQxczLIAUyFfXJOySQlQEptwZj65hxyoEvS+siTupFW76a3AKUhqrhMJ90xKDcSCF9jb9D71zjoPw13Xe1+EKA==", - "requires": { - "prop-types": "^15.7.2" - } - }, "react-icon-base": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-icon-base/-/react-icon-base-2.1.0.tgz", diff --git a/package.json b/package.json index 454762658..f8c7e7d7d 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "react-copy-to-clipboard": "^5.0.3", "react-dom": "^16.13.1", "react-ga": "^2.7.0", - "react-grid-system": "^6.4.2", "react-places-autocomplete": "^7.2.1", "react-redux": "^7.2.0", "react-router": "^5.2.0", diff --git a/src/assets/gen3TokenScreenshot.png b/src/assets/gen3TokenScreenshot.png deleted file mode 100644 index 5a61a1f6d..000000000 Binary files a/src/assets/gen3TokenScreenshot.png and /dev/null differ diff --git a/src/assets/icon-allapps-contact.svg b/src/assets/icon-allapps-contact.svg deleted file mode 100644 index f7fe3de51..000000000 --- a/src/assets/icon-allapps-contact.svg +++ /dev/null @@ -1 +0,0 @@ -icon-allapps-contact \ No newline at end of file diff --git a/src/assets/icon-allapps-menu-pink.svg b/src/assets/icon-allapps-menu-pink.svg deleted file mode 100644 index 4ebbb1043..000000000 --- a/src/assets/icon-allapps-menu-pink.svg +++ /dev/null @@ -1 +0,0 @@ -icon-allapps-menu-pink \ No newline at end of file diff --git a/src/assets/icon-allapps-portal.svg b/src/assets/icon-allapps-portal.svg deleted file mode 100644 index 80c4896a5..000000000 --- a/src/assets/icon-allapps-portal.svg +++ /dev/null @@ -1 +0,0 @@ -icon-allapps-portal \ No newline at end of file diff --git a/src/assets/icon-allapps-support.svg b/src/assets/icon-allapps-support.svg deleted file mode 100644 index 97a50066f..000000000 --- a/src/assets/icon-allapps-support.svg +++ /dev/null @@ -1 +0,0 @@ -icon-allapps-support \ No newline at end of file diff --git a/src/assets/icon-allapps-website.svg b/src/assets/icon-allapps-website.svg deleted file mode 100644 index 24b4d2b60..000000000 --- a/src/assets/icon-allapps-website.svg +++ /dev/null @@ -1 +0,0 @@ -icon-allapps-website \ No newline at end of file diff --git a/src/assets/icon-copy-clipboard.svg b/src/assets/icon-copy-clipboard.svg deleted file mode 100644 index 0ae645f69..000000000 --- a/src/assets/icon-copy-clipboard.svg +++ /dev/null @@ -1 +0,0 @@ -icon-copy-clipboard \ No newline at end of file diff --git a/src/assets/icon-download-white.svg b/src/assets/icon-download-white.svg deleted file mode 100644 index 61790399b..000000000 --- a/src/assets/icon-download-white.svg +++ /dev/null @@ -1 +0,0 @@ -icon-download-white \ No newline at end of file diff --git a/src/assets/icon-family-members.svg b/src/assets/icon-family-members.svg deleted file mode 100644 index 51a73cdf9..000000000 --- a/src/assets/icon-family-members.svg +++ /dev/null @@ -1 +0,0 @@ -icon-family-members \ No newline at end of file diff --git a/src/assets/icon-info.svg b/src/assets/icon-info.svg deleted file mode 100644 index 4fb839380..000000000 --- a/src/assets/icon-info.svg +++ /dev/null @@ -1 +0,0 @@ -icon-info \ No newline at end of file diff --git a/src/assets/icon-lab-flask.svg b/src/assets/icon-lab-flask.svg deleted file mode 100644 index cb9247204..000000000 --- a/src/assets/icon-lab-flask.svg +++ /dev/null @@ -1 +0,0 @@ -icon-beta-progress \ No newline at end of file diff --git a/src/assets/icon-location.svg b/src/assets/icon-location.svg deleted file mode 100644 index 0b6ae7505..000000000 --- a/src/assets/icon-location.svg +++ /dev/null @@ -1 +0,0 @@ -icon-location \ No newline at end of file diff --git a/src/assets/icon-mail.svg b/src/assets/icon-mail.svg deleted file mode 100644 index 8c23a51e7..000000000 --- a/src/assets/icon-mail.svg +++ /dev/null @@ -1 +0,0 @@ -icon-mail \ No newline at end of file diff --git a/src/assets/icon-note.svg b/src/assets/icon-note.svg deleted file mode 100644 index b595437c4..000000000 --- a/src/assets/icon-note.svg +++ /dev/null @@ -1 +0,0 @@ -icon-note \ No newline at end of file diff --git a/src/assets/icon-phone.svg b/src/assets/icon-phone.svg deleted file mode 100644 index d15c77175..000000000 --- a/src/assets/icon-phone.svg +++ /dev/null @@ -1 +0,0 @@ -icon-phone \ No newline at end of file diff --git a/src/assets/icon-plus.svg b/src/assets/icon-plus.svg deleted file mode 100644 index d15e6c1e7..000000000 --- a/src/assets/icon-plus.svg +++ /dev/null @@ -1 +0,0 @@ -icon-plus \ No newline at end of file diff --git a/src/assets/icon-search.svg b/src/assets/icon-search.svg deleted file mode 100644 index 0689b383c..000000000 --- a/src/assets/icon-search.svg +++ /dev/null @@ -1 +0,0 @@ -icon-search \ No newline at end of file diff --git a/src/assets/icon-success.svg b/src/assets/icon-success.svg deleted file mode 100644 index 71729041a..000000000 --- a/src/assets/icon-success.svg +++ /dev/null @@ -1 +0,0 @@ -icon-success \ No newline at end of file diff --git a/src/assets/icon-user-patients.svg b/src/assets/icon-user-patients.svg deleted file mode 100644 index 4aa9f9ea7..000000000 --- a/src/assets/icon-user-patients.svg +++ /dev/null @@ -1 +0,0 @@ -icon-user-patients \ No newline at end of file diff --git a/src/assets/icon-warning.svg b/src/assets/icon-warning.svg deleted file mode 100644 index dd04cd765..000000000 --- a/src/assets/icon-warning.svg +++ /dev/null @@ -1 +0,0 @@ -icon-warning \ No newline at end of file diff --git a/src/assets/icon-with-check.svg b/src/assets/icon-with-check.svg deleted file mode 100644 index 4b27d41a7..000000000 --- a/src/assets/icon-with-check.svg +++ /dev/null @@ -1 +0,0 @@ -icon-with-check \ No newline at end of file diff --git a/src/assets/icon-without.svg b/src/assets/icon-without.svg deleted file mode 100644 index a0e2f2a5f..000000000 --- a/src/assets/icon-without.svg +++ /dev/null @@ -1 +0,0 @@ -icon-without \ No newline at end of file diff --git a/src/assets/logo-dcf.png b/src/assets/logo-dcf.png deleted file mode 100644 index 75ab2a0b1..000000000 Binary files a/src/assets/logo-dcf.png and /dev/null differ diff --git a/src/assets/logo-orcid.svg b/src/assets/logo-orcid.svg deleted file mode 100644 index c1500de65..000000000 --- a/src/assets/logo-orcid.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/logomark-cavatica-mono-white.svg b/src/assets/logomark-cavatica-mono-white.svg deleted file mode 100644 index 6630984c5..000000000 --- a/src/assets/logomark-cavatica-mono-white.svg +++ /dev/null @@ -1 +0,0 @@ -logo-cavatica diff --git a/src/assets/logomark-cavatica.svg b/src/assets/logomark-cavatica.svg deleted file mode 100644 index 5ff55dfb2..000000000 --- a/src/assets/logomark-cavatica.svg +++ /dev/null @@ -1 +0,0 @@ -logo-cavatica diff --git a/src/icons/EnvelopeIcon.js b/src/icons/EnvelopeIcon.js deleted file mode 100644 index f901abf9a..000000000 --- a/src/icons/EnvelopeIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: `icon-mail`, - width, - height, - ...props, - }); diff --git a/src/icons/ExploreDataIcon.js b/src/icons/ExploreDataIcon.js deleted file mode 100644 index d65161cba..000000000 --- a/src/icons/ExploreDataIcon.js +++ /dev/null @@ -1,20 +0,0 @@ -import React from 'react'; - -const svg = ({ ...props }) => ( - - icon-explore-data - - - - - - - -); -export default svg; diff --git a/src/icons/FilesIcon.js b/src/icons/FilesIcon.js deleted file mode 100644 index 25b6729ee..000000000 --- a/src/icons/FilesIcon.js +++ /dev/null @@ -1,10 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ fill = '#a9adc0', width = '12px', height = '16px', ...props }) => - BaseSvg({ - // eslint-disable-next-line max-len - svg: `icon-files`, - width, - height, - ...props, - }); diff --git a/src/icons/FlaskIcon.js b/src/icons/FlaskIcon.js deleted file mode 100644 index 9faad1ad1..000000000 --- a/src/icons/FlaskIcon.js +++ /dev/null @@ -1,24 +0,0 @@ -import * as React from 'react'; - -export default ({ width = 94, height = 94, fill = '#FFFFFF', ...props }) => { - return ( - - Shape - Created with Sketch. - - - - - ); -}; diff --git a/src/icons/GoogleScholarIcon.js b/src/icons/GoogleScholarIcon.js deleted file mode 100644 index 5f9d8cd60..000000000 --- a/src/icons/GoogleScholarIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ fill = '#000', size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: ` `, - width, - height, - ...props, - }); diff --git a/src/icons/LinkedInIcon.js b/src/icons/LinkedInIcon.js deleted file mode 100644 index e49f74ff9..000000000 --- a/src/icons/LinkedInIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ fill = '#007ab9', size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: ``, - width, - height, - ...props, - }); diff --git a/src/icons/MapMarkerIcon.js b/src/icons/MapMarkerIcon.js deleted file mode 100644 index e2d2df70a..000000000 --- a/src/icons/MapMarkerIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: `icon-location`, - width, - height, - ...props, - }); diff --git a/src/icons/PhoneIcon.js b/src/icons/PhoneIcon.js deleted file mode 100644 index 687dd4c83..000000000 --- a/src/icons/PhoneIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: `icon-phone`, - width, - height, - ...props, - }); diff --git a/src/icons/QuickFilterIcon.js b/src/icons/QuickFilterIcon.js deleted file mode 100644 index bb1a3dda1..000000000 --- a/src/icons/QuickFilterIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ fill = '#fff', size = '14px', width = size, height = size, ...props }) => - BaseSvg({ - svg: `icon-quick-filters`, - width, - height, - ...props, - }); diff --git a/src/icons/SaveIcon.js b/src/icons/SaveIcon.js deleted file mode 100644 index ba5f9c405..000000000 --- a/src/icons/SaveIcon.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from 'react'; - -export default props => ( - - - -); diff --git a/src/icons/WebsiteIcon.js b/src/icons/WebsiteIcon.js deleted file mode 100644 index fed4b34c6..000000000 --- a/src/icons/WebsiteIcon.js +++ /dev/null @@ -1,9 +0,0 @@ -import { BaseSvg } from 'icons'; - -export default ({ fill = '#009bb8', size = '1em', width = size, height = size, ...props }) => - BaseSvg({ - svg: ``, - width, - height, - ...props, - }); diff --git a/src/uikit/SummaryTable/VariableSummaryTable/index.js b/src/uikit/SummaryTable/VariableSummaryTable/index.js index 50f49bbb4..51f2fe0db 100644 --- a/src/uikit/SummaryTable/VariableSummaryTable/index.js +++ b/src/uikit/SummaryTable/VariableSummaryTable/index.js @@ -1,22 +1,22 @@ import React from 'react'; +import { Grid } from 'antd'; import PropTypes from 'prop-types'; -import { mq } from 'uikit/BreakpointHelper'; -// [NEXT] TODO - REMOVE react-grid-system in favor of whatever else we have -import { Visible } from 'react-grid-system'; + import Tables from './Tables'; import './VariableSummaryTable.css'; -const VariableSummaryTable = ({ rows, nbOfTables }) => ( -
- - - - - - -
-); +const { useBreakpoint } = Grid; + +const VariableSummaryTable = ({ rows }) => { + const screens = useBreakpoint(); + const screenIsSmall = screens.xs; + return ( +
+ +
+ ); +}; VariableSummaryTable.propTypes = { rows: PropTypes.arrayOf( @@ -24,7 +24,6 @@ VariableSummaryTable.propTypes = { title: PropTypes.string, }), ).isRequired, - nbOfTables: PropTypes.number, }; export default VariableSummaryTable; diff --git a/src/uikit/SummaryTable/index.js b/src/uikit/SummaryTable/index.js index a7d71c23d..cd659ce09 100644 --- a/src/uikit/SummaryTable/index.js +++ b/src/uikit/SummaryTable/index.js @@ -1,8 +1,3 @@ -import React from 'react'; import VariableSummaryTable from './VariableSummaryTable'; -const SummaryTable = ({ rows }) => ( - //backwards compatibility for File page -); - -export default SummaryTable; +export default VariableSummaryTable;