From 26932612f839de98773a5c699e8071c5d5ea4fcc Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 13 Feb 2019 14:58:40 +0100 Subject: [PATCH] Fix static site icon URL --- Packages-react/ohif-viewer/example/index.html | 7 +++---- Packages-react/ohif-viewer/src/App.js | 3 +-- .../ohif-viewer/src/components/Header/Header.js | 3 --- .../ohif-viewer/src/components/OHIFLogo/OHIFLogo.js | 2 +- .../ohif-viewer/src/connectedComponents/ToolbarRow.js | 3 +-- Packages-react/ohif-viewer/src/sha.js | 2 +- Packages-react/ohif-viewer/src/version.js | 2 +- Packages-react/react-cornerstone-viewport | 2 +- _redirects | 2 +- docs/README.md | 2 +- generateStaticSite.sh | 8 ++++---- 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Packages-react/ohif-viewer/example/index.html b/Packages-react/ohif-viewer/example/index.html index d2efcc272..8a1b52ef9 100644 --- a/Packages-react/ohif-viewer/example/index.html +++ b/Packages-react/ohif-viewer/example/index.html @@ -16,12 +16,11 @@ - + - + - + OHIF Standalone Viewer diff --git a/Packages-react/ohif-viewer/src/App.js b/Packages-react/ohif-viewer/src/App.js index a7eee8878..67f5a8900 100644 --- a/Packages-react/ohif-viewer/src/App.js +++ b/Packages-react/ohif-viewer/src/App.js @@ -23,8 +23,7 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'; const { ExtensionManager } = OHIF.extensions; -//import Icons from "./images/icons.svg" -const Icons = '/icons.svg'; +const Icons = 'icons.svg'; const { reducers, localStorage } = OHIF.redux; reducers.ui = ui; diff --git a/Packages-react/ohif-viewer/src/components/Header/Header.js b/Packages-react/ohif-viewer/src/components/Header/Header.js index 014a8b704..779a90742 100644 --- a/Packages-react/ohif-viewer/src/components/Header/Header.js +++ b/Packages-react/ohif-viewer/src/components/Header/Header.js @@ -5,9 +5,6 @@ import { Dropdown } from 'react-viewerbase'; import './Header.css'; import OHIFLogo from '../OHIFLogo/OHIFLogo.js'; import ConnectedUserPreferencesModal from '../../connectedComponents/ConnectedUserPreferencesModal.js'; -//import Icons from "../../images/icons.svg"; - -//const Icons = '/icons.svg'; class Header extends Component { static propTypes = { diff --git a/Packages-react/ohif-viewer/src/components/OHIFLogo/OHIFLogo.js b/Packages-react/ohif-viewer/src/components/OHIFLogo/OHIFLogo.js index 757a1eed8..e1fe80967 100644 --- a/Packages-react/ohif-viewer/src/components/OHIFLogo/OHIFLogo.js +++ b/Packages-react/ohif-viewer/src/components/OHIFLogo/OHIFLogo.js @@ -1,7 +1,7 @@ import React from 'react'; import './OHIFLogo.css'; -const Icons = '/icons.svg'; +const Icons = 'icons.svg'; function OHIFLogo() { return ( diff --git a/Packages-react/ohif-viewer/src/connectedComponents/ToolbarRow.js b/Packages-react/ohif-viewer/src/connectedComponents/ToolbarRow.js index 89623fd8c..01d776ff1 100644 --- a/Packages-react/ohif-viewer/src/connectedComponents/ToolbarRow.js +++ b/Packages-react/ohif-viewer/src/connectedComponents/ToolbarRow.js @@ -5,9 +5,8 @@ import ConnectedCineDialog from './ConnectedCineDialog.js'; import PropTypes from 'prop-types'; import { ToolbarButton, RoundedButtonGroup } from 'react-viewerbase'; import './ToolbarRow.css'; -//import Icons from "../images/icons.svg" -const Icons = '/icons.svg'; +const Icons = 'icons.svg'; class ToolbarRow extends Component { state = { diff --git a/Packages-react/ohif-viewer/src/sha.js b/Packages-react/ohif-viewer/src/sha.js index 52fa609ac..4f0d60e2f 100644 --- a/Packages-react/ohif-viewer/src/sha.js +++ b/Packages-react/ohif-viewer/src/sha.js @@ -1 +1 @@ -export default '3e5147f4ba463a7ce3d21257c0da8dede09f848d'; +export default '6b6237cdf6e54b87ccfb69efed769bc75e6fe232'; diff --git a/Packages-react/ohif-viewer/src/version.js b/Packages-react/ohif-viewer/src/version.js index f92b489c0..ee4dc112e 100644 --- a/Packages-react/ohif-viewer/src/version.js +++ b/Packages-react/ohif-viewer/src/version.js @@ -1 +1 @@ -export default '0.0.13'; +export default '0.0.15'; diff --git a/Packages-react/react-cornerstone-viewport b/Packages-react/react-cornerstone-viewport index 1309d8fa7..3f2d6cdf6 160000 --- a/Packages-react/react-cornerstone-viewport +++ b/Packages-react/react-cornerstone-viewport @@ -1 +1 @@ -Subproject commit 1309d8fa700710720eb3e722003c57374b4a7800 +Subproject commit 3f2d6cdf6409db98ff3777a0d186799b33cf608e diff --git a/_redirects b/_redirects index cea4a396f..b966afb85 100644 --- a/_redirects +++ b/_redirects @@ -1 +1 @@ -/viewer/* /viewer/index.html 200 \ No newline at end of file +/demo/* /demo/index.html 200 diff --git a/docs/README.md b/docs/README.md index e5ba8e9aa..3b74123f6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -##### Looking for your Deploy Preview? - Deploy Preview for Viewer +##### Looking for your Deploy Preview? - Deploy Preview for Viewer # Introduction diff --git a/generateStaticSite.sh b/generateStaticSite.sh index e8962f5fe..84123dff4 100755 --- a/generateStaticSite.sh +++ b/generateStaticSite.sh @@ -12,7 +12,7 @@ cd .. # Build and copy the StandaloneViewer into the static directory echo $DEPLOY_PRIME_URL cd Packages-react/ohif-viewer -export ROOT_URL=$DEPLOY_PRIME_URL/viewer +export ROOT_URL=$DEPLOY_PRIME_URL/demo cat package.json yarn install @@ -22,8 +22,8 @@ cd example yarn install yarn run prepare sed -i "s,http://localhost:5000,${ROOT_URL},g" index.html -sed -i 's,"routerBasename": "/","routerBasename": "/viewer",g' index.html +sed -i 's,"routerBasename": "/","routerBasename": "/demo",g' index.html rm -rf node_modules -mkdir ../../../docs/_book/viewer/ -cp -R * ../../../docs/_book/viewer/ +mkdir ../../../docs/_book/demo/ +cp -R * ../../../docs/_book/demo/ cp ../../../_redirects ../../../docs/_book/_redirects