Changeset 702ca77 for reactapp/src/App.js

Timestamp:

08/19/22 19:10:24 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

6221ab6

Parents:

6eba109

Message:

added current user/logout in header, display karma on user dashboard, started add post functionality in react

File:

• reactapp/src/App.js (modified) (4 diffs)

reactapp/src/App.js

@@ -4 +4 @@
 import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
 import Home from "./Pages/Home";
-import User from "./Pages/User";
+import UserDashboard from "./Pages/UserDashboard";
 import { useEffect, useState, useMemo } from "react";
 import AuthApi from "./api/AuthApi";
@@ -12 +12 @@
   const [auth, setAuth] = useState(false);
   const variableAuth = useMemo(() => ({ auth, setAuth }), [auth]);
+  const [authLoaded, setAuthLoaded] = useState(false);
 
-  const readCookie = () => {
+  const readCookie = async () => {
     const session = Cookies.get("JSESSIONID");
     if (session) {
       setAuth(true); // go stava true ako postoi takvo cookie (zasto auth=false na sekoe renderiranje)
+    } else {
+      setAuth(false);
     }
+    setAuthLoaded(true);
   };
 
@@ -25 +29 @@
 
   const ProtectedRoute = ({ auth, children }) => {
-    if (!auth) {
-      return <Navigate to="/login" replace />;
+    if (authLoaded) {
+      if (!auth) {
+        return <Navigate to="/login" replace />;
+      }
+      return children;
+    } else {
+      return <div>се вчитува cookie...</div>;
     }
-    return children;
   };
 
@@ -42 +50 @@
             <Route path="search" element={<SearchResults />}></Route>
             <Route
-              path="user"
+              path="user_dashboard"
               element={
                 <ProtectedRoute auth={auth}>
-                  <User />
+                  <UserDashboard />
                 </ProtectedRoute>
               }