Ignore:
Timestamp:
10/27/22 17:35:03 (21 months ago)
Author:
unknown <mlviktor23@…>
Branches:
main
Children:
3b6962d
Parents:
8d83180
Message:

left: moderation, oAuth, messaging

File:
1 edited

Legend:

Unmodified
Added
Removed
  • reactapp/src/App.js

    r8d83180 rc68150f  
    1212import AuthApi from "./api/AuthApi";
    1313import Cookies from "js-cookie";
    14 import axios from "./api/axios";
    15 import JSOG from "jsog";
    1614import NotFound from "./Pages/NotFound";
     15import Topic from "./Pages/Topic";
    1716
    1817export default function App() {
    1918  const [auth, setAuth] = useState(false);
    20   const [user, setUser] = useState(null);
    21   const [userLoaded, setUserLoaded] = useState(false);
    2219  const variableAuth = useMemo(() => ({ auth, setAuth }), [auth]);
    2320  const [authLoaded, setAuthLoaded] = useState(false);
    24 
    25   const fetchUser = async () => {
    26     try {
    27       const response = await axios.get(
    28         "http://192.168.0.17:8080/secure/currentUser",
    29         { withCredentials: true }
    30       );
    31       var cyclicGraph = await response.data;
    32       var jsogStructure = JSOG.encode(cyclicGraph);
    33       cyclicGraph = JSOG.decode(jsogStructure);
    34       setUser(cyclicGraph);
    35       setUserLoaded(true);
    36     } catch (error) {
    37       console.log("Fetching error", error);
    38     }
    39   };
    4021
    4122  const readCookie = async () => {
     
    4324    if (session) {
    4425      setAuth(true);
    45       fetchUser();
    4626    } else {
    4727      setAuth(false);
     
    5131
    5232  useEffect(() => {
     33    document.title = "profesori.mk";
    5334    readCookie();
    5435  }, []);
     
    6950      <BrowserRouter>
    7051        <Routes>
    71           <Route
    72             path="/"
    73             element={<Home user={user} userLoaded={userLoaded} />}
    74           >
     52          <Route path="/" element={<Home />}>
    7553            <Route path="login" element={<Login />}></Route>
    7654            <Route path="registration" element={<Registration />}></Route>
    7755            <Route path="professor">
    78               <Route
    79                 path=":professorId"
    80                 element={<Professor user={user} userLoaded={userLoaded} />}
    81               />
     56              <Route path=":professorId" element={<Professor />} />
    8257            </Route>
    8358            <Route path="university/:universityId" element={<University />} />
    8459            <Route path="faculty/:facultyId" element={<Faculty />} />
    8560            <Route path="subject/:subjectId" element={<Subject />} />
     61            <Route path="topic/:topicId" element={<Topic />} />
    8662            <Route path="search" element={<SearchResults />}></Route>
    8763            <Route
    8864              path="user_dashboard"
    8965              element={
    90                 <ProtectedRoute auth={auth}>
    91                   {<UserDashboard user={user} userLoaded={userLoaded} />}
    92                 </ProtectedRoute>
     66                <ProtectedRoute auth={auth}>{<UserDashboard />}</ProtectedRoute>
    9367              }
    9468            ></Route>
Note: See TracChangeset for help on using the changeset viewer.