Merge pull request #206 from hussaino03/dev

Dev
hussaino03 · Dec 28, 2024 · abdc6df · abdc6df
2 parents 3529600 + ba3fb05
commit abdc6df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/client/src/components/Modal Management/Projects/ProjectView.js b/client/src/components/Modal Management/Projects/ProjectView.js
@@ -28,7 +28,7 @@ const ProjectView = ({ task, isCompleted, handleSubtaskToggle }) => {
           className="text-blue-500 hover:text-blue-600 dark:text-blue-400 
                     dark:hover:text-blue-300 text-sm font-medium"
         >
-          🤝 Share Project
+          🤝 Share Project (coming soon!)
         </button>
       </div>
 

diff --git a/client/src/components/Modal Management/Tasks/TaskView.js b/client/src/components/Modal Management/Tasks/TaskView.js
@@ -178,14 +178,7 @@ const TaskView = ({ task, isCompleted, isTextTruncated, textRef, nameOnly }) =>
         {task.deadline && (
           <div className="flex items-center gap-2">
             <span>📅</span>
-            <span>
-              Due: {formatDeadline(task.deadline)}
-              {isOverdue(task.deadline) && !isCompleted && (
-                <span className="text-red-500 ml-1">
-                  ({calculateOverduePenalty(task.deadline)}xp)
-                </span>
-              )}
-            </span>
+            <span>Due: {formatDeadline(task.deadline)}</span>
           </div>
         )}
         <div className="flex items-center gap-2">
@@ -197,6 +190,11 @@ const TaskView = ({ task, isCompleted, isTextTruncated, textRef, nameOnly }) =>
                 +{task.earlyBonus}xp bonus
               </span>
             )}
+            {!isCompleted && isOverdue(task.deadline) && (
+              <span className="text-red-500 ml-1">
+                ({calculateOverduePenalty(task.deadline)}xp)
+              </span>
+            )}
           </span>
         </div>
         <div className="flex items-center">