fix: public or private navigate hook

Zen-cronic · Nov 22, 2023 · 6fb80c9 · 6fb80c9
1 parent dd2f972
commit 6fb80c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/client/src/hooks/usePublicOrPrivateNavigate.jsx b/client/src/hooks/usePublicOrPrivateNavigate.jsx
@@ -5,10 +5,11 @@ const usePublicOrPrivateNavigate = () => {
 
   const authObj = useAuth();
 
+  console.log('authObj from customHook: ', authObj);
   const navigate = useNavigate();
 
   const navigateFn =  (publicPathname) => {
-    if (!Object.values(authObj).every((val) => val)) {
+    if (Object.values(authObj).every((val) => !Boolean(val))) {
       navigate(publicPathname);
     } else {
       navigate(`/dash${publicPathname}`);

diff --git a/server/src/routes/eventsRoutes.js b/server/src/routes/eventsRoutes.js
@@ -2,26 +2,31 @@ const express = require("express");
 const eventsControllers = require("../controllers/eventsControllers");
 const { ROLES } = require("../config/roles");
 const verifyRole = require("../middleware/verifyRole");
+const verifyJWT = require("../middleware/verifyJWT");
 
 const router = express.Router();
 
-
 router
   .route("/")
-
-  .get(eventsControllers.getAllEvents)
 
-  .post(verifyRole(ROLES.ADMIN), eventsControllers.createNewEvent)
-  .put(verifyRole(ROLES.ADMIN), eventsControllers.updateEventInfo)
-  .delete(verifyRole(ROLES.ADMIN), eventsControllers.deleteEvent);
+  .get(eventsControllers.getAllEvents)
 
+  .post(verifyJWT, verifyRole(ROLES.ADMIN), eventsControllers.createNewEvent)
+  .put(verifyJWT, verifyRole(ROLES.ADMIN), eventsControllers.updateEventInfo)
+  .delete(verifyJWT, verifyRole(ROLES.ADMIN), eventsControllers.deleteEvent);
 
 // event/refresh - taskscheduling
 
 router.route("/:eventId").get(eventsControllers.getEventById);
 
 //only admin
-router.route("/volunteers").post(verifyRole(ROLES.ADMIN),eventsControllers.getSignedUpVolunteers);
+router
+  .route("/volunteers")
+  .post(
+    verifyJWT,
+    verifyRole(ROLES.ADMIN),
+    eventsControllers.getSignedUpVolunteers
+  );
 
 router.route("/search").post(eventsControllers.searchEvents);
 router.route("/sort").post(eventsControllers.sortEvents);