Changeset 0c6b92a for imaps-frontend/src/components/ProtectedRoute/ProtectedRoute.jsx

Timestamp:

12/12/24 17:06:06 (5 weeks ago)

Author:

stefan toskovski <stefantoska84@…>

Branches:

main

Parents:

d565449

Message:

Pred finalna verzija

File:

• imaps-frontend/src/components/ProtectedRoute/ProtectedRoute.jsx (modified) (1 diff)

imaps-frontend/src/components/ProtectedRoute/ProtectedRoute.jsx

@@ -1 @@
-import React from "react";
-import { Outlet, Navigate } from "react-router-dom";
+import { Navigate, Outlet, useLocation } from "react-router-dom";
+import {useAppContext} from "../AppContext/AppContext.jsx";
+import HttpService from "../../scripts/net/HttpService.js";
+import React, {useEffect} from "react";
+import {LoadingContainer} from "../LoadingContainer/LoadingContainer.jsx";
+import config from "../../scripts/net/netconfig.js";
+import {verifyToken} from "../../scripts/util/verifyToken.js";
 
-const ProtectedRoute = ({ isAuthenticated }) => {
-  return isAuthenticated ? <Outlet /> : <Navigate to="/Login" />;
+const ProtectedRoute = () => {
+  const location = useLocation();
+  const {loading,isAuthenticated} = useAppContext();
+
+
+  if(loading){
+    return <LoadingContainer/>
+  }
+
+
+  if (!isAuthenticated) {
+    return <Navigate to="/Login" state={{ targetPath: location }} replace />;
+  }
+
+  return <Outlet />;
 };