Merge pull request #370 from hackforla/gh-pages-fix

history fix for gh-pages
hackforla · Feb 10, 2021 · 9d189b4 · 9d189b4
2 parents 935f739 + 05418da
commit 9d189b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/client/web/package.json b/client/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "web",
   "version": "0.1.0",
-  "homepage": "https://hackforla.github.io/ballotnav",
+  "homepage": "https://hackforla.github.io/ballotnav/",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.32",

diff --git a/client/web/src/App.jsx b/client/web/src/App.jsx
@@ -22,7 +22,7 @@ const useStyles = makeStyles({
 const App = () => {
   const classes = useStyles()
   return (
-    <ConnectedRouter history={history}>
+    <ConnectedRouter basename={process.env.PUBLIC_URL} history={history}>
       <Div100vh className={classes.root}>
         <Header />
         <div className={classes.content}>

diff --git a/client/web/src/services/history.js b/client/web/src/services/history.js
@@ -1,5 +1,8 @@
-import { createBrowserHistory } from 'history'
+import {
+  // createBrowserHistory as createHistory, // for regular deploy
+  createHashHistory as createHistory, // for gh-pages deploy
+} from 'history'
 
-const history = createBrowserHistory()
+const history = createHistory()
 
 export default history