Revert "fix: subpath removal"

This reverts commit 2e89ef7.
lsegg · Oct 24, 2024 · 74d0ef8 · 74d0ef8
1 parent 2e89ef7
commit 74d0ef8
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 28 deletions.
diff --git a/docs/assets/index-C8kJS1VA.js → docs/assets/index-VBkLQ-qs.js b/docs/assets/index-C8kJS1VA.js → docs/assets/index-VBkLQ-qs.js
diff --git a/docs/index.html b/docs/index.html
@@ -14,7 +14,7 @@
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
     />
-    <script type="module" crossorigin src="./assets/index-C8kJS1VA.js"></script>
+    <script type="module" crossorigin src="./assets/index-VBkLQ-qs.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-DgD5xdTU.css" />
   </head>
   <body>

diff --git a/src/auth/pages/LoginPage.jsx b/src/auth/pages/LoginPage.jsx
@@ -7,7 +7,8 @@ export const LoginPage = () => {
   const navigate = useNavigate();
 
   const handleLogin = () => {
-    const lastPath = localStorage.getItem("lastPath") || "/home/search";
+    const lastPath =
+      localStorage.getItem("lastPath") || "/heroes-spa/home/search";
     login("Jane Doe");
     navigate(lastPath, { replace: true });
   };

diff --git a/src/heroes/components/HeroCard.jsx b/src/heroes/components/HeroCard.jsx
@@ -24,7 +24,10 @@ export const HeroCard = ({
               <p className="card-text">
                 <small className="text-muted">{first_appearance}</small>
               </p>
-              <Link to={`/home/hero/${id}`} className="btn btn-outline-dark">
+              <Link
+                to={`/heroes-spa/home/hero/${id}`}
+                className="btn btn-outline-dark"
+              >
                 More info
               </Link>
             </div>

diff --git a/src/heroes/pages/HeroPage.jsx b/src/heroes/pages/HeroPage.jsx
@@ -11,7 +11,7 @@ export const HeroPage = () => {
     navigate(-1);
   };
 
-  if (!hero) return <Navigate to="/home" />;
+  if (!hero) return <Navigate to="/heroes-spa/home" />;
   return (
     <div className="row mt-5">
       <div className="col-4">

diff --git a/src/router/AppRouter.jsx b/src/router/AppRouter.jsx
@@ -8,7 +8,7 @@ import { PublicRouter } from "./PublicRouter";
 
 const router = createHashRouter([
   {
-    path: "/",
+    path: "/heroes-spa",
     element: (
       <PublicRouter>
         <LoginPage />
@@ -17,7 +17,7 @@ const router = createHashRouter([
     errorElement: <ErrorPage />,
   },
   {
-    path: "home",
+    path: "/heroes-spa/home",
     element: (
       <PrivateRouter>
         <HeroesApp />
@@ -26,19 +26,19 @@ const router = createHashRouter([
     errorElement: <ErrorPage />,
     children: [
       {
-        path: "marvel",
+        path: "/heroes-spa/home/marvel",
         element: <MarvelPage />,
       },
       {
-        path: "dc",
+        path: "/heroes-spa/home/dc",
         element: <DcPage />,
       },
       {
-        path: "search",
+        path: "/heroes-spa/home/search",
         element: <SearchPage />,
       },
       {
-        path: "hero/:id",
+        path: "/heroes-spa/home/hero/:id",
         element: <HeroPage />,
       },
     ],

diff --git a/src/router/PrivateRouter.jsx b/src/router/PrivateRouter.jsx
@@ -9,5 +9,5 @@ export const PrivateRouter = ({ children }) => {
   const lastPath = pathname + search;
   localStorage.setItem("lastPath", lastPath);
 
-  return logged ? children : <Navigate to={"/login"} />;
+  return logged ? children : <Navigate to={"/heroes-spa/login"} />;
 };
diff --git a/src/router/PublicRouter.jsx b/src/router/PublicRouter.jsx
@@ -4,5 +4,5 @@ import { AuthContext } from "../auth";
 
 export const PublicRouter = ({ children }) => {
   const { logged } = useContext(AuthContext);
-  return !logged ? children : <Navigate to={"/home/search"} />;
+  return !logged ? children : <Navigate to={"/heroes-spa/home/search"} />;
 };
diff --git a/src/ui/components/NavBar.jsx b/src/ui/components/NavBar.jsx
@@ -7,13 +7,13 @@ export const NavBar = () => {
   const navigate = useNavigate();
   const handleLogout = () => {
     logout();
-    navigate("/", { replace: true });
+    navigate("/heroes-spa", { replace: true });
   };
 
   return (
     <nav className="navbar navbar-expand-lg navbar-dark bg-dark p-2">
       <div className="container-fluid">
-        <Link className="navbar-brand" to="/home/search">
+        <Link className="navbar-brand" to="/heroes-spa/home/search">
           Heroes
         </Link>
         <div className="collapse navbar-collapse" id="navbarNav">
@@ -22,23 +22,23 @@ export const NavBar = () => {
               className={({ isActive }) =>
                 `nav-link ${isActive ? "active" : ""}`
               }
-              to="marvel"
+              to="/heroes-spa/home/marvel"
             >
               Marvel
             </NavLink>
             <NavLink
               className={({ isActive }) =>
                 `nav-link ${isActive ? "active" : ""}`
               }
-              to="/home/dc"
+              to="/heroes-spa/home/dc"
             >
               DC
             </NavLink>
             <NavLink
               className={({ isActive }) =>
                 `nav-link ${isActive ? "active" : ""}`
               }
-              to="/home/search"
+              to="/heroes-spa/home/search"
             >
               Search
             </NavLink>