update user

src/components/NavBar/Navbar.tsx

@@ -3,16 +3,18 @@ import routes from "../../routes/route.json";
 import { useEffect, useState } from "react";
 import Cookies from "js-cookie";
 import user from "../../assets/user .png";
+import { useNavigate } from "react-router-dom";
 
 const Navbar = () => {
   const location = useLocation();
   const [isLoggedIn, setIsLoggedIn] = useState(false);
+  const navigate = useNavigate();
 
   useEffect(() => {
     if (Cookies.get("access_token")) {
       setIsLoggedIn(true);
     }
-  }, []);
+  }, [navigate]);
 
   return (
     <div className="navbar bg-primaryLighter border-b-2 border-b-secondary">

src/components/Profile/Account.tsx

@@ -2,50 +2,35 @@ import { useCallback, useEffect, useState } from "react";
 import editing from "../../assets/editing .png";
 import virtualClass from "../../assets/virtual-class.png";
 import Cookies from "js-cookie";
-import { set } from "firebase/database";
+import { useAuthentication } from "../../hooks/useAuthentication";
+import { useNavigate } from "react-router-dom";
 
 const UserAccount = () => {
   const [username, setUsername] = useState("");
   const [email, setEmail] = useState("");
   const [phone, setPhone] = useState("");
   const [role, setRole] = useState("");
+  const { user } = useAuthentication();
   const [isnewUser, setIsNewUser] = useState(false);
+  const navigate = useNavigate();
 
   const [isEditing, setIsEditing] = useState(false);
 
   useEffect(() => {
-    const fetchUser = async () => {
-      try {
-        const response = await fetch(
-          "http://localhost:3000/api/user/currentUser",
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-              access_token: Cookies.get("access_token"),
-            },
-          }
-        );
-        if (!response.ok) {
-          throw new Error("Failed to fetch user data");
-        }
+    console.log(user);
 
-        const data = await response.json();
+    setUsername(user?.fullName || "");
+    setEmail(user?.email || "");
+    setPhone(user?.phone || "");
+    setRole(user?.role || "");
 
-        setUsername(data.fullName);
-        setEmail(data.email);
-        setPhone(data.phone);
-        setRole(data.role);
-        if (role === "" || phone === "") {
-          setIsNewUser(true);
-        }
-      } catch (error) {
-        console.error(error);
-      }
-    };
+    console.log(!user?.role && !user?.phone);
 
-    fetchUser();
-  }, []);
+    if (!(!user?.role && !user?.phone)) {
+      setIsNewUser(true);
+      console.log(isnewUser);
+    }
+  }, [user]);
 
   const handleEditClick = () => {
     setIsEditing(!isEditing);
@@ -98,35 +83,35 @@ const UserAccount = () => {
         throw new Error("Failed to delete user data");
       }
       Cookies.remove("access_token");
-      window.location.href = "/";
+      navigate("/");
     } catch (error) {
       console.error(error);
     }
   };
 
-  const handleNewUser = async (e) => {
+  const handleNewUser = async () => {
     console.log("update new user");
-    // try {
-    //   const response = await fetch(
-    //     "http://localhost:3000/api/user/updateNewUser",
-    //     {
-    //       method: "PATCH",
-    //       headers: {
-    //         "Content-Type": "application/json",
-    //         access_token: Cookies.get("access_token"),
-    //       },
-    //       body: JSON.stringify({
-    //         fullName: username,
-    //         phone: phone,
-    //       }),
-    //     }
-    //   );
-    //   if (!response.ok) {
-    //     throw new Error("Failed to update user data");
-    //   }
-    // } catch (error) {
-    //   console.error(error);
-    // }
+    try {
+      const response = await fetch(
+        "http://localhost:3000/api/user/updateNewUser",
+        {
+          method: "PATCH",
+          headers: {
+            "Content-Type": "application/json",
+            access_token: Cookies.get("access_token"),
+          },
+          body: JSON.stringify({
+            role: role,
+            phone: phone,
+          }),
+        }
+      );
+      if (!response.ok) {
+        throw new Error("Failed to update user data");
+      }
+    } catch (error) {
+      console.error(error);
+    }
     setRole("LEARNER");
     setPhone("94710627526");
     setIsNewUser(false);
@@ -263,6 +248,9 @@ const UserAccount = () => {
                           <option value="instructor" className="text-white">
                             Instructor
                           </option>
+                          <option value="instructor" className="text-white">
+                            Adminss
+                          </option>
                         </select>
                       </div>
                       <div>

src/hooks/useAuthentication.ts

@@ -1,32 +1,53 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from "react";
+import Cookies from "js-cookie";
 
 export interface User {
   id: string;
+  fullName: string;
   email: string;
-  name: string;
-  avatar: string;
-  phone?: string;
-  role: 'student' | 'instructor' | 'admin';
+  phone: string;
+  role: "student" | "instructor" | "admin";
+
 }
 
 export const useAuthentication = () => {
   const [user, setUser] = useState<User | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
+  // const [isLoading, setIsLoading] = useState(true);
 
   useEffect(() => {
-    setIsLoading(true);
-    setUser({
-      id: '664191c26d71d98b40c14326',
-      email: 'navojith22@gmail.com',
-      name: 'Example',
-      //role: 'instructor',
-      //role: 'admin',
-      role: 'student',
-      phone: '94713197055',
-      avatar: 'https://example.com/avatar.png',
-    });
-    //setUser(null);
-    setIsLoading(false);
+    const fetchUser = async () => {
+      // setIsLoading(true);
+      try {
+        const response = await fetch(
+          "http://localhost:3000/api/user/currentUser",
+          {
+            method: "GET",
+            headers: {
+              "Content-Type": "application/json",
+              access_token: Cookies.get("access_token"),
+            },
+          }
+        );
+        if (!response.ok) {
+          throw new Error("Error fetching user");
+        }
+
+        const data = await response.json();
+        setUser({
+          id: data.id,
+          fullName: data.fullName,
+          email: data.email,
+          phone: data.phone,
+          role: data.role,
+        });
+      } catch (error) {
+        console.error(error);
+      }
+    };
+    // setIsLoading(false);
+    fetchUser();
+
   }, []);
-  return { user, isLoading };
+  // return { user, isLoading };
+  return { user };
 };

src/routes/Routes.tsx

@@ -1,8 +1,7 @@
-import { Route, Routes } from "react-router-dom";
+import { Navigate, Route, Routes } from "react-router-dom";
 import { useAuthentication } from "../hooks/useAuthentication";
 import AuthWrapper from "../pages/AuthWrapper";
 import Login from "../pages/auth/Login";
-import SignUp from "../pages/auth/Signup";
 import Course from "../pages/course/Course";
 import IndividualCourse from "../pages/course/IndividualCourse/IndividualCourse";
 import CourseContent from "../pages/courseContent/[id]";
@@ -20,7 +19,6 @@ import {
   LOGIN,
   MY_COURSES,
   ROOT,
-  SIGNUP,
 } from "./route.json";
 
 const AppRoutes = () => {
@@ -45,8 +43,8 @@ const AppRoutes = () => {
       </Route>
       <Route
         path={LOGIN.route}
-        // element={user ? <Navigate to={ROOT.route} replace /> : <Login />}
-        element={<Login />}
+        element={user ? <Navigate to={ROOT.route} replace /> : <Login />}
+        // element={<Login />}
       />
     </Routes>
   );

src/utils/userAuthentication.ts

@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";
 
 export const getAccessToken = async () => {
-  const accessToken = Cookies.get("accessToken");
+  const accessToken = Cookies.get("access_token");
   return accessToken;
 };