Index: client/src/CreatePost/CreatePost.jsx =================================================================== --- client/src/CreatePost/CreatePost.jsx (revision 5523b75057ef8574e6a307bd6ea65039f096b802) +++ client/src/CreatePost/CreatePost.jsx (revision f54e5efcde4c478a0168c2abe09d11998a91a13e) @@ -179,7 +179,7 @@ className="min-h-screen bg-base-100 p-3 sm:p-4 lg:p-6" > -
-
-

+
+
+

Create a Post

@@ -188,5 +188,7 @@ const targetUrl = fromForumSearchParams ? `${fromPath}?${fromForumSearchParams}` - : fromPath; + : fromUserPostsSearchParams + ? `${fromPath}?${fromUserPostsSearchParams}` + : `${fromPath}`; navigate(targetUrl); }} @@ -203,5 +205,7 @@ - Back to Forum + {fromPath === '/dashboard/forum' + ? 'Back to Forum' + : 'Back to Your Posts'}
@@ -211,5 +215,5 @@ className="card bg-base-200 shadow-xl w-full relative" > -
+
-

+

Posting Guidelines

-
+
✓ @@ -271,5 +275,5 @@
-
+

Note: Posts exceeding character limits or @@ -283,9 +287,9 @@

-
-
+
+
-

+ +
+ + {post.topic === 'general' + ? 'General' + : 'Daily Challenge'} + + {post.challengeTitle && ( + + {formatFilterLabel(post.challengeTitle)} + + )} +
+ +

+ By{' '} + + {post.author_name} + + · + + {new Date(post.date_created).toLocaleDateString( + 'en-US', + { + year: 'numeric', + month: 'short', + day: 'numeric', + } + )} + +

+ +

+ {post.content && post.content.length > 50 + ? post.content.slice(0, 50) + '...' + : post.content} +

+ +
+
{ + navigate(`/dashboard/forum-detail/${post.id}`, { + state: { post }, + }); + }} + > +

+ {post.comment_count} +

+ Comment +
- - ))} - - )} - - {!loading && ( -
- - - {Array.from({ length: Math.min(3, totalPages) }, (_, idx) => ( + ))} +
+ )} + + {!loading && ( +
- ))} - - {totalPages > 3 && ( - - ... - - )} - - {page > 2 && page < totalPages - 1 && ( + + {Array.from( + { length: Math.min(3, totalPages) }, + (_, idx) => ( + + ) + )} + + {totalPages > 3 && ( + + ... + + )} + + {page > 2 && page < totalPages - 1 && ( + + )} + + {totalPages > 3 && ( + + )} + - )} - - {totalPages > 3 && ( - - )} - - -
- )} - - )} + + )} + + )} + Index: client/src/Dashboard/components/ManageChallenges.jsx =================================================================== --- client/src/Dashboard/components/ManageChallenges.jsx (revision 5523b75057ef8574e6a307bd6ea65039f096b802) +++ client/src/Dashboard/components/ManageChallenges.jsx (revision f54e5efcde4c478a0168c2abe09d11998a91a13e) @@ -147,5 +147,5 @@
{/* Add New Challenge Button */} -
+
Index: client/src/Dashboard/components/Navbar.jsx =================================================================== --- client/src/Dashboard/components/Navbar.jsx (revision 5523b75057ef8574e6a307bd6ea65039f096b802) +++ client/src/Dashboard/components/Navbar.jsx (revision f54e5efcde4c478a0168c2abe09d11998a91a13e) @@ -261,5 +261,13 @@ src={pp} alt="Profile" - className="w-8 xl:w-10 h-8 xl:h-10 rounded-full border-2 border-base-content/10 flex-shrink-0" + className={`w-8 xl:w-10 h-8 xl:h-10 rounded-full border-2 flex-shrink-0 + ${ + isActive('/dashboard/profile') ? 'border-black' : 'border-base-content/10' + }`} + style={ + isActive('/dashboard/profile') + ? { filter: 'brightness(0) invert(0)' } + : {} + } />
Index: client/src/Dashboard/components/Profile.jsx =================================================================== --- client/src/Dashboard/components/Profile.jsx (revision 5523b75057ef8574e6a307bd6ea65039f096b802) +++ client/src/Dashboard/components/Profile.jsx (revision f54e5efcde4c478a0168c2abe09d11998a91a13e) @@ -1,16 +1,27 @@ -import React, { use, useState } from "react"; -import pp from "../../assets/images/pp.svg"; -import Navbar from "./Navbar"; -import RankBadgeNav from "@/utils/RankBadgeForNavbar"; -import { useAuth } from "../../contexts/AuthContext.jsx"; -import { useNavigate } from "react-router-dom"; +import React, { useState } from 'react'; +import pp from '../../assets/images/pp.svg'; +import Navbar from './Navbar'; +import RankBadgeNav from '@/utils/RankBadgeForNavbar'; +import { useAuth } from '../../contexts/AuthContext.jsx'; +import { useNavigate } from 'react-router-dom'; const Profile = () => { const { user, loading } = useAuth(); - const navigate = useNavigate(); - const handleSignOut = async () => { - navigate("/logout"); + const [modal, setModal] = useState({ isOpen: false, message: '', type: '' }); + + const handleSignOut = () => + setModal({ + isOpen: true, + message: 'Are you sure you want to log out?', + type: 'confirmLogout', + }); + + const closeModal = () => setModal({ isOpen: false, message: '', type: '' }); + + const confirmLogout = () => { + closeModal(); + navigate('/logout'); }; @@ -18,69 +29,65 @@
-
-
+
+
{loading ? ( -
+
-

Loading profile...

+

Loading profile...

) : ( <> - {/* Profile Header */} -
-
-
+ {/* Header */} +
+
+
Profile
-

+

{user.name}

-

{user.email}

+

{user.email}

-
-
- -

+ + {/* Rank */} +

+
+ +

Current Rank

- {/* Stats Section */} -
-
-
- - {user.points} - -

- Total Points -

-
+ + {/* Stats */} +
+
+ + {user.points} + +

Total Points

- -
-
- - {user.solved_problems} - -

- Solved Challenges -

-
+
+ + {user.solved_problems} + +

+ Solved Challenges +

- {/* Sign Out Button */} + {/* Sign Out */}
+ {modal.isOpen && ( +
+
+
+
+ + + +
+ +
+
+

+ {modal.message} +

+
+
+ + +
+
+
+ )}
); Index: client/src/Dashboard/components/Task.jsx =================================================================== --- client/src/Dashboard/components/Task.jsx (revision 5523b75057ef8574e6a307bd6ea65039f096b802) +++ client/src/Dashboard/components/Task.jsx (revision f54e5efcde4c478a0168c2abe09d11998a91a13e) @@ -286,10 +286,10 @@
) : ( -
+
-
+
{/* Header Section */} -
-

+
+

Challenge for {today}

@@ -298,5 +298,5 @@ {/* Already Completed Alert */} {user.solvedDailyChallenge && ( -
+
{/* Problem Section */} -
-
-

+
+
+

Problem: {task.title || 'Daily Challenge'}

-

+

{task.content || 'No description available'}

@@ -334,13 +334,13 @@ {/* Input and Examples Section */} -
+
{/* Your Input Card */}
-
-

+
+

Your Input:

-
-

+
+

Examples:

-
+
{task.examples.map((example, index) => (
@@ -391,5 +391,5 @@ ) : ( -
+
@@ -398,6 +398,6 @@ {/* Submit Solution Section */}
-
-

+
+

Submit Your Solution

@@ -415,5 +415,5 @@ setIsUserOutputEmpty(value.trim() === ''); }} - className={`textarea textarea-bordered w-full mb-3 sm:mb-4 text-sm sm:text-base resize-none ${ + className={`textarea textarea-bordered w-full mb-2 sm:mb-3 text-sm sm:text-base resize-none ${ isCorrect === null ? '' @@ -422,11 +422,11 @@ : 'border-red-500' }`} - rows="4" - style={{ minHeight: '100px', maxHeight: '200px' }} + rows="6" + style={{ minHeight: '150px', maxHeight: '300px' }} disabled={user.solvedDailyChallenge || isSubmitting} /> {user.solvedDailyChallenge && ( -

+

You earned:{' '} {user.daily_points}{' '} @@ -443,5 +443,5 @@

+

- {/* Right side - Action buttons */} -
+ {/* Right - Action buttons */} +