Navy.gif/webserver-framework-frontend
Template
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Erik 2023-02-08 00:01:50 +02:00
parent 82397d63a7
commit 9fb29bba44
Signed by: Navy.gif
GPG Key ID: 2532FBBB61C65A68
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.js
View File

@ -9,7 +9,7 @@ import UserControls from './components/UserControls';
import { useLoginContext } from './structures/UserContext'; import { useLoginContext } from './structures/UserContext';
import Login from './pages/Login'; import Login from './pages/Login';
import { get, setSession, setSettings } from './util/Util'; import { get, setSession, setSettings } from './util/Util';
import PrivateRoute from './structures/PrivateRoute'; import { PrivateRoute } from './structures/PrivateRoute';
import { UnauthedRoute } from './structures/UnauthedRoute'; import { UnauthedRoute } from './structures/UnauthedRoute';
import Users from './pages/Users'; import Users from './pages/Users';
import Admin from './pages/Admin'; import Admin from './pages/Admin';

6
src/structures/PrivateRoute.js
View File

@ -2,11 +2,9 @@ import React from 'react';
import { Navigate, useLocation } from "react-router-dom"; import { Navigate, useLocation } from "react-router-dom";
import { getUser } from "../util/Util"; import { getUser } from "../util/Util";
const PrivateRoute = ({ children }) => { export const PrivateRoute = ({ children }) => {
const user = getUser(); const user = getUser();
const location = useLocation(); const location = useLocation();
if (!user) return <Navigate to='/login' replace state={{ from: location }} />; if (!user) return <Navigate to='/login' replace state={{ from: location }} />;
return children; return children;
}; };
export default PrivateRoute;

2
src/util/Util.js
View File

@ -46,7 +46,7 @@ const parseResponse = async (response) => {
if (status === 401) { if (status === 401) {
clearSession(); clearSession();
if(!location.pathname.includes('/login')) location.pathname = '/login'; if(!location.pathname.includes('/login') && !location.pathname.includes('/register')) location.pathname = '/login';
} }
if (headers['content-type']?.includes('application/json')) { if (headers['content-type']?.includes('application/json')) {