Skip to content
Snippets Groups Projects
Commit 60b4fee6 authored by Antoine Detailleur's avatar Antoine Detailleur
Browse files

[NRRPLT-8175] CSS import experiment buttons

parent ed756c7b
No related branches found
No related tags found
No related merge requests found
...@@ -3792,6 +3792,11 @@ ...@@ -3792,6 +3792,11 @@
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"bootstrap": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz",
"integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw=="
},
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
...@@ -10115,6 +10120,11 @@ ...@@ -10115,6 +10120,11 @@
} }
} }
}, },
"jquery": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
},
"js-tokens": { "js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
......
...@@ -12,8 +12,11 @@ ...@@ -12,8 +12,11 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"bootstrap": "4.6.0",
"jszip": "3.2.0", "jszip": "3.2.0",
"jquery": "3.6.0",
"react": "^17.0.1", "react": "^17.0.1",
"react-bootstrap": "1.5.2",
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-icons": "4.1.0", "react-icons": "4.1.0",
"react-router-dom": "5.2.0", "react-router-dom": "5.2.0",
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
z-index: 10001; z-index: 10001;
} }
#import-buttons { .import-button {
vertical-align: middle; cursor: pointer;
margin: auto 0; height: 50%;
} }
\ No newline at end of file
...@@ -155,14 +155,16 @@ export default class ImportExperimentButtons extends React.Component { ...@@ -155,14 +155,16 @@ export default class ImportExperimentButtons extends React.Component {
multiple accept='.zip' multiple accept='.zip'
onChange={(event) => this.importZippedExperimentChange(event)}/> onChange={(event) => this.importZippedExperimentChange(event)}/>
{!this.state.isImporting {!this.state.isImporting
? <div role="group"> ? <div className="btn-group" role="group">
<button variant="outline-dark"> <button type="button" className="btn btn-outline-dark">
<label htmlFor="folder"><FaFolder/> Import folder</label> <label htmlFor="folder" className="import-button">
<FaFolder/> Import folder
</label>
</button> </button>
<button variant="outline-dark"> <button type="button" className="btn btn-outline-dark">
<label htmlFor="zip"><FaFileArchive/> Import zip</label> <label htmlFor="zip" className="import-button"><FaFileArchive/> Import zip</label>
</button > </button >
<button variant="outline-dark" onClick={() => this.scanStorageClick()}> <button type="button" className="btn btn-outline-dark" onClick={() => this.scanStorageClick()}>
<FaAudible/> Scan Storage <FaAudible/> Scan Storage
</button> </button>
</div> </div>
......
...@@ -38,22 +38,16 @@ export default class UserMenu extends React.Component { ...@@ -38,22 +38,16 @@ export default class UserMenu extends React.Component {
return ( return (
<div className='user-menu-wrapper'> <div className='user-menu-wrapper'>
<div className='dropdown'> <div className='dropdown'>
<div <button className='dropdown-toggle' id='dropdownMenuButton'
className='dropdown-toggle' data-toggle="dropdown" aria-haspopup='true' aria-expanded='false'>
variant='success' <FaUserCircle className='user-icon'/>
id='dropdown-basic'
>
<FaUserCircle className='user-icon' />
<div className='user-name'> <div className='user-name'>
{this.state.user ? this.state.user.displayName : 'pending ...'} {this.state.user ? this.state.user.displayName : 'pending ...'}
</div> </div>
</div> </button>
<div className='dropdown-menu'> <div className='dropdown-menu' aria-labelledby='dropdownMenuButton'>
<div <div className='dropdown-item' href='#' onClick={this.onClickLogout}>
className='dropdown-item'
onClick={this.onClickLogout}
>
<FaSignOutAlt className='user-icon' /> <FaSignOutAlt className='user-icon' />
Logout Logout
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment