Skip to content

Commit

Permalink
Merge pull request #67 from KPMP/develop
Browse files Browse the repository at this point in the history
Release v0.1.1
  • Loading branch information
rlreamy authored Dec 21, 2021
2 parents b384e14 + 4411a82 commit 0271b49
Show file tree
Hide file tree
Showing 6 changed files with 2,426 additions and 2,679 deletions.
5,067 changes: 2,406 additions & 2,661 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "/spatial-viewer",
"baseURL": "/spatial-viewer",
"dependencies": {
"axios": "0.21.1",
"axios": "0.24.0",
"bootstrap-css-only": "4.4.1",
"history": "5.0.1",
"kpmp-common-components": "1.1.4",
"history": "5.1.0",
"kpmp-common-components": "1.1.7",
"kpmp-common-styles": "1.0.9",
"node-sass-chokidar": "1.5.0",
"npm-run-all": "4.1.5",
Expand All @@ -19,11 +19,11 @@
"react-redux": "7.2.4",
"react-router-dom": "5.2.1",
"react-scripts": "4.0.3",
"react-table-filter": "^2.0.2",
"reactstrap": "^8.9.0",
"react-table-filter": "2.0.2",
"reactstrap": "8.9.0",
"redux": "4.1.1",
"redux-thunk": "2.3.0",
"vitessce": "file:vitessce-1.1.15.tgz"
"vitessce": "file:vitessce-1.1.17.tgz"
},
"scripts": {
"start": "npm-run-all -p watch-css start-js",
Expand Down
6 changes: 4 additions & 2 deletions src/components/SpatialViewer/SpatialViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Row, Col} from "reactstrap";
import { baseURL } from '../../../package.json';
import { getViewConfig, populateViewConfig } from './viewConfigHelper';
import { createHeaderString } from './spatialHelper';
import { Redirect } from 'react-router-dom';

class SpatialViewer extends Component {

Expand All @@ -27,9 +28,10 @@ class SpatialViewer extends Component {
}

render() {
if (!this.props.selectedImageDataset || (this.props.selectedImageDataset && Object.keys(this.props.selectedImageDataset).length === 0)) {
return <Redirect to='/' />
}



return (
<div className="container-fluid">
<div id="vitessce-container" className="rounded border shadow-sm mt-2 mx-3 p-3">
Expand Down
20 changes: 10 additions & 10 deletions src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,24 +49,24 @@
text-decoration: none;
}

.title > span.details > span > button:first-child {
display: none;
th[title='Acquisition Date'] {
display:none;
}

.title > span.details > span > button:last-child {
display: none;
th[title='Pixels Type'], th[title='Pixels Type'] + td {
display:none;
}

.layer-controller-container > div:last-child > button {
display: none;
.title-buttons > div:first-child > button{
display: none
}

th[title='Acquisition Date'] {
display:none;
.title-buttons > button:last-child {
display: none
}

th[title='Pixels Type'], th[title='Pixels Type'] + td {
display:none;
.layer-controller-container .MuiButtonBase-root-12 .MuiIconButton-root-3 {
top: -15.4px;
}

.icon-info {
Expand Down
Binary file removed vitessce-1.1.15.tgz
Binary file not shown.
Binary file added vitessce-1.1.17.tgz
Binary file not shown.

0 comments on commit 0271b49

Please sign in to comment.