Merge pull request #44 from prydonius/hash-routing

use hash router to support serving from subpath
vmware-archive · Nov 15, 2017 · 63581b7 · 63581b7
2 parents 0520417 + eeb4828
commit 63581b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: kubeless-ui-dev
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile-prod
     command: bash -c "yarn install && npm rebuild node-sass && yarn run dev"
     environment:
       NODE_ENV: development

diff --git a/src/components/AppContainer.js b/src/components/AppContainer.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 // @flow
 import React, { Component } from 'react'
-import { browserHistory, Router } from 'react-router'
+import { hashHistory, Router } from 'react-router'
 import { Provider } from 'react-redux'
 import getMuiTheme from 'material-ui/styles/getMuiTheme'
 import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme'
@@ -48,7 +48,7 @@ export default class AppContainer extends Component {
       <Provider store={store}>
         <MuiThemeProvider muiTheme={muiTheme}>
           <div style={{ height: '100%' }}>
-            <Router history={browserHistory} children={routes} />
+            <Router history={hashHistory} children={routes} />
           </div>
         </MuiThemeProvider>
       </Provider>

diff --git a/src/utils/Api.js b/src/utils/Api.js
@@ -27,7 +27,7 @@ export default class Api {
       url: URL, method, json
     }
 
-    return fetch('/proxy', {
+    return fetch('proxy', {
       method: 'post',
       headers,
       body: JSON.stringify(forwardBody)