updated to handle wp subdirectory installations

jackreichert · jackreichert · commit ff0577992d6f · 2018-05-09T11:10:42.000-04:00
diff --git a/bundle.js b/bundle.js
diff --git a/bundle.js.map b/bundle.js.map
diff --git a/src/actions/index.js b/src/actions/index.js
@@ -1,5 +1,7 @@
 import axios from 'axios';
 
+export const SITEBASE = RT_API.baseUrl.replace(['http://','https://'],'').replace(window.location.origin.replace(['http://','https://'],''), '');
+
 export const FETCH_POSTS = 'FETCH_POSTS';
 export const FETCH_POST = 'FETCH_POST';
 export const SEARCH_POSTS = 'SEARCH_POSTS';
diff --git a/src/components/header.js b/src/components/header.js
@@ -4,11 +4,14 @@ import {Link} from 'react-router-dom';
 import Menu from '../containers/parts/menu';
 import Search from './search';
 
+import {SITEBASE} from '../actions';
+
 class Header extends Component {
     render() {
+    
         return (
             <header className="navbar navbar-expand-lg navbar-light bg-light">
-                <h1 className="navbar-brand"><Link to='/'>{RT_API.siteName}</Link></h1>
+                <h1 className="navbar-brand"><Link to={SITEBASE}>{RT_API.siteName}</Link></h1>
                 <nav className="collapse navbar-collapse">
                     <Menu name="main_menu" />
                     <Search searchTerm={this.props.searchTerm} isSearch={this.props.isSearch} />
diff --git a/src/components/search.js b/src/components/search.js
@@ -1,6 +1,8 @@
 import React, {Component} from 'react';
 import {withRouter} from "react-router-dom";
 
+import {SITEBASE} from '../actions';
+
 class Search extends Component {
     componentDidMount() {
         if ( this.props.isSearch) {
@@ -15,9 +17,9 @@ class Search extends Component {
         event.preventDefault();
         const searchTerm = event.target.value;
         if (0 < searchTerm.length) {
-            this.props.history.push(`/search/${searchTerm}`);
+            this.props.history.push(`${SITEBASE}/search/${searchTerm}`);
         } else {
-            this.props.history.push('/');
+            this.props.history.push(`${SITEBASE}/`);
         }
     }
 
diff --git a/src/index.js b/src/index.js
@@ -34,19 +34,21 @@ import Category from './containers/category';
 import Tag from './containers/tag';
 import Single from './containers/single';
 
+import {SITEBASE} from './actions';
+
 ReactDom.render(
 	<Provider store={store}>
 		<ConnectedRouter history={history}>
 			<Switch>
-				<Route exact path="/" component={Blog}/>
-				<Route path="/page/:pageNum" component={Blog}/>
-				<Route path="/search/:term" component={Search}/>
-				<Route path="/category/:slug/page/:pageNum" component={Category}/>
-				<Route path="/category/:slug/" component={Category}/>
-				<Route path="/category/:parent/:slug/page/:pageNum" component={Category}/>
-				<Route path="/category/:parent/:slug/" component={Category}/>
-				<Route path="/tag/:slug/page/:pageNum" component={Tag}/>
-				<Route path="/tag/:slug" component={Tag}/>
+				<Route exact path={`${SITEBASE}/`} component={Blog}/>
+				<Route path={`${SITEBASE}/page/:pageNum`} component={Blog}/>
+				<Route path={`${SITEBASE}/search/:term`} component={Search}/>
+				<Route path={`${SITEBASE}/category/:slug/page/:pageNum`} component={Category}/>
+				<Route path={`${SITEBASE}/category/:slug`} component={Category}/>
+				<Route path={`${SITEBASE}/category/:parent/:slug/page/:pageNum`} component={Category}/>
+				<Route path={`${SITEBASE}/category/:parent/:slug`} component={Category}/>
+				<Route path={`${SITEBASE}/tag/:slug/page/:pageNum`} component={Tag}/>
+				<Route path={`${SITEBASE}/tag/:slug`} component={Tag}/>
 				<Route path="*" component={Single}/>
 			</Switch>
 		</ConnectedRouter>
