keannu125/Ivy-Frontend
1
0
Fork 0
mirror of https://github.com/lemeow125/Ivy-Frontend.git synced 2024-11-17 06:39:25 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert to browser router

Browse source
This commit is contained in:
keannu125 2023-03-10 19:36:40 +08:00
parent 8af4b9b3ac
commit 5d8610056b
3 changed files with 85 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "ivy-inventorymanager", "name": "ivy-inventorymanager",
"version": "0.1.0", "version": "0.1.0",
"homepage": "https://lemeow125.github.io/Ivy", "homepage": "https://lemeow125.github.io/Ivy/#",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@emotion/react": "^11.10.5", "@emotion/react": "^11.10.5",

11
src/App.tsx
View file

@ -7,7 +7,11 @@ import Container from "./Components/Container/Container";
import { import {
createBrowserRouter, createBrowserRouter,
createHashRouter, createHashRouter,
HashRouter,
Navigate,
Route,
RouterProvider, RouterProvider,
Routes,
} from "react-router-dom"; } from "react-router-dom";
import Store from "./Plugins/Redux/Store/Store"; import Store from "./Plugins/Redux/Store/Store";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
@ -21,8 +25,7 @@ import Register from "./Routes/Register/Register";
const queryClient = new QueryClient(); const queryClient = new QueryClient();
const router = createHashRouter( const router = createBrowserRouter([
[
{ {
path: "/", path: "/",
element: ( element: (
@ -100,9 +103,7 @@ const router = createHashRouter(
</Container> </Container>
), ),
}, },
], ]);
{ basename: "/Ivy" }
);
export default function App() { export default function App() {
return ( return (

2
src/Components/LoginChecker/LoginChecker.tsx
View file

@ -14,7 +14,7 @@ export default function LoginChecker() {
if (!logged_in && !old_session_checked) { if (!logged_in && !old_session_checked) {
} else if (!logged_in && old_session_checked) { } else if (!logged_in && old_session_checked) {
console.log("Not logged in. Redirecting to login page"); console.log("Not logged in. Redirecting to login page");
return <Navigate to="/Login" replace />; return <Navigate to="Ivy/Login" replace />;
} }
return <div />; return <div />;
} }