From 70f83f131ac7cda828a28f646ed185b9e6041a81 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Mon, 29 Apr 2019 15:06:17 -0400 Subject: [PATCH] Try to find ideal defaults --- netlify.toml | 7 +------ public/config/netlify.js | 3 --- src/App.js | 3 +++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/netlify.toml b/netlify.toml index 9dd0ccae5..4f53693fc 100644 --- a/netlify.toml +++ b/netlify.toml @@ -14,12 +14,7 @@ YARN_FLAGS = "--no-ignore-optional --pure-lockfile" # COMMENT: This a rule for Single Page Applications -# [[redirects]] -# from = "/*" -# to = "/index.html" -# status = 200 - [[redirects]] from = "/*" - to ="/demo/index.html" + to = "/index.html" status = 200 diff --git a/public/config/netlify.js b/public/config/netlify.js index 9c5be2156..179130c9a 100644 --- a/public/config/netlify.js +++ b/public/config/netlify.js @@ -1,8 +1,5 @@ window.config = { - // default: '/' routerBasename: '/demo', - // default: '/' - relativeWebWorkerScriptsPath: '', servers: { dicomWeb: [ { diff --git a/src/App.js b/src/App.js index 5b6d5e64e..1cb179ea6 100644 --- a/src/App.js +++ b/src/App.js @@ -226,9 +226,12 @@ class App extends Component { oidc: PropTypes.array, userManager: PropTypes.object, location: PropTypes.object, + whiteLabelling: PropTypes.object, } static defaultProps = { + routerBasename: '/', + relativeWebWorkerScriptsPath: '', whiteLabelling: {}, }