From 7c231a4c5edf3323fe44bd0621eba0d8204fc657 Mon Sep 17 00:00:00 2001
From: vrde <agranzot@gmail.com>
Date: Tue, 13 Oct 2015 14:19:08 +0200
Subject: [PATCH] Restore baseUrl in router

---
 js/components/whitelabel/prize/prize_routes.js   |  5 +----
 js/components/whitelabel/wallet/wallet_routes.js |  9 +++------
 js/history.js                                    | 10 +++++++++-
 js/routes.js                                     |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/js/components/whitelabel/prize/prize_routes.js b/js/components/whitelabel/prize/prize_routes.js
index 9f3c5392..14d8b4d9 100644
--- a/js/components/whitelabel/prize/prize_routes.js
+++ b/js/components/whitelabel/prize/prize_routes.js
@@ -17,16 +17,13 @@ import CoaVerifyContainer from '../../../components/coa_verify_container';
 import ErrorNotFoundPage from '../../../components/error_not_found_page';
 
 import App from './prize_app';
-import AppConstants from '../../../constants/application_constants';
 
 import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
 
 
-let baseUrl = AppConstants.baseUrl;
-
 function getRoutes() {
     return (
-        <Route path={baseUrl} component={App}>
+        <Route path='/' component={App}>
             <IndexRoute component={Landing} />
             <Route
                 path='login'
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 5ef78e4a..cd6d6f6f 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -33,14 +33,11 @@ import CCRegisterPiece from './components/cc/cc_register_piece';
 import AuthProxyHandler from '../../../components/ascribe_routes/proxy_routes/auth_proxy_handler';
 
 import WalletApp from './wallet_app';
-import AppConstants from '../../../constants/application_constants';
 
 
-let baseUrl = AppConstants.baseUrl;
-
 let ROUTES = {
     'cyland': (
-        <Route path={baseUrl} component={WalletApp}>
+        <Route path='/' component={WalletApp}>
             <IndexRoute component={CylandLanding} />
             <Route
                 path='login'
@@ -75,7 +72,7 @@ let ROUTES = {
         </Route>
     ),
     'cc': (
-        <Route path={baseUrl} component={WalletApp}>
+        <Route path='/' component={WalletApp}>
             <Route
                 path='login'
                 component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />
@@ -109,7 +106,7 @@ let ROUTES = {
         </Route>
     ),
     'ikonotv': (
-        <Route path={baseUrl} component={WalletApp}>
+        <Route path='/' component={WalletApp}>
             <IndexRoute component={IkonotvLanding} />
             <Route
                 path='login'
diff --git a/js/history.js b/js/history.js
index 18ec400f..903f2b73 100644
--- a/js/history.js
+++ b/js/history.js
@@ -1,5 +1,13 @@
 'use strict';
 
+import useBasename from 'history/lib/useBasename';
 import createBrowserHistory from 'history/lib/createBrowserHistory';
+import AppConstants from './constants/application_constants';
 
-export default createBrowserHistory();
\ No newline at end of file
+
+// Remove the trailing slash if present
+let baseUrl = AppConstants.baseUrl.replace(/\/$/, '');
+
+export default useBasename(createBrowserHistory)({
+    basename: baseUrl
+});
diff --git a/js/routes.js b/js/routes.js
index 4611ff47..4c9c90fe 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -33,7 +33,7 @@ import AppConstants from './constants/application_constants';
 let baseUrl = AppConstants.baseUrl;
 
 let COMMON_ROUTES = (
-    <Route path={baseUrl} component={App}>
+    <Route path='/' component={App}>
         <Route
             path="login"
             component={AuthProxyHandler({to: '/collection', when: 'loggedIn'})(LoginContainer)} />