Merge pull request #208 from hussaino03/dev

Fixes #200: collaborative projects
hussaino03 · Dec 30, 2024 · 0b7e65b · 0b7e65b
2 parents 4663ea8 + f248203
commit 0b7e65b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/client/src/components/Modal Management/Layout/View.js b/client/src/components/Modal Management/Layout/View.js
@@ -115,14 +115,23 @@ const View = ({
                   Project
                 </span>
               )}
-              {task.label && (
+              {task.label ? (
                 <span
-                  className="inline-flex text-xs px-1.5 py-0.5 bg-blue-50 dark:bg-blue-500/10 
-                             text-blue-600 dark:text-blue-400 rounded-full border 
-                             border-blue-200 dark:border-blue-800 whitespace-nowrap"
+                  className={`inline-flex text-xs px-1.5 py-0.5 ${
+                    task.urgent ? 'bg-red-50 dark:bg-red-500/10 text-red-600 dark:text-red-400 border-red-200 dark:border-red-800' 
+                    : 'bg-blue-50 dark:bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-200 dark:border-blue-800'
+                  } rounded-full border whitespace-nowrap`}
                 >
                   {task.label}
                 </span>
+              ) : task.urgent && (
+                <span
+                  className="inline-flex text-xs px-1.5 py-0.5 bg-red-50 dark:bg-red-500/10 
+                             text-red-600 dark:text-red-400 rounded-full border 
+                             border-red-200 dark:border-red-800 whitespace-nowrap"
+                >
+                  Urgent
+                </span>
               )}
               {!isCompleted && task.deadline && isOverdue(task.deadline) && (
                 <span

diff --git a/client/src/components/Modal Management/Tasks/TaskForm.js b/client/src/components/Modal Management/Tasks/TaskForm.js
@@ -34,14 +34,25 @@ const TaskForm = ({ addTask }) => {
       return;
     }
 
+    // Handle urgent label
+    let finalLabel = formState.label;
+    if (formState.urgent) {
+      if (!finalLabel) {
+        finalLabel = 'urgent';
+      } else if (!finalLabel.toLowerCase().includes('urgent')) {
+        const urgentSuffix = ' | urgent';
+        finalLabel = (finalLabel + urgentSuffix).slice(0, MAX_LABEL_LENGTH);
+      }
+    }
+
     const newTask = {
       name: formState.name,
       desc: formState.description,
       difficulty: formState.difficulty,
       importance: formState.importance,
       deadline: formState.deadline || null,
       urgent: formState.urgent, 
-      label: formState.label || null,
+      label: finalLabel,
       experience: calculateBaseXP(
         formState.difficulty,
         formState.importance,