-
-
+
+
{loading ? (
-
+
+
+
) : (
<>
- Loading profile...
+
-
- 
+ {/* Profile Header */}
+
+
+
+
+
+
+
+ + {user.name} +
+{user.email}
+
+
-
+
+ Current Rank +
{user.name}
-{user.email}
-
-
-
+
-
+
-
+
+ {user.points}
+
+
+ Total Points +
+- Total Points:{" "} - {user.points} -
-- Solved Challenges:{" "} - {user.solved_problems} -
+ +
+
+
+ {user.solved_problems}
+
+
+ + Solved Challenges +
+
-
- Posts Awaiting Approval
- {loadingPosts ? ( - - ) : pendingPosts.length > 0 ? ( --
- {pendingPosts.map((post) => (
-
- {post.title} - ))} -
- You have no posts waiting for review. -
- )} -
-
+
+
Index: client/src/Dashboard/components/UserPosts.jsx
===================================================================
--- client/src/Dashboard/components/UserPosts.jsx (revision 127dcb9a5c6f4c1e4d5c4ed6719716a768278232)
+++ client/src/Dashboard/components/UserPosts.jsx (revision 127dcb9a5c6f4c1e4d5c4ed6719716a768278232)
@@ -0,0 +1,344 @@
+import { useAuth } from "../../contexts/AuthContext.jsx";
+import { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import { getPendingPosts } from "@/services/reviewService";
+import { getAllPostsByUser } from "@/services/forumService.js";
+import commentIcon from "../../assets/images/comment.svg";
+
+const UserPosts = () => {
+ const { user } = useAuth();
+ const [approvedPosts, setApprovedPosts] = useState([]);
+ const [pendingPosts, setPendingPosts] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [activeTab, setActiveTab] = useState("published");
+ const [searchQuery, setSearchQuery] = useState("");
+ const navigate = useNavigate();
+ useEffect(() => {
+ if (user) {
+ const fetchAllPosts = async () => {
+ try {
+ setLoading(true);
+
+ const [approvedData, pendingData] = await Promise.all([
+ getAllPostsByUser(),
+ getPendingPosts(),
+ ]);
+
+ setApprovedPosts(approvedData);
+ console.log(approvedData);
+ setPendingPosts(pendingData);
+ } catch (error) {
+ console.error("Error fetching user posts:", error);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ fetchAllPosts();
+ }
+ }, []);
+
+ const filteredApprovedPosts = approvedPosts.filter((post) => {
+ const searchLower = searchQuery.toLowerCase();
+ const postDate = new Date(post.date_created).toLocaleDateString("en-US", {
+ year: "numeric",
+ month: "short",
+ day: "numeric",
+ });
+
+ return (
+ post.title.toLowerCase().includes(searchLower) ||
+ post.content.toLowerCase().includes(searchLower) ||
+ postDate.toLowerCase().includes(searchLower)
+ );
+ });
+
+ if (loading) {
+ return (
+
+
+
+ );
+ }
+
+ return (
+
+ {/* Tab Navigation */}
+
+ );
+};
+
+export default UserPosts;
Index: client/src/services/forumService.js
===================================================================
--- client/src/services/forumService.js (revision db6c39447bc2212ca42a63030e5e2d227af33490)
+++ client/src/services/forumService.js (revision 127dcb9a5c6f4c1e4d5c4ed6719716a768278232)
@@ -1,24 +1,27 @@
import apiClient from "./apiClient";
-export const getForumPosts = (page, limit) => {
- return apiClient.get(`/forum/posts?page=${page}&limit=${limit}`);
+export const getForumPosts = async (page, limit) => {
+ return await apiClient.get(`/forum/posts?page=${page}&limit=${limit}`);
};
-export const deleteForumPost = (postId) => {
- return apiClient.delete(`/forum/posts/${postId}`);
+export const deleteForumPost = async (postId) => {
+ return await apiClient.delete(`/forum/posts/${postId}`);
};
-export const createForumPost = (postData) => {
- return apiClient.post("/forum/posts", postData);
+export const createForumPost = async (postData) => {
+ return await apiClient.post("/forum/posts", postData);
+};
+export const getAllPostsByUser = async () => {
+ return await apiClient.get("/forum/user-posts");
};
//Comment functions
-export const getCommentsForPost = (postId) => {
+export const getCommentsForPost = async (postId) => {
return apiClient.get(`/forum/comments/${postId}`);
};
-export const createComment = (commentData) => {
+export const createComment = async (commentData) => {
return apiClient.post("/forum/comments", commentData);
};
-export const deleteComment = (commentId) => {
+export const deleteComment = async (commentId) => {
return apiClient.delete(`/forum/comments/${commentId}`);
};
Index: client/src/services/reviewService.js
===================================================================
--- client/src/services/reviewService.js (revision db6c39447bc2212ca42a63030e5e2d227af33490)
+++ client/src/services/reviewService.js (revision 127dcb9a5c6f4c1e4d5c4ed6719716a768278232)
@@ -10,6 +10,6 @@
};
-export const createApprovalForumPost = (postData) => {
- return apiClient.post("/review/posts/approval", postData);
+export const createApprovalForumPost = async (postData) => {
+ return await apiClient.post("/review/posts/approval", postData);
};
export const approveReviewPost = async (postId, postData, userId) => {
+
+
+
+
+
+
+
+
+ {/* Tab Content */}
+
+ {activeTab == "published" && (
+ <>
+ setSearchQuery(e.target.value)}
+ />
+
+
+ )}
+
+
+ {activeTab === "published" && (
+
+
+
+ )}
+
+ {activeTab === "pending" && (
+
+
+
+
+ {filteredApprovedPosts.length > 0 ? (
+ + Your Published Posts +
+ +
+ {filteredApprovedPosts.map((post) => (
+
+ ) : (
+
+
+ ))}
+
+
+
+
+ { + navigate(`/dashboard/forum-detail/${post.id}`, { + state: { post, from: "/dashboard/user-posts" }, + }); + }} + > + {post.title} +
++ {post.content && post.content.length > 150 + ? post.content.slice(0, 150) + "..." + : post.content} +
+
+
+ {new Date(post.date_created).toLocaleDateString(
+ "en-US",
+ {
+ year: "numeric",
+ month: "short",
+ day: "numeric",
+ }
+ )}
+
+
+
+
+
+
+
+ {post.comment_count}
+ 
+
+
+
+ )}
+
+
+
+ + No published posts found. +
++ Start creating content to see your published posts here! +
+
+
+ )}
+
+
+
+
+ {pendingPosts.length > 0 ? (
+ + Awaiting Approval +
+ +
+ {pendingPosts.map((post) => (
+
+ ) : (
+
+
+
+
+ ))}
+
+
+ + {post.title} +
++ {post.content} +
+ +
+
+ Submitted{" "}
+ {new Date(post.created_at).toLocaleDateString("en-US", {
+ year: "numeric",
+ month: "short",
+ day: "numeric",
+ })}
+
+
+
+
+
+
+
+
+ Under Review
+
+
+
+ )}
+
+
+
+ + All clear! No posts waiting for review. +
++ Your submissions will appear here while awaiting approval. +
+