Fix static site icon URL

This commit is contained in:
Erik Ziegler 2019-02-13 14:58:40 +01:00
parent 6b6237cdf6
commit 26932612f8
11 changed files with 15 additions and 21 deletions

View File

@ -16,12 +16,11 @@
<link rel="stylesheet" href="index.css"> <link rel="stylesheet" href="index.css">
<!-- Latest compiled and minified CSS --> <!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<!-- WEB FONTS --> <!-- WEB FONTS -->
<link href="https://fonts.googleapis.com/css?family=Sanchez" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Sanchez" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
crossorigin="anonymous">
<title>OHIF Standalone Viewer</title> <title>OHIF Standalone Viewer</title>
<base href="http://localhost:5000/"> <base href="http://localhost:5000/">

View File

@ -23,8 +23,7 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
const { ExtensionManager } = OHIF.extensions; const { ExtensionManager } = OHIF.extensions;
//import Icons from "./images/icons.svg" const Icons = 'icons.svg';
const Icons = '/icons.svg';
const { reducers, localStorage } = OHIF.redux; const { reducers, localStorage } = OHIF.redux;
reducers.ui = ui; reducers.ui = ui;

View File

@ -5,9 +5,6 @@ import { Dropdown } from 'react-viewerbase';
import './Header.css'; import './Header.css';
import OHIFLogo from '../OHIFLogo/OHIFLogo.js'; import OHIFLogo from '../OHIFLogo/OHIFLogo.js';
import ConnectedUserPreferencesModal from '../../connectedComponents/ConnectedUserPreferencesModal.js'; import ConnectedUserPreferencesModal from '../../connectedComponents/ConnectedUserPreferencesModal.js';
//import Icons from "../../images/icons.svg";
//const Icons = '/icons.svg';
class Header extends Component { class Header extends Component {
static propTypes = { static propTypes = {

View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import './OHIFLogo.css'; import './OHIFLogo.css';
const Icons = '/icons.svg'; const Icons = 'icons.svg';
function OHIFLogo() { function OHIFLogo() {
return ( return (

View File

@ -5,9 +5,8 @@ import ConnectedCineDialog from './ConnectedCineDialog.js';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { ToolbarButton, RoundedButtonGroup } from 'react-viewerbase'; import { ToolbarButton, RoundedButtonGroup } from 'react-viewerbase';
import './ToolbarRow.css'; import './ToolbarRow.css';
//import Icons from "../images/icons.svg"
const Icons = '/icons.svg'; const Icons = 'icons.svg';
class ToolbarRow extends Component { class ToolbarRow extends Component {
state = { state = {

View File

@ -1 +1 @@
export default '3e5147f4ba463a7ce3d21257c0da8dede09f848d'; export default '6b6237cdf6e54b87ccfb69efed769bc75e6fe232';

View File

@ -1 +1 @@
export default '0.0.13'; export default '0.0.15';

@ -1 +1 @@
Subproject commit 1309d8fa700710720eb3e722003c57374b4a7800 Subproject commit 3f2d6cdf6409db98ff3777a0d186799b33cf608e

View File

@ -1 +1 @@
/viewer/* /viewer/index.html 200 /demo/* /demo/index.html 200

View File

@ -1,4 +1,4 @@
##### Looking for your Deploy Preview? - <a onclick="function redirect() { window.location.href='/viewer/?url=https://s3.eu-central-1.amazonaws.com/ohif-viewer/sampleDICOM.json'; } redirect();">Deploy Preview for Viewer</a> ##### Looking for your Deploy Preview? - <a onclick="function redirect() { window.location.href='/demo/'; } redirect();">Deploy Preview for Viewer</a>
# Introduction # Introduction

View File

@ -12,7 +12,7 @@ cd ..
# Build and copy the StandaloneViewer into the static directory # Build and copy the StandaloneViewer into the static directory
echo $DEPLOY_PRIME_URL echo $DEPLOY_PRIME_URL
cd Packages-react/ohif-viewer cd Packages-react/ohif-viewer
export ROOT_URL=$DEPLOY_PRIME_URL/viewer export ROOT_URL=$DEPLOY_PRIME_URL/demo
cat package.json cat package.json
yarn install yarn install
@ -22,8 +22,8 @@ cd example
yarn install yarn install
yarn run prepare yarn run prepare
sed -i "s,http://localhost:5000,${ROOT_URL},g" index.html 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 rm -rf node_modules
mkdir ../../../docs/_book/viewer/ mkdir ../../../docs/_book/demo/
cp -R * ../../../docs/_book/viewer/ cp -R * ../../../docs/_book/demo/
cp ../../../_redirects ../../../docs/_book/_redirects cp ../../../_redirects ../../../docs/_book/_redirects