Index: backend/controllers/taskController.js =================================================================== --- backend/controllers/taskController.js (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ backend/controllers/taskController.js (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -71,34 +71,29 @@ const getTaskByDate = async (req, res) => { try { - const now = new Date(); - - const year = now.getUTCFullYear(); - const month = now.getUTCMonth(); - const day = now.getUTCDate(); - - let effectiveDay = day; - if (now.getUTCHours() < 7) { - effectiveDay = day - 1; - } - - const startOfEffectiveDay = new Date( - Date.UTC(year, month, effectiveDay, 0, 0, 0, 0) - ); - - const startOfNextDay = new Date(startOfEffectiveDay); - startOfNextDay.setUTCDate(startOfEffectiveDay.getUTCDate() + 1); - - // console.log( - // "Querying between (UTC dates):", - // startOfEffectiveDay.toISOString(), - // "and", - // startOfNextDay.toISOString() + // const now = new Date(); + + // const year = now.getUTCFullYear(); + // const month = now.getUTCMonth(); + // const day = now.getUTCDate(); + + // let effectiveDay = day; + // if (now.getUTCHours() < 7) { + // effectiveDay = day - 1; + // } + + // const startOfEffectiveDay = new Date( + // Date.UTC(year, month, effectiveDay, 0, 0, 0, 0) // ); + // const startOfNextDay = new Date(startOfEffectiveDay); + // startOfNextDay.setUTCDate(startOfEffectiveDay.getUTCDate() + 1); + + const startOfDay = new Date("2025-07-08T00:00:00.000Z"); + const endOfDay = new Date("2025-07-09T00:00:00.000Z"); let tasks = await prisma.challenges.findMany({ where: { solving_date: { - gte: startOfEffectiveDay, - lt: startOfNextDay, + gte: startOfDay, + lt: endOfDay, }, expired: false, Index: client/src/Dashboard/components/Forum.jsx =================================================================== --- client/src/Dashboard/components/Forum.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/Forum.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -37,5 +37,4 @@ setIsDeleting(false); } - closeModal(); }; @@ -80,4 +79,5 @@ setPage(0); setHasMore(data.length >= postsPerPage); + showModal("Post deleted successfully.", "success"); setLoading(false); } catch (error) { @@ -212,5 +212,5 @@ {modal.isOpen && (
-
- - - -
+ {modal.type === "confirm" && ( +
+ + + +
+ )} + {modal.type === "success" && ( +
+ + + +
+ )}
Index: client/src/Dashboard/components/ForumPostDetail.jsx =================================================================== --- client/src/Dashboard/components/ForumPostDetail.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/ForumPostDetail.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -45,5 +45,4 @@ setIsDeleting(false); } - closeModal(); }; @@ -81,5 +80,5 @@ prevComments.filter((comment) => comment.id !== commentId) ); - console.log("Comment deleted successfully"); + showModal("Comment deleted successfully.", "success"); } catch (error) { console.error("Error deleting comment:", error); @@ -231,5 +230,5 @@ {modal.isOpen && (
-
- - - -
+ {modal.type === "confirm" && ( +
+ + + +
+ )} + {modal.type === "success" && ( +
+ + + +
+ )}
Index: client/src/Dashboard/components/ManageChallenges.jsx =================================================================== --- client/src/Dashboard/components/ManageChallenges.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/ManageChallenges.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -120,7 +120,7 @@ challenges.filter((challenge) => challenge.id !== challengeId) ); - console.log(`Challenge ${challengeId} deleted successfully.`); + showModal("Challenge deleted successfully.", "success"); } catch (err) { - console.error(`Failed to delete challenge ${challengeId}:`, err); + showModal(`Failed to delete challenge: ${err.message}`, "error"); } finally { setLoading(false); @@ -142,5 +142,4 @@ setLoading(false); } - closeModal(); }; @@ -309,5 +308,5 @@ onClick={() => showModal( - "Are you sure you want to delete this challenge? This action cannot be undone.", + `Are you sure you want to delete challenge with title "${challenge.title}" ? This action cannot be undone.`, "confirm", challenge.id @@ -392,5 +391,5 @@ {modal.isOpen && (
-
- - - -
+ {modal.type === "confirm" && ( +
+ + + +
+ )} + {modal.type === "success" && ( +
+ + + +
+ )}
Index: client/src/Dashboard/components/ManagePosts.jsx =================================================================== --- client/src/Dashboard/components/ManagePosts.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/ManagePosts.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -50,5 +50,4 @@ } setIsActionLoading(false); - closeModal(); }; @@ -98,5 +97,5 @@ await deleteReviewPost(postId, user.id); setPosts((prevPosts) => prevPosts.filter((post) => post.id !== postId)); - console.log("Post deleted successfully from review queue"); + showModal("Post deleted successfully.", "deleted"); } catch (err) { console.error("Error deleting review post:", err); @@ -125,5 +124,5 @@ prevPosts.filter((p) => p.id !== postToApprove.id) ); - console.log("Post approved successfully"); + showModal("Post approved successfully.", "success"); } catch (err) { console.error("Error approving post:", err); @@ -131,11 +130,15 @@ err.response?.data?.message || err.message || "Failed to approve post." ); - } - }; - - const openConfirmationModal = (type, item) => { + showModal( + err.response?.data?.message || err.message || "Failed to approve post.", + "error" + ); + } + }; + + const openConfirmationModal = (type, item, postTitle) => { if (type === "delete") { showModal( - "Are you sure you want to delete this post permanently? This action cannot be undone.", + `Are you sure you want to delete post with title "${postTitle}"? This action cannot be undone.`, "delete", item @@ -143,5 +146,5 @@ } else if (type === "approve") { showModal( - "Are you sure you want to approve this post? It will be published to the forum.", + `Are you sure you want to approve post with title "${postTitle}"? It will be published to the forum.`, "approve", item.id, @@ -215,5 +218,5 @@ onClick={(e) => { e.stopPropagation(); - openConfirmationModal("approve", post); + openConfirmationModal("approve", post, post.title); }} > @@ -225,5 +228,5 @@ onClick={(e) => { e.stopPropagation(); - openConfirmationModal("delete", post.id); + openConfirmationModal("delete", post.id, post.title); }} > @@ -269,5 +272,5 @@ {modal.isOpen && (
- {modal.type === "approve" && ( + {(modal.type === "approve" || modal.type === "success") && (
)} - {modal.type === "delete" && ( + {(modal.type === "delete" || + modal.type === "deleted" || + modal.type === "error") && (
{modal.type === "approve" && "Approve Post"} - {modal.type === "delete" && "Delete Post"} + {modal.type === "deleted" && "Delete Post"} + {(modal.type === "success" || modal.type === "error") && + "Approve Post"}

{modal.message}

- - + {modal.type === "approve" || modal.type === "delete" ? ( + <> + + + + ) : ( + + )}
Index: client/src/Dashboard/components/Navbar.jsx =================================================================== --- client/src/Dashboard/components/Navbar.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/Navbar.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -20,5 +20,6 @@ (location.pathname === "/dashboard/forum" || location.pathname === "/dashboard/forum/create-post" || - location.pathname === "/dashboard/create-post") + location.pathname === "/dashboard/create-post" || + location.pathname.startsWith("/dashboard/forum-detail/")) ) { return true; @@ -30,4 +31,18 @@ return true; } + if ( + path === "/dashboard/leaderboard" && + location.pathname === "/dashboard/leaderboard" + ) { + return true; + } + + if ( + path === "/dashboard/profile" && + location.pathname === "/dashboard/profile" + ) { + return true; + } + if ( path === "/dashboard/manage-challenges" && @@ -123,5 +138,4 @@ - {user && user.isModerator && ( <> Index: client/src/Dashboard/components/Profile.jsx =================================================================== --- client/src/Dashboard/components/Profile.jsx (revision a70b6c40d5fbeaeaf4f790429c3adecb8edb4818) +++ client/src/Dashboard/components/Profile.jsx (revision c01bee279ddaa0c7426b40e2f266618e4fa9e88f) @@ -42,5 +42,10 @@

- Points: {user.points} + Total Points:{" "} + {user.points} +

+

+ Solved Challenges:{" "} + {user.solved_problems}

@@ -51,7 +56,4 @@ > Sign Out - - - Create New Account