Merge branch 'master' of https://git.corgi.wtf/Navy.gif/webserver-framework-frontend

src/App.js

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

src/structures/PrivateRoute.js

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

src/util/Util.js

@@ -46,7 +46,7 @@ const parseResponse = async (response) => {
 
     if (status === 401) {
         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')) {