diff --git a/package-lock.json b/package-lock.json
index 3e6f31cba2658c2d4d48546718a28bce8af484f9..26c3128a73ba4cd4959eb657d3e50118368dcf2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1895,25 +1895,6 @@
}
}
},
- "@popperjs/core": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.6.0.tgz",
- "integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="
- },
- "@restart/context": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/@restart/context/-/context-2.1.4.tgz",
- "integrity": "sha512-INJYZQJP7g+IoDUh/475NlGiTeMfwTXUEr3tmRneckHIxNolGOW9CTq83S8cxq0CgJwwcMzMJFchxvlwe7Rk8Q=="
- },
- "@restart/hooks": {
- "version": "0.3.26",
- "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.3.26.tgz",
- "integrity": "sha512-7Hwk2ZMYm+JLWcb7R9qIXk1OoUg1Z+saKWqZXlrvFwT3w6UArVNWgxYOzf+PJoK9zZejp8okPAKTctthhXLt5g==",
- "requires": {
- "lodash": "^4.17.20",
- "lodash-es": "^4.17.20"
- }
- },
"@rollup/plugin-node-resolve": {
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
@@ -2333,11 +2314,6 @@
"@babel/types": "^7.3.0"
}
},
- "@types/classnames": {
- "version": "2.2.11",
- "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz",
- "integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="
- },
"@types/cookie": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz",
@@ -2380,11 +2356,6 @@
"resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
"integrity": "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="
},
- "@types/invariant": {
- "version": "2.2.34",
- "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.34.tgz",
- "integrity": "sha512-lYUtmJ9BqUN688fGY1U1HZoWT1/Jrmgigx2loq4ZcJpICECm/Om3V314BxdzypO0u5PORKGMM6x0OXaljV1YFg=="
- },
"@types/istanbul-lib-coverage": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
@@ -2451,33 +2422,11 @@
"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz",
"integrity": "sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ=="
},
- "@types/prop-types": {
- "version": "15.7.3",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
- "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
- },
"@types/q": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
},
- "@types/react": {
- "version": "16.14.3",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.3.tgz",
- "integrity": "sha512-zPrXn03hmPYqh9DznqSFQsoRtrQ4aHgnZDO+hMGvsE/PORvDTdJCHQ6XvJV31ic+0LzF73huPFXUb++W6Kri0Q==",
- "requires": {
- "@types/prop-types": "*",
- "csstype": "^3.0.2"
- }
- },
- "@types/react-transition-group": {
- "version": "4.4.0",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
- "integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==",
- "requires": {
- "@types/react": "*"
- }
- },
"@types/resolve": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
@@ -2525,11 +2474,6 @@
}
}
},
- "@types/warning": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
- "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
- },
"@types/webpack": {
"version": "4.41.25",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz",
@@ -3848,11 +3792,6 @@
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
},
- "bootstrap": {
- "version": "4.5.3",
- "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz",
- "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ=="
- },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4257,11 +4196,6 @@
}
}
},
- "classnames": {
- "version": "2.2.6",
- "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
- "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
- },
"clean-css": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -5054,11 +4988,6 @@
}
}
},
- "csstype": {
- "version": "3.0.6",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.6.tgz",
- "integrity": "sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw=="
- },
"cyclist": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -5392,15 +5321,6 @@
"utila": "~0.4"
}
},
- "dom-helpers": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
- "integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
- "requires": {
- "@babel/runtime": "^7.8.7",
- "csstype": "^3.0.2"
- }
- },
"dom-serializer": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
@@ -8159,14 +8079,6 @@
}
}
},
- "invariant": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
- "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
- "requires": {
- "loose-envify": "^1.0.0"
- }
- },
"ip": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -10495,11 +10407,6 @@
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
},
- "lodash-es": {
- "version": "4.17.20",
- "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz",
- "integrity": "sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="
- },
"lodash._reinterpolate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -13084,15 +12991,6 @@
"react-is": "^16.8.1"
}
},
- "prop-types-extra": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
- "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==",
- "requires": {
- "react-is": "^16.3.2",
- "warning": "^4.0.0"
- }
- },
"proxy-addr": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
@@ -13271,31 +13169,6 @@
"whatwg-fetch": "^3.4.1"
}
},
- "react-bootstrap": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-1.4.0.tgz",
- "integrity": "sha512-0BMzgeUAxH126v7VYDzIXbHxQVHSnniPVKpz9fblumdQpWaiElMnnzk+u8h8DoELX0nCXwPlcUzgXqmpncdc2Q==",
- "requires": {
- "@babel/runtime": "^7.4.2",
- "@restart/context": "^2.1.4",
- "@restart/hooks": "^0.3.21",
- "@types/classnames": "^2.2.10",
- "@types/invariant": "^2.2.33",
- "@types/prop-types": "^15.7.3",
- "@types/react": "^16.9.35",
- "@types/react-transition-group": "^4.4.0",
- "@types/warning": "^3.0.0",
- "classnames": "^2.2.6",
- "dom-helpers": "^5.1.2",
- "invariant": "^2.2.4",
- "prop-types": "^15.7.2",
- "prop-types-extra": "^1.1.0",
- "react-overlays": "^4.1.0",
- "react-transition-group": "^4.4.1",
- "uncontrollable": "^7.0.0",
- "warning": "^4.0.3"
- }
- },
"react-dev-utils": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.0.tgz",
@@ -13406,26 +13279,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
- "react-lifecycles-compat": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
- },
- "react-overlays": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz",
- "integrity": "sha512-WtJifh081e6M24KnvTQoNjQEpz7HoLxqt8TwZM7LOYIkYJ8i/Ly1Xi7RVte87ZVnmqQ4PFaFiNHZhSINPSpdBQ==",
- "requires": {
- "@babel/runtime": "^7.12.1",
- "@popperjs/core": "^2.5.3",
- "@restart/hooks": "^0.3.25",
- "@types/warning": "^3.0.0",
- "dom-helpers": "^5.2.0",
- "prop-types": "^15.7.2",
- "uncontrollable": "^7.0.0",
- "warning": "^4.0.3"
- }
- },
"react-refresh": {
"version": "0.8.3",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
@@ -13551,17 +13404,6 @@
"prop-types": "^15.5.0"
}
},
- "react-transition-group": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
- "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
- "requires": {
- "@babel/runtime": "^7.5.5",
- "dom-helpers": "^5.0.1",
- "loose-envify": "^1.4.0",
- "prop-types": "^15.6.2"
- }
- },
"read-pkg": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
@@ -16064,17 +15906,6 @@
"integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
"dev": true
},
- "uncontrollable": {
- "version": "7.2.1",
- "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz",
- "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==",
- "requires": {
- "@babel/runtime": "^7.6.3",
- "@types/react": ">=16.9.11",
- "invariant": "^2.2.4",
- "react-lifecycles-compat": "^3.0.4"
- }
- },
"unicode-canonical-property-names-ecmascript": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -16422,14 +16253,6 @@
"makeerror": "1.0.x"
}
},
- "warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
- "requires": {
- "loose-envify": "^1.0.0"
- }
- },
"watchpack": {
"version": "1.7.5",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
diff --git a/package.json b/package.json
index fef55b15322cae2989d9ebf1206936db583ca439..e034b56e939f197d07424366925769c9c9a8ee52 100644
--- a/package.json
+++ b/package.json
@@ -12,10 +12,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
- "bootstrap": "4.5",
"jszip": "3.2.0",
"react": "^17.0.1",
- "react-bootstrap": "1.4.0",
"react-dom": "^17.0.1",
"react-icons": "4.1.0",
"react-router-dom": "5.2.0",
diff --git a/public/index.html b/public/index.html
index 8c1f6cb3cad46961473c1190c81023b095cbf282..dd172158746c1c6a64bd030dc00ee0ab7f45c857 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
diff --git a/src/components/experiment-list/import-experiment-buttons.js b/src/components/experiment-list/import-experiment-buttons.js
index 8129213a7b674a8fd7fa8801d7e79a026147f865..43170eb8341ea123e57c8d7e80b4519f78f32a29 100644
--- a/src/components/experiment-list/import-experiment-buttons.js
+++ b/src/components/experiment-list/import-experiment-buttons.js
@@ -1,7 +1,6 @@
import React from 'react';
import { FaFolder, FaFileArchive, FaAudible } from 'react-icons/fa';
-import { ButtonGroup, Button } from 'react-bootstrap';
import ImportExperimentService from '../../services/experiments/files/import-experiment-service.js';
import ExperimentStorageService from '../../services/experiments/files/experiment-storage-service.js';
@@ -101,7 +100,7 @@ export default class ImportExperimentButtons extends React.Component {
</p>
</div>
<div className="text-right">
- <Button variant="success" onClick={() => this.importFolderPopupClick()}>Got it!</Button>
+ <button variant="success" onClick={() => this.importFolderPopupClick()}>Got it!</button>
</div>
</div>
: null
@@ -118,7 +117,7 @@ export default class ImportExperimentButtons extends React.Component {
<p>have been successfully imported as:</p>
<p><b>{this.state.importZipResponses.destFolderName.join(', ')}.</b></p>
<div className="text-right">
- <Button variant="success" onClick={() => this.importZipPopupClick()}>Got it!</Button>
+ <button variant="success" onClick={() => this.importZipPopupClick()}>Got it!</button>
</div>
</div>
: null
@@ -141,7 +140,7 @@ export default class ImportExperimentButtons extends React.Component {
? this.state.scanStorageResponse.deletedFolders
: 'none' }</b></p>
<div className="text-right">
- <Button variant="success" onClick={() => this.scanStoragePopupClick()}>Got it!</Button>
+ <button variant="success" onClick={() => this.scanStoragePopupClick()}>Got it!</button>
</div>
</div>
: null
@@ -156,17 +155,17 @@ export default class ImportExperimentButtons extends React.Component {
multiple accept='.zip'
onChange={(event) => this.importZippedExperimentChange(event)}/>
{!this.state.isImporting
- ? <ButtonGroup role="group">
- <Button variant="outline-dark">
+ ? <div role="group">
+ <button variant="outline-dark">
<label htmlFor="folder"><FaFolder/> Import folder</label>
- </Button>
- <Button variant="outline-dark">
+ </button>
+ <button variant="outline-dark">
<label htmlFor="zip"><FaFileArchive/> Import zip</label>
- </Button >
- <Button variant="outline-dark" onClick={() => this.scanStorageClick()}>
+ </button >
+ <button variant="outline-dark" onClick={() => this.scanStorageClick()}>
<FaAudible/> Scan Storage
- </Button>
- </ButtonGroup>
+ </button>
+ </div>
: null}
</div>
</div>
diff --git a/src/components/user-menu/user-menu.js b/src/components/user-menu/user-menu.js
index a287c8620d25ab87dcf6068bbf47e830b3bbebb4..507b1b4122f8a6874cd8a82108029bf5936b83dd 100644
--- a/src/components/user-menu/user-menu.js
+++ b/src/components/user-menu/user-menu.js
@@ -1,5 +1,4 @@
import React from 'react';
-import Dropdown from 'react-bootstrap/Dropdown';
import { FaUserCircle, FaSignOutAlt } from 'react-icons/fa';
import NrpUserService from '../../services/proxy/nrp-user-service.js';
@@ -38,8 +37,8 @@ export default class UserMenu extends React.Component {
render() {
return (
<div className='user-menu-wrapper'>
- <Dropdown>
- <Dropdown.Toggle
+ <div className='dropdown'>
+ <div
className='dropdown-toggle'
variant='success'
id='dropdown-basic'
@@ -48,18 +47,18 @@ export default class UserMenu extends React.Component {
<div className='user-name'>
{this.state.user ? this.state.user.displayName : 'pending ...'}
</div>
- </Dropdown.Toggle>
+ </div>
- <Dropdown.Menu className='dropdown-menu'>
- <Dropdown.Item
+ <div className='dropdown-menu'>
+ <div
className='dropdown-item'
onClick={this.onClickLogout}
>
<FaSignOutAlt className='user-icon' />
Logout
- </Dropdown.Item>
- </Dropdown.Menu>
- </Dropdown>
+ </div>
+ </div>
+ </div>
</div>
);
}
diff --git a/src/index.js b/src/index.js
index 33f3dd6b06a99231aa04113f545f3f2c34dd0955..ef2edf8ea3fc42258464231e29140c8723458c1e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
-import 'bootstrap/dist/css/bootstrap.min.css';
import App from './App';
import reportWebVitals from './reportWebVitals';