Reset attempts to fix routing with GH Pages

macareonie · Jun 27, 2024 · 56e3680 · 56e3680
1 parent e240ca3
commit 56e3680
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 61 deletions.
diff --git a/index.html b/index.html
@@ -5,25 +5,6 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React</title>
-
-    <script type="text/javascript">
-      (function (l) {
-        if (l.search[1] === "/") {
-          var decoded = l.search
-            .slice(1)
-            .split("&")
-            .map(function (s) {
-              return s.replace(/~and~/g, "&");
-            })
-            .join("?");
-          window.history.replaceState(
-            null,
-            null,
-            l.pathname.slice(0, -1) + decoded + l.hash
-          );
-        }
-      })(window.location);
-    </script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,12 +1,9 @@
 {
-  "homepage": "https://macareonie.github.io/me/",
   "name": "personal-website",
   "private": true,
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d dist",
     "dev": "vite",
     "build": "vite build",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",

diff --git a/public/404.html b/public/404.html
diff --git a/src/App.jsx b/src/App.jsx
@@ -12,9 +12,10 @@ function App() {
       <Router>
         <NavBar />
         <Routes>
-          <Route exact path="/" element={<Home />} />
-          <Route exact path="/about" element={<About />} />
-          <Route exact path="/foodblog" element={<FoodBlog />} />
+          <Route exact path="/me/" element={<Home />} />
+          <Route exact path="/me/about" element={<About />} />
+          <Route exact path="/me/foodblog" element={<FoodBlog />} />
+          <Route exact path="*" element={<div>Page Not Found</div>} />
         </Routes>
       </Router>
       <Footer />

diff --git a/src/components/header/NavBar.jsx b/src/components/header/NavBar.jsx
@@ -10,9 +10,9 @@ import {
 import { Bars3Icon, BellIcon, XMarkIcon } from "@heroicons/react/24/outline";
 
 const navigation = [
-  { name: "Home", href: "/", current: true },
-  { name: "About Me", href: "/about", current: false },
-  { name: "Food Blog", href: "/foodblog", current: false },
+  { name: "Home", href: "/me/", current: true },
+  { name: "About Me", href: "/me/about", current: false },
+  { name: "Food Blog", href: "/me/foodblog", current: false },
 ];
 
 function classNames(...classes) {